diff -Nru gitg-3.22.0/aclocal.m4 gitg-3.23.0/aclocal.m4 --- gitg-3.22.0/aclocal.m4 2016-09-18 12:01:36.000000000 +0000 +++ gitg-3.23.0/aclocal.m4 2016-11-26 13:24:43.000000000 +0000 @@ -20,648 +20,6 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# gnome-compiler-flags.m4 -# -# serial 4 -# - -dnl GNOME_COMPILE_WARNINGS -dnl Turn on many useful compiler warnings and substitute the result into -dnl WARN_CFLAGS -dnl For now, only works on GCC -dnl Pass the default value of the --enable-compile-warnings configure option as -dnl the first argument to the macro, defaulting to 'yes'. -dnl Additional warning/error flags can be passed as an optional second argument. -dnl -dnl For example: GNOME_COMPILE_WARNINGS([maximum],[-Werror=some-flag -Wfoobar]) -AU_DEFUN([GNOME_COMPILE_WARNINGS],[ - dnl ****************************** - dnl More compiler warnings - dnl ****************************** - - AC_ARG_ENABLE(compile-warnings, - AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], - [Turn on compiler warnings]),, - [enable_compile_warnings="m4_default([$1],[yes])"]) - - if test "x$GCC" != xyes; then - enable_compile_warnings=no - fi - - warning_flags= - realsave_CFLAGS="$CFLAGS" - - dnl These are warning flags that aren't marked as fatal. Can be - dnl overridden on a per-project basis with -Wno-foo. - base_warn_flags=" \ - -Wall \ - -Wstrict-prototypes \ - -Wnested-externs \ - " - - dnl These compiler flags typically indicate very broken or suspicious - dnl code. Some of them such as implicit-function-declaration are - dnl just not default because gcc compiles a lot of legacy code. - dnl We choose to make this set into explicit errors. - base_error_flags=" \ - -Werror=missing-prototypes \ - -Werror=implicit-function-declaration \ - -Werror=pointer-arith \ - -Werror=init-self \ - -Werror=format-security \ - -Werror=format=2 \ - -Werror=missing-include-dirs \ - -Werror=return-type \ - " - - dnl Additional warning or error flags provided by the module author to - dnl allow stricter standards to be imposed on a per-module basis. - dnl The author can pass -W or -Werror flags here as they see fit. - additional_flags="m4_default([$2],[])" - - case "$enable_compile_warnings" in - no) - warning_flags="-w" - ;; - minimum) - warning_flags="-Wall" - ;; - yes|maximum|error) - warning_flags="$base_warn_flags $base_error_flags $additional_flags" - ;; - *) - AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) - ;; - esac - - if test "$enable_compile_warnings" = "error" ; then - warning_flags="$warning_flags -Werror" - fi - - dnl Check whether GCC supports the warning options - for option in $warning_flags; do - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - CFLAGS="$save_CFLAGS" - AC_MSG_RESULT([$has_option]) - if test $has_option = yes; then - tested_warning_flags="$tested_warning_flags $option" - fi - unset has_option - unset save_CFLAGS - done - unset option - CFLAGS="$realsave_CFLAGS" - AC_MSG_CHECKING(what warning flags to pass to the C compiler) - AC_MSG_RESULT($tested_warning_flags) - - AC_ARG_ENABLE(iso-c, - AS_HELP_STRING([--enable-iso-c], - [Try to warn if code is not ISO C ]),, - [enable_iso_c=no]) - - AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) - complCFLAGS= - if test "x$enable_iso_c" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -ansi" ;; - esac - case " $CFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCFLAGS) - - WARN_CFLAGS="$tested_warning_flags $complCFLAGS" - AC_SUBST(WARN_CFLAGS) -], -[[$0: This macro is deprecated. You should use AX_COMPILER_FLAGS instead and -eliminate use of --enable-iso-c. -See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_compiler_flags]]) - -dnl For C++, do basically the same thing. - -AU_DEFUN([GNOME_CXX_WARNINGS],[ - AC_ARG_ENABLE(cxx-warnings, - AS_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] - [Turn on compiler warnings.]),, - [enable_cxx_warnings="m4_default([$1],[minimum])"]) - - AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) - warnCXXFLAGS= - if test "x$GXX" != xyes; then - enable_cxx_warnings=no - fi - if test "x$enable_cxx_warnings" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-Wall[\ \ ]*) ;; - *) warnCXXFLAGS="-Wall -Wno-unused" ;; - esac - - ## -W is not all that useful. And it cannot be controlled - ## with individual -Wno-xxx flags, unlike -Wall - if test "x$enable_cxx_warnings" = "xyes"; then - warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" - fi - fi - fi - AC_MSG_RESULT($warnCXXFLAGS) - - AC_ARG_ENABLE(iso-cxx, - AS_HELP_STRING([--enable-iso-cxx], - [Try to warn if code is not ISO C++ ]),, - [enable_iso_cxx=no]) - - AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) - complCXXFLAGS= - if test "x$enable_iso_cxx" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; - esac - - case " $CXXFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCXXFLAGS) - - WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" - AC_SUBST(WARN_CXXFLAGS) -], -[[$0: This macro is deprecated. You should use AX_COMPILER_FLAGS instead and -eliminate use of --enable-iso-cxx. -See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_compiler_flags]]) - -dnl GLIB_GSETTINGS -dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether -dnl the schema should be compiled -dnl - -AC_DEFUN([GLIB_GSETTINGS], -[ - m4_pattern_allow([AM_V_GEN]) - AC_ARG_ENABLE(schemas-compile, - AS_HELP_STRING([--disable-schemas-compile], - [Disable regeneration of gschemas.compiled on install]), - [case ${enableval} in - yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; - no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; - esac]) - AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) - PKG_PROG_PKG_CONFIG([0.16]) - AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) - if test x$cross_compiling != xyes; then - GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` - else - AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) - fi - AC_SUBST(GLIB_COMPILE_SCHEMAS) - if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then - ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) - else - ifelse([$1],,[:],[$1]) - fi - - GSETTINGS_RULES=' -.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas - -mostlyclean-am: clean-gsettings-schemas - -gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) - -%.gschema.valid: %.gschema.xml $(gsettings__enum_file) - $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@ - -all-am: $(gsettings_SCHEMAS:.xml=.valid) -uninstall-am: uninstall-gsettings-schemas -install-data-am: install-gsettings-schemas - -.SECONDARY: $(gsettings_SCHEMAS) - -install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) - @$(NORMAL_INSTALL) - if test -n "$^"; then \ - test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ - $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ - fi - -uninstall-gsettings-schemas: - @$(NORMAL_UNINSTALL) - @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) - -clean-gsettings-schemas: - rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) - -ifdef gsettings_ENUM_NAMESPACE -$(gsettings__enum_file): $(gsettings_ENUM_FILES) - $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ -endif -' - _GSETTINGS_SUBST(GSETTINGS_RULES) -]) - -dnl _GSETTINGS_SUBST(VARIABLE) -dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -AC_DEFUN([_GSETTINGS_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) - -dnl -*- mode: autoconf -*- -dnl Copyright 2009 Johan Dahlin -dnl -dnl This file is free software; the author(s) gives unlimited -dnl permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. -dnl - -# serial 1 - -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first - - dnl enable/disable introspection - m4_if([$2], [require], - [dnl - enable_introspection=yes - ],[dnl - AC_ARG_ENABLE(introspection, - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], - [Enable introspection for this build]),, - [enable_introspection=auto]) - ])dnl - - AC_MSG_CHECKING([for gobject-introspection]) - - dnl presence/version checking - AS_CASE([$enable_introspection], - [no], [dnl - found_introspection="no (disabled, use --enable-introspection to enable)" - ],dnl - [yes],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0],, - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], - found_introspection=yes, - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) - ],dnl - [auto],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) - dnl Canonicalize enable_introspection - enable_introspection=$found_introspection - ],dnl - [dnl - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) - ])dnl - - AC_MSG_RESULT([$found_introspection]) - - INTROSPECTION_SCANNER= - INTROSPECTION_COMPILER= - INTROSPECTION_GENERATE= - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - if test "x$found_introspection" = "xyes"; then - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) - AC_SUBST(INTROSPECTION_GENERATE) - AC_SUBST(INTROSPECTION_GIRDIR) - AC_SUBST(INTROSPECTION_TYPELIBDIR) - AC_SUBST(INTROSPECTION_CFLAGS) - AC_SUBST(INTROSPECTION_LIBS) - AC_SUBST(INTROSPECTION_MAKEFILE) - - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -]) - - -dnl Usage: -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) - -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -]) - -dnl Usage: -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) - - -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -]) - -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29.1) -dnl -dnl Copyright © 2004 Scott James Remnant . -dnl Copyright © 2012-2015 Dan Nicholson -dnl -dnl This program is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2 of the License, or -dnl (at your option) any later version. -dnl -dnl This program is distributed in the hope that it will be useful, but -dnl WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -dnl 02111-1307, USA. -dnl -dnl As a special exception to the GNU General Public License, if you -dnl distribute this file as part of a program that contains a -dnl configuration script generated by Autoconf, you may include it under -dnl the same distribution terms that you use for the rest of that -dnl program. - -dnl PKG_PREREQ(MIN-VERSION) -dnl ----------------------- -dnl Since: 0.29 -dnl -dnl Verify that the version of the pkg-config macros are at least -dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's -dnl installed version of pkg-config, this checks the developer's version -dnl of pkg.m4 when generating configure. -dnl -dnl To ensure that this macro is defined, also add: -dnl m4_ifndef([PKG_PREREQ], -dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) -dnl -dnl See the "Since" comment for each macro you use to see what version -dnl of the macros you require. -m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) -m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, - [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) -])dnl PKG_PREREQ - -dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) -dnl ---------------------------------- -dnl Since: 0.16 -dnl -dnl Search for the pkg-config tool and set the PKG_CONFIG variable to -dnl first found in the path. Checks that the version of pkg-config found -dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is -dnl used since that's the first version where most current features of -dnl pkg-config existed. -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])dnl PKG_PROG_PKG_CONFIG - -dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -dnl ------------------------------------------------------------------- -dnl Since: 0.18 -dnl -dnl Check to see whether a particular set of modules exists. Similar to -dnl PKG_CHECK_MODULES(), but does not set variables or print errors. -dnl -dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -dnl only at the first occurence in configure.ac, so if the first place -dnl it's called might be skipped (such as if it is within an "if", you -dnl have to call PKG_CHECK_EXISTS manually -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - -dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -dnl --------------------------------------------- -dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting -dnl pkg_failed based on the result. -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes ], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])dnl _PKG_CONFIG - -dnl _PKG_SHORT_ERRORS_SUPPORTED -dnl --------------------------- -dnl Internal check to see if pkg-config supports short errors. -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])dnl _PKG_SHORT_ERRORS_SUPPORTED - - -dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -dnl [ACTION-IF-NOT-FOUND]) -dnl -------------------------------------------------------------- -dnl Since: 0.4.0 -dnl -dnl Note that if there is a possibility the first call to -dnl PKG_CHECK_MODULES might not happen, you should be sure to include an -dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: - -$$1_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -_PKG_TEXT])[]dnl - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -_PKG_TEXT - -To get pkg-config, see .])[]dnl - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])dnl PKG_CHECK_MODULES - - -dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -dnl [ACTION-IF-NOT-FOUND]) -dnl --------------------------------------------------------------------- -dnl Since: 0.29 -dnl -dnl Checks for existence of MODULES and gathers its build flags with -dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags -dnl and VARIABLE-PREFIX_LIBS from --libs. -dnl -dnl Note that if there is a possibility the first call to -dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to -dnl include an explicit call to PKG_PROG_PKG_CONFIG in your -dnl configure.ac. -AC_DEFUN([PKG_CHECK_MODULES_STATIC], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -_save_PKG_CONFIG=$PKG_CONFIG -PKG_CONFIG="$PKG_CONFIG --static" -PKG_CHECK_MODULES($@) -PKG_CONFIG=$_save_PKG_CONFIG[]dnl -])dnl PKG_CHECK_MODULES_STATIC - - -dnl PKG_INSTALLDIR([DIRECTORY]) -dnl ------------------------- -dnl Since: 0.27 -dnl -dnl Substitutes the variable pkgconfigdir as the location where a module -dnl should install pkg-config .pc files. By default the directory is -dnl $libdir/pkgconfig, but the default can be changed by passing -dnl DIRECTORY. The user can override through the --with-pkgconfigdir -dnl parameter. -AC_DEFUN([PKG_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([pkgconfigdir], - [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, - [with_pkgconfigdir=]pkg_default) -AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -])dnl PKG_INSTALLDIR - - -dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) -dnl -------------------------------- -dnl Since: 0.27 -dnl -dnl Substitutes the variable noarch_pkgconfigdir as the location where a -dnl module should install arch-independent pkg-config .pc files. By -dnl default the directory is $datadir/pkgconfig, but the default can be -dnl changed by passing DIRECTORY. The user can override through the -dnl --with-noarch-pkgconfigdir parameter. -AC_DEFUN([PKG_NOARCH_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([noarch-pkgconfigdir], - [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, - [with_noarch_pkgconfigdir=]pkg_default) -AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -])dnl PKG_NOARCH_INSTALLDIR - - -dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -dnl ------------------------------------------- -dnl Since: 0.28 -dnl -dnl Retrieves the value of the pkg-config variable for the given module. -AC_DEFUN([PKG_CHECK_VAR], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl - -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -AS_VAR_COPY([$1], [pkg_cv_][$1]) - -AS_VAR_IF([$1], [""], [$5], [$4])dnl -])dnl PKG_CHECK_VAR - # Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -2134,9 +1492,12 @@ fi]) m4_include([m4/gettext.m4]) +m4_include([m4/gnome-compiler-flags.m4]) +m4_include([m4/gsettings.m4]) m4_include([m4/iconv.m4]) m4_include([m4/intlmacosx.m4]) m4_include([m4/intltool.m4]) +m4_include([m4/introspection.m4]) m4_include([m4/lib-ld.m4]) m4_include([m4/lib-link.m4]) m4_include([m4/lib-prefix.m4]) @@ -2146,5 +1507,6 @@ m4_include([m4/ltversion.m4]) m4_include([m4/lt~obsolete.m4]) m4_include([m4/nls.m4]) +m4_include([m4/pkg.m4]) m4_include([m4/po.m4]) m4_include([m4/progtest.m4]) diff -Nru gitg-3.22.0/autogen.sh gitg-3.23.0/autogen.sh --- gitg-3.22.0/autogen.sh 2016-09-18 11:59:28.000000000 +0000 +++ gitg-3.23.0/autogen.sh 2016-11-26 13:23:45.000000000 +0000 @@ -30,11 +30,13 @@ exit 1 fi -git submodule update --init --recursive +if ! test -z `which git` && test -d .git; then + git submodule update --init --recursive -if [ $? != 0 ]; then - echo "*** Failed to download submodules. Maybe you have a bad connection or a submodule was not forked?" - exit 1 + if [ $? != 0 ]; then + echo "*** Failed to download submodules. Maybe you have a bad connection or a submodule was not forked?" + exit 1 + fi fi autopoint --force diff -Nru gitg-3.22.0/configure gitg-3.23.0/configure --- gitg-3.22.0/configure 2016-09-18 12:01:36.000000000 +0000 +++ gitg-3.23.0/configure 2016-11-26 13:24:43.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gitg 3.22.0. +# Generated by GNU Autoconf 2.69 for gitg 3.23.0. # # Report bugs to . # @@ -651,8 +651,8 @@ # Identity of this package. PACKAGE_NAME='gitg' PACKAGE_TARNAME='gitg' -PACKAGE_VERSION='3.22.0' -PACKAGE_STRING='gitg 3.22.0' +PACKAGE_VERSION='3.23.0' +PACKAGE_STRING='gitg 3.23.0' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gitg' PACKAGE_URL='http://wiki.gnome.org/Apps/Gitg' @@ -1549,7 +1549,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gitg 3.22.0 to adapt to many kinds of systems. +\`configure' configures gitg 3.23.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1620,7 +1620,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gitg 3.22.0:";; + short | recursive ) echo "Configuration of gitg 3.23.0:";; esac cat <<\_ACEOF @@ -1772,7 +1772,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gitg configure 3.22.0 +gitg configure 3.23.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2088,7 +2088,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gitg $as_me 3.22.0, which was +It was created by gitg $as_me 3.23.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2478,9 +2478,9 @@ GITG_MAJOR_VERSION=3 -$as_echo "#define GITG_MINOR_VERSION 22" >>confdefs.h +$as_echo "#define GITG_MINOR_VERSION 23" >>confdefs.h -GITG_MINOR_VERSION=22 +GITG_MINOR_VERSION=23 $as_echo "#define GITG_MICRO_VERSION 0" >>confdefs.h @@ -2974,7 +2974,7 @@ # Define the identity of the package. PACKAGE='gitg' - VERSION='3.22.0' + VERSION='3.23.0' cat >>confdefs.h <<_ACEOF @@ -18072,7 +18072,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gitg $as_me 3.22.0, which was +This file was extended by gitg $as_me 3.23.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18139,7 +18139,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gitg config.status 3.22.0 +gitg config.status 3.23.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru gitg-3.22.0/configure.ac gitg-3.23.0/configure.ac --- gitg-3.22.0/configure.ac 2016-09-18 12:01:11.000000000 +0000 +++ gitg-3.23.0/configure.ac 2016-11-26 12:10:36.000000000 +0000 @@ -3,7 +3,7 @@ AC_PREREQ([2.64]) m4_define(gitg_major_version, 3) -m4_define(gitg_minor_version, 22) +m4_define(gitg_minor_version, 23) m4_define(gitg_micro_version, 0) m4_define(gitg_version, gitg_major_version.gitg_minor_version.gitg_micro_version) diff -Nru gitg-3.22.0/data/gitg.desktop.in gitg-3.23.0/data/gitg.desktop.in --- gitg-3.22.0/data/gitg.desktop.in 2016-09-18 12:01:39.000000000 +0000 +++ gitg-3.23.0/data/gitg.desktop.in 2016-11-26 13:24:47.000000000 +0000 @@ -12,4 +12,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gitg X-GNOME-Bugzilla-Component=core -X-GNOME-Bugzilla-Version=3.22.0 +X-GNOME-Bugzilla-Version=3.23.0 diff -Nru gitg-3.22.0/debian/BUGS gitg-3.23.0/debian/BUGS --- gitg-3.22.0/debian/BUGS 2016-02-11 23:54:43.000000000 +0000 +++ gitg-3.23.0/debian/BUGS 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -FTBFS: https://bugzilla.gnome.org/show_bug.cgi?id=761887 diff -Nru gitg-3.22.0/debian/changelog gitg-3.23.0/debian/changelog --- gitg-3.22.0/debian/changelog 2016-10-15 15:54:28.000000000 +0000 +++ gitg-3.23.0/debian/changelog 2017-01-15 02:12:21.000000000 +0000 @@ -1,3 +1,13 @@ +gitg (3.23.0-1) unstable; urgency=medium + + * New upstream release [November 2016]. + * Upload to unstable (Closes: #766461). + * Replaced "dbus-x11" with "default-dbus-session-bus | dbus-session-bus" + in "Depends" (Closes: #835882). + * Orphaned package. + + -- Dmitry Smirnov Sun, 15 Jan 2017 13:12:21 +1100 + gitg (3.22.0-1) experimental; urgency=medium * New upstream release [September 2016]. diff -Nru gitg-3.22.0/debian/control gitg-3.23.0/debian/control --- gitg-3.22.0/debian/control 2016-10-15 15:54:28.000000000 +0000 +++ gitg-3.23.0/debian/control 2017-01-15 02:12:21.000000000 +0000 @@ -1,7 +1,7 @@ Source: gitg Section: vcs Priority: optional -Maintainer: Dmitry Smirnov +Maintainer: Debian QA Group Build-Depends: debhelper (>= 9), dh-autoreconf, intltool ,pkg-config ,gnome-common @@ -30,7 +30,7 @@ Package: gitg Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} - ,dbus-x11 + ,default-dbus-session-bus | dbus-session-bus ,gir1.2-peas-1.0 ,git ,gsettings-desktop-schemas diff -Nru gitg-3.22.0/debian/copyright gitg-3.23.0/debian/copyright --- gitg-3.22.0/debian/copyright 2016-02-01 09:02:45.000000000 +0000 +++ gitg-3.23.0/debian/copyright 2017-01-15 02:10:37.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: gitg Source: http://ftp.gnome.org/pub/GNOME/sources/gitg/ Comment: @@ -36,6 +36,22 @@ License: FSFULLR Files: + m4/introspection.m4 +Copyright: + 2009 Johan Dahlin +License: FSFULLR~A + This file is free software; the author(s) gives unlimited + permission to copy and/or distribute it, with or without + modifications, as long as this notice is preserved. + +Files: + m4/pkg.m4 +Copyright: + 2012-2015 Dan Nicholson + 2004 Scott James Remnant +License: GPL-2+ and exception-GPL-Autoconf + +Files: contrib/ide/* Copyright: 2015 Christian Hergert @@ -57,7 +73,6 @@ gives unlimited permission to copy and/or distribute it, with or without modifications, as long as this notice is preserved. - License: GPL-2+ 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 @@ -100,3 +115,9 @@ On Debian systems, the complete text of the GNU Library General Public License Version 2 can be found in "/usr/share/common-licenses/LGPL-2". +License: exception-GPL-Autoconf + As a special exception to the GNU General Public License, if you + distribute this file as part of a program that contains a + configuration script generated by Autoconf, you may include it under + the same distribution terms that you use for the rest of that + program. diff -Nru gitg-3.22.0/gitg/commit/gitg-commit.c gitg-3.23.0/gitg/commit/gitg-commit.c --- gitg-3.22.0/gitg/commit/gitg-commit.c 2016-09-18 12:01:48.000000000 +0000 +++ gitg-3.23.0/gitg/commit/gitg-commit.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-commit.c generated by valac 0.32.1, the Vala compiler +/* gitg-commit.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-commit.vala, do not modify */ /* @@ -259,88 +259,84 @@ gchar* _tmp16_; GError* e; gchar* msg; - const gchar* _tmp17_; - GitgStageStatusSubmodule* _tmp18_; + GitgStageStatusSubmodule* _tmp17_; + gchar* _tmp18_; gchar* _tmp19_; gchar* _tmp20_; gchar* _tmp21_; gchar* _tmp22_; - gchar* _tmp23_; + GitgExtApplication* _tmp23_; GitgExtApplication* _tmp24_; GitgExtApplication* _tmp25_; - GitgExtApplication* _tmp26_; - const gchar* _tmp27_; - GError* _tmp28_; - const gchar* _tmp29_; + const gchar* _tmp26_; + GError* _tmp27_; + const gchar* _tmp28_; GitgRepository* repo; - GgitRepository* _tmp30_; - GitgStageStatusSubmodule* _tmp31_; + GgitRepository* _tmp29_; + GitgStageStatusSubmodule* _tmp30_; + GgitSubmodule* _tmp31_; GgitSubmodule* _tmp32_; - GgitSubmodule* _tmp33_; + GgitRepository* _tmp33_; GgitRepository* _tmp34_; - GgitRepository* _tmp35_; - GitgRepository* _tmp36_; + GitgRepository* _tmp35_; GError* _vala1_e; gchar* _vala1_msg; - const gchar* _tmp37_; - GitgStageStatusSubmodule* _tmp38_; + GitgStageStatusSubmodule* _tmp36_; + gchar* _tmp37_; + gchar* _tmp38_; gchar* _tmp39_; gchar* _tmp40_; gchar* _tmp41_; - gchar* _tmp42_; - gchar* _tmp43_; + GitgExtApplication* _tmp42_; + GitgExtApplication* _tmp43_; GitgExtApplication* _tmp44_; - GitgExtApplication* _tmp45_; - GitgExtApplication* _tmp46_; + const gchar* _tmp45_; + GError* _tmp46_; const gchar* _tmp47_; - GError* _tmp48_; - const gchar* _tmp49_; - GitgCommit* _tmp50_; - GitgCommit* _tmp51_; - GitgRepository* _tmp52_; - GitgStageStatusSubmodule* _tmp53_; - GgitSubmodule* _tmp54_; - GgitSubmodule* _tmp55_; - GgitOId* _tmp56_; - GgitOId* _tmp57_; - gpointer _tmp58_; - GitgCommit* _tmp59_; + GitgCommit* _tmp48_; + GitgCommit* _tmp49_; + GitgRepository* _tmp50_; + GitgStageStatusSubmodule* _tmp51_; + GgitSubmodule* _tmp52_; + GgitSubmodule* _tmp53_; + GgitOId* _tmp54_; + GgitOId* _tmp55_; + gpointer _tmp56_; + GitgCommit* _tmp57_; GError* _vala2_e; gchar* _vala2_msg; - const gchar* _tmp61_; - GitgStageStatusSubmodule* _tmp62_; + GitgStageStatusSubmodule* _tmp59_; + gchar* _tmp60_; + gchar* _tmp61_; + gchar* _tmp62_; gchar* _tmp63_; gchar* _tmp64_; - gchar* _tmp65_; - gchar* _tmp66_; - gchar* _tmp67_; - GitgExtApplication* _tmp68_; - GitgExtApplication* _tmp69_; - GitgExtApplication* _tmp70_; - const gchar* _tmp71_; - GError* _tmp72_; - const gchar* _tmp73_; - GitgStage* _tmp74_; - GitgStageStatusSubmodule* _tmp75_; - gchar* _tmp76_; - gchar* _tmp77_; - gchar* _tmp78_; - GitgCommit* _tmp79_; + GitgExtApplication* _tmp65_; + GitgExtApplication* _tmp66_; + GitgExtApplication* _tmp67_; + const gchar* _tmp68_; + GError* _tmp69_; + const gchar* _tmp70_; + GitgStage* _tmp71_; + GitgStageStatusSubmodule* _tmp72_; + gchar* _tmp73_; + gchar* _tmp74_; + gchar* _tmp75_; + GitgCommit* _tmp76_; GError* _vala3_e; gchar* _vala3_msg; - const gchar* _tmp80_; - GitgStageStatusSubmodule* _tmp81_; + GitgStageStatusSubmodule* _tmp77_; + gchar* _tmp78_; + gchar* _tmp79_; + gchar* _tmp80_; + gchar* _tmp81_; gchar* _tmp82_; - gchar* _tmp83_; - gchar* _tmp84_; - gchar* _tmp85_; - gchar* _tmp86_; - GitgExtApplication* _tmp87_; - GitgExtApplication* _tmp88_; - GitgExtApplication* _tmp89_; - const gchar* _tmp90_; - GError* _tmp91_; - const gchar* _tmp92_; + GitgExtApplication* _tmp83_; + GitgExtApplication* _tmp84_; + GitgExtApplication* _tmp85_; + const gchar* _tmp86_; + GError* _tmp87_; + const gchar* _tmp88_; GError * _inner_error_; }; @@ -372,39 +368,37 @@ gchar* _tmp16_; GError* e; gchar* msg; - const gchar* _tmp17_; - GitgStageStatusFile* _tmp18_; + GitgStageStatusFile* _tmp17_; + gchar* _tmp18_; gchar* _tmp19_; gchar* _tmp20_; gchar* _tmp21_; gchar* _tmp22_; - gchar* _tmp23_; + GitgExtApplication* _tmp23_; GitgExtApplication* _tmp24_; GitgExtApplication* _tmp25_; - GitgExtApplication* _tmp26_; - const gchar* _tmp27_; - GError* _tmp28_; - const gchar* _tmp29_; - GitgStage* _tmp30_; - GitgStageStatusFile* _tmp31_; + const gchar* _tmp26_; + GError* _tmp27_; + const gchar* _tmp28_; + GitgStage* _tmp29_; + GitgStageStatusFile* _tmp30_; + gchar* _tmp31_; gchar* _tmp32_; gchar* _tmp33_; - gchar* _tmp34_; GError* _vala1_e; gchar* _vala1_msg; - const gchar* _tmp35_; - GitgStageStatusFile* _tmp36_; + GitgStageStatusFile* _tmp34_; + gchar* _tmp35_; + gchar* _tmp36_; gchar* _tmp37_; gchar* _tmp38_; gchar* _tmp39_; - gchar* _tmp40_; - gchar* _tmp41_; + GitgExtApplication* _tmp40_; + GitgExtApplication* _tmp41_; GitgExtApplication* _tmp42_; - GitgExtApplication* _tmp43_; - GitgExtApplication* _tmp44_; + const gchar* _tmp43_; + GError* _tmp44_; const gchar* _tmp45_; - GError* _tmp46_; - const gchar* _tmp47_; GError * _inner_error_; }; @@ -513,22 +507,20 @@ GitgStageStatusFile* _tmp1_; GgitStatusFlags _tmp2_; GgitStatusFlags _tmp3_; - const gchar* _tmp4_; - GitgStageStatusFile* _tmp5_; + GitgStageStatusFile* _tmp4_; + gchar* _tmp5_; gchar* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; gchar* _tmp9_; - gchar* _tmp10_; - const gchar* _tmp11_; - GitgStageStatusFile* _tmp12_; + GitgStageStatusFile* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; gchar* _tmp13_; gchar* _tmp14_; gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; - gboolean _tmp18_; - gboolean _tmp19_; + gboolean _tmp16_; + gboolean _tmp17_; }; struct _GitgCommitActivityUnstageSubmoduleData { @@ -543,22 +535,20 @@ GitgStageStatusSubmodule* _tmp1_; GgitSubmoduleStatus _tmp2_; GgitSubmoduleStatus _tmp3_; - const gchar* _tmp4_; - GitgStageStatusSubmodule* _tmp5_; + GitgStageStatusSubmodule* _tmp4_; + gchar* _tmp5_; gchar* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; gchar* _tmp9_; - gchar* _tmp10_; - const gchar* _tmp11_; - GitgStageStatusSubmodule* _tmp12_; + GitgStageStatusSubmodule* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; gchar* _tmp13_; gchar* _tmp14_; gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; - gboolean _tmp18_; - gboolean _tmp19_; + gboolean _tmp16_; + gboolean _tmp17_; }; struct _GitgCommitActivityUnstageItemsData { @@ -653,9 +643,8 @@ GitgExtApplication* _tmp10_; GitgExtApplication* _tmp11_; GitgExtApplication* _tmp12_; - const gchar* _tmp13_; - GError* _tmp14_; - const gchar* _tmp15_; + GError* _tmp13_; + const gchar* _tmp14_; GError * _inner_error_; }; @@ -978,8 +967,8 @@ static gpointer gitg_commit_activity_parent_class = NULL; -static GitgExtUIElementIface* gitg_commit_activity_gitg_ext_ui_element_parent_iface = NULL; -static GitgExtActivityIface* gitg_commit_activity_gitg_ext_activity_parent_iface = NULL; +static GitgExtUIElementIface * gitg_commit_activity_gitg_ext_ui_element_parent_iface = NULL; +static GitgExtActivityIface * gitg_commit_activity_gitg_ext_activity_parent_iface = NULL; GType gitg_commit_activity_get_type (void) G_GNUC_CONST; GType gitg_commit_paned_get_type (void) G_GNUC_CONST; @@ -1115,7 +1104,7 @@ static void block9_data_unref (void * _userdata_); GitgCommitSidebarItem* gitg_commit_sidebar_item_new (GitgStageStatusItem* item, GitgCommitSidebarItemType type); GitgCommitSidebarItem* gitg_commit_sidebar_item_construct (GType object_type, GitgStageStatusItem* item, GitgCommitSidebarItemType type); -static void _vala_array_add2 (GitgCommitSidebarItem*** array, int* length, int* size, GitgCommitSidebarItem* value); +static void _vala_array_add2 (GitgCommitSidebarItem** * array, int* length, int* size, GitgCommitSidebarItem* value); static void ____lambda18_ (Block9Data* _data9_, gint numclick); static void _____lambda18__gitg_sidebar_item_activated (GitgSidebarItem* _sender, gint numclick, gpointer self); static Block10Data* block10_data_ref (Block10Data* _data10_); @@ -1129,10 +1118,10 @@ static void ____lambda13_ (Block11Data* _data11_, GObject* obj, GAsyncResult* res); static void _____lambda13__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); static void __lambda14_ (Block10Data* _data10_, GObject* obj, GAsyncResult* res); -static void _vala_array_add3 (GitgStageStatusItem*** array, int* length, int* size, GitgStageStatusItem* value); -static void _vala_array_add4 (GitgStageStatusItem*** array, int* length, int* size, GitgStageStatusItem* value); -static void _vala_array_add5 (GitgStageStatusItem*** array, int* length, int* size, GitgStageStatusItem* value); -static void _vala_array_add6 (GitgStageStatusItem*** array, int* length, int* size, GitgStageStatusItem* value); +static void _vala_array_add3 (GitgStageStatusItem** * array, int* length, int* size, GitgStageStatusItem* value); +static void _vala_array_add4 (GitgStageStatusItem** * array, int* length, int* size, GitgStageStatusItem* value); +static void _vala_array_add5 (GitgStageStatusItem** * array, int* length, int* size, GitgStageStatusItem* value); +static void _vala_array_add6 (GitgStageStatusItem** * array, int* length, int* size, GitgStageStatusItem* value); static void __lambda15_ (GitgCommitActivity* self, gint numclick); static void gitg_commit_activity_on_unstage_selected_items (GitgCommitActivity* self); static void ___lambda15__gitg_sidebar_item_activated (GitgSidebarItem* _sender, gint numclick, gpointer self); @@ -1300,7 +1289,7 @@ static GitgStageStatusItem** gitg_commit_activity_items_to_stage_items (GitgCommitActivity* self, GitgCommitSidebarItem** items, int items_length1, int* result_length1); static GitgStageStatusItem** gitg_commit_activity_stage_status_items_of_type (GitgCommitActivity* self, GitgCommitSidebarItemType type, int* result_length1); GitgCommitSidebarItem** gitg_commit_sidebar_items_of_type (GitgCommitSidebar* self, GitgCommitSidebarItemType type, int* result_length1); -static void _vala_array_add7 (GitgStageStatusItem*** array, int* length, int* size, GitgStageStatusItem* value); +static void _vala_array_add7 (GitgStageStatusItem** * array, int* length, int* size, GitgStageStatusItem* value); GitgCommitSidebarItemType gitg_commit_sidebar_item_get_stage_type (GitgCommitSidebarItem* self); static void gitg_commit_activity_sidebar_selection_changed (GitgCommitActivity* self, GitgSidebarItem** items, int items_length1); static void gitg_commit_activity_build_ui (GitgCommitActivity* self); @@ -1340,7 +1329,7 @@ void gitg_commit_activity_set_repository (GitgCommitActivity* self, GitgRepository* value); static GObject * gitg_commit_activity_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); static void _gitg_commit_activity_repository_changed_externally_gitg_ext_application_repository_changed_externally (GitgExtApplication* _sender, GitgExtExternalChangeHint hint, gpointer self); -static void gitg_commit_activity_finalize (GObject* obj); +static void gitg_commit_activity_finalize (GObject * obj); static void _vala_gitg_commit_activity_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_commit_activity_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -1382,14 +1371,14 @@ self = (GitgCommitActivity*) g_object_new (object_type, "application", _tmp0_, NULL); #line 48 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return self; -#line 1386 "gitg-commit.c" +#line 1375 "gitg-commit.c" } GitgCommitActivity* gitg_commit_activity_new (GitgExtApplication* application) { #line 48 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return gitg_commit_activity_construct (GITG_COMMIT_TYPE_ACTIVITY, application); -#line 1393 "gitg-commit.c" +#line 1382 "gitg-commit.c" } @@ -1402,7 +1391,7 @@ _tmp0_ = self->priv->d_externally_changed_id; #line 85 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp0_ != ((gulong) 0)) { -#line 1406 "gitg-commit.c" +#line 1395 "gitg-commit.c" GitgExtApplication* _tmp1_ = NULL; GitgExtApplication* _tmp2_ = NULL; GitgExtApplication* _tmp3_ = NULL; @@ -1421,25 +1410,25 @@ _g_object_unref0 (_tmp3_); #line 88 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self->priv->d_externally_changed_id = (gulong) 0; -#line 1425 "gitg-commit.c" +#line 1414 "gitg-commit.c" } #line 91 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" G_OBJECT_CLASS (gitg_commit_activity_parent_class)->dispose (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject)); -#line 1429 "gitg-commit.c" +#line 1418 "gitg-commit.c" } static void ____lambda12_ (GitgCommitActivity* self) { #line 103 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_reload (self); -#line 1436 "gitg-commit.c" +#line 1425 "gitg-commit.c" } static void _____lambda12__gitg_when_mapped_on_mapped (gpointer self) { #line 102 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" ____lambda12_ ((GitgCommitActivity*) self); -#line 1443 "gitg-commit.c" +#line 1432 "gitg-commit.c" } @@ -1451,28 +1440,28 @@ _tmp0_ = self->priv->d_ignore_external_changes; #line 96 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (!_tmp0_) { -#line 1455 "gitg-commit.c" +#line 1444 "gitg-commit.c" gboolean _tmp1_ = FALSE; GitgCommitPaned* _tmp2_ = NULL; #line 98 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp2_ = self->priv->d_main; #line 98 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp2_ != NULL) { -#line 1462 "gitg-commit.c" +#line 1451 "gitg-commit.c" GitgExtExternalChangeHint _tmp3_ = 0; #line 98 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp3_ = hint; #line 98 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp1_ = (_tmp3_ & GITG_EXT_EXTERNAL_CHANGE_HINT_INDEX) != 0; -#line 1468 "gitg-commit.c" +#line 1457 "gitg-commit.c" } else { #line 98 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp1_ = FALSE; -#line 1472 "gitg-commit.c" +#line 1461 "gitg-commit.c" } #line 98 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp1_) { -#line 1476 "gitg-commit.c" +#line 1465 "gitg-commit.c" GitgCommitPaned* _tmp4_ = NULL; GitgWhenMapped* _tmp5_ = NULL; GitgWhenMapped* _tmp6_ = NULL; @@ -1488,12 +1477,12 @@ _tmp6_ = self->priv->d_reload_when_mapped; #line 102 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_when_mapped_update (_tmp6_, _____lambda12__gitg_when_mapped_on_mapped, g_object_ref (self), g_object_unref, (GObject*) self); -#line 1492 "gitg-commit.c" +#line 1481 "gitg-commit.c" } } #line 108 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self->priv->d_ignore_external_changes = FALSE; -#line 1497 "gitg-commit.c" +#line 1486 "gitg-commit.c" } @@ -1511,7 +1500,7 @@ result = g_strcmp0 (_tmp0_, "commit") == 0; #line 141 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 1515 "gitg-commit.c" +#line 1504 "gitg-commit.c" } @@ -1527,7 +1516,7 @@ _tmp1__length1 = items_length1; #line 157 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp1__length1 == 1) { -#line 1531 "gitg-commit.c" +#line 1520 "gitg-commit.c" GitgStageStatusItem** _tmp2_ = NULL; gint _tmp2__length1 = 0; GitgStageStatusItem* _tmp3_ = NULL; @@ -1539,15 +1528,15 @@ _tmp3_ = _tmp2_[0]; #line 157 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, GITG_TYPE_STAGE_STATUS_SUBMODULE); -#line 1543 "gitg-commit.c" +#line 1532 "gitg-commit.c" } else { #line 157 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp0_ = FALSE; -#line 1547 "gitg-commit.c" +#line 1536 "gitg-commit.c" } #line 157 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp0_) { -#line 1551 "gitg-commit.c" +#line 1540 "gitg-commit.c" GitgStageStatusItem** _tmp4_ = NULL; gint _tmp4__length1 = 0; GitgStageStatusItem* _tmp5_ = NULL; @@ -1559,7 +1548,7 @@ _tmp5_ = _tmp4_[0]; #line 159 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_show_submodule_history (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GITG_TYPE_STAGE_STATUS_SUBMODULE, GitgStageStatusSubmodule), GITG_COMMIT_ACTIVITY_INDEX_TYPE_UNSTAGED); -#line 1563 "gitg-commit.c" +#line 1552 "gitg-commit.c" } else { GitgExtApplication* _tmp6_ = NULL; GitgExtApplication* _tmp7_ = NULL; @@ -1602,7 +1591,7 @@ _g_object_unref0 (_tmp11_); #line 164 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp8_); -#line 1606 "gitg-commit.c" +#line 1595 "gitg-commit.c" } } @@ -1610,7 +1599,7 @@ static gpointer _g_object_ref0 (gpointer self) { #line 168 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return self ? g_object_ref (self) : NULL; -#line 1614 "gitg-commit.c" +#line 1603 "gitg-commit.c" } @@ -1619,7 +1608,7 @@ g_atomic_int_inc (&_data4_->_ref_count_); #line 168 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data4_; -#line 1623 "gitg-commit.c" +#line 1612 "gitg-commit.c" } @@ -1628,7 +1617,7 @@ _data4_ = (Block4Data*) _userdata_; #line 168 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) { -#line 1632 "gitg-commit.c" +#line 1621 "gitg-commit.c" GitgCommitActivity* self; #line 168 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data4_->self; @@ -1642,7 +1631,7 @@ _g_object_unref0 (self); #line 168 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block4Data, _data4_); -#line 1646 "gitg-commit.c" +#line 1635 "gitg-commit.c" } } @@ -1668,14 +1657,14 @@ _tmp3_ = _data4_->patchable; #line 174 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_show_unstaged_diff_intern (self, _tmp0_, _tmp1_, _tmp2_, _tmp2__length1, _tmp3_); -#line 1672 "gitg-commit.c" +#line 1661 "gitg-commit.c" } static void ___lambda30__gitg_commit_activity_update_diff_callback (gpointer self) { #line 173 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" __lambda30_ (self); -#line 1679 "gitg-commit.c" +#line 1668 "gitg-commit.c" } @@ -1748,7 +1737,7 @@ block4_data_unref (_data4_); #line 168 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data4_ = NULL; -#line 1752 "gitg-commit.c" +#line 1741 "gitg-commit.c" } @@ -1757,7 +1746,7 @@ g_atomic_int_inc (&_data5_->_ref_count_); #line 178 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data5_; -#line 1761 "gitg-commit.c" +#line 1750 "gitg-commit.c" } @@ -1766,7 +1755,7 @@ _data5_ = (Block5Data*) _userdata_; #line 178 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data5_->_ref_count_)) { -#line 1770 "gitg-commit.c" +#line 1759 "gitg-commit.c" GitgCommitActivity* self; #line 178 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data5_->self; @@ -1778,7 +1767,7 @@ _g_object_unref0 (self); #line 178 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block5Data, _data5_); -#line 1782 "gitg-commit.c" +#line 1771 "gitg-commit.c" } } @@ -1790,7 +1779,7 @@ self = _data5_->self; #line 185 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_return_if_fail (res != NULL); -#line 1794 "gitg-commit.c" +#line 1783 "gitg-commit.c" { GgitDiff* d = NULL; GAsyncResult* _tmp0_ = NULL; @@ -1801,16 +1790,15 @@ GitgCommitPaned* _tmp5_ = NULL; GtkButton* _tmp6_ = NULL; GtkButton* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - GitgCommitPaned* _tmp9_ = NULL; + GitgCommitPaned* _tmp8_ = NULL; + GtkButton* _tmp9_ = NULL; GtkButton* _tmp10_ = NULL; - GtkButton* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - GitgCommitPaned* _tmp13_ = NULL; + gboolean _tmp11_ = FALSE; + GitgCommitPaned* _tmp12_ = NULL; + GtkButton* _tmp13_ = NULL; GtkButton* _tmp14_ = NULL; - GtkButton* _tmp15_ = NULL; + GitgDiffView* _tmp15_ = NULL; GitgDiffView* _tmp16_ = NULL; - GitgDiffView* _tmp17_ = NULL; #line 188 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp0_ = res; #line 188 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -1819,7 +1807,7 @@ d = _tmp1_; #line 188 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1823 "gitg-commit.c" +#line 1811 "gitg-commit.c" goto __catch6_g_error; } #line 190 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -1839,52 +1827,50 @@ #line 193 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp7_ = _tmp6_; #line 193 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp8_ = _ ("_Stage selection"); -#line 193 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gtk_button_set_label (_tmp7_, _tmp8_); + gtk_button_set_label (_tmp7_, _ ("_Stage selection")); #line 194 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp9_ = self->priv->d_main; + _tmp8_ = self->priv->d_main; #line 194 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp10_ = gitg_commit_paned_get_button_stage (_tmp9_); + _tmp9_ = gitg_commit_paned_get_button_stage (_tmp8_); #line 194 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 194 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp12_ = _data5_->patchable; + _tmp11_ = _data5_->patchable; #line 194 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gtk_widget_set_visible ((GtkWidget*) _tmp11_, _tmp12_); + gtk_widget_set_visible ((GtkWidget*) _tmp10_, _tmp11_); #line 195 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp13_ = self->priv->d_main; + _tmp12_ = self->priv->d_main; #line 195 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp14_ = gitg_commit_paned_get_button_discard (_tmp13_); + _tmp13_ = gitg_commit_paned_get_button_discard (_tmp12_); #line 195 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 195 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gtk_widget_set_visible ((GtkWidget*) _tmp15_, TRUE); + gtk_widget_set_visible ((GtkWidget*) _tmp14_, TRUE); #line 197 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp16_ = _data5_->view; + _tmp15_ = _data5_->view; #line 197 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_diff_view_set_new_is_workdir (_tmp16_, TRUE); + gitg_diff_view_set_new_is_workdir (_tmp15_, TRUE); #line 198 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp17_ = _data5_->view; + _tmp16_ = _data5_->view; #line 198 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_diff_view_set_diff (_tmp17_, d); + gitg_diff_view_set_diff (_tmp16_, d); #line 186 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (d); -#line 1874 "gitg-commit.c" +#line 1860 "gitg-commit.c" } goto __finally6; __catch6_g_error: { - GitgDiffView* _tmp18_ = NULL; + GitgDiffView* _tmp17_ = NULL; #line 186 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_clear_error (&_inner_error_); #line 186 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _inner_error_ = NULL; #line 203 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp18_ = _data5_->view; + _tmp17_ = _data5_->view; #line 203 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_diff_view_set_diff (_tmp18_, NULL); -#line 1888 "gitg-commit.c" + gitg_diff_view_set_diff (_tmp17_, NULL); +#line 1874 "gitg-commit.c" } __finally6: #line 186 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -1895,7 +1881,7 @@ g_clear_error (&_inner_error_); #line 186 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 1899 "gitg-commit.c" +#line 1885 "gitg-commit.c" } } @@ -1905,7 +1891,7 @@ __lambda29_ (self, source_object, res); #line 185 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" block5_data_unref (self); -#line 1909 "gitg-commit.c" +#line 1895 "gitg-commit.c" } @@ -1916,17 +1902,17 @@ result = g_new0 (GitgStageStatusItem*, length + 1); #line 207 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" for (i = 0; i < length; i++) { -#line 1920 "gitg-commit.c" +#line 1906 "gitg-commit.c" GitgStageStatusItem* _tmp0_ = NULL; #line 207 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 207 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result[i] = _tmp0_; -#line 1926 "gitg-commit.c" +#line 1912 "gitg-commit.c" } #line 207 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 1930 "gitg-commit.c" +#line 1916 "gitg-commit.c" } @@ -2014,7 +2000,7 @@ block5_data_unref (_data5_); #line 178 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data5_ = NULL; -#line 2018 "gitg-commit.c" +#line 2004 "gitg-commit.c" } @@ -2030,7 +2016,7 @@ self->priv->d_ignore_external_changes = TRUE; #line 216 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_reload (self); -#line 2034 "gitg-commit.c" +#line 2020 "gitg-commit.c" } @@ -2039,7 +2025,7 @@ __lambda26_ ((GitgCommitActivity*) self, source_object, res); #line 212 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (self); -#line 2043 "gitg-commit.c" +#line 2029 "gitg-commit.c" } @@ -2056,7 +2042,7 @@ _tmp1_ = commit; #line 212 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_stage_submodule (self, _tmp0_, _tmp1_, ___lambda26__gasync_ready_callback, g_object_ref (self)); -#line 2060 "gitg-commit.c" +#line 2046 "gitg-commit.c" } @@ -2071,7 +2057,7 @@ _g_object_unref0 (_data_->self); #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (GitgCommitActivityStageSubmoduleData, _data_); -#line 2075 "gitg-commit.c" +#line 2061 "gitg-commit.c" } @@ -2110,7 +2096,7 @@ _data_->commit = _tmp4_; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_stage_submodule_co (_data_); -#line 2114 "gitg-commit.c" +#line 2100 "gitg-commit.c" } @@ -2123,7 +2109,7 @@ result = _data_->result; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 2127 "gitg-commit.c" +#line 2113 "gitg-commit.c" } @@ -2137,14 +2123,14 @@ _data_->_res_ = _res_; #line 228 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_stage_submodule_co (_data_); -#line 2141 "gitg-commit.c" +#line 2127 "gitg-commit.c" } static void _vala_GgitOId_free (GgitOId* self) { #line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_boxed_free (ggit_oid_get_type (), self); -#line 2148 "gitg-commit.c" +#line 2134 "gitg-commit.c" } @@ -2153,20 +2139,20 @@ switch (_data_->_state_) { #line 220 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 0: -#line 2157 "gitg-commit.c" +#line 2143 "gitg-commit.c" goto _state_0; #line 220 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 1: -#line 2161 "gitg-commit.c" +#line 2147 "gitg-commit.c" goto _state_1; #line 220 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 2: -#line 2165 "gitg-commit.c" +#line 2151 "gitg-commit.c" goto _state_2; default: #line 220 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_assert_not_reached (); -#line 2170 "gitg-commit.c" +#line 2156 "gitg-commit.c" } _state_0: #line 222 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -2225,7 +2211,7 @@ _data_->_tmp11_ = _data_->_tmp10_; #line 224 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if ((_data_->_tmp11_ & GGIT_SUBMODULE_STATUS_WD_DELETED) != 0) { -#line 2229 "gitg-commit.c" +#line 2215 "gitg-commit.c" { #line 228 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp12_ = NULL; @@ -2253,7 +2239,7 @@ gitg_stage_delete_path (_data_->_tmp12_, _data_->_tmp16_, gitg_commit_activity_stage_submodule_ready, _data_); #line 228 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 2257 "gitg-commit.c" +#line 2243 "gitg-commit.c" _state_1: #line 228 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_stage_delete_path_finish (_data_->_tmp12_, _data_->_res_, &_data_->_inner_error_); @@ -2261,7 +2247,7 @@ _g_free0 (_data_->_tmp16_); #line 228 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 2265 "gitg-commit.c" +#line 2251 "gitg-commit.c" goto __catch7_g_error; } } @@ -2275,15 +2261,15 @@ #line 232 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp17_ = NULL; #line 232 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp17_ = _ ("Failed to stage the removal of submodule `%s'"); + _data_->_tmp17_ = _data_->sub; #line 232 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp18_ = NULL; #line 232 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp18_ = _data_->sub; + _data_->_tmp18_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp17_); #line 232 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp19_ = NULL; #line 232 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp19_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp18_); + _data_->_tmp19_ = _data_->_tmp18_; #line 232 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp20_ = NULL; #line 232 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -2291,23 +2277,23 @@ #line 232 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp21_ = NULL; #line 232 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp21_ = _data_->_tmp20_; + _data_->_tmp21_ = g_strdup_printf (_ ("Failed to stage the removal of submodule `%s'"), _data_->_tmp20_); #line 232 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp22_ = NULL; #line 232 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp22_ = g_strdup_printf (_data_->_tmp17_, _data_->_tmp21_); -#line 232 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp23_ = NULL; -#line 232 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp23_ = _data_->_tmp22_; + _data_->_tmp22_ = _data_->_tmp21_; #line 232 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_data_->_tmp21_); + _g_free0 (_data_->_tmp20_); #line 232 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->msg = _data_->_tmp23_; + _data_->msg = _data_->_tmp22_; +#line 233 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp23_ = NULL; +#line 233 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp23_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); #line 233 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp24_ = NULL; #line 233 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp24_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); + _data_->_tmp24_ = _data_->_tmp23_; #line 233 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp25_ = NULL; #line 233 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -2315,23 +2301,19 @@ #line 233 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp26_ = NULL; #line 233 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp26_ = _data_->_tmp25_; + _data_->_tmp26_ = _data_->msg; #line 233 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp27_ = NULL; #line 233 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp27_ = _data_->msg; + _data_->_tmp27_ = _data_->e; #line 233 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp28_ = NULL; #line 233 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp28_ = _data_->e; + _data_->_tmp28_ = _data_->_tmp27_->message; #line 233 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp29_ = NULL; -#line 233 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp29_ = _data_->_tmp28_->message; + gitg_ext_application_show_infobar (_data_->_tmp25_, _data_->_tmp26_, _data_->_tmp28_, GTK_MESSAGE_ERROR); #line 233 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_application_show_infobar (_data_->_tmp26_, _data_->_tmp27_, _data_->_tmp29_, GTK_MESSAGE_ERROR); -#line 233 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_data_->_tmp26_); + _g_object_unref0 (_data_->_tmp25_); #line 235 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->result = FALSE; #line 235 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -2344,17 +2326,17 @@ if (_data_->_state_ == 0) { #line 235 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2348 "gitg-commit.c" +#line 2330 "gitg-commit.c" } else { #line 235 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2352 "gitg-commit.c" +#line 2334 "gitg-commit.c" } #line 235 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 235 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 2358 "gitg-commit.c" +#line 2340 "gitg-commit.c" } __finally7: #line 226 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -2367,56 +2349,56 @@ g_clear_error (&_data_->_inner_error_); #line 226 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 2371 "gitg-commit.c" +#line 2353 "gitg-commit.c" } } else { { #line 244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp30_ = NULL; +#line 244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp30_ = _data_->sub; +#line 244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp31_ = NULL; #line 244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp31_ = _data_->sub; + _data_->_tmp31_ = gitg_stage_status_submodule_get_submodule (_data_->_tmp30_); #line 244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp32_ = NULL; #line 244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp32_ = gitg_stage_status_submodule_get_submodule (_data_->_tmp31_); + _data_->_tmp32_ = _data_->_tmp31_; #line 244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp33_ = NULL; #line 244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp33_ = _data_->_tmp32_; -#line 244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp34_ = NULL; -#line 244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp34_ = ggit_submodule_open (_data_->_tmp33_, &_data_->_inner_error_); + _data_->_tmp33_ = ggit_submodule_open (_data_->_tmp32_, &_data_->_inner_error_); #line 244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp30_ = _data_->_tmp34_; + _data_->_tmp29_ = _data_->_tmp33_; #line 244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 2395 "gitg-commit.c" +#line 2377 "gitg-commit.c" goto __catch8_g_error; } #line 244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp35_ = NULL; + _data_->_tmp34_ = NULL; #line 244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp35_ = _data_->_tmp30_; + _data_->_tmp34_ = _data_->_tmp29_; #line 244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp30_ = NULL; + _data_->_tmp29_ = NULL; #line 244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp36_ = NULL; + _data_->_tmp35_ = NULL; #line 244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp36_ = G_TYPE_CHECK_INSTANCE_TYPE (_data_->_tmp35_, GITG_TYPE_REPOSITORY) ? ((GitgRepository*) _data_->_tmp35_) : NULL; + _data_->_tmp35_ = G_TYPE_CHECK_INSTANCE_TYPE (_data_->_tmp34_, GITG_TYPE_REPOSITORY) ? ((GitgRepository*) _data_->_tmp34_) : NULL; #line 244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_data_->_tmp36_ == NULL) { + if (_data_->_tmp35_ == NULL) { #line 244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_data_->_tmp35_); -#line 2412 "gitg-commit.c" + _g_object_unref0 (_data_->_tmp34_); +#line 2394 "gitg-commit.c" } #line 244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_data_->repo); #line 244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->repo = _data_->_tmp36_; + _data_->repo = _data_->_tmp35_; #line 242 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_data_->_tmp30_); -#line 2420 "gitg-commit.c" + _g_object_unref0 (_data_->_tmp29_); +#line 2402 "gitg-commit.c" } goto __finally8; __catch8_g_error: @@ -2426,65 +2408,61 @@ #line 242 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_inner_error_ = NULL; #line 248 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp36_ = NULL; +#line 248 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp36_ = _data_->sub; +#line 248 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp37_ = NULL; #line 248 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp37_ = _ ("Failed to open the repository of submodule `%s' while trying to stage"); + _data_->_tmp37_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp36_); #line 248 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp38_ = NULL; #line 248 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp38_ = _data_->sub; + _data_->_tmp38_ = _data_->_tmp37_; #line 248 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp39_ = NULL; #line 248 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp39_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp38_); + _data_->_tmp39_ = _data_->_tmp38_; #line 248 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp40_ = NULL; #line 248 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp40_ = _data_->_tmp39_; + _data_->_tmp40_ = g_strdup_printf (_ ("Failed to open the repository of submodule `%s' while trying to stage"), _data_->_tmp39_); #line 248 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp41_ = NULL; #line 248 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp41_ = _data_->_tmp40_; #line 248 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp42_ = NULL; -#line 248 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp42_ = g_strdup_printf (_data_->_tmp37_, _data_->_tmp41_); + _g_free0 (_data_->_tmp39_); #line 248 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_vala1_msg = _data_->_tmp41_; +#line 249 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp42_ = NULL; +#line 249 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp42_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); +#line 249 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp43_ = NULL; -#line 248 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" +#line 249 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp43_ = _data_->_tmp42_; -#line 248 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_data_->_tmp41_); -#line 248 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_vala1_msg = _data_->_tmp43_; #line 249 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp44_ = NULL; #line 249 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp44_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); + _data_->_tmp44_ = _data_->_tmp43_; #line 249 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp45_ = NULL; #line 249 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp45_ = _data_->_tmp44_; + _data_->_tmp45_ = _data_->_vala1_msg; #line 249 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp46_ = NULL; #line 249 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp46_ = _data_->_tmp45_; + _data_->_tmp46_ = _data_->_vala1_e; #line 249 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp47_ = NULL; #line 249 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp47_ = _data_->_vala1_msg; -#line 249 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp48_ = NULL; -#line 249 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp48_ = _data_->_vala1_e; -#line 249 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp49_ = NULL; -#line 249 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp49_ = _data_->_tmp48_->message; + _data_->_tmp47_ = _data_->_tmp46_->message; #line 249 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_application_show_infobar (_data_->_tmp46_, _data_->_tmp47_, _data_->_tmp49_, GTK_MESSAGE_ERROR); + gitg_ext_application_show_infobar (_data_->_tmp44_, _data_->_tmp45_, _data_->_tmp47_, GTK_MESSAGE_ERROR); #line 249 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_data_->_tmp46_); + _g_object_unref0 (_data_->_tmp44_); #line 251 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->result = FALSE; #line 251 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -2499,17 +2477,17 @@ if (_data_->_state_ == 0) { #line 251 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2503 "gitg-commit.c" +#line 2481 "gitg-commit.c" } else { #line 251 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2507 "gitg-commit.c" +#line 2485 "gitg-commit.c" } #line 251 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 251 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 2513 "gitg-commit.c" +#line 2491 "gitg-commit.c" } __finally8: #line 242 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -2524,29 +2502,37 @@ g_clear_error (&_data_->_inner_error_); #line 242 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 2528 "gitg-commit.c" +#line 2506 "gitg-commit.c" } #line 254 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp50_ = NULL; + _data_->_tmp48_ = NULL; #line 254 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp50_ = _data_->commit; + _data_->_tmp48_ = _data_->commit; #line 254 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_data_->_tmp50_ == NULL) { -#line 2536 "gitg-commit.c" + if (_data_->_tmp48_ == NULL) { +#line 2514 "gitg-commit.c" { - GitgCommit* _tmp60_ = NULL; + GitgCommit* _tmp58_ = NULL; +#line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp50_ = NULL; +#line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp50_ = _data_->repo; +#line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp51_ = NULL; +#line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp51_ = _data_->sub; #line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp52_ = NULL; #line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp52_ = _data_->repo; + _data_->_tmp52_ = gitg_stage_status_submodule_get_submodule (_data_->_tmp51_); #line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp53_ = NULL; #line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp53_ = _data_->sub; + _data_->_tmp53_ = _data_->_tmp52_; #line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp54_ = NULL; #line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp54_ = gitg_stage_status_submodule_get_submodule (_data_->_tmp53_); + _data_->_tmp54_ = ggit_submodule_get_workdir_id (_data_->_tmp53_); #line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp55_ = NULL; #line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -2554,37 +2540,29 @@ #line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp56_ = NULL; #line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp56_ = ggit_submodule_get_workdir_id (_data_->_tmp55_); + _data_->_tmp56_ = gitg_repository_lookup (_data_->_tmp50_, GITG_TYPE_COMMIT, (GBoxedCopyFunc) g_object_ref, g_object_unref, _data_->_tmp55_, &_data_->_inner_error_); #line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp57_ = NULL; #line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp57_ = _data_->_tmp56_; -#line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp58_ = NULL; -#line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp58_ = gitg_repository_lookup (_data_->_tmp52_, GITG_TYPE_COMMIT, (GBoxedCopyFunc) g_object_ref, g_object_unref, _data_->_tmp57_, &_data_->_inner_error_); -#line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp59_ = NULL; -#line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp59_ = (GitgCommit*) _data_->_tmp58_; + _data_->_tmp57_ = (GitgCommit*) _data_->_tmp56_; #line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - __vala_GgitOId_free0 (_data_->_tmp57_); + __vala_GgitOId_free0 (_data_->_tmp55_); #line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp51_ = _data_->_tmp59_; + _data_->_tmp49_ = _data_->_tmp57_; #line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 2577 "gitg-commit.c" +#line 2555 "gitg-commit.c" goto __catch9_g_error; } #line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp60_ = _g_object_ref0 (_data_->_tmp51_); + _tmp58_ = _g_object_ref0 (_data_->_tmp49_); #line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_data_->commit); #line 258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->commit = _tmp60_; + _data_->commit = _tmp58_; #line 256 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_data_->_tmp51_); -#line 2588 "gitg-commit.c" + _g_object_unref0 (_data_->_tmp49_); +#line 2566 "gitg-commit.c" } goto __finally9; __catch9_g_error: @@ -2594,66 +2572,62 @@ #line 256 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_inner_error_ = NULL; #line 262 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp59_ = NULL; +#line 262 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp59_ = _data_->sub; +#line 262 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp60_ = NULL; +#line 262 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp60_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp59_); +#line 262 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp61_ = NULL; #line 262 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp61_ = _ ("Failed to lookup the working directory commit of submodule `%s' while " \ -"trying to stage"); + _data_->_tmp61_ = _data_->_tmp60_; #line 262 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp62_ = NULL; #line 262 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp62_ = _data_->sub; + _data_->_tmp62_ = _data_->_tmp61_; #line 262 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp63_ = NULL; #line 262 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp63_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp62_); + _data_->_tmp63_ = g_strdup_printf (_ ("Failed to lookup the working directory commit of submodule `%s' while " \ +"trying to stage"), _data_->_tmp62_); #line 262 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp64_ = NULL; #line 262 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp64_ = _data_->_tmp63_; #line 262 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp65_ = NULL; -#line 262 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp65_ = _data_->_tmp64_; -#line 262 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp66_ = NULL; -#line 262 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp66_ = g_strdup_printf (_data_->_tmp61_, _data_->_tmp65_); -#line 262 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp67_ = NULL; -#line 262 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp67_ = _data_->_tmp66_; -#line 262 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_data_->_tmp65_); + _g_free0 (_data_->_tmp62_); #line 262 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_vala2_msg = _data_->_tmp67_; + _data_->_vala2_msg = _data_->_tmp64_; #line 263 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp68_ = NULL; + _data_->_tmp65_ = NULL; #line 263 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp68_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); + _data_->_tmp65_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); #line 263 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp69_ = NULL; + _data_->_tmp66_ = NULL; #line 263 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp69_ = _data_->_tmp68_; + _data_->_tmp66_ = _data_->_tmp65_; #line 263 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp70_ = NULL; + _data_->_tmp67_ = NULL; #line 263 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp70_ = _data_->_tmp69_; + _data_->_tmp67_ = _data_->_tmp66_; #line 263 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp71_ = NULL; + _data_->_tmp68_ = NULL; #line 263 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp71_ = _data_->_vala2_msg; + _data_->_tmp68_ = _data_->_vala2_msg; #line 263 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp72_ = NULL; + _data_->_tmp69_ = NULL; #line 263 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp72_ = _data_->_vala2_e; + _data_->_tmp69_ = _data_->_vala2_e; #line 263 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp73_ = NULL; + _data_->_tmp70_ = NULL; #line 263 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp73_ = _data_->_tmp72_->message; + _data_->_tmp70_ = _data_->_tmp69_->message; #line 263 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_application_show_infobar (_data_->_tmp70_, _data_->_tmp71_, _data_->_tmp73_, GTK_MESSAGE_ERROR); + gitg_ext_application_show_infobar (_data_->_tmp67_, _data_->_tmp68_, _data_->_tmp70_, GTK_MESSAGE_ERROR); #line 263 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_data_->_tmp70_); + _g_object_unref0 (_data_->_tmp67_); #line 265 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->result = FALSE; #line 265 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -2668,17 +2642,17 @@ if (_data_->_state_ == 0) { #line 265 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2671 "gitg-commit.c" +#line 2645 "gitg-commit.c" } else { #line 265 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2675 "gitg-commit.c" +#line 2649 "gitg-commit.c" } #line 265 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 265 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 2681 "gitg-commit.c" +#line 2655 "gitg-commit.c" } __finally9: #line 256 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -2693,49 +2667,49 @@ g_clear_error (&_data_->_inner_error_); #line 256 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 2696 "gitg-commit.c" +#line 2670 "gitg-commit.c" } } { #line 271 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp74_ = NULL; + _data_->_tmp71_ = NULL; #line 271 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp74_ = _data_->stage; + _data_->_tmp71_ = _data_->stage; #line 271 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp75_ = NULL; + _data_->_tmp72_ = NULL; #line 271 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp75_ = _data_->sub; + _data_->_tmp72_ = _data_->sub; #line 271 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp76_ = NULL; + _data_->_tmp73_ = NULL; #line 271 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp76_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp75_); + _data_->_tmp73_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp72_); #line 271 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp77_ = NULL; + _data_->_tmp74_ = NULL; #line 271 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp77_ = _data_->_tmp76_; + _data_->_tmp74_ = _data_->_tmp73_; #line 271 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp78_ = NULL; + _data_->_tmp75_ = NULL; #line 271 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp78_ = _data_->_tmp77_; + _data_->_tmp75_ = _data_->_tmp74_; #line 271 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp79_ = NULL; + _data_->_tmp76_ = NULL; #line 271 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp79_ = _data_->commit; + _data_->_tmp76_ = _data_->commit; #line 271 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_state_ = 2; #line 271 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_stage_stage_commit (_data_->_tmp74_, _data_->_tmp78_, (GgitCommit*) _data_->_tmp79_, gitg_commit_activity_stage_submodule_ready, _data_); + gitg_stage_stage_commit (_data_->_tmp71_, _data_->_tmp75_, (GgitCommit*) _data_->_tmp76_, gitg_commit_activity_stage_submodule_ready, _data_); #line 271 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 2730 "gitg-commit.c" +#line 2704 "gitg-commit.c" _state_2: #line 271 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_stage_stage_commit_finish (_data_->_tmp74_, _data_->_res_, &_data_->_inner_error_); + gitg_stage_stage_commit_finish (_data_->_tmp71_, _data_->_res_, &_data_->_inner_error_); #line 271 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_data_->_tmp78_); + _g_free0 (_data_->_tmp75_); #line 271 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 2738 "gitg-commit.c" +#line 2712 "gitg-commit.c" goto __catch10_g_error; } } @@ -2747,65 +2721,61 @@ #line 269 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_inner_error_ = NULL; #line 275 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp80_ = NULL; -#line 275 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp80_ = _ ("Failed to stage the submodule `%s'"); -#line 275 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp81_ = NULL; + _data_->_tmp77_ = NULL; #line 275 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp81_ = _data_->sub; + _data_->_tmp77_ = _data_->sub; #line 275 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp82_ = NULL; + _data_->_tmp78_ = NULL; #line 275 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp82_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp81_); + _data_->_tmp78_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp77_); #line 275 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp83_ = NULL; + _data_->_tmp79_ = NULL; #line 275 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp83_ = _data_->_tmp82_; + _data_->_tmp79_ = _data_->_tmp78_; #line 275 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp84_ = NULL; + _data_->_tmp80_ = NULL; #line 275 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp84_ = _data_->_tmp83_; + _data_->_tmp80_ = _data_->_tmp79_; #line 275 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp85_ = NULL; + _data_->_tmp81_ = NULL; #line 275 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp85_ = g_strdup_printf (_data_->_tmp80_, _data_->_tmp84_); + _data_->_tmp81_ = g_strdup_printf (_ ("Failed to stage the submodule `%s'"), _data_->_tmp80_); #line 275 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp86_ = NULL; + _data_->_tmp82_ = NULL; #line 275 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp86_ = _data_->_tmp85_; + _data_->_tmp82_ = _data_->_tmp81_; #line 275 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_data_->_tmp84_); + _g_free0 (_data_->_tmp80_); #line 275 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_vala3_msg = _data_->_tmp86_; + _data_->_vala3_msg = _data_->_tmp82_; #line 276 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp87_ = NULL; + _data_->_tmp83_ = NULL; #line 276 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp87_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); + _data_->_tmp83_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); #line 276 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp88_ = NULL; + _data_->_tmp84_ = NULL; #line 276 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp88_ = _data_->_tmp87_; + _data_->_tmp84_ = _data_->_tmp83_; #line 276 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp89_ = NULL; + _data_->_tmp85_ = NULL; #line 276 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp89_ = _data_->_tmp88_; + _data_->_tmp85_ = _data_->_tmp84_; #line 276 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp90_ = NULL; + _data_->_tmp86_ = NULL; #line 276 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp90_ = _data_->_vala3_msg; + _data_->_tmp86_ = _data_->_vala3_msg; #line 276 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp91_ = NULL; + _data_->_tmp87_ = NULL; #line 276 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp91_ = _data_->_vala3_e; + _data_->_tmp87_ = _data_->_vala3_e; #line 276 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp92_ = NULL; + _data_->_tmp88_ = NULL; #line 276 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp92_ = _data_->_tmp91_->message; + _data_->_tmp88_ = _data_->_tmp87_->message; #line 276 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_application_show_infobar (_data_->_tmp89_, _data_->_tmp90_, _data_->_tmp92_, GTK_MESSAGE_ERROR); + gitg_ext_application_show_infobar (_data_->_tmp85_, _data_->_tmp86_, _data_->_tmp88_, GTK_MESSAGE_ERROR); #line 276 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_data_->_tmp89_); + _g_object_unref0 (_data_->_tmp85_); #line 278 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->result = FALSE; #line 278 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -2820,17 +2790,17 @@ if (_data_->_state_ == 0) { #line 278 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2823 "gitg-commit.c" +#line 2793 "gitg-commit.c" } else { #line 278 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2827 "gitg-commit.c" +#line 2797 "gitg-commit.c" } #line 278 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 278 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 2833 "gitg-commit.c" +#line 2803 "gitg-commit.c" } __finally10: #line 269 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -2845,11 +2815,11 @@ g_clear_error (&_data_->_inner_error_); #line 269 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 2848 "gitg-commit.c" +#line 2818 "gitg-commit.c" } #line 224 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_data_->repo); -#line 2852 "gitg-commit.c" +#line 2822 "gitg-commit.c" } #line 282 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->result = TRUE; @@ -2859,11 +2829,11 @@ if (_data_->_state_ == 0) { #line 282 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2862 "gitg-commit.c" +#line 2832 "gitg-commit.c" } else { #line 282 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2866 "gitg-commit.c" +#line 2836 "gitg-commit.c" } #line 282 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); @@ -2875,17 +2845,17 @@ if (_data_->_state_ == 0) { #line 220 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2878 "gitg-commit.c" +#line 2848 "gitg-commit.c" } else { #line 220 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2882 "gitg-commit.c" +#line 2852 "gitg-commit.c" } #line 220 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 220 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 2888 "gitg-commit.c" +#line 2858 "gitg-commit.c" } @@ -2898,7 +2868,7 @@ _g_object_unref0 (_data_->self); #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (GitgCommitActivityStageFileData, _data_); -#line 2901 "gitg-commit.c" +#line 2871 "gitg-commit.c" } @@ -2927,7 +2897,7 @@ _data_->file = _tmp2_; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_stage_file_co (_data_); -#line 2930 "gitg-commit.c" +#line 2900 "gitg-commit.c" } @@ -2940,7 +2910,7 @@ result = _data_->result; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 2943 "gitg-commit.c" +#line 2913 "gitg-commit.c" } @@ -2954,7 +2924,7 @@ _data_->_res_ = _res_; #line 293 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_stage_file_co (_data_); -#line 2957 "gitg-commit.c" +#line 2927 "gitg-commit.c" } @@ -2963,20 +2933,20 @@ switch (_data_->_state_) { #line 285 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 0: -#line 2966 "gitg-commit.c" +#line 2936 "gitg-commit.c" goto _state_0; #line 285 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 1: -#line 2970 "gitg-commit.c" +#line 2940 "gitg-commit.c" goto _state_1; #line 285 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 2: -#line 2974 "gitg-commit.c" +#line 2944 "gitg-commit.c" goto _state_2; default: #line 285 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_assert_not_reached (); -#line 2979 "gitg-commit.c" +#line 2949 "gitg-commit.c" } _state_0: #line 287 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -3035,7 +3005,7 @@ _data_->_tmp11_ = _data_->_tmp10_; #line 289 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if ((_data_->_tmp11_ & GGIT_STATUS_WORKING_TREE_DELETED) != 0) { -#line 3038 "gitg-commit.c" +#line 3008 "gitg-commit.c" { #line 293 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp12_ = NULL; @@ -3063,7 +3033,7 @@ gitg_stage_delete_path (_data_->_tmp12_, _data_->_tmp16_, gitg_commit_activity_stage_file_ready, _data_); #line 293 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 3066 "gitg-commit.c" +#line 3036 "gitg-commit.c" _state_1: #line 293 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_stage_delete_path_finish (_data_->_tmp12_, _data_->_res_, &_data_->_inner_error_); @@ -3071,7 +3041,7 @@ _g_free0 (_data_->_tmp16_); #line 293 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 3074 "gitg-commit.c" +#line 3044 "gitg-commit.c" goto __catch11_g_error; } } @@ -3085,15 +3055,15 @@ #line 297 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp17_ = NULL; #line 297 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp17_ = _ ("Failed to stage the removal of file `%s'"); + _data_->_tmp17_ = _data_->file; #line 297 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp18_ = NULL; #line 297 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp18_ = _data_->file; + _data_->_tmp18_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp17_); #line 297 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp19_ = NULL; #line 297 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp19_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp18_); + _data_->_tmp19_ = _data_->_tmp18_; #line 297 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp20_ = NULL; #line 297 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -3101,23 +3071,23 @@ #line 297 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp21_ = NULL; #line 297 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp21_ = _data_->_tmp20_; + _data_->_tmp21_ = g_strdup_printf (_ ("Failed to stage the removal of file `%s'"), _data_->_tmp20_); #line 297 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp22_ = NULL; #line 297 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp22_ = g_strdup_printf (_data_->_tmp17_, _data_->_tmp21_); -#line 297 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp23_ = NULL; -#line 297 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp23_ = _data_->_tmp22_; + _data_->_tmp22_ = _data_->_tmp21_; #line 297 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_data_->_tmp21_); + _g_free0 (_data_->_tmp20_); #line 297 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->msg = _data_->_tmp23_; + _data_->msg = _data_->_tmp22_; +#line 298 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp23_ = NULL; +#line 298 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp23_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); #line 298 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp24_ = NULL; #line 298 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp24_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); + _data_->_tmp24_ = _data_->_tmp23_; #line 298 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp25_ = NULL; #line 298 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -3125,23 +3095,19 @@ #line 298 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp26_ = NULL; #line 298 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp26_ = _data_->_tmp25_; + _data_->_tmp26_ = _data_->msg; #line 298 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp27_ = NULL; #line 298 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp27_ = _data_->msg; + _data_->_tmp27_ = _data_->e; #line 298 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp28_ = NULL; #line 298 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp28_ = _data_->e; + _data_->_tmp28_ = _data_->_tmp27_->message; #line 298 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp29_ = NULL; -#line 298 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp29_ = _data_->_tmp28_->message; + gitg_ext_application_show_infobar (_data_->_tmp25_, _data_->_tmp26_, _data_->_tmp28_, GTK_MESSAGE_ERROR); #line 298 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_application_show_infobar (_data_->_tmp26_, _data_->_tmp27_, _data_->_tmp29_, GTK_MESSAGE_ERROR); -#line 298 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_data_->_tmp26_); + _g_object_unref0 (_data_->_tmp25_); #line 300 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->result = FALSE; #line 300 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -3154,17 +3120,17 @@ if (_data_->_state_ == 0) { #line 300 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3157 "gitg-commit.c" +#line 3123 "gitg-commit.c" } else { #line 300 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3161 "gitg-commit.c" +#line 3127 "gitg-commit.c" } #line 300 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 300 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 3167 "gitg-commit.c" +#line 3133 "gitg-commit.c" } __finally11: #line 291 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -3177,45 +3143,45 @@ g_clear_error (&_data_->_inner_error_); #line 291 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 3180 "gitg-commit.c" +#line 3146 "gitg-commit.c" } } else { { #line 307 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp29_ = NULL; +#line 307 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp29_ = _data_->stage; +#line 307 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp30_ = NULL; #line 307 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp30_ = _data_->stage; + _data_->_tmp30_ = _data_->file; #line 307 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp31_ = NULL; #line 307 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp31_ = _data_->file; + _data_->_tmp31_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp30_); #line 307 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp32_ = NULL; #line 307 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp32_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp31_); + _data_->_tmp32_ = _data_->_tmp31_; #line 307 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp33_ = NULL; #line 307 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp33_ = _data_->_tmp32_; #line 307 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp34_ = NULL; -#line 307 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp34_ = _data_->_tmp33_; -#line 307 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_state_ = 2; #line 307 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_stage_stage_path (_data_->_tmp30_, _data_->_tmp34_, gitg_commit_activity_stage_file_ready, _data_); + gitg_stage_stage_path (_data_->_tmp29_, _data_->_tmp33_, gitg_commit_activity_stage_file_ready, _data_); #line 307 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 3210 "gitg-commit.c" +#line 3176 "gitg-commit.c" _state_2: #line 307 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_stage_stage_path_finish (_data_->_tmp30_, _data_->_res_, &_data_->_inner_error_); + gitg_stage_stage_path_finish (_data_->_tmp29_, _data_->_res_, &_data_->_inner_error_); #line 307 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_data_->_tmp34_); + _g_free0 (_data_->_tmp33_); #line 307 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 3218 "gitg-commit.c" +#line 3184 "gitg-commit.c" goto __catch12_g_error; } } @@ -3227,65 +3193,61 @@ #line 305 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_inner_error_ = NULL; #line 311 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp34_ = NULL; +#line 311 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp34_ = _data_->file; +#line 311 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp35_ = NULL; #line 311 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp35_ = _ ("Failed to stage the file `%s'"); + _data_->_tmp35_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp34_); #line 311 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp36_ = NULL; #line 311 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp36_ = _data_->file; + _data_->_tmp36_ = _data_->_tmp35_; #line 311 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp37_ = NULL; #line 311 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp37_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp36_); + _data_->_tmp37_ = _data_->_tmp36_; #line 311 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp38_ = NULL; #line 311 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp38_ = _data_->_tmp37_; + _data_->_tmp38_ = g_strdup_printf (_ ("Failed to stage the file `%s'"), _data_->_tmp37_); #line 311 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp39_ = NULL; #line 311 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp39_ = _data_->_tmp38_; #line 311 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp40_ = NULL; -#line 311 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp40_ = g_strdup_printf (_data_->_tmp35_, _data_->_tmp39_); + _g_free0 (_data_->_tmp37_); #line 311 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_vala1_msg = _data_->_tmp39_; +#line 312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp40_ = NULL; +#line 312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->_tmp40_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); +#line 312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp41_ = NULL; -#line 311 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" +#line 312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp41_ = _data_->_tmp40_; -#line 311 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_data_->_tmp39_); -#line 311 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_vala1_msg = _data_->_tmp41_; #line 312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp42_ = NULL; #line 312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp42_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); + _data_->_tmp42_ = _data_->_tmp41_; #line 312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp43_ = NULL; #line 312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp43_ = _data_->_tmp42_; + _data_->_tmp43_ = _data_->_vala1_msg; #line 312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp44_ = NULL; #line 312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp44_ = _data_->_tmp43_; + _data_->_tmp44_ = _data_->_vala1_e; #line 312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp45_ = NULL; #line 312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp45_ = _data_->_vala1_msg; -#line 312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp46_ = NULL; -#line 312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp46_ = _data_->_vala1_e; -#line 312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp47_ = NULL; -#line 312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp47_ = _data_->_tmp46_->message; + _data_->_tmp45_ = _data_->_tmp44_->message; #line 312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_application_show_infobar (_data_->_tmp44_, _data_->_tmp45_, _data_->_tmp47_, GTK_MESSAGE_ERROR); + gitg_ext_application_show_infobar (_data_->_tmp42_, _data_->_tmp43_, _data_->_tmp45_, GTK_MESSAGE_ERROR); #line 312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_data_->_tmp44_); + _g_object_unref0 (_data_->_tmp42_); #line 314 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->result = FALSE; #line 314 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -3298,17 +3260,17 @@ if (_data_->_state_ == 0) { #line 314 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3301 "gitg-commit.c" +#line 3263 "gitg-commit.c" } else { #line 314 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3305 "gitg-commit.c" +#line 3267 "gitg-commit.c" } #line 314 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 314 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 3311 "gitg-commit.c" +#line 3273 "gitg-commit.c" } __finally12: #line 305 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -3321,7 +3283,7 @@ g_clear_error (&_data_->_inner_error_); #line 305 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 3324 "gitg-commit.c" +#line 3286 "gitg-commit.c" } } #line 318 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -3332,11 +3294,11 @@ if (_data_->_state_ == 0) { #line 318 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3335 "gitg-commit.c" +#line 3297 "gitg-commit.c" } else { #line 318 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3339 "gitg-commit.c" +#line 3301 "gitg-commit.c" } #line 318 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); @@ -3348,17 +3310,17 @@ if (_data_->_state_ == 0) { #line 285 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3351 "gitg-commit.c" +#line 3313 "gitg-commit.c" } else { #line 285 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3355 "gitg-commit.c" +#line 3317 "gitg-commit.c" } #line 285 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 285 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 3361 "gitg-commit.c" +#line 3323 "gitg-commit.c" } @@ -3371,7 +3333,7 @@ _g_object_unref0 (_data_->self); #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (GitgCommitActivityStageItemsData, _data_); -#line 3374 "gitg-commit.c" +#line 3336 "gitg-commit.c" } @@ -3396,7 +3358,7 @@ _data_->items_length1 = items_length1; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_stage_items_co (_data_); -#line 3399 "gitg-commit.c" +#line 3361 "gitg-commit.c" } @@ -3404,7 +3366,7 @@ GitgCommitActivityStageItemsData* _data_; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 3407 "gitg-commit.c" +#line 3369 "gitg-commit.c" } @@ -3418,7 +3380,7 @@ _data_->_res_ = _res_; #line 330 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_stage_items_co (_data_); -#line 3421 "gitg-commit.c" +#line 3383 "gitg-commit.c" } @@ -3427,20 +3389,20 @@ switch (_data_->_state_) { #line 321 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 0: -#line 3430 "gitg-commit.c" +#line 3392 "gitg-commit.c" goto _state_0; #line 321 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 1: -#line 3434 "gitg-commit.c" +#line 3396 "gitg-commit.c" goto _state_1; #line 321 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 2: -#line 3438 "gitg-commit.c" +#line 3400 "gitg-commit.c" goto _state_2; default: #line 321 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_assert_not_reached (); -#line 3443 "gitg-commit.c" +#line 3405 "gitg-commit.c" } _state_0: #line 323 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -3451,7 +3413,7 @@ _data_->_tmp0_ = _data_->items; #line 323 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp0__length1 = _data_->items_length1; -#line 3454 "gitg-commit.c" +#line 3416 "gitg-commit.c" { #line 323 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->item_collection_length1 = 0; @@ -3469,7 +3431,7 @@ _data_->_tmp1_ = _g_object_ref0 (_data_->item_collection[_data_->item_it]); #line 323 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->item = _data_->_tmp1_; -#line 3472 "gitg-commit.c" +#line 3434 "gitg-commit.c" { #line 325 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->ok = TRUE; @@ -3491,7 +3453,7 @@ gitg_commit_activity_stage_file (_data_->self, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp3_, GITG_TYPE_STAGE_STATUS_FILE, GitgStageStatusFile), gitg_commit_activity_stage_items_ready, _data_); #line 330 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 3494 "gitg-commit.c" +#line 3456 "gitg-commit.c" _state_1: #line 330 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp4_ = FALSE; @@ -3499,7 +3461,7 @@ _data_->_tmp4_ = gitg_commit_activity_stage_file_finish (_data_->self, _data_->_res_); #line 330 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->ok = _data_->_tmp4_; -#line 3502 "gitg-commit.c" +#line 3464 "gitg-commit.c" } else { #line 332 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp5_ = NULL; @@ -3519,7 +3481,7 @@ gitg_commit_activity_stage_submodule (_data_->self, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp6_, GITG_TYPE_STAGE_STATUS_SUBMODULE, GitgStageStatusSubmodule), NULL, gitg_commit_activity_stage_items_ready, _data_); #line 335 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 3522 "gitg-commit.c" +#line 3484 "gitg-commit.c" _state_2: #line 335 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp7_ = FALSE; @@ -3527,11 +3489,11 @@ _data_->_tmp7_ = gitg_commit_activity_stage_submodule_finish (_data_->self, _data_->_res_); #line 335 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->ok = _data_->_tmp7_; -#line 3530 "gitg-commit.c" +#line 3492 "gitg-commit.c" } else { #line 339 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_assert_not_reached (); -#line 3534 "gitg-commit.c" +#line 3496 "gitg-commit.c" } } #line 342 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -3544,11 +3506,11 @@ _g_object_unref0 (_data_->item); #line 344 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" break; -#line 3547 "gitg-commit.c" +#line 3509 "gitg-commit.c" } #line 323 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_data_->item); -#line 3551 "gitg-commit.c" +#line 3513 "gitg-commit.c" } } } @@ -3560,17 +3522,17 @@ if (_data_->_state_ == 0) { #line 321 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3563 "gitg-commit.c" +#line 3525 "gitg-commit.c" } else { #line 321 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3567 "gitg-commit.c" +#line 3529 "gitg-commit.c" } #line 321 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 321 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 3573 "gitg-commit.c" +#line 3535 "gitg-commit.c" } @@ -3626,7 +3588,7 @@ _tmp12_ = type; #line 357 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp12_ != GITG_COMMIT_ACTIVITY_UI_TYPE_DIFF) { -#line 3629 "gitg-commit.c" +#line 3591 "gitg-commit.c" GitgCommitPaned* _tmp13_ = NULL; GitgDiffView* _tmp14_ = NULL; GitgDiffView* _tmp15_ = NULL; @@ -3638,13 +3600,13 @@ _tmp15_ = _tmp14_; #line 359 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_diff_view_set_diff (_tmp15_, NULL); -#line 3641 "gitg-commit.c" +#line 3603 "gitg-commit.c" } #line 362 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp16_ = type; #line 362 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp16_ != GITG_COMMIT_ACTIVITY_UI_TYPE_SUBMODULE_DIFF) { -#line 3647 "gitg-commit.c" +#line 3609 "gitg-commit.c" GitgCommitSubmoduleDiffView* view = NULL; GitgCommitPaned* _tmp17_ = NULL; GitgCommitSubmoduleDiffView* _tmp18_ = NULL; @@ -3695,13 +3657,13 @@ gitg_diff_view_set_diff (_tmp29_, NULL); #line 362 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (view); -#line 3698 "gitg-commit.c" +#line 3660 "gitg-commit.c" } #line 371 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp30_ = type; #line 371 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp30_ != GITG_COMMIT_ACTIVITY_UI_TYPE_SUBMODULE_HISTORY) { -#line 3704 "gitg-commit.c" +#line 3666 "gitg-commit.c" GitgCommitSubmoduleHistoryView* view = NULL; GitgCommitPaned* _tmp31_ = NULL; GitgCommitSubmoduleHistoryView* _tmp32_ = NULL; @@ -3746,13 +3708,13 @@ _tmp41_ = model; #line 376 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp41_ != NULL) { -#line 3749 "gitg-commit.c" +#line 3711 "gitg-commit.c" GitgCommitModel* _tmp42_ = NULL; #line 378 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp42_ = model; #line 378 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_model_set_repository (_tmp42_, NULL); -#line 3755 "gitg-commit.c" +#line 3717 "gitg-commit.c" } #line 381 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp43_ = view; @@ -3774,7 +3736,7 @@ _g_object_unref0 (model); #line 371 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (view); -#line 3777 "gitg-commit.c" +#line 3739 "gitg-commit.c" } } @@ -3786,17 +3748,17 @@ result = g_new0 (GitgStageStatusItem*, length + 1); #line 389 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" for (i = 0; i < length; i++) { -#line 3789 "gitg-commit.c" +#line 3751 "gitg-commit.c" GitgStageStatusItem* _tmp0_ = NULL; #line 389 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 389 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result[i] = _tmp0_; -#line 3795 "gitg-commit.c" +#line 3757 "gitg-commit.c" } #line 389 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 3799 "gitg-commit.c" +#line 3761 "gitg-commit.c" } @@ -3808,7 +3770,7 @@ _tmp0_ = res; #line 390 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_stage_items_finish (self, _tmp0_); -#line 3811 "gitg-commit.c" +#line 3773 "gitg-commit.c" } @@ -3817,7 +3779,7 @@ __lambda21_ ((GitgCommitActivity*) self, source_object, res); #line 389 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (self); -#line 3820 "gitg-commit.c" +#line 3782 "gitg-commit.c" } @@ -3838,7 +3800,7 @@ _tmp1__length1 = _tmp0__length1; #line 389 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_stage_items (self, _tmp1_, _tmp1__length1, ___lambda21__gasync_ready_callback, g_object_ref (self)); -#line 3841 "gitg-commit.c" +#line 3803 "gitg-commit.c" } @@ -3894,7 +3856,7 @@ _tmp9_ = _tmp8_; #line 400 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_submodule_info_set_submodule (_tmp6_, _tmp9_); -#line 3897 "gitg-commit.c" +#line 3859 "gitg-commit.c" { GgitRepository* _tmp10_ = NULL; GitgStageStatusSubmodule* _tmp11_ = NULL; @@ -3915,7 +3877,7 @@ _tmp10_ = _tmp14_; #line 406 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3918 "gitg-commit.c" +#line 3880 "gitg-commit.c" goto __catch13_g_error; } #line 406 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -3928,7 +3890,7 @@ if (_tmp16_ == NULL) { #line 406 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp15_); -#line 3931 "gitg-commit.c" +#line 3893 "gitg-commit.c" } #line 406 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (repo); @@ -3936,7 +3898,7 @@ repo = _tmp16_; #line 404 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp10_); -#line 3939 "gitg-commit.c" +#line 3901 "gitg-commit.c" } goto __finally13; __catch13_g_error: @@ -3976,7 +3938,7 @@ _g_object_unref0 (view); #line 413 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 3979 "gitg-commit.c" +#line 3941 "gitg-commit.c" } __finally13: #line 404 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -3991,7 +3953,7 @@ g_clear_error (&_inner_error_); #line 404 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 3994 "gitg-commit.c" +#line 3956 "gitg-commit.c" } #line 416 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp23_ = repo; @@ -4017,7 +3979,7 @@ _g_object_unref0 (repo); #line 394 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (view); -#line 4020 "gitg-commit.c" +#line 3982 "gitg-commit.c" } @@ -4067,7 +4029,7 @@ _tmp4_ = commit; #line 424 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp4_ == NULL) { -#line 4070 "gitg-commit.c" +#line 4032 "gitg-commit.c" GitgCommitSubmoduleHistoryView* _tmp5_ = NULL; GitgDiffView* _tmp6_ = NULL; GitgDiffView* _tmp7_ = NULL; @@ -4083,7 +4045,7 @@ _g_object_unref0 (view); #line 427 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 4086 "gitg-commit.c" +#line 4048 "gitg-commit.c" } #line 430 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp8_ = self->priv->d_current_submodule_repository; @@ -4093,7 +4055,7 @@ _g_object_unref0 (view); #line 432 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 4096 "gitg-commit.c" +#line 4058 "gitg-commit.c" } #line 435 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp9_ = self->priv->d_current_submodule_repository; @@ -4123,7 +4085,7 @@ _tmp17_ = head; #line 442 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp17_ != NULL) { -#line 4126 "gitg-commit.c" +#line 4088 "gitg-commit.c" GgitCommit* head_commit = NULL; GgitCommit* _tmp26_ = NULL; GgitTree* _tmp27_ = NULL; @@ -4143,7 +4105,7 @@ _tmp18_ = (GitgCommit*) _tmp21_; #line 448 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4146 "gitg-commit.c" +#line 4108 "gitg-commit.c" goto __catch14_g_error; } #line 448 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -4156,7 +4118,7 @@ head_commit = (GgitCommit*) _tmp22_; #line 446 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp18_); -#line 4159 "gitg-commit.c" +#line 4121 "gitg-commit.c" } goto __finally14; __catch14_g_error: @@ -4193,7 +4155,7 @@ _g_object_unref0 (view); #line 454 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 4196 "gitg-commit.c" +#line 4158 "gitg-commit.c" } __finally14: #line 446 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -4216,7 +4178,7 @@ g_clear_error (&_inner_error_); #line 446 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 4219 "gitg-commit.c" +#line 4181 "gitg-commit.c" } #line 457 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp26_ = head_commit; @@ -4228,7 +4190,7 @@ head_tree = _tmp27_; #line 442 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (head_commit); -#line 4231 "gitg-commit.c" +#line 4193 "gitg-commit.c" } { GgitDiff* _tmp28_ = NULL; @@ -4264,7 +4226,7 @@ _tmp28_ = _tmp37_; #line 464 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4267 "gitg-commit.c" +#line 4229 "gitg-commit.c" goto __catch15_g_error; } #line 464 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -4277,7 +4239,7 @@ diff = _tmp38_; #line 462 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp28_); -#line 4280 "gitg-commit.c" +#line 4242 "gitg-commit.c" } goto __finally15; __catch15_g_error: @@ -4314,7 +4276,7 @@ _g_object_unref0 (view); #line 470 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 4317 "gitg-commit.c" +#line 4279 "gitg-commit.c" } __finally15: #line 462 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -4337,7 +4299,7 @@ g_clear_error (&_inner_error_); #line 462 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 4340 "gitg-commit.c" +#line 4302 "gitg-commit.c" } #line 473 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp42_ = view; @@ -4369,28 +4331,28 @@ _g_object_unref0 (repo); #line 420 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (view); -#line 4372 "gitg-commit.c" +#line 4334 "gitg-commit.c" } static gpointer _ggit_submodule_ref0 (gpointer self) { #line 486 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return self ? ggit_submodule_ref (self) : NULL; -#line 4379 "gitg-commit.c" +#line 4341 "gitg-commit.c" } static GgitOId* _vala_GgitOId_copy (GgitOId* self) { #line 523 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return g_boxed_copy (ggit_oid_get_type (), self); -#line 4386 "gitg-commit.c" +#line 4348 "gitg-commit.c" } static gpointer __vala_GgitOId_copy0 (gpointer self) { #line 523 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return self ? _vala_GgitOId_copy (self) : NULL; -#line 4393 "gitg-commit.c" +#line 4355 "gitg-commit.c" } @@ -4402,14 +4364,14 @@ _tmp0_ = commit; #line 531 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_unstage_submodule_at (self, _tmp0_); -#line 4405 "gitg-commit.c" +#line 4367 "gitg-commit.c" } static void ____lambda25__gitg_commit_activity_stage_unstage_submodule_commit_callback (GitgCommit* commit, gpointer self) { #line 530 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" ___lambda25_ ((GitgCommitActivity*) self, commit); -#line 4412 "gitg-commit.c" +#line 4374 "gitg-commit.c" } @@ -4421,14 +4383,14 @@ _tmp0_ = commit; #line 550 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_stage_submodule_at (self, _tmp0_); -#line 4424 "gitg-commit.c" +#line 4386 "gitg-commit.c" } static void ____lambda28__gitg_commit_activity_stage_unstage_submodule_commit_callback (GitgCommit* commit, gpointer self) { #line 549 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" ___lambda28_ ((GitgCommitActivity*) self, commit); -#line 4431 "gitg-commit.c" +#line 4393 "gitg-commit.c" } @@ -4483,7 +4445,7 @@ _tmp3_ = _ggit_submodule_ref0 (_tmp2_); #line 486 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" submodule = _tmp3_; -#line 4486 "gitg-commit.c" +#line 4448 "gitg-commit.c" { GgitRepository* _tmp4_ = NULL; GgitSubmodule* _tmp5_ = NULL; @@ -4498,7 +4460,7 @@ _tmp4_ = _tmp6_; #line 490 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4501 "gitg-commit.c" +#line 4463 "gitg-commit.c" goto __catch16_g_error; } #line 490 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -4511,7 +4473,7 @@ if (_tmp8_ == NULL) { #line 490 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp7_); -#line 4514 "gitg-commit.c" +#line 4476 "gitg-commit.c" } #line 490 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (repo); @@ -4519,7 +4481,7 @@ repo = _tmp8_; #line 488 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp4_); -#line 4522 "gitg-commit.c" +#line 4484 "gitg-commit.c" } goto __finally16; __catch16_g_error: @@ -4548,7 +4510,7 @@ _g_object_unref0 (repo); #line 496 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 4551 "gitg-commit.c" +#line 4513 "gitg-commit.c" } __finally16: #line 488 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -4563,7 +4525,7 @@ g_clear_error (&_inner_error_); #line 488 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 4566 "gitg-commit.c" +#line 4528 "gitg-commit.c" } #line 499 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp12_ = sub; @@ -4609,7 +4571,7 @@ _tmp26_ = model; #line 505 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp26_ == NULL) { -#line 4612 "gitg-commit.c" +#line 4574 "gitg-commit.c" GitgRepository* _tmp27_ = NULL; GitgCommitModel* _tmp28_ = NULL; GitgCommitSubmoduleHistoryView* _tmp29_ = NULL; @@ -4634,7 +4596,7 @@ _tmp32_ = model; #line 508 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gtk_tree_view_set_model ((GtkTreeView*) _tmp31_, (GtkTreeModel*) _tmp32_); -#line 4637 "gitg-commit.c" +#line 4599 "gitg-commit.c" } else { GitgCommitModel* _tmp33_ = NULL; GitgRepository* _tmp34_ = NULL; @@ -4644,13 +4606,13 @@ _tmp34_ = repo; #line 512 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_model_set_repository (_tmp33_, _tmp34_); -#line 4647 "gitg-commit.c" +#line 4609 "gitg-commit.c" } #line 515 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp35_ = type; #line 515 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp35_ == GITG_COMMIT_ACTIVITY_INDEX_TYPE_STAGED) { -#line 4653 "gitg-commit.c" +#line 4615 "gitg-commit.c" GitgCommitModel* _tmp36_ = NULL; GgitSubmodule* _tmp37_ = NULL; GgitOId* _tmp38_ = NULL; @@ -4689,7 +4651,7 @@ _tmp43_ = head_id; #line 521 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp43_ != NULL) { -#line 4692 "gitg-commit.c" +#line 4654 "gitg-commit.c" GitgCommitModel* _tmp44_ = NULL; GgitOId* _tmp45_ = NULL; GgitOId* _tmp46_ = NULL; @@ -4714,7 +4676,7 @@ gitg_commit_model_set_exclude (_tmp44_, _tmp48_, 1); #line 523 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp48_ = (_vala_array_free (_tmp48_, _tmp48__length1, (GDestroyNotify) _vala_GgitOId_free), NULL); -#line 4717 "gitg-commit.c" +#line 4679 "gitg-commit.c" } else { GitgCommitModel* _tmp49_ = NULL; GgitOId** _tmp50_ = NULL; @@ -4732,7 +4694,7 @@ gitg_commit_model_set_exclude (_tmp49_, _tmp51_, 0); #line 527 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp51_ = (_vala_array_free (_tmp51_, _tmp51__length1, (GDestroyNotify) _vala_GgitOId_free), NULL); -#line 4735 "gitg-commit.c" +#line 4697 "gitg-commit.c" } #line 530 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" (self->priv->d_stage_unstage_submodule_commit_callback_target_destroy_notify == NULL) ? NULL : (self->priv->d_stage_unstage_submodule_commit_callback_target_destroy_notify (self->priv->d_stage_unstage_submodule_commit_callback_target), NULL); @@ -4750,7 +4712,7 @@ self->priv->d_stage_unstage_submodule_commit_callback_target_destroy_notify = g_object_unref; #line 515 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" __vala_GgitOId_free0 (head_id); -#line 4753 "gitg-commit.c" +#line 4715 "gitg-commit.c" } else { GgitOId* index_id = NULL; GgitSubmodule* _tmp52_ = NULL; @@ -4790,7 +4752,7 @@ _tmp59_ = index_id; #line 540 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp59_ != NULL) { -#line 4793 "gitg-commit.c" +#line 4755 "gitg-commit.c" GitgCommitModel* _tmp60_ = NULL; GgitOId* _tmp61_ = NULL; GgitOId* _tmp62_ = NULL; @@ -4815,7 +4777,7 @@ gitg_commit_model_set_exclude (_tmp60_, _tmp64_, 1); #line 542 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp64_ = (_vala_array_free (_tmp64_, _tmp64__length1, (GDestroyNotify) _vala_GgitOId_free), NULL); -#line 4818 "gitg-commit.c" +#line 4780 "gitg-commit.c" } else { GitgCommitModel* _tmp65_ = NULL; GgitOId** _tmp66_ = NULL; @@ -4833,7 +4795,7 @@ gitg_commit_model_set_exclude (_tmp65_, _tmp67_, 0); #line 546 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp67_ = (_vala_array_free (_tmp67_, _tmp67__length1, (GDestroyNotify) _vala_GgitOId_free), NULL); -#line 4836 "gitg-commit.c" +#line 4798 "gitg-commit.c" } #line 549 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" (self->priv->d_stage_unstage_submodule_commit_callback_target_destroy_notify == NULL) ? NULL : (self->priv->d_stage_unstage_submodule_commit_callback_target_destroy_notify (self->priv->d_stage_unstage_submodule_commit_callback_target), NULL); @@ -4851,7 +4813,7 @@ self->priv->d_stage_unstage_submodule_commit_callback_target_destroy_notify = g_object_unref; #line 515 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" __vala_GgitOId_free0 (index_id); -#line 4854 "gitg-commit.c" +#line 4816 "gitg-commit.c" } #line 554 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self->priv->d_submodule_history_select_first = TRUE; @@ -4867,7 +4829,7 @@ _ggit_submodule_unref0 (submodule); #line 477 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (repo); -#line 4870 "gitg-commit.c" +#line 4832 "gitg-commit.c" } @@ -4876,7 +4838,7 @@ g_atomic_int_inc (&_data6_->_ref_count_); #line 558 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data6_; -#line 4879 "gitg-commit.c" +#line 4841 "gitg-commit.c" } @@ -4885,7 +4847,7 @@ _data6_ = (Block6Data*) _userdata_; #line 558 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) { -#line 4888 "gitg-commit.c" +#line 4850 "gitg-commit.c" GitgCommitActivity* self; #line 558 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data6_->self; @@ -4899,7 +4861,7 @@ _g_object_unref0 (self); #line 558 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block6Data, _data6_); -#line 4902 "gitg-commit.c" +#line 4864 "gitg-commit.c" } } @@ -4925,14 +4887,14 @@ _tmp3_ = _data6_->patchable; #line 564 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_show_staged_diff_intern (self, _tmp0_, _tmp1_, _tmp2_, _tmp2__length1, _tmp3_); -#line 4928 "gitg-commit.c" +#line 4890 "gitg-commit.c" } static void ___lambda32__gitg_commit_activity_update_diff_callback (gpointer self) { #line 563 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" __lambda32_ (self); -#line 4935 "gitg-commit.c" +#line 4897 "gitg-commit.c" } @@ -5005,7 +4967,7 @@ block6_data_unref (_data6_); #line 558 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data6_ = NULL; -#line 5008 "gitg-commit.c" +#line 4970 "gitg-commit.c" } @@ -5014,7 +4976,7 @@ g_atomic_int_inc (&_data7_->_ref_count_); #line 568 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data7_; -#line 5017 "gitg-commit.c" +#line 4979 "gitg-commit.c" } @@ -5023,7 +4985,7 @@ _data7_ = (Block7Data*) _userdata_; #line 568 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data7_->_ref_count_)) { -#line 5026 "gitg-commit.c" +#line 4988 "gitg-commit.c" GitgCommitActivity* self; #line 568 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data7_->self; @@ -5035,7 +4997,7 @@ _g_object_unref0 (self); #line 568 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block7Data, _data7_); -#line 5038 "gitg-commit.c" +#line 5000 "gitg-commit.c" } } @@ -5047,7 +5009,7 @@ self = _data7_->self; #line 575 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_return_if_fail (res != NULL); -#line 5050 "gitg-commit.c" +#line 5012 "gitg-commit.c" { GgitDiff* d = NULL; GAsyncResult* _tmp0_ = NULL; @@ -5058,16 +5020,15 @@ GitgCommitPaned* _tmp5_ = NULL; GtkButton* _tmp6_ = NULL; GtkButton* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - GitgCommitPaned* _tmp9_ = NULL; + GitgCommitPaned* _tmp8_ = NULL; + GtkButton* _tmp9_ = NULL; GtkButton* _tmp10_ = NULL; - GtkButton* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - GitgCommitPaned* _tmp13_ = NULL; + gboolean _tmp11_ = FALSE; + GitgCommitPaned* _tmp12_ = NULL; + GtkButton* _tmp13_ = NULL; GtkButton* _tmp14_ = NULL; - GtkButton* _tmp15_ = NULL; + GitgDiffView* _tmp15_ = NULL; GitgDiffView* _tmp16_ = NULL; - GitgDiffView* _tmp17_ = NULL; #line 578 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp0_ = res; #line 578 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -5076,7 +5037,7 @@ d = _tmp1_; #line 578 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5079 "gitg-commit.c" +#line 5040 "gitg-commit.c" goto __catch17_g_error; } #line 580 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -5096,52 +5057,50 @@ #line 583 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp7_ = _tmp6_; #line 583 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp8_ = _ ("_Unstage selection"); -#line 583 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gtk_button_set_label (_tmp7_, _tmp8_); + gtk_button_set_label (_tmp7_, _ ("_Unstage selection")); #line 584 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp9_ = self->priv->d_main; + _tmp8_ = self->priv->d_main; #line 584 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp10_ = gitg_commit_paned_get_button_stage (_tmp9_); + _tmp9_ = gitg_commit_paned_get_button_stage (_tmp8_); #line 584 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 584 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp12_ = _data7_->patchable; + _tmp11_ = _data7_->patchable; #line 584 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gtk_widget_set_visible ((GtkWidget*) _tmp11_, _tmp12_); + gtk_widget_set_visible ((GtkWidget*) _tmp10_, _tmp11_); #line 585 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp13_ = self->priv->d_main; + _tmp12_ = self->priv->d_main; #line 585 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp14_ = gitg_commit_paned_get_button_discard (_tmp13_); + _tmp13_ = gitg_commit_paned_get_button_discard (_tmp12_); #line 585 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 585 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gtk_widget_set_visible ((GtkWidget*) _tmp15_, FALSE); + gtk_widget_set_visible ((GtkWidget*) _tmp14_, FALSE); #line 587 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp16_ = _data7_->view; + _tmp15_ = _data7_->view; #line 587 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_diff_view_set_new_is_workdir (_tmp16_, FALSE); + gitg_diff_view_set_new_is_workdir (_tmp15_, FALSE); #line 588 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp17_ = _data7_->view; + _tmp16_ = _data7_->view; #line 588 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_diff_view_set_diff (_tmp17_, d); + gitg_diff_view_set_diff (_tmp16_, d); #line 576 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (d); -#line 5130 "gitg-commit.c" +#line 5089 "gitg-commit.c" } goto __finally17; __catch17_g_error: { - GitgDiffView* _tmp18_ = NULL; + GitgDiffView* _tmp17_ = NULL; #line 576 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_clear_error (&_inner_error_); #line 576 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _inner_error_ = NULL; #line 593 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp18_ = _data7_->view; + _tmp17_ = _data7_->view; #line 593 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_diff_view_set_diff (_tmp18_, NULL); -#line 5144 "gitg-commit.c" + gitg_diff_view_set_diff (_tmp17_, NULL); +#line 5103 "gitg-commit.c" } __finally17: #line 576 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -5152,7 +5111,7 @@ g_clear_error (&_inner_error_); #line 576 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 5155 "gitg-commit.c" +#line 5114 "gitg-commit.c" } } @@ -5162,7 +5121,7 @@ __lambda31_ (self, source_object, res); #line 575 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" block7_data_unref (self); -#line 5165 "gitg-commit.c" +#line 5124 "gitg-commit.c" } @@ -5173,17 +5132,17 @@ result = g_new0 (GitgStageStatusItem*, length + 1); #line 597 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" for (i = 0; i < length; i++) { -#line 5176 "gitg-commit.c" +#line 5135 "gitg-commit.c" GitgStageStatusItem* _tmp0_ = NULL; #line 597 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 597 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result[i] = _tmp0_; -#line 5182 "gitg-commit.c" +#line 5141 "gitg-commit.c" } #line 597 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 5186 "gitg-commit.c" +#line 5145 "gitg-commit.c" } @@ -5271,7 +5230,7 @@ block7_data_unref (_data7_); #line 568 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data7_ = NULL; -#line 5274 "gitg-commit.c" +#line 5233 "gitg-commit.c" } @@ -5287,7 +5246,7 @@ _tmp1__length1 = items_length1; #line 602 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp1__length1 == 1) { -#line 5290 "gitg-commit.c" +#line 5249 "gitg-commit.c" GitgStageStatusItem** _tmp2_ = NULL; gint _tmp2__length1 = 0; GitgStageStatusItem* _tmp3_ = NULL; @@ -5299,15 +5258,15 @@ _tmp3_ = _tmp2_[0]; #line 602 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, GITG_TYPE_STAGE_STATUS_SUBMODULE); -#line 5302 "gitg-commit.c" +#line 5261 "gitg-commit.c" } else { #line 602 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp0_ = FALSE; -#line 5306 "gitg-commit.c" +#line 5265 "gitg-commit.c" } #line 602 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp0_) { -#line 5310 "gitg-commit.c" +#line 5269 "gitg-commit.c" GitgStageStatusItem** _tmp4_ = NULL; gint _tmp4__length1 = 0; GitgStageStatusItem* _tmp5_ = NULL; @@ -5319,7 +5278,7 @@ _tmp5_ = _tmp4_[0]; #line 604 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_show_submodule_history (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GITG_TYPE_STAGE_STATUS_SUBMODULE, GitgStageStatusSubmodule), GITG_COMMIT_ACTIVITY_INDEX_TYPE_STAGED); -#line 5322 "gitg-commit.c" +#line 5281 "gitg-commit.c" } else { GitgExtApplication* _tmp6_ = NULL; GitgExtApplication* _tmp7_ = NULL; @@ -5362,7 +5321,7 @@ _g_object_unref0 (_tmp11_); #line 609 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp8_); -#line 5365 "gitg-commit.c" +#line 5324 "gitg-commit.c" } } @@ -5380,7 +5339,7 @@ _g_object_unref0 (_data_->self); #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (GitgCommitActivityUnstageItemData, _data_); -#line 5383 "gitg-commit.c" +#line 5342 "gitg-commit.c" } @@ -5434,7 +5393,7 @@ _data_->unstage_msg = _tmp7_; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_unstage_item_co (_data_); -#line 5437 "gitg-commit.c" +#line 5396 "gitg-commit.c" } @@ -5447,7 +5406,7 @@ result = _data_->result; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 5450 "gitg-commit.c" +#line 5409 "gitg-commit.c" } @@ -5461,7 +5420,7 @@ _data_->_res_ = _res_; #line 621 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_unstage_item_co (_data_); -#line 5464 "gitg-commit.c" +#line 5423 "gitg-commit.c" } @@ -5470,20 +5429,20 @@ switch (_data_->_state_) { #line 613 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 0: -#line 5473 "gitg-commit.c" +#line 5432 "gitg-commit.c" goto _state_0; #line 613 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 1: -#line 5477 "gitg-commit.c" +#line 5436 "gitg-commit.c" goto _state_1; #line 613 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 2: -#line 5481 "gitg-commit.c" +#line 5440 "gitg-commit.c" goto _state_2; default: #line 613 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_assert_not_reached (); -#line 5486 "gitg-commit.c" +#line 5445 "gitg-commit.c" } _state_0: #line 615 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -5534,7 +5493,7 @@ _data_->_tmp9_ = _data_->isnew; #line 617 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_data_->_tmp9_) { -#line 5537 "gitg-commit.c" +#line 5496 "gitg-commit.c" { #line 621 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp10_ = NULL; @@ -5562,7 +5521,7 @@ gitg_stage_delete_path (_data_->_tmp10_, _data_->_tmp14_, gitg_commit_activity_unstage_item_ready, _data_); #line 621 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 5565 "gitg-commit.c" +#line 5524 "gitg-commit.c" _state_1: #line 621 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_stage_delete_path_finish (_data_->_tmp10_, _data_->_res_, &_data_->_inner_error_); @@ -5570,7 +5529,7 @@ _g_free0 (_data_->_tmp14_); #line 621 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 5573 "gitg-commit.c" +#line 5532 "gitg-commit.c" goto __catch18_g_error; } } @@ -5619,17 +5578,17 @@ if (_data_->_state_ == 0) { #line 626 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 5622 "gitg-commit.c" +#line 5581 "gitg-commit.c" } else { #line 626 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 5626 "gitg-commit.c" +#line 5585 "gitg-commit.c" } #line 626 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 626 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 5632 "gitg-commit.c" +#line 5591 "gitg-commit.c" } __finally18: #line 619 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -5642,7 +5601,7 @@ g_clear_error (&_data_->_inner_error_); #line 619 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 5645 "gitg-commit.c" +#line 5604 "gitg-commit.c" } } else { { @@ -5672,7 +5631,7 @@ gitg_stage_unstage_path (_data_->_tmp21_, _data_->_tmp25_, gitg_commit_activity_unstage_item_ready, _data_); #line 633 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 5675 "gitg-commit.c" +#line 5634 "gitg-commit.c" _state_2: #line 633 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_stage_unstage_path_finish (_data_->_tmp21_, _data_->_res_, &_data_->_inner_error_); @@ -5680,7 +5639,7 @@ _g_free0 (_data_->_tmp25_); #line 633 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 5683 "gitg-commit.c" +#line 5642 "gitg-commit.c" goto __catch19_g_error; } } @@ -5729,17 +5688,17 @@ if (_data_->_state_ == 0) { #line 638 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 5732 "gitg-commit.c" +#line 5691 "gitg-commit.c" } else { #line 638 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 5736 "gitg-commit.c" +#line 5695 "gitg-commit.c" } #line 638 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 638 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 5742 "gitg-commit.c" +#line 5701 "gitg-commit.c" } __finally19: #line 631 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -5752,7 +5711,7 @@ g_clear_error (&_data_->_inner_error_); #line 631 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 5755 "gitg-commit.c" +#line 5714 "gitg-commit.c" } } #line 642 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -5763,11 +5722,11 @@ if (_data_->_state_ == 0) { #line 642 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 5766 "gitg-commit.c" +#line 5725 "gitg-commit.c" } else { #line 642 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 5770 "gitg-commit.c" +#line 5729 "gitg-commit.c" } #line 642 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); @@ -5779,17 +5738,17 @@ if (_data_->_state_ == 0) { #line 613 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 5782 "gitg-commit.c" +#line 5741 "gitg-commit.c" } else { #line 613 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 5786 "gitg-commit.c" +#line 5745 "gitg-commit.c" } #line 613 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 613 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 5792 "gitg-commit.c" +#line 5751 "gitg-commit.c" } @@ -5802,7 +5761,7 @@ _g_object_unref0 (_data_->self); #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (GitgCommitActivityUnstageFileData, _data_); -#line 5805 "gitg-commit.c" +#line 5764 "gitg-commit.c" } @@ -5831,7 +5790,7 @@ _data_->file = _tmp2_; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_unstage_file_co (_data_); -#line 5834 "gitg-commit.c" +#line 5793 "gitg-commit.c" } @@ -5844,7 +5803,7 @@ result = _data_->result; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 5847 "gitg-commit.c" +#line 5806 "gitg-commit.c" } @@ -5858,7 +5817,7 @@ _data_->_res_ = _res_; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_unstage_file_co (_data_); -#line 5861 "gitg-commit.c" +#line 5820 "gitg-commit.c" } @@ -5867,16 +5826,16 @@ switch (_data_->_state_) { #line 645 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 0: -#line 5870 "gitg-commit.c" +#line 5829 "gitg-commit.c" goto _state_0; #line 645 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 1: -#line 5874 "gitg-commit.c" +#line 5833 "gitg-commit.c" goto _state_1; default: #line 645 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_assert_not_reached (); -#line 5879 "gitg-commit.c" +#line 5838 "gitg-commit.c" } _state_0: #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -5898,15 +5857,15 @@ #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp4_ = NULL; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp4_ = _ ("Failed to unstage the removal of file `%s'"); + _data_->_tmp4_ = _data_->file; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp5_ = NULL; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp5_ = _data_->file; + _data_->_tmp5_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp4_); #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp6_ = NULL; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp6_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp5_); + _data_->_tmp6_ = _data_->_tmp5_; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp7_ = NULL; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -5914,78 +5873,70 @@ #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp8_ = NULL; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp8_ = _data_->_tmp7_; + _data_->_tmp8_ = g_strdup_printf (_ ("Failed to unstage the removal of file `%s'"), _data_->_tmp7_); #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp9_ = NULL; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp9_ = g_strdup_printf (_data_->_tmp4_, _data_->_tmp8_); + _data_->_tmp9_ = _data_->_tmp8_; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp10_ = NULL; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp10_ = _data_->_tmp9_; + _data_->_tmp10_ = _data_->file; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp11_ = NULL; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp11_ = _ ("Failed to unstage the file `%s'"); + _data_->_tmp11_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp10_); #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp12_ = NULL; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp12_ = _data_->file; + _data_->_tmp12_ = _data_->_tmp11_; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp13_ = NULL; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp13_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp12_); + _data_->_tmp13_ = _data_->_tmp12_; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp14_ = NULL; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp14_ = _data_->_tmp13_; + _data_->_tmp14_ = g_strdup_printf (_ ("Failed to unstage the file `%s'"), _data_->_tmp13_); #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp15_ = NULL; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp15_ = _data_->_tmp14_; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp16_ = NULL; -#line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp16_ = g_strdup_printf (_data_->_tmp11_, _data_->_tmp15_); -#line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp17_ = NULL; -#line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp17_ = _data_->_tmp16_; -#line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_state_ = 1; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_commit_activity_unstage_item (_data_->self, (GitgStageStatusItem*) _data_->_tmp0_, (_data_->_tmp3_ & GGIT_STATUS_INDEX_NEW) != 0, _data_->_tmp10_, _data_->_tmp17_, gitg_commit_activity_unstage_file_ready, _data_); + gitg_commit_activity_unstage_item (_data_->self, (GitgStageStatusItem*) _data_->_tmp0_, (_data_->_tmp3_ & GGIT_STATUS_INDEX_NEW) != 0, _data_->_tmp9_, _data_->_tmp15_, gitg_commit_activity_unstage_file_ready, _data_); #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 5960 "gitg-commit.c" +#line 5911 "gitg-commit.c" _state_1: #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp18_ = FALSE; -#line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp18_ = gitg_commit_activity_unstage_item_finish (_data_->self, _data_->_res_); + _data_->_tmp16_ = FALSE; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp19_ = FALSE; + _data_->_tmp16_ = gitg_commit_activity_unstage_item_finish (_data_->self, _data_->_res_); #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp19_ = _data_->_tmp18_; + _data_->_tmp17_ = FALSE; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_data_->_tmp17_); + _data_->_tmp17_ = _data_->_tmp16_; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_free0 (_data_->_tmp15_); #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_data_->_tmp10_); + _g_free0 (_data_->_tmp13_); +#line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _g_free0 (_data_->_tmp9_); #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_data_->_tmp8_); + _g_free0 (_data_->_tmp7_); #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->result = _data_->_tmp19_; + _data_->result = _data_->_tmp17_; #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_data_->_state_ == 0) { #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 5984 "gitg-commit.c" +#line 5935 "gitg-commit.c" } else { #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 5988 "gitg-commit.c" +#line 5939 "gitg-commit.c" } #line 647 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); @@ -5995,17 +5946,17 @@ if (_data_->_state_ == 0) { #line 645 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 5998 "gitg-commit.c" +#line 5949 "gitg-commit.c" } else { #line 645 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 6002 "gitg-commit.c" +#line 5953 "gitg-commit.c" } #line 645 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 645 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 6008 "gitg-commit.c" +#line 5959 "gitg-commit.c" } @@ -6018,7 +5969,7 @@ _g_object_unref0 (_data_->self); #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (GitgCommitActivityUnstageSubmoduleData, _data_); -#line 6021 "gitg-commit.c" +#line 5972 "gitg-commit.c" } @@ -6047,7 +5998,7 @@ _data_->sub = _tmp2_; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_unstage_submodule_co (_data_); -#line 6050 "gitg-commit.c" +#line 6001 "gitg-commit.c" } @@ -6060,7 +6011,7 @@ result = _data_->result; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 6063 "gitg-commit.c" +#line 6014 "gitg-commit.c" } @@ -6074,7 +6025,7 @@ _data_->_res_ = _res_; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_unstage_submodule_co (_data_); -#line 6077 "gitg-commit.c" +#line 6028 "gitg-commit.c" } @@ -6083,16 +6034,16 @@ switch (_data_->_state_) { #line 653 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 0: -#line 6086 "gitg-commit.c" +#line 6037 "gitg-commit.c" goto _state_0; #line 653 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 1: -#line 6090 "gitg-commit.c" +#line 6041 "gitg-commit.c" goto _state_1; default: #line 653 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_assert_not_reached (); -#line 6095 "gitg-commit.c" +#line 6046 "gitg-commit.c" } _state_0: #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -6114,15 +6065,15 @@ #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp4_ = NULL; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp4_ = _ ("Failed to unstage the removal of submodule `%s'"); + _data_->_tmp4_ = _data_->sub; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp5_ = NULL; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp5_ = _data_->sub; + _data_->_tmp5_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp4_); #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp6_ = NULL; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp6_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp5_); + _data_->_tmp6_ = _data_->_tmp5_; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp7_ = NULL; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -6130,78 +6081,70 @@ #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp8_ = NULL; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp8_ = _data_->_tmp7_; + _data_->_tmp8_ = g_strdup_printf (_ ("Failed to unstage the removal of submodule `%s'"), _data_->_tmp7_); #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp9_ = NULL; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp9_ = g_strdup_printf (_data_->_tmp4_, _data_->_tmp8_); + _data_->_tmp9_ = _data_->_tmp8_; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp10_ = NULL; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp10_ = _data_->_tmp9_; + _data_->_tmp10_ = _data_->sub; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp11_ = NULL; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp11_ = _ ("Failed to unstage the submodule `%s'"); + _data_->_tmp11_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp10_); #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp12_ = NULL; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp12_ = _data_->sub; + _data_->_tmp12_ = _data_->_tmp11_; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp13_ = NULL; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp13_ = gitg_stage_status_item_get_path ((GitgStageStatusItem*) _data_->_tmp12_); + _data_->_tmp13_ = _data_->_tmp12_; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp14_ = NULL; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp14_ = _data_->_tmp13_; + _data_->_tmp14_ = g_strdup_printf (_ ("Failed to unstage the submodule `%s'"), _data_->_tmp13_); #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp15_ = NULL; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp15_ = _data_->_tmp14_; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp16_ = NULL; -#line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp16_ = g_strdup_printf (_data_->_tmp11_, _data_->_tmp15_); -#line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp17_ = NULL; -#line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp17_ = _data_->_tmp16_; -#line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_state_ = 1; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_commit_activity_unstage_item (_data_->self, (GitgStageStatusItem*) _data_->_tmp0_, (_data_->_tmp3_ & GGIT_SUBMODULE_STATUS_INDEX_ADDED) != 0, _data_->_tmp10_, _data_->_tmp17_, gitg_commit_activity_unstage_submodule_ready, _data_); + gitg_commit_activity_unstage_item (_data_->self, (GitgStageStatusItem*) _data_->_tmp0_, (_data_->_tmp3_ & GGIT_SUBMODULE_STATUS_INDEX_ADDED) != 0, _data_->_tmp9_, _data_->_tmp15_, gitg_commit_activity_unstage_submodule_ready, _data_); #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 6176 "gitg-commit.c" +#line 6119 "gitg-commit.c" _state_1: #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp18_ = FALSE; -#line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp18_ = gitg_commit_activity_unstage_item_finish (_data_->self, _data_->_res_); + _data_->_tmp16_ = FALSE; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp19_ = FALSE; + _data_->_tmp16_ = gitg_commit_activity_unstage_item_finish (_data_->self, _data_->_res_); #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp19_ = _data_->_tmp18_; + _data_->_tmp17_ = FALSE; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_data_->_tmp17_); + _data_->_tmp17_ = _data_->_tmp16_; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_free0 (_data_->_tmp15_); #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_data_->_tmp10_); + _g_free0 (_data_->_tmp13_); #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_data_->_tmp8_); + _g_free0 (_data_->_tmp9_); #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->result = _data_->_tmp19_; + _g_free0 (_data_->_tmp7_); +#line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _data_->result = _data_->_tmp17_; #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_data_->_state_ == 0) { #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 6200 "gitg-commit.c" +#line 6143 "gitg-commit.c" } else { #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 6204 "gitg-commit.c" +#line 6147 "gitg-commit.c" } #line 655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); @@ -6211,17 +6154,17 @@ if (_data_->_state_ == 0) { #line 653 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 6214 "gitg-commit.c" +#line 6157 "gitg-commit.c" } else { #line 653 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 6218 "gitg-commit.c" +#line 6161 "gitg-commit.c" } #line 653 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 653 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 6224 "gitg-commit.c" +#line 6167 "gitg-commit.c" } @@ -6235,7 +6178,7 @@ gitg_commit_activity_unstage_submodule_finish (self, _tmp0_); #line 675 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_reload (self); -#line 6238 "gitg-commit.c" +#line 6181 "gitg-commit.c" } @@ -6244,7 +6187,7 @@ ___lambda27_ ((GitgCommitActivity*) self, source_object, res); #line 673 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (self); -#line 6247 "gitg-commit.c" +#line 6190 "gitg-commit.c" } @@ -6273,7 +6216,7 @@ _tmp4_ = _tmp3_; #line 665 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp4_ != ((guint) 0)) { -#line 6276 "gitg-commit.c" +#line 6219 "gitg-commit.c" GgitCommitParents* _tmp5_ = NULL; GgitCommit* _tmp6_ = NULL; GitgCommit* _tmp7_ = NULL; @@ -6290,7 +6233,7 @@ if (_tmp7_ == NULL) { #line 668 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp6_); -#line 6293 "gitg-commit.c" +#line 6236 "gitg-commit.c" } #line 668 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp8_ = _tmp7_; @@ -6298,7 +6241,7 @@ gitg_commit_activity_stage_submodule_at (self, _tmp8_); #line 668 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp8_); -#line 6301 "gitg-commit.c" +#line 6244 "gitg-commit.c" } else { GitgStageStatusSubmodule* _tmp9_ = NULL; #line 672 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -6307,11 +6250,11 @@ _tmp9_ = self->priv->d_current_submodule; #line 673 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_unstage_submodule (self, _tmp9_, ____lambda27__gasync_ready_callback, g_object_ref (self)); -#line 6310 "gitg-commit.c" +#line 6253 "gitg-commit.c" } #line 661 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (parents); -#line 6314 "gitg-commit.c" +#line 6257 "gitg-commit.c" } @@ -6324,7 +6267,7 @@ _g_object_unref0 (_data_->self); #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (GitgCommitActivityUnstageItemsData, _data_); -#line 6327 "gitg-commit.c" +#line 6270 "gitg-commit.c" } @@ -6349,7 +6292,7 @@ _data_->items_length1 = items_length1; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_unstage_items_co (_data_); -#line 6352 "gitg-commit.c" +#line 6295 "gitg-commit.c" } @@ -6357,7 +6300,7 @@ GitgCommitActivityUnstageItemsData* _data_; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 6360 "gitg-commit.c" +#line 6303 "gitg-commit.c" } @@ -6371,7 +6314,7 @@ _data_->_res_ = _res_; #line 689 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_unstage_items_co (_data_); -#line 6374 "gitg-commit.c" +#line 6317 "gitg-commit.c" } @@ -6380,20 +6323,20 @@ switch (_data_->_state_) { #line 680 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 0: -#line 6383 "gitg-commit.c" +#line 6326 "gitg-commit.c" goto _state_0; #line 680 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 1: -#line 6387 "gitg-commit.c" +#line 6330 "gitg-commit.c" goto _state_1; #line 680 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 2: -#line 6391 "gitg-commit.c" +#line 6334 "gitg-commit.c" goto _state_2; default: #line 680 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_assert_not_reached (); -#line 6396 "gitg-commit.c" +#line 6339 "gitg-commit.c" } _state_0: #line 682 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -6404,7 +6347,7 @@ _data_->_tmp0_ = _data_->items; #line 682 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp0__length1 = _data_->items_length1; -#line 6407 "gitg-commit.c" +#line 6350 "gitg-commit.c" { #line 682 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->item_collection_length1 = 0; @@ -6422,7 +6365,7 @@ _data_->_tmp1_ = _g_object_ref0 (_data_->item_collection[_data_->item_it]); #line 682 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->item = _data_->_tmp1_; -#line 6425 "gitg-commit.c" +#line 6368 "gitg-commit.c" { #line 684 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->ok = TRUE; @@ -6444,7 +6387,7 @@ gitg_commit_activity_unstage_file (_data_->self, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp3_, GITG_TYPE_STAGE_STATUS_FILE, GitgStageStatusFile), gitg_commit_activity_unstage_items_ready, _data_); #line 689 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 6447 "gitg-commit.c" +#line 6390 "gitg-commit.c" _state_1: #line 689 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp4_ = FALSE; @@ -6452,7 +6395,7 @@ _data_->_tmp4_ = gitg_commit_activity_unstage_file_finish (_data_->self, _data_->_res_); #line 689 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->ok = _data_->_tmp4_; -#line 6455 "gitg-commit.c" +#line 6398 "gitg-commit.c" } else { #line 691 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp5_ = NULL; @@ -6472,7 +6415,7 @@ gitg_commit_activity_unstage_submodule (_data_->self, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp6_, GITG_TYPE_STAGE_STATUS_SUBMODULE, GitgStageStatusSubmodule), gitg_commit_activity_unstage_items_ready, _data_); #line 694 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 6475 "gitg-commit.c" +#line 6418 "gitg-commit.c" _state_2: #line 694 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp7_ = FALSE; @@ -6480,11 +6423,11 @@ _data_->_tmp7_ = gitg_commit_activity_unstage_submodule_finish (_data_->self, _data_->_res_); #line 694 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->ok = _data_->_tmp7_; -#line 6483 "gitg-commit.c" +#line 6426 "gitg-commit.c" } else { #line 698 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_assert_not_reached (); -#line 6487 "gitg-commit.c" +#line 6430 "gitg-commit.c" } } #line 701 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -6497,11 +6440,11 @@ _g_object_unref0 (_data_->item); #line 703 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" break; -#line 6500 "gitg-commit.c" +#line 6443 "gitg-commit.c" } #line 682 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_data_->item); -#line 6504 "gitg-commit.c" +#line 6447 "gitg-commit.c" } } } @@ -6513,17 +6456,17 @@ if (_data_->_state_ == 0) { #line 680 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 6516 "gitg-commit.c" +#line 6459 "gitg-commit.c" } else { #line 680 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 6520 "gitg-commit.c" +#line 6463 "gitg-commit.c" } #line 680 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 680 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 6526 "gitg-commit.c" +#line 6469 "gitg-commit.c" } @@ -6534,17 +6477,17 @@ result = g_new0 (GitgStageStatusItem*, length + 1); #line 712 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" for (i = 0; i < length; i++) { -#line 6537 "gitg-commit.c" +#line 6480 "gitg-commit.c" GitgStageStatusItem* _tmp0_ = NULL; #line 712 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 712 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result[i] = _tmp0_; -#line 6543 "gitg-commit.c" +#line 6486 "gitg-commit.c" } #line 712 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 6547 "gitg-commit.c" +#line 6490 "gitg-commit.c" } @@ -6556,7 +6499,7 @@ _tmp0_ = res; #line 713 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_unstage_items_finish (self, _tmp0_); -#line 6559 "gitg-commit.c" +#line 6502 "gitg-commit.c" } @@ -6565,7 +6508,7 @@ __lambda16_ ((GitgCommitActivity*) self, source_object, res); #line 712 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (self); -#line 6568 "gitg-commit.c" +#line 6511 "gitg-commit.c" } @@ -6586,7 +6529,7 @@ _tmp1__length1 = _tmp0__length1; #line 712 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_unstage_items (self, _tmp1_, _tmp1__length1, ___lambda16__gasync_ready_callback, g_object_ref (self)); -#line 6589 "gitg-commit.c" +#line 6532 "gitg-commit.c" } @@ -6595,7 +6538,7 @@ g_atomic_int_inc (&_data8_->_ref_count_); #line 717 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data8_; -#line 6598 "gitg-commit.c" +#line 6541 "gitg-commit.c" } @@ -6604,7 +6547,7 @@ _data8_ = (Block8Data*) _userdata_; #line 717 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data8_->_ref_count_)) { -#line 6607 "gitg-commit.c" +#line 6550 "gitg-commit.c" GitgCommitActivity* self; #line 717 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data8_->self; @@ -6612,7 +6555,7 @@ _g_object_unref0 (self); #line 717 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block8Data, _data8_); -#line 6615 "gitg-commit.c" +#line 6558 "gitg-commit.c" } } @@ -6624,17 +6567,17 @@ result = g_new0 (GitgStageStatusItem*, length + 1); #line 725 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" for (i = 0; i < length; i++) { -#line 6627 "gitg-commit.c" +#line 6570 "gitg-commit.c" GitgStageStatusItem* _tmp0_ = NULL; #line 725 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 725 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result[i] = _tmp0_; -#line 6633 "gitg-commit.c" +#line 6576 "gitg-commit.c" } #line 725 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 6637 "gitg-commit.c" +#line 6580 "gitg-commit.c" } @@ -6698,7 +6641,7 @@ result = _tmp13_; #line 728 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 6701 "gitg-commit.c" +#line 6644 "gitg-commit.c" } @@ -6707,7 +6650,7 @@ result = __lambda17_ ((GitgCommitActivity*) self, (GitgStageStatusItem*) a, (GitgStageStatusItem*) b); #line 727 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 6710 "gitg-commit.c" +#line 6653 "gitg-commit.c" } @@ -6716,7 +6659,7 @@ g_atomic_int_inc (&_data9_->_ref_count_); #line 731 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data9_; -#line 6719 "gitg-commit.c" +#line 6662 "gitg-commit.c" } @@ -6725,7 +6668,7 @@ _data9_ = (Block9Data*) _userdata_; #line 731 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data9_->_ref_count_)) { -#line 6728 "gitg-commit.c" +#line 6671 "gitg-commit.c" GitgCommitActivity* self; #line 731 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data9_->_data8_->self; @@ -6737,25 +6680,25 @@ _data9_->_data8_ = NULL; #line 731 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block9Data, _data9_); -#line 6740 "gitg-commit.c" +#line 6683 "gitg-commit.c" } } -static void _vala_array_add2 (GitgCommitSidebarItem*** array, int* length, int* size, GitgCommitSidebarItem* value) { +static void _vala_array_add2 (GitgCommitSidebarItem** * array, int* length, int* size, GitgCommitSidebarItem* value) { #line 737 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if ((*length) == (*size)) { #line 737 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" *size = (*size) ? (2 * (*size)) : 4; #line 737 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" *array = g_renew (GitgCommitSidebarItem*, *array, (*size) + 1); -#line 6752 "gitg-commit.c" +#line 6695 "gitg-commit.c" } #line 737 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" (*array)[(*length)++] = value; #line 737 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" (*array)[*length] = NULL; -#line 6758 "gitg-commit.c" +#line 6701 "gitg-commit.c" } @@ -6777,14 +6720,14 @@ _tmp1_ = _data9_->sitem; #line 741 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp0_ (_tmp1_, _tmp0__target); -#line 6780 "gitg-commit.c" +#line 6723 "gitg-commit.c" } static void _____lambda18__gitg_sidebar_item_activated (GitgSidebarItem* _sender, gint numclick, gpointer self) { #line 740 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" ____lambda18_ (self, numclick); -#line 6787 "gitg-commit.c" +#line 6730 "gitg-commit.c" } @@ -6848,7 +6791,7 @@ _tmp5_ = sorted; #line 727 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gee_list_sort ((GeeList*) _tmp5_, ___lambda17__gcompare_data_func, g_object_ref (self), g_object_unref); -#line 6851 "gitg-commit.c" +#line 6794 "gitg-commit.c" { GeeArrayList* _item_list = NULL; GeeArrayList* _tmp6_ = NULL; @@ -6876,7 +6819,7 @@ _item_index = -1; #line 731 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" while (TRUE) { -#line 6879 "gitg-commit.c" +#line 6822 "gitg-commit.c" Block9Data* _data9_; gint _tmp11_ = 0; gint _tmp12_ = 0; @@ -6917,7 +6860,7 @@ _data9_ = NULL; #line 731 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" break; -#line 6920 "gitg-commit.c" +#line 6863 "gitg-commit.c" } #line 731 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp14_ = _item_list; @@ -6939,7 +6882,7 @@ _tmp21_ = selected_paths; #line 735 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp21_ != NULL) { -#line 6942 "gitg-commit.c" +#line 6885 "gitg-commit.c" GeeHashSet* _tmp22_ = NULL; GitgStageStatusItem* _tmp23_ = NULL; gchar* _tmp24_ = NULL; @@ -6962,15 +6905,15 @@ _tmp20_ = _tmp27_; #line 735 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_free0 (_tmp26_); -#line 6965 "gitg-commit.c" +#line 6908 "gitg-commit.c" } else { #line 735 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp20_ = FALSE; -#line 6969 "gitg-commit.c" +#line 6912 "gitg-commit.c" } #line 735 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp20_) { -#line 6973 "gitg-commit.c" +#line 6916 "gitg-commit.c" GitgCommitSidebarItem** _tmp28_ = NULL; gint _tmp28__length1 = 0; GitgCommitSidebarItem* _tmp29_ = NULL; @@ -6985,7 +6928,7 @@ _tmp30_ = _g_object_ref0 (_tmp29_); #line 737 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _vala_array_add2 (&ret, &ret_length1, &_ret_size_, _tmp30_); -#line 6988 "gitg-commit.c" +#line 6931 "gitg-commit.c" } #line 740 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp31_ = _data9_->sitem; @@ -7007,11 +6950,11 @@ block9_data_unref (_data9_); #line 731 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data9_ = NULL; -#line 7010 "gitg-commit.c" +#line 6953 "gitg-commit.c" } #line 731 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_item_list); -#line 7014 "gitg-commit.c" +#line 6957 "gitg-commit.c" } #line 747 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp36_ = ret; @@ -7021,7 +6964,7 @@ if (result_length1) { #line 747 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" *result_length1 = _tmp36__length1; -#line 7024 "gitg-commit.c" +#line 6967 "gitg-commit.c" } #line 747 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result = _tmp36_; @@ -7033,7 +6976,7 @@ _data8_ = NULL; #line 747 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 7036 "gitg-commit.c" +#line 6979 "gitg-commit.c" } @@ -7042,7 +6985,7 @@ g_atomic_int_inc (&_data10_->_ref_count_); #line 750 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data10_; -#line 7045 "gitg-commit.c" +#line 6988 "gitg-commit.c" } @@ -7051,7 +6994,7 @@ _data10_ = (Block10Data*) _userdata_; #line 750 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data10_->_ref_count_)) { -#line 7054 "gitg-commit.c" +#line 6997 "gitg-commit.c" GitgCommitActivity* self; #line 750 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data10_->self; @@ -7065,7 +7008,7 @@ _g_object_unref0 (self); #line 750 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block10Data, _data10_); -#line 7068 "gitg-commit.c" +#line 7011 "gitg-commit.c" } } @@ -7075,7 +7018,7 @@ g_atomic_int_inc (&_data11_->_ref_count_); #line 782 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data11_; -#line 7078 "gitg-commit.c" +#line 7021 "gitg-commit.c" } @@ -7084,7 +7027,7 @@ _data11_ = (Block11Data*) _userdata_; #line 782 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data11_->_ref_count_)) { -#line 7087 "gitg-commit.c" +#line 7030 "gitg-commit.c" GitgCommitActivity* self; #line 782 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data11_->_data10_->self; @@ -7096,7 +7039,7 @@ _data11_->_data10_ = NULL; #line 782 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block11Data, _data11_); -#line 7099 "gitg-commit.c" +#line 7042 "gitg-commit.c" } } @@ -7124,7 +7067,7 @@ _tmp3_ = _tmp2_; #line 788 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp3_); -#line 7127 "gitg-commit.c" +#line 7070 "gitg-commit.c" } @@ -7133,89 +7076,89 @@ ____lambda13_ (self, source_object, res); #line 787 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" block11_data_unref (self); -#line 7136 "gitg-commit.c" +#line 7079 "gitg-commit.c" } -static void _vala_array_add3 (GitgStageStatusItem*** array, int* length, int* size, GitgStageStatusItem* value) { +static void _vala_array_add3 (GitgStageStatusItem** * array, int* length, int* size, GitgStageStatusItem* value) { #line 827 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if ((*length) == (*size)) { #line 827 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" *size = (*size) ? (2 * (*size)) : 4; #line 827 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" *array = g_renew (GitgStageStatusItem*, *array, (*size) + 1); -#line 7147 "gitg-commit.c" +#line 7090 "gitg-commit.c" } #line 827 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" (*array)[(*length)++] = value; #line 827 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" (*array)[*length] = NULL; -#line 7153 "gitg-commit.c" +#line 7096 "gitg-commit.c" } -static void _vala_array_add4 (GitgStageStatusItem*** array, int* length, int* size, GitgStageStatusItem* value) { +static void _vala_array_add4 (GitgStageStatusItem** * array, int* length, int* size, GitgStageStatusItem* value) { #line 832 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if ((*length) == (*size)) { #line 832 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" *size = (*size) ? (2 * (*size)) : 4; #line 832 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" *array = g_renew (GitgStageStatusItem*, *array, (*size) + 1); -#line 7164 "gitg-commit.c" +#line 7107 "gitg-commit.c" } #line 832 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" (*array)[(*length)++] = value; #line 832 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" (*array)[*length] = NULL; -#line 7170 "gitg-commit.c" +#line 7113 "gitg-commit.c" } -static void _vala_array_add5 (GitgStageStatusItem*** array, int* length, int* size, GitgStageStatusItem* value) { +static void _vala_array_add5 (GitgStageStatusItem** * array, int* length, int* size, GitgStageStatusItem* value) { #line 837 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if ((*length) == (*size)) { #line 837 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" *size = (*size) ? (2 * (*size)) : 4; #line 837 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" *array = g_renew (GitgStageStatusItem*, *array, (*size) + 1); -#line 7181 "gitg-commit.c" +#line 7124 "gitg-commit.c" } #line 837 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" (*array)[(*length)++] = value; #line 837 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" (*array)[*length] = NULL; -#line 7187 "gitg-commit.c" +#line 7130 "gitg-commit.c" } -static void _vala_array_add6 (GitgStageStatusItem*** array, int* length, int* size, GitgStageStatusItem* value) { +static void _vala_array_add6 (GitgStageStatusItem** * array, int* length, int* size, GitgStageStatusItem* value) { #line 848 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if ((*length) == (*size)) { #line 848 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" *size = (*size) ? (2 * (*size)) : 4; #line 848 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" *array = g_renew (GitgStageStatusItem*, *array, (*size) + 1); -#line 7198 "gitg-commit.c" +#line 7141 "gitg-commit.c" } #line 848 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" (*array)[(*length)++] = value; #line 848 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" (*array)[*length] = NULL; -#line 7204 "gitg-commit.c" +#line 7147 "gitg-commit.c" } static void __lambda15_ (GitgCommitActivity* self, gint numclick) { #line 865 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_on_unstage_selected_items (self); -#line 7211 "gitg-commit.c" +#line 7154 "gitg-commit.c" } static void ___lambda15__gitg_sidebar_item_activated (GitgSidebarItem* _sender, gint numclick, gpointer self) { #line 864 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" __lambda15_ ((GitgCommitActivity*) self, numclick); -#line 7218 "gitg-commit.c" +#line 7161 "gitg-commit.c" } @@ -7241,7 +7184,7 @@ if (_tmp4_) { #line 881 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_on_unstage_selected_items (self); -#line 7244 "gitg-commit.c" +#line 7187 "gitg-commit.c" } else { GitgCommitSidebarItem* _tmp5_ = NULL; GitgStageStatusItem* _tmp6_ = NULL; @@ -7270,7 +7213,7 @@ gitg_commit_activity_on_staged_activated (self, _tmp10_, 1); #line 885 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp10_ = (_vala_array_free (_tmp10_, _tmp10__length1, (GDestroyNotify) g_object_unref), NULL); -#line 7273 "gitg-commit.c" +#line 7216 "gitg-commit.c" } } @@ -7278,21 +7221,21 @@ static void ____lambda19__gitg_commit_activity_stage_unstage_callback (GitgCommitSidebarItem* item, gpointer self) { #line 874 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" ___lambda19_ ((GitgCommitActivity*) self, item); -#line 7281 "gitg-commit.c" +#line 7224 "gitg-commit.c" } static void __lambda20_ (GitgCommitActivity* self, gint numclick) { #line 896 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_on_stage_selected_items (self); -#line 7288 "gitg-commit.c" +#line 7231 "gitg-commit.c" } static void ___lambda20__gitg_sidebar_item_activated (GitgSidebarItem* _sender, gint numclick, gpointer self) { #line 895 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" __lambda20_ ((GitgCommitActivity*) self, numclick); -#line 7295 "gitg-commit.c" +#line 7238 "gitg-commit.c" } @@ -7318,7 +7261,7 @@ if (_tmp4_) { #line 912 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_on_stage_selected_items (self); -#line 7321 "gitg-commit.c" +#line 7264 "gitg-commit.c" } else { GitgCommitSidebarItem* _tmp5_ = NULL; GitgStageStatusItem* _tmp6_ = NULL; @@ -7347,7 +7290,7 @@ gitg_commit_activity_on_unstaged_activated (self, _tmp10_, 1); #line 916 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp10_ = (_vala_array_free (_tmp10_, _tmp10__length1, (GDestroyNotify) g_object_unref), NULL); -#line 7350 "gitg-commit.c" +#line 7293 "gitg-commit.c" } } @@ -7355,7 +7298,7 @@ static void ____lambda22__gitg_commit_activity_stage_unstage_callback (GitgCommitSidebarItem* item, gpointer self) { #line 905 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" ___lambda22_ ((GitgCommitActivity*) self, item); -#line 7358 "gitg-commit.c" +#line 7301 "gitg-commit.c" } @@ -7381,7 +7324,7 @@ if (_tmp4_) { #line 939 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_on_stage_selected_items (self); -#line 7384 "gitg-commit.c" +#line 7327 "gitg-commit.c" } else { GitgCommitSidebarItem* _tmp5_ = NULL; GitgStageStatusItem* _tmp6_ = NULL; @@ -7410,7 +7353,7 @@ gitg_commit_activity_on_unstaged_activated (self, _tmp10_, 1); #line 943 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp10_ = (_vala_array_free (_tmp10_, _tmp10__length1, (GDestroyNotify) g_object_unref), NULL); -#line 7413 "gitg-commit.c" +#line 7356 "gitg-commit.c" } } @@ -7418,7 +7361,7 @@ static void ____lambda23__gitg_commit_activity_stage_unstage_callback (GitgCommitSidebarItem* item, gpointer self) { #line 932 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" ___lambda23_ ((GitgCommitActivity*) self, item); -#line 7421 "gitg-commit.c" +#line 7364 "gitg-commit.c" } @@ -7444,7 +7387,7 @@ if (_tmp4_) { #line 968 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_on_stage_selected_items (self); -#line 7447 "gitg-commit.c" +#line 7390 "gitg-commit.c" } else { GitgCommitSidebarItem* _tmp5_ = NULL; GitgStageStatusItem* _tmp6_ = NULL; @@ -7473,7 +7416,7 @@ gitg_commit_activity_on_unstaged_activated (self, _tmp10_, 1); #line 972 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp10_ = (_vala_array_free (_tmp10_, _tmp10__length1, (GDestroyNotify) g_object_unref), NULL); -#line 7476 "gitg-commit.c" +#line 7419 "gitg-commit.c" } } @@ -7481,7 +7424,7 @@ static void _____lambda24__gitg_commit_activity_stage_unstage_callback (GitgCommitSidebarItem* item, gpointer self) { #line 961 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" ____lambda24_ ((GitgCommitActivity*) self, item); -#line 7484 "gitg-commit.c" +#line 7427 "gitg-commit.c" } @@ -7492,17 +7435,17 @@ result = g_new0 (GitgCommitSidebarItem*, length + 1); #line 992 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" for (i = 0; i < length; i++) { -#line 7495 "gitg-commit.c" +#line 7438 "gitg-commit.c" GitgCommitSidebarItem* _tmp0_ = NULL; #line 992 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 992 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result[i] = _tmp0_; -#line 7501 "gitg-commit.c" +#line 7444 "gitg-commit.c" } #line 992 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 7505 "gitg-commit.c" +#line 7448 "gitg-commit.c" } @@ -7513,17 +7456,17 @@ result = g_new0 (GitgCommitSidebarItem*, length + 1); #line 995 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" for (i = 0; i < length; i++) { -#line 7516 "gitg-commit.c" +#line 7459 "gitg-commit.c" GitgCommitSidebarItem* _tmp0_ = NULL; #line 995 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 995 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result[i] = _tmp0_; -#line 7522 "gitg-commit.c" +#line 7465 "gitg-commit.c" } #line 995 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 7526 "gitg-commit.c" +#line 7469 "gitg-commit.c" } @@ -7534,17 +7477,17 @@ result = g_new0 (GitgCommitSidebarItem*, length + 1); #line 998 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" for (i = 0; i < length; i++) { -#line 7537 "gitg-commit.c" +#line 7480 "gitg-commit.c" GitgCommitSidebarItem* _tmp0_ = NULL; #line 998 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 998 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result[i] = _tmp0_; -#line 7543 "gitg-commit.c" +#line 7486 "gitg-commit.c" } #line 998 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 7547 "gitg-commit.c" +#line 7490 "gitg-commit.c" } @@ -7555,17 +7498,17 @@ result = g_new0 (GitgCommitSidebarItem*, length + 1); #line 1001 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" for (i = 0; i < length; i++) { -#line 7558 "gitg-commit.c" +#line 7501 "gitg-commit.c" GitgCommitSidebarItem* _tmp0_ = NULL; #line 1001 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 1001 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result[i] = _tmp0_; -#line 7564 "gitg-commit.c" +#line 7507 "gitg-commit.c" } #line 1001 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 7568 "gitg-commit.c" +#line 7511 "gitg-commit.c" } @@ -7576,17 +7519,17 @@ result = g_new0 (GitgCommitSidebarItem*, length + 1); #line 1007 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" for (i = 0; i < length; i++) { -#line 7579 "gitg-commit.c" +#line 7522 "gitg-commit.c" GitgCommitSidebarItem* _tmp0_ = NULL; #line 1007 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 1007 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result[i] = _tmp0_; -#line 7585 "gitg-commit.c" +#line 7528 "gitg-commit.c" } #line 1007 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 7589 "gitg-commit.c" +#line 7532 "gitg-commit.c" } @@ -7597,17 +7540,17 @@ result = g_new0 (GitgCommitSidebarItem*, length + 1); #line 1012 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" for (i = 0; i < length; i++) { -#line 7600 "gitg-commit.c" +#line 7543 "gitg-commit.c" GitgCommitSidebarItem* _tmp0_ = NULL; #line 1012 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 1012 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result[i] = _tmp0_; -#line 7606 "gitg-commit.c" +#line 7549 "gitg-commit.c" } #line 1012 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 7610 "gitg-commit.c" +#line 7553 "gitg-commit.c" } @@ -7618,17 +7561,17 @@ result = g_new0 (GitgCommitSidebarItem*, length + 1); #line 1017 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" for (i = 0; i < length; i++) { -#line 7621 "gitg-commit.c" +#line 7564 "gitg-commit.c" GitgCommitSidebarItem* _tmp0_ = NULL; #line 1017 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 1017 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result[i] = _tmp0_; -#line 7627 "gitg-commit.c" +#line 7570 "gitg-commit.c" } #line 1017 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 7631 "gitg-commit.c" +#line 7574 "gitg-commit.c" } @@ -7639,17 +7582,17 @@ result = g_new0 (GitgCommitSidebarItem*, length + 1); #line 1022 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" for (i = 0; i < length; i++) { -#line 7642 "gitg-commit.c" +#line 7585 "gitg-commit.c" GitgCommitSidebarItem* _tmp0_ = NULL; #line 1022 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 1022 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result[i] = _tmp0_; -#line 7648 "gitg-commit.c" +#line 7591 "gitg-commit.c" } #line 1022 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 7652 "gitg-commit.c" +#line 7595 "gitg-commit.c" } @@ -7715,42 +7658,39 @@ gint _current_submodules_size_ = 0; GitgSidebarStoreSidebarHeader* staged_header = NULL; GitgSidebarStore* _tmp53_ = NULL; - const gchar* _tmp54_ = NULL; + GitgSidebarStoreSidebarHeader* _tmp54_ = NULL; GitgSidebarStoreSidebarHeader* _tmp55_ = NULL; - GitgSidebarStoreSidebarHeader* _tmp56_ = NULL; - GitgStageStatusItem** _tmp57_ = NULL; - gint _tmp57__length1 = 0; + GitgStageStatusItem** _tmp56_ = NULL; + gint _tmp56__length1 = 0; + GitgSidebarStore* _tmp65_ = NULL; + GitgSidebarStore* _tmp66_ = NULL; GitgSidebarStore* _tmp67_ = NULL; - GitgSidebarStore* _tmp68_ = NULL; - GitgSidebarStore* _tmp69_ = NULL; GitgSidebarStoreSidebarHeader* unstaged_header = NULL; - GitgSidebarStore* _tmp70_ = NULL; - const gchar* _tmp71_ = NULL; - GitgSidebarStoreSidebarHeader* _tmp72_ = NULL; - GitgSidebarStoreSidebarHeader* _tmp73_ = NULL; - GitgStageStatusItem** _tmp74_ = NULL; - gint _tmp74__length1 = 0; - GitgSidebarStore* _tmp84_ = NULL; - GitgSidebarStore* _tmp85_ = NULL; - GitgSidebarStore* _tmp86_ = NULL; - GitgSidebarStore* _tmp87_ = NULL; - const gchar* _tmp88_ = NULL; - GitgSidebarStoreSidebarHeader* _tmp89_ = NULL; - GitgSidebarStoreSidebarHeader* _tmp90_ = NULL; - GitgStageStatusItem** _tmp91_ = NULL; - gint _tmp91__length1 = 0; - GitgSidebarStore* _tmp101_ = NULL; - GitgSidebarStore* _tmp102_ = NULL; - GitgSidebarStore* _tmp103_ = NULL; - gboolean _tmp104_ = FALSE; - GitgCommitPaned* _tmp122_ = NULL; - GitgCommitSidebar* _tmp123_ = NULL; - GitgCommitSidebar* _tmp124_ = NULL; - GitgStageStatusItem** _tmp125_ = NULL; - gint _tmp125__length1 = 0; - GeeHashSet* _tmp126_ = NULL; - gint _tmp127_ = 0; - gint _tmp128_ = 0; + GitgSidebarStore* _tmp68_ = NULL; + GitgSidebarStoreSidebarHeader* _tmp69_ = NULL; + GitgSidebarStoreSidebarHeader* _tmp70_ = NULL; + GitgStageStatusItem** _tmp71_ = NULL; + gint _tmp71__length1 = 0; + GitgSidebarStore* _tmp80_ = NULL; + GitgSidebarStore* _tmp81_ = NULL; + GitgSidebarStore* _tmp82_ = NULL; + GitgSidebarStore* _tmp83_ = NULL; + GitgSidebarStoreSidebarHeader* _tmp84_ = NULL; + GitgSidebarStoreSidebarHeader* _tmp85_ = NULL; + GitgStageStatusItem** _tmp86_ = NULL; + gint _tmp86__length1 = 0; + GitgSidebarStore* _tmp95_ = NULL; + GitgSidebarStore* _tmp96_ = NULL; + GitgSidebarStore* _tmp97_ = NULL; + gboolean _tmp98_ = FALSE; + GitgCommitPaned* _tmp114_ = NULL; + GitgCommitSidebar* _tmp115_ = NULL; + GitgCommitSidebar* _tmp116_ = NULL; + GitgStageStatusItem** _tmp117_ = NULL; + gint _tmp117__length1 = 0; + GeeHashSet* _tmp118_ = NULL; + gint _tmp119_ = 0; + gint _tmp120_ = 0; #line 806 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data10_->self; #line 806 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -7837,7 +7777,7 @@ _tmp16_ = items; #line 823 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp16__length1 = items_length1; -#line 7840 "gitg-commit.c" +#line 7780 "gitg-commit.c" { GitgStageStatusItem** item_collection = NULL; gint item_collection_length1 = 0; @@ -7849,14 +7789,14 @@ item_collection_length1 = _tmp16__length1; #line 823 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" for (item_it = 0; item_it < _tmp16__length1; item_it = item_it + 1) { -#line 7852 "gitg-commit.c" +#line 7792 "gitg-commit.c" GitgStageStatusItem* _tmp17_ = NULL; GitgStageStatusItem* item = NULL; #line 823 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp17_ = _g_object_ref0 (item_collection[item_it]); #line 823 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" item = _tmp17_; -#line 7859 "gitg-commit.c" +#line 7799 "gitg-commit.c" { GitgStageStatusItem* _tmp18_ = NULL; gboolean _tmp19_ = FALSE; @@ -7879,7 +7819,7 @@ _tmp20_ = _tmp19_; #line 825 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp20_) { -#line 7882 "gitg-commit.c" +#line 7822 "gitg-commit.c" GitgStageStatusItem** _tmp21_ = NULL; gint _tmp21__length1 = 0; GitgStageStatusItem* _tmp22_ = NULL; @@ -7894,7 +7834,7 @@ _tmp23_ = _g_object_ref0 (_tmp22_); #line 827 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _vala_array_add3 (&staged, &staged_length1, &_staged_size_, _tmp23_); -#line 7897 "gitg-commit.c" +#line 7837 "gitg-commit.c" } #line 830 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp24_ = item; @@ -7904,7 +7844,7 @@ _tmp26_ = _tmp25_; #line 830 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp26_) { -#line 7907 "gitg-commit.c" +#line 7847 "gitg-commit.c" GitgStageStatusItem** _tmp27_ = NULL; gint _tmp27__length1 = 0; GitgStageStatusItem* _tmp28_ = NULL; @@ -7919,7 +7859,7 @@ _tmp29_ = _g_object_ref0 (_tmp28_); #line 832 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _vala_array_add4 (&unstaged, &unstaged_length1, &_unstaged_size_, _tmp29_); -#line 7922 "gitg-commit.c" +#line 7862 "gitg-commit.c" } #line 835 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp30_ = item; @@ -7929,7 +7869,7 @@ _tmp32_ = _tmp31_; #line 835 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp32_) { -#line 7932 "gitg-commit.c" +#line 7872 "gitg-commit.c" GitgStageStatusItem** _tmp33_ = NULL; gint _tmp33__length1 = 0; GitgStageStatusItem* _tmp34_ = NULL; @@ -7944,7 +7884,7 @@ _tmp35_ = _g_object_ref0 (_tmp34_); #line 837 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _vala_array_add5 (&untracked, &untracked_length1, &_untracked_size_, _tmp35_); -#line 7947 "gitg-commit.c" +#line 7887 "gitg-commit.c" } #line 840 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp36_ = item; @@ -7956,7 +7896,7 @@ _tmp38_ = sub; #line 842 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp38_ != NULL) { -#line 7959 "gitg-commit.c" +#line 7899 "gitg-commit.c" GitgStageStatusSubmodule* _tmp39_ = NULL; gboolean _tmp40_ = FALSE; gboolean _tmp41_ = FALSE; @@ -7970,7 +7910,7 @@ _tmp41_ = _tmp40_; #line 846 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp41_) { -#line 7973 "gitg-commit.c" +#line 7913 "gitg-commit.c" GitgStageStatusItem** _tmp42_ = NULL; gint _tmp42__length1 = 0; GitgStageStatusItem* _tmp43_ = NULL; @@ -7985,14 +7925,14 @@ _tmp44_ = _g_object_ref0 (_tmp43_); #line 848 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _vala_array_add6 (&dirty, &dirty_length1, &_dirty_size_, _tmp44_); -#line 7988 "gitg-commit.c" +#line 7928 "gitg-commit.c" } } #line 823 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (sub); #line 823 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (item); -#line 7995 "gitg-commit.c" +#line 7935 "gitg-commit.c" } } } @@ -8043,335 +7983,314 @@ #line 862 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp53_ = _data10_->model; #line 862 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp54_ = _ ("Staged"); -#line 862 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp55_ = gitg_sidebar_store_begin_header (_tmp53_, _tmp54_, (guint) GITG_COMMIT_SIDEBAR_ITEM_TYPE_STAGED); + _tmp54_ = gitg_sidebar_store_begin_header (_tmp53_, _ ("Staged"), (guint) GITG_COMMIT_SIDEBAR_ITEM_TYPE_STAGED); #line 862 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - staged_header = _tmp55_; + staged_header = _tmp54_; #line 864 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp56_ = staged_header; + _tmp55_ = staged_header; #line 864 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - g_signal_connect_object ((GitgSidebarItem*) _tmp56_, "activated", (GCallback) ___lambda15__gitg_sidebar_item_activated, self, 0); + g_signal_connect_object ((GitgSidebarItem*) _tmp55_, "activated", (GCallback) ___lambda15__gitg_sidebar_item_activated, self, 0); #line 868 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp57_ = staged; + _tmp56_ = staged; #line 868 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp57__length1 = staged_length1; + _tmp56__length1 = staged_length1; #line 868 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp57__length1 == 0) { -#line 8061 "gitg-commit.c" + if (_tmp56__length1 == 0) { +#line 7999 "gitg-commit.c" + GitgSidebarStore* _tmp57_ = NULL; GitgSidebarStore* _tmp58_ = NULL; - const gchar* _tmp59_ = NULL; - GitgSidebarStore* _tmp60_ = NULL; - GitgSidebarStore* _tmp61_ = NULL; -#line 870 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp58_ = _data10_->model; + GitgSidebarStore* _tmp59_ = NULL; #line 870 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp59_ = _ ("No staged files"); + _tmp57_ = _data10_->model; #line 870 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp60_ = gitg_sidebar_store_append_dummy (_tmp58_, _tmp59_); + _tmp58_ = gitg_sidebar_store_append_dummy (_tmp57_, _ ("No staged files")); #line 870 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp61_ = _tmp60_; + _tmp59_ = _tmp58_; #line 870 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_tmp61_); -#line 8076 "gitg-commit.c" + _g_object_unref0 (_tmp59_); +#line 8011 "gitg-commit.c" } else { - GitgSidebarStore* _tmp62_ = NULL; - GitgStageStatusItem** _tmp63_ = NULL; - gint _tmp63__length1 = 0; - GeeHashSet* _tmp64_ = NULL; - gint _tmp65_ = 0; - GitgCommitSidebarItem** _tmp66_ = NULL; + GitgSidebarStore* _tmp60_ = NULL; + GitgStageStatusItem** _tmp61_ = NULL; + gint _tmp61__length1 = 0; + GeeHashSet* _tmp62_ = NULL; + gint _tmp63_ = 0; + GitgCommitSidebarItem** _tmp64_ = NULL; #line 874 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp62_ = _data10_->model; + _tmp60_ = _data10_->model; #line 874 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp63_ = staged; + _tmp61_ = staged; #line 874 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp63__length1 = staged_length1; + _tmp61__length1 = staged_length1; #line 874 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp64_ = _data10_->selected_paths; + _tmp62_ = _data10_->selected_paths; #line 874 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp66_ = gitg_commit_activity_append_items (self, _tmp62_, _tmp63_, _tmp63__length1, GITG_COMMIT_SIDEBAR_ITEM_TYPE_STAGED, _tmp64_, ____lambda19__gitg_commit_activity_stage_unstage_callback, self, &_tmp65_); + _tmp64_ = gitg_commit_activity_append_items (self, _tmp60_, _tmp61_, _tmp61__length1, GITG_COMMIT_SIDEBAR_ITEM_TYPE_STAGED, _tmp62_, ____lambda19__gitg_commit_activity_stage_unstage_callback, self, &_tmp63_); #line 874 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" current_staged = (_vala_array_free (current_staged, current_staged_length1, (GDestroyNotify) g_object_unref), NULL); #line 874 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - current_staged = _tmp66_; + current_staged = _tmp64_; #line 874 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - current_staged_length1 = _tmp65_; + current_staged_length1 = _tmp63_; #line 874 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _current_staged_size_ = current_staged_length1; -#line 8102 "gitg-commit.c" +#line 8037 "gitg-commit.c" } #line 890 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp67_ = _data10_->model; + _tmp65_ = _data10_->model; #line 890 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp68_ = gitg_sidebar_store_end_header (_tmp67_); + _tmp66_ = gitg_sidebar_store_end_header (_tmp65_); #line 890 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp69_ = _tmp68_; + _tmp67_ = _tmp66_; #line 890 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_tmp69_); -#line 893 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp70_ = _data10_->model; + _g_object_unref0 (_tmp67_); #line 893 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp71_ = _ ("Unstaged"); + _tmp68_ = _data10_->model; #line 893 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp72_ = gitg_sidebar_store_begin_header (_tmp70_, _tmp71_, (guint) GITG_COMMIT_SIDEBAR_ITEM_TYPE_UNSTAGED); + _tmp69_ = gitg_sidebar_store_begin_header (_tmp68_, _ ("Unstaged"), (guint) GITG_COMMIT_SIDEBAR_ITEM_TYPE_UNSTAGED); #line 893 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - unstaged_header = _tmp72_; + unstaged_header = _tmp69_; #line 895 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp73_ = unstaged_header; + _tmp70_ = unstaged_header; #line 895 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - g_signal_connect_object ((GitgSidebarItem*) _tmp73_, "activated", (GCallback) ___lambda20__gitg_sidebar_item_activated, self, 0); + g_signal_connect_object ((GitgSidebarItem*) _tmp70_, "activated", (GCallback) ___lambda20__gitg_sidebar_item_activated, self, 0); #line 899 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp74_ = unstaged; + _tmp71_ = unstaged; #line 899 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp74__length1 = unstaged_length1; + _tmp71__length1 = unstaged_length1; #line 899 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp74__length1 == 0) { -#line 8130 "gitg-commit.c" - GitgSidebarStore* _tmp75_ = NULL; - const gchar* _tmp76_ = NULL; - GitgSidebarStore* _tmp77_ = NULL; - GitgSidebarStore* _tmp78_ = NULL; + if (_tmp71__length1 == 0) { +#line 8063 "gitg-commit.c" + GitgSidebarStore* _tmp72_ = NULL; + GitgSidebarStore* _tmp73_ = NULL; + GitgSidebarStore* _tmp74_ = NULL; #line 901 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp75_ = _data10_->model; -#line 901 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp76_ = _ ("No unstaged files"); + _tmp72_ = _data10_->model; #line 901 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp77_ = gitg_sidebar_store_append_dummy (_tmp75_, _tmp76_); + _tmp73_ = gitg_sidebar_store_append_dummy (_tmp72_, _ ("No unstaged files")); #line 901 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp78_ = _tmp77_; + _tmp74_ = _tmp73_; #line 901 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_tmp78_); -#line 8145 "gitg-commit.c" + _g_object_unref0 (_tmp74_); +#line 8075 "gitg-commit.c" } else { - GitgSidebarStore* _tmp79_ = NULL; - GitgStageStatusItem** _tmp80_ = NULL; - gint _tmp80__length1 = 0; - GeeHashSet* _tmp81_ = NULL; - gint _tmp82_ = 0; - GitgCommitSidebarItem** _tmp83_ = NULL; + GitgSidebarStore* _tmp75_ = NULL; + GitgStageStatusItem** _tmp76_ = NULL; + gint _tmp76__length1 = 0; + GeeHashSet* _tmp77_ = NULL; + gint _tmp78_ = 0; + GitgCommitSidebarItem** _tmp79_ = NULL; #line 905 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp79_ = _data10_->model; + _tmp75_ = _data10_->model; #line 905 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp80_ = unstaged; + _tmp76_ = unstaged; #line 905 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp80__length1 = unstaged_length1; + _tmp76__length1 = unstaged_length1; #line 905 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp81_ = _data10_->selected_paths; + _tmp77_ = _data10_->selected_paths; #line 905 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp83_ = gitg_commit_activity_append_items (self, _tmp79_, _tmp80_, _tmp80__length1, GITG_COMMIT_SIDEBAR_ITEM_TYPE_UNSTAGED, _tmp81_, ____lambda22__gitg_commit_activity_stage_unstage_callback, self, &_tmp82_); + _tmp79_ = gitg_commit_activity_append_items (self, _tmp75_, _tmp76_, _tmp76__length1, GITG_COMMIT_SIDEBAR_ITEM_TYPE_UNSTAGED, _tmp77_, ____lambda22__gitg_commit_activity_stage_unstage_callback, self, &_tmp78_); #line 905 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" current_unstaged = (_vala_array_free (current_unstaged, current_unstaged_length1, (GDestroyNotify) g_object_unref), NULL); #line 905 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - current_unstaged = _tmp83_; + current_unstaged = _tmp79_; #line 905 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - current_unstaged_length1 = _tmp82_; + current_unstaged_length1 = _tmp78_; #line 905 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _current_unstaged_size_ = current_unstaged_length1; -#line 8171 "gitg-commit.c" +#line 8101 "gitg-commit.c" } #line 921 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp84_ = _data10_->model; + _tmp80_ = _data10_->model; #line 921 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp85_ = gitg_sidebar_store_end_header (_tmp84_); + _tmp81_ = gitg_sidebar_store_end_header (_tmp80_); #line 921 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp86_ = _tmp85_; + _tmp82_ = _tmp81_; #line 921 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_tmp86_); -#line 924 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp87_ = _data10_->model; + _g_object_unref0 (_tmp82_); #line 924 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp88_ = _ ("Untracked"); + _tmp83_ = _data10_->model; #line 924 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp89_ = gitg_sidebar_store_begin_header (_tmp87_, _tmp88_, (guint) GITG_COMMIT_SIDEBAR_ITEM_TYPE_UNTRACKED); + _tmp84_ = gitg_sidebar_store_begin_header (_tmp83_, _ ("Untracked"), (guint) GITG_COMMIT_SIDEBAR_ITEM_TYPE_UNTRACKED); #line 924 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp90_ = _tmp89_; + _tmp85_ = _tmp84_; #line 924 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_tmp90_); + _g_object_unref0 (_tmp85_); #line 926 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp91_ = untracked; + _tmp86_ = untracked; #line 926 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp91__length1 = untracked_length1; + _tmp86__length1 = untracked_length1; #line 926 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp91__length1 == 0) { -#line 8197 "gitg-commit.c" - GitgSidebarStore* _tmp92_ = NULL; - const gchar* _tmp93_ = NULL; - GitgSidebarStore* _tmp94_ = NULL; - GitgSidebarStore* _tmp95_ = NULL; -#line 928 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp92_ = _data10_->model; + if (_tmp86__length1 == 0) { +#line 8125 "gitg-commit.c" + GitgSidebarStore* _tmp87_ = NULL; + GitgSidebarStore* _tmp88_ = NULL; + GitgSidebarStore* _tmp89_ = NULL; #line 928 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp93_ = _ ("No untracked files"); + _tmp87_ = _data10_->model; #line 928 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp94_ = gitg_sidebar_store_append_dummy (_tmp92_, _tmp93_); + _tmp88_ = gitg_sidebar_store_append_dummy (_tmp87_, _ ("No untracked files")); #line 928 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp95_ = _tmp94_; + _tmp89_ = _tmp88_; #line 928 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_tmp95_); -#line 8212 "gitg-commit.c" + _g_object_unref0 (_tmp89_); +#line 8137 "gitg-commit.c" } else { - GitgSidebarStore* _tmp96_ = NULL; - GitgStageStatusItem** _tmp97_ = NULL; - gint _tmp97__length1 = 0; - GeeHashSet* _tmp98_ = NULL; - gint _tmp99_ = 0; - GitgCommitSidebarItem** _tmp100_ = NULL; + GitgSidebarStore* _tmp90_ = NULL; + GitgStageStatusItem** _tmp91_ = NULL; + gint _tmp91__length1 = 0; + GeeHashSet* _tmp92_ = NULL; + gint _tmp93_ = 0; + GitgCommitSidebarItem** _tmp94_ = NULL; #line 932 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp96_ = _data10_->model; + _tmp90_ = _data10_->model; #line 932 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp97_ = untracked; + _tmp91_ = untracked; #line 932 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp97__length1 = untracked_length1; + _tmp91__length1 = untracked_length1; #line 932 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp98_ = _data10_->selected_paths; + _tmp92_ = _data10_->selected_paths; #line 932 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp100_ = gitg_commit_activity_append_items (self, _tmp96_, _tmp97_, _tmp97__length1, GITG_COMMIT_SIDEBAR_ITEM_TYPE_UNTRACKED, _tmp98_, ____lambda23__gitg_commit_activity_stage_unstage_callback, self, &_tmp99_); + _tmp94_ = gitg_commit_activity_append_items (self, _tmp90_, _tmp91_, _tmp91__length1, GITG_COMMIT_SIDEBAR_ITEM_TYPE_UNTRACKED, _tmp92_, ____lambda23__gitg_commit_activity_stage_unstage_callback, self, &_tmp93_); #line 932 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" current_untracked = (_vala_array_free (current_untracked, current_untracked_length1, (GDestroyNotify) g_object_unref), NULL); #line 932 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - current_untracked = _tmp100_; + current_untracked = _tmp94_; #line 932 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - current_untracked_length1 = _tmp99_; + current_untracked_length1 = _tmp93_; #line 932 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _current_untracked_size_ = current_untracked_length1; -#line 8238 "gitg-commit.c" +#line 8163 "gitg-commit.c" } #line 948 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp101_ = _data10_->model; + _tmp95_ = _data10_->model; #line 948 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp102_ = gitg_sidebar_store_end_header (_tmp101_); + _tmp96_ = gitg_sidebar_store_end_header (_tmp95_); #line 948 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp103_ = _tmp102_; + _tmp97_ = _tmp96_; #line 948 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_tmp103_); + _g_object_unref0 (_tmp97_); #line 951 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp104_ = hassub; + _tmp98_ = hassub; #line 951 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp104_) { -#line 8252 "gitg-commit.c" - GitgSidebarStore* _tmp105_ = NULL; - const gchar* _tmp106_ = NULL; - GitgSidebarStoreSidebarHeader* _tmp107_ = NULL; - GitgSidebarStoreSidebarHeader* _tmp108_ = NULL; - GitgStageStatusItem** _tmp109_ = NULL; - gint _tmp109__length1 = 0; - GitgSidebarStore* _tmp119_ = NULL; - GitgSidebarStore* _tmp120_ = NULL; - GitgSidebarStore* _tmp121_ = NULL; + if (_tmp98_) { +#line 8177 "gitg-commit.c" + GitgSidebarStore* _tmp99_ = NULL; + GitgSidebarStoreSidebarHeader* _tmp100_ = NULL; + GitgSidebarStoreSidebarHeader* _tmp101_ = NULL; + GitgStageStatusItem** _tmp102_ = NULL; + gint _tmp102__length1 = 0; + GitgSidebarStore* _tmp111_ = NULL; + GitgSidebarStore* _tmp112_ = NULL; + GitgSidebarStore* _tmp113_ = NULL; #line 953 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp105_ = _data10_->model; + _tmp99_ = _data10_->model; #line 953 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp106_ = _ ("Submodule"); + _tmp100_ = gitg_sidebar_store_begin_header (_tmp99_, _ ("Submodule"), (guint) GITG_COMMIT_SIDEBAR_ITEM_TYPE_SUBMODULE); #line 953 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp107_ = gitg_sidebar_store_begin_header (_tmp105_, _tmp106_, (guint) GITG_COMMIT_SIDEBAR_ITEM_TYPE_SUBMODULE); + _tmp101_ = _tmp100_; #line 953 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp108_ = _tmp107_; -#line 953 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_tmp108_); + _g_object_unref0 (_tmp101_); #line 955 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp109_ = dirty; + _tmp102_ = dirty; #line 955 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp109__length1 = dirty_length1; + _tmp102__length1 = dirty_length1; #line 955 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp109__length1 == 0) { -#line 8278 "gitg-commit.c" - GitgSidebarStore* _tmp110_ = NULL; - const gchar* _tmp111_ = NULL; - GitgSidebarStore* _tmp112_ = NULL; - GitgSidebarStore* _tmp113_ = NULL; -#line 957 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp110_ = _data10_->model; + if (_tmp102__length1 == 0) { +#line 8200 "gitg-commit.c" + GitgSidebarStore* _tmp103_ = NULL; + GitgSidebarStore* _tmp104_ = NULL; + GitgSidebarStore* _tmp105_ = NULL; #line 957 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp111_ = _ ("No dirty submodules"); + _tmp103_ = _data10_->model; #line 957 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp112_ = gitg_sidebar_store_append_dummy (_tmp110_, _tmp111_); + _tmp104_ = gitg_sidebar_store_append_dummy (_tmp103_, _ ("No dirty submodules")); #line 957 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp113_ = _tmp112_; + _tmp105_ = _tmp104_; #line 957 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_tmp113_); -#line 8293 "gitg-commit.c" + _g_object_unref0 (_tmp105_); +#line 8212 "gitg-commit.c" } else { - GitgSidebarStore* _tmp114_ = NULL; - GitgStageStatusItem** _tmp115_ = NULL; - gint _tmp115__length1 = 0; - GeeHashSet* _tmp116_ = NULL; - gint _tmp117_ = 0; - GitgCommitSidebarItem** _tmp118_ = NULL; + GitgSidebarStore* _tmp106_ = NULL; + GitgStageStatusItem** _tmp107_ = NULL; + gint _tmp107__length1 = 0; + GeeHashSet* _tmp108_ = NULL; + gint _tmp109_ = 0; + GitgCommitSidebarItem** _tmp110_ = NULL; #line 961 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp114_ = _data10_->model; + _tmp106_ = _data10_->model; #line 961 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp115_ = dirty; + _tmp107_ = dirty; #line 961 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp115__length1 = dirty_length1; + _tmp107__length1 = dirty_length1; #line 961 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp116_ = _data10_->selected_paths; + _tmp108_ = _data10_->selected_paths; #line 961 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp118_ = gitg_commit_activity_append_items (self, _tmp114_, _tmp115_, _tmp115__length1, GITG_COMMIT_SIDEBAR_ITEM_TYPE_SUBMODULE, _tmp116_, _____lambda24__gitg_commit_activity_stage_unstage_callback, self, &_tmp117_); + _tmp110_ = gitg_commit_activity_append_items (self, _tmp106_, _tmp107_, _tmp107__length1, GITG_COMMIT_SIDEBAR_ITEM_TYPE_SUBMODULE, _tmp108_, _____lambda24__gitg_commit_activity_stage_unstage_callback, self, &_tmp109_); #line 961 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" current_submodules = (_vala_array_free (current_submodules, current_submodules_length1, (GDestroyNotify) g_object_unref), NULL); #line 961 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - current_submodules = _tmp118_; + current_submodules = _tmp110_; #line 961 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - current_submodules_length1 = _tmp117_; + current_submodules_length1 = _tmp109_; #line 961 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _current_submodules_size_ = current_submodules_length1; -#line 8319 "gitg-commit.c" +#line 8238 "gitg-commit.c" } #line 977 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp119_ = _data10_->model; + _tmp111_ = _data10_->model; #line 977 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp120_ = gitg_sidebar_store_end_header (_tmp119_); + _tmp112_ = gitg_sidebar_store_end_header (_tmp111_); #line 977 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp121_ = _tmp120_; + _tmp113_ = _tmp112_; #line 977 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_tmp121_); -#line 8329 "gitg-commit.c" + _g_object_unref0 (_tmp113_); +#line 8248 "gitg-commit.c" } #line 980 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp122_ = self->priv->d_main; + _tmp114_ = self->priv->d_main; #line 980 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp123_ = gitg_commit_paned_get_sidebar (_tmp122_); + _tmp115_ = gitg_commit_paned_get_sidebar (_tmp114_); #line 980 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp124_ = _tmp123_; + _tmp116_ = _tmp115_; #line 980 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gtk_tree_view_expand_all ((GtkTreeView*) _tmp124_); + gtk_tree_view_expand_all ((GtkTreeView*) _tmp116_); #line 981 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp125_ = staged; + _tmp117_ = staged; #line 981 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp125__length1 = staged_length1; + _tmp117__length1 = staged_length1; #line 981 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - self->priv->d_has_staged = _tmp125__length1 != 0; + self->priv->d_has_staged = _tmp117__length1 != 0; #line 983 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self->priv->d_reloading = FALSE; #line 985 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp126_ = _data10_->selected_paths; + _tmp118_ = _data10_->selected_paths; #line 985 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp127_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp126_); + _tmp119_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp118_); #line 985 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp128_ = _tmp127_; + _tmp120_ = _tmp119_; #line 985 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp128_ != 0) { -#line 8355 "gitg-commit.c" + if (_tmp120_ != 0) { +#line 8274 "gitg-commit.c" GitgCommitSidebarItem** sel = NULL; gint sel_length1 = 0; gint _sel_size_ = 0; - GitgCommitSidebarItemType _tmp129_ = 0; - gboolean _tmp138_ = FALSE; - GitgCommitSidebarItem** _tmp139_ = NULL; - gint _tmp139__length1 = 0; - gboolean _tmp143_ = FALSE; - GitgCommitSidebarItem** _tmp144_ = NULL; - gint _tmp144__length1 = 0; - gboolean _tmp148_ = FALSE; - GitgCommitSidebarItem** _tmp149_ = NULL; - gint _tmp149__length1 = 0; - gboolean _tmp153_ = FALSE; - GitgCommitSidebarItem** _tmp154_ = NULL; - gint _tmp154__length1 = 0; - gboolean _tmp158_ = FALSE; - GitgCommitSidebarItem** _tmp159_ = NULL; - gint _tmp159__length1 = 0; + GitgCommitSidebarItemType _tmp121_ = 0; + gboolean _tmp130_ = FALSE; + GitgCommitSidebarItem** _tmp131_ = NULL; + gint _tmp131__length1 = 0; + gboolean _tmp135_ = FALSE; + GitgCommitSidebarItem** _tmp136_ = NULL; + gint _tmp136__length1 = 0; + gboolean _tmp140_ = FALSE; + GitgCommitSidebarItem** _tmp141_ = NULL; + gint _tmp141__length1 = 0; + gboolean _tmp145_ = FALSE; + GitgCommitSidebarItem** _tmp146_ = NULL; + gint _tmp146__length1 = 0; + gboolean _tmp150_ = FALSE; + GitgCommitSidebarItem** _tmp151_ = NULL; + gint _tmp151__length1 = 0; #line 987 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" sel = NULL; #line 987 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -8379,461 +8298,461 @@ #line 987 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _sel_size_ = sel_length1; #line 989 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp129_ = _data10_->selected_type; + _tmp121_ = _data10_->selected_type; #line 989 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - switch (_tmp129_) { + switch (_tmp121_) { #line 989 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case GITG_COMMIT_SIDEBAR_ITEM_TYPE_STAGED: -#line 8387 "gitg-commit.c" +#line 8306 "gitg-commit.c" { - GitgCommitSidebarItem** _tmp130_ = NULL; - gint _tmp130__length1 = 0; - GitgCommitSidebarItem** _tmp131_ = NULL; - gint _tmp131__length1 = 0; + GitgCommitSidebarItem** _tmp122_ = NULL; + gint _tmp122__length1 = 0; + GitgCommitSidebarItem** _tmp123_ = NULL; + gint _tmp123__length1 = 0; #line 992 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp130_ = current_staged; + _tmp122_ = current_staged; #line 992 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp130__length1 = current_staged_length1; + _tmp122__length1 = current_staged_length1; #line 992 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp131_ = (_tmp130_ != NULL) ? _vala_array_dup7 (_tmp130_, _tmp130__length1) : ((gpointer) _tmp130_); + _tmp123_ = (_tmp122_ != NULL) ? _vala_array_dup7 (_tmp122_, _tmp122__length1) : ((gpointer) _tmp122_); #line 992 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp131__length1 = _tmp130__length1; + _tmp123__length1 = _tmp122__length1; #line 992 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" sel = (_vala_array_free (sel, sel_length1, (GDestroyNotify) g_object_unref), NULL); #line 992 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - sel = _tmp131_; + sel = _tmp123_; #line 992 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - sel_length1 = _tmp131__length1; + sel_length1 = _tmp123__length1; #line 992 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _sel_size_ = sel_length1; #line 993 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" break; -#line 8411 "gitg-commit.c" +#line 8330 "gitg-commit.c" } #line 989 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case GITG_COMMIT_SIDEBAR_ITEM_TYPE_UNSTAGED: -#line 8415 "gitg-commit.c" +#line 8334 "gitg-commit.c" { - GitgCommitSidebarItem** _tmp132_ = NULL; - gint _tmp132__length1 = 0; - GitgCommitSidebarItem** _tmp133_ = NULL; - gint _tmp133__length1 = 0; + GitgCommitSidebarItem** _tmp124_ = NULL; + gint _tmp124__length1 = 0; + GitgCommitSidebarItem** _tmp125_ = NULL; + gint _tmp125__length1 = 0; #line 995 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp132_ = current_unstaged; + _tmp124_ = current_unstaged; #line 995 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp132__length1 = current_unstaged_length1; + _tmp124__length1 = current_unstaged_length1; #line 995 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp133_ = (_tmp132_ != NULL) ? _vala_array_dup8 (_tmp132_, _tmp132__length1) : ((gpointer) _tmp132_); + _tmp125_ = (_tmp124_ != NULL) ? _vala_array_dup8 (_tmp124_, _tmp124__length1) : ((gpointer) _tmp124_); #line 995 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp133__length1 = _tmp132__length1; + _tmp125__length1 = _tmp124__length1; #line 995 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" sel = (_vala_array_free (sel, sel_length1, (GDestroyNotify) g_object_unref), NULL); #line 995 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - sel = _tmp133_; + sel = _tmp125_; #line 995 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - sel_length1 = _tmp133__length1; + sel_length1 = _tmp125__length1; #line 995 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _sel_size_ = sel_length1; #line 996 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" break; -#line 8439 "gitg-commit.c" +#line 8358 "gitg-commit.c" } #line 989 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case GITG_COMMIT_SIDEBAR_ITEM_TYPE_UNTRACKED: -#line 8443 "gitg-commit.c" +#line 8362 "gitg-commit.c" { - GitgCommitSidebarItem** _tmp134_ = NULL; - gint _tmp134__length1 = 0; - GitgCommitSidebarItem** _tmp135_ = NULL; - gint _tmp135__length1 = 0; + GitgCommitSidebarItem** _tmp126_ = NULL; + gint _tmp126__length1 = 0; + GitgCommitSidebarItem** _tmp127_ = NULL; + gint _tmp127__length1 = 0; #line 998 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp134_ = current_untracked; + _tmp126_ = current_untracked; #line 998 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp134__length1 = current_untracked_length1; + _tmp126__length1 = current_untracked_length1; #line 998 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp135_ = (_tmp134_ != NULL) ? _vala_array_dup9 (_tmp134_, _tmp134__length1) : ((gpointer) _tmp134_); + _tmp127_ = (_tmp126_ != NULL) ? _vala_array_dup9 (_tmp126_, _tmp126__length1) : ((gpointer) _tmp126_); #line 998 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp135__length1 = _tmp134__length1; + _tmp127__length1 = _tmp126__length1; #line 998 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" sel = (_vala_array_free (sel, sel_length1, (GDestroyNotify) g_object_unref), NULL); #line 998 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - sel = _tmp135_; + sel = _tmp127_; #line 998 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - sel_length1 = _tmp135__length1; + sel_length1 = _tmp127__length1; #line 998 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _sel_size_ = sel_length1; #line 999 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" break; -#line 8467 "gitg-commit.c" +#line 8386 "gitg-commit.c" } #line 989 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case GITG_COMMIT_SIDEBAR_ITEM_TYPE_SUBMODULE: -#line 8471 "gitg-commit.c" +#line 8390 "gitg-commit.c" { - GitgCommitSidebarItem** _tmp136_ = NULL; - gint _tmp136__length1 = 0; - GitgCommitSidebarItem** _tmp137_ = NULL; - gint _tmp137__length1 = 0; + GitgCommitSidebarItem** _tmp128_ = NULL; + gint _tmp128__length1 = 0; + GitgCommitSidebarItem** _tmp129_ = NULL; + gint _tmp129__length1 = 0; #line 1001 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp136_ = current_submodules; + _tmp128_ = current_submodules; #line 1001 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp136__length1 = current_submodules_length1; + _tmp128__length1 = current_submodules_length1; #line 1001 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp137_ = (_tmp136_ != NULL) ? _vala_array_dup10 (_tmp136_, _tmp136__length1) : ((gpointer) _tmp136_); + _tmp129_ = (_tmp128_ != NULL) ? _vala_array_dup10 (_tmp128_, _tmp128__length1) : ((gpointer) _tmp128_); #line 1001 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp137__length1 = _tmp136__length1; + _tmp129__length1 = _tmp128__length1; #line 1001 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" sel = (_vala_array_free (sel, sel_length1, (GDestroyNotify) g_object_unref), NULL); #line 1001 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - sel = _tmp137_; + sel = _tmp129_; #line 1001 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - sel_length1 = _tmp137__length1; + sel_length1 = _tmp129__length1; #line 1001 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _sel_size_ = sel_length1; #line 1002 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" break; -#line 8495 "gitg-commit.c" +#line 8414 "gitg-commit.c" } default: #line 989 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" break; -#line 8500 "gitg-commit.c" +#line 8419 "gitg-commit.c" } #line 1005 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp139_ = sel; + _tmp131_ = sel; #line 1005 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp139__length1 = sel_length1; + _tmp131__length1 = sel_length1; #line 1005 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp139_ == NULL) { + if (_tmp131_ == NULL) { #line 1005 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp138_ = TRUE; -#line 8510 "gitg-commit.c" + _tmp130_ = TRUE; +#line 8429 "gitg-commit.c" } else { - GitgCommitSidebarItem** _tmp140_ = NULL; - gint _tmp140__length1 = 0; + GitgCommitSidebarItem** _tmp132_ = NULL; + gint _tmp132__length1 = 0; #line 1005 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp140_ = sel; + _tmp132_ = sel; #line 1005 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp140__length1 = sel_length1; + _tmp132__length1 = sel_length1; #line 1005 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp138_ = _tmp140__length1 == 0; -#line 8520 "gitg-commit.c" + _tmp130_ = _tmp132__length1 == 0; +#line 8439 "gitg-commit.c" } #line 1005 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp138_) { -#line 8524 "gitg-commit.c" - GitgCommitSidebarItem** _tmp141_ = NULL; - gint _tmp141__length1 = 0; - GitgCommitSidebarItem** _tmp142_ = NULL; - gint _tmp142__length1 = 0; + if (_tmp130_) { +#line 8443 "gitg-commit.c" + GitgCommitSidebarItem** _tmp133_ = NULL; + gint _tmp133__length1 = 0; + GitgCommitSidebarItem** _tmp134_ = NULL; + gint _tmp134__length1 = 0; #line 1007 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp141_ = current_staged; + _tmp133_ = current_staged; #line 1007 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp141__length1 = current_staged_length1; + _tmp133__length1 = current_staged_length1; #line 1007 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp142_ = (_tmp141_ != NULL) ? _vala_array_dup11 (_tmp141_, _tmp141__length1) : ((gpointer) _tmp141_); + _tmp134_ = (_tmp133_ != NULL) ? _vala_array_dup11 (_tmp133_, _tmp133__length1) : ((gpointer) _tmp133_); #line 1007 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp142__length1 = _tmp141__length1; + _tmp134__length1 = _tmp133__length1; #line 1007 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" sel = (_vala_array_free (sel, sel_length1, (GDestroyNotify) g_object_unref), NULL); #line 1007 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - sel = _tmp142_; + sel = _tmp134_; #line 1007 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - sel_length1 = _tmp142__length1; + sel_length1 = _tmp134__length1; #line 1007 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _sel_size_ = sel_length1; -#line 8545 "gitg-commit.c" +#line 8464 "gitg-commit.c" } #line 1010 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp144_ = sel; + _tmp136_ = sel; #line 1010 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp144__length1 = sel_length1; + _tmp136__length1 = sel_length1; #line 1010 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp144_ == NULL) { + if (_tmp136_ == NULL) { #line 1010 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp143_ = TRUE; -#line 8555 "gitg-commit.c" + _tmp135_ = TRUE; +#line 8474 "gitg-commit.c" } else { - GitgCommitSidebarItem** _tmp145_ = NULL; - gint _tmp145__length1 = 0; + GitgCommitSidebarItem** _tmp137_ = NULL; + gint _tmp137__length1 = 0; #line 1010 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp145_ = sel; + _tmp137_ = sel; #line 1010 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp145__length1 = sel_length1; + _tmp137__length1 = sel_length1; #line 1010 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp143_ = _tmp145__length1 == 0; -#line 8565 "gitg-commit.c" + _tmp135_ = _tmp137__length1 == 0; +#line 8484 "gitg-commit.c" } #line 1010 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp143_) { -#line 8569 "gitg-commit.c" - GitgCommitSidebarItem** _tmp146_ = NULL; - gint _tmp146__length1 = 0; - GitgCommitSidebarItem** _tmp147_ = NULL; - gint _tmp147__length1 = 0; + if (_tmp135_) { +#line 8488 "gitg-commit.c" + GitgCommitSidebarItem** _tmp138_ = NULL; + gint _tmp138__length1 = 0; + GitgCommitSidebarItem** _tmp139_ = NULL; + gint _tmp139__length1 = 0; #line 1012 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp146_ = current_unstaged; + _tmp138_ = current_unstaged; #line 1012 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp146__length1 = current_unstaged_length1; + _tmp138__length1 = current_unstaged_length1; #line 1012 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp147_ = (_tmp146_ != NULL) ? _vala_array_dup12 (_tmp146_, _tmp146__length1) : ((gpointer) _tmp146_); + _tmp139_ = (_tmp138_ != NULL) ? _vala_array_dup12 (_tmp138_, _tmp138__length1) : ((gpointer) _tmp138_); #line 1012 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp147__length1 = _tmp146__length1; + _tmp139__length1 = _tmp138__length1; #line 1012 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" sel = (_vala_array_free (sel, sel_length1, (GDestroyNotify) g_object_unref), NULL); #line 1012 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - sel = _tmp147_; + sel = _tmp139_; #line 1012 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - sel_length1 = _tmp147__length1; + sel_length1 = _tmp139__length1; #line 1012 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _sel_size_ = sel_length1; -#line 8590 "gitg-commit.c" +#line 8509 "gitg-commit.c" } #line 1015 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp149_ = sel; + _tmp141_ = sel; #line 1015 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp149__length1 = sel_length1; + _tmp141__length1 = sel_length1; #line 1015 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp149_ == NULL) { + if (_tmp141_ == NULL) { #line 1015 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp148_ = TRUE; -#line 8600 "gitg-commit.c" + _tmp140_ = TRUE; +#line 8519 "gitg-commit.c" } else { - GitgCommitSidebarItem** _tmp150_ = NULL; - gint _tmp150__length1 = 0; + GitgCommitSidebarItem** _tmp142_ = NULL; + gint _tmp142__length1 = 0; #line 1015 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp150_ = sel; + _tmp142_ = sel; #line 1015 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp150__length1 = sel_length1; + _tmp142__length1 = sel_length1; #line 1015 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp148_ = _tmp150__length1 == 0; -#line 8610 "gitg-commit.c" + _tmp140_ = _tmp142__length1 == 0; +#line 8529 "gitg-commit.c" } #line 1015 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp148_) { -#line 8614 "gitg-commit.c" - GitgCommitSidebarItem** _tmp151_ = NULL; - gint _tmp151__length1 = 0; - GitgCommitSidebarItem** _tmp152_ = NULL; - gint _tmp152__length1 = 0; + if (_tmp140_) { +#line 8533 "gitg-commit.c" + GitgCommitSidebarItem** _tmp143_ = NULL; + gint _tmp143__length1 = 0; + GitgCommitSidebarItem** _tmp144_ = NULL; + gint _tmp144__length1 = 0; #line 1017 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp151_ = current_untracked; + _tmp143_ = current_untracked; #line 1017 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp151__length1 = current_untracked_length1; + _tmp143__length1 = current_untracked_length1; #line 1017 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp152_ = (_tmp151_ != NULL) ? _vala_array_dup13 (_tmp151_, _tmp151__length1) : ((gpointer) _tmp151_); + _tmp144_ = (_tmp143_ != NULL) ? _vala_array_dup13 (_tmp143_, _tmp143__length1) : ((gpointer) _tmp143_); #line 1017 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp152__length1 = _tmp151__length1; + _tmp144__length1 = _tmp143__length1; #line 1017 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" sel = (_vala_array_free (sel, sel_length1, (GDestroyNotify) g_object_unref), NULL); #line 1017 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - sel = _tmp152_; + sel = _tmp144_; #line 1017 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - sel_length1 = _tmp152__length1; + sel_length1 = _tmp144__length1; #line 1017 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _sel_size_ = sel_length1; -#line 8635 "gitg-commit.c" +#line 8554 "gitg-commit.c" } #line 1020 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp154_ = sel; + _tmp146_ = sel; #line 1020 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp154__length1 = sel_length1; + _tmp146__length1 = sel_length1; #line 1020 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp154_ == NULL) { + if (_tmp146_ == NULL) { #line 1020 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp153_ = TRUE; -#line 8645 "gitg-commit.c" + _tmp145_ = TRUE; +#line 8564 "gitg-commit.c" } else { - GitgCommitSidebarItem** _tmp155_ = NULL; - gint _tmp155__length1 = 0; + GitgCommitSidebarItem** _tmp147_ = NULL; + gint _tmp147__length1 = 0; #line 1020 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp155_ = sel; + _tmp147_ = sel; #line 1020 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp155__length1 = sel_length1; + _tmp147__length1 = sel_length1; #line 1020 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp153_ = _tmp155__length1 == 0; -#line 8655 "gitg-commit.c" + _tmp145_ = _tmp147__length1 == 0; +#line 8574 "gitg-commit.c" } #line 1020 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp153_) { -#line 8659 "gitg-commit.c" - GitgCommitSidebarItem** _tmp156_ = NULL; - gint _tmp156__length1 = 0; - GitgCommitSidebarItem** _tmp157_ = NULL; - gint _tmp157__length1 = 0; + if (_tmp145_) { +#line 8578 "gitg-commit.c" + GitgCommitSidebarItem** _tmp148_ = NULL; + gint _tmp148__length1 = 0; + GitgCommitSidebarItem** _tmp149_ = NULL; + gint _tmp149__length1 = 0; #line 1022 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp156_ = current_submodules; + _tmp148_ = current_submodules; #line 1022 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp156__length1 = current_submodules_length1; + _tmp148__length1 = current_submodules_length1; #line 1022 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp157_ = (_tmp156_ != NULL) ? _vala_array_dup14 (_tmp156_, _tmp156__length1) : ((gpointer) _tmp156_); + _tmp149_ = (_tmp148_ != NULL) ? _vala_array_dup14 (_tmp148_, _tmp148__length1) : ((gpointer) _tmp148_); #line 1022 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp157__length1 = _tmp156__length1; + _tmp149__length1 = _tmp148__length1; #line 1022 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" sel = (_vala_array_free (sel, sel_length1, (GDestroyNotify) g_object_unref), NULL); #line 1022 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - sel = _tmp157_; + sel = _tmp149_; #line 1022 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - sel_length1 = _tmp157__length1; + sel_length1 = _tmp149__length1; #line 1022 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _sel_size_ = sel_length1; -#line 8680 "gitg-commit.c" +#line 8599 "gitg-commit.c" } #line 1025 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp159_ = sel; + _tmp151_ = sel; #line 1025 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp159__length1 = sel_length1; + _tmp151__length1 = sel_length1; #line 1025 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp159_ != NULL) { -#line 8688 "gitg-commit.c" - GitgCommitSidebarItem** _tmp160_ = NULL; - gint _tmp160__length1 = 0; + if (_tmp151_ != NULL) { +#line 8607 "gitg-commit.c" + GitgCommitSidebarItem** _tmp152_ = NULL; + gint _tmp152__length1 = 0; #line 1025 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp160_ = sel; + _tmp152_ = sel; #line 1025 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp160__length1 = sel_length1; + _tmp152__length1 = sel_length1; #line 1025 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp158_ = _tmp160__length1 != 0; -#line 8697 "gitg-commit.c" + _tmp150_ = _tmp152__length1 != 0; +#line 8616 "gitg-commit.c" } else { #line 1025 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp158_ = FALSE; -#line 8701 "gitg-commit.c" + _tmp150_ = FALSE; +#line 8620 "gitg-commit.c" } #line 1025 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp158_) { -#line 8705 "gitg-commit.c" - GitgCommitSidebarItem** _tmp161_ = NULL; - gint _tmp161__length1 = 0; + if (_tmp150_) { +#line 8624 "gitg-commit.c" + GitgCommitSidebarItem** _tmp153_ = NULL; + gint _tmp153__length1 = 0; #line 1027 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp161_ = sel; + _tmp153_ = sel; #line 1027 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp161__length1 = sel_length1; -#line 8712 "gitg-commit.c" + _tmp153__length1 = sel_length1; +#line 8631 "gitg-commit.c" { GitgCommitSidebarItem** item_collection = NULL; gint item_collection_length1 = 0; gint _item_collection_size_ = 0; gint item_it = 0; #line 1027 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - item_collection = _tmp161_; + item_collection = _tmp153_; #line 1027 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - item_collection_length1 = _tmp161__length1; + item_collection_length1 = _tmp153__length1; #line 1027 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - for (item_it = 0; item_it < _tmp161__length1; item_it = item_it + 1) { -#line 8724 "gitg-commit.c" - GitgCommitSidebarItem* _tmp162_ = NULL; + for (item_it = 0; item_it < _tmp153__length1; item_it = item_it + 1) { +#line 8643 "gitg-commit.c" + GitgCommitSidebarItem* _tmp154_ = NULL; GitgCommitSidebarItem* item = NULL; #line 1027 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp162_ = _g_object_ref0 (item_collection[item_it]); + _tmp154_ = _g_object_ref0 (item_collection[item_it]); #line 1027 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - item = _tmp162_; -#line 8731 "gitg-commit.c" + item = _tmp154_; +#line 8650 "gitg-commit.c" { - GitgCommitPaned* _tmp163_ = NULL; - GitgCommitSidebar* _tmp164_ = NULL; - GitgCommitSidebar* _tmp165_ = NULL; - GitgCommitSidebarItem* _tmp166_ = NULL; + GitgCommitPaned* _tmp155_ = NULL; + GitgCommitSidebar* _tmp156_ = NULL; + GitgCommitSidebar* _tmp157_ = NULL; + GitgCommitSidebarItem* _tmp158_ = NULL; #line 1029 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp163_ = self->priv->d_main; + _tmp155_ = self->priv->d_main; #line 1029 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp164_ = gitg_commit_paned_get_sidebar (_tmp163_); + _tmp156_ = gitg_commit_paned_get_sidebar (_tmp155_); #line 1029 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp165_ = _tmp164_; + _tmp157_ = _tmp156_; #line 1029 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp166_ = item; + _tmp158_ = item; #line 1029 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_sidebar_select ((GitgSidebar*) _tmp165_, (GitgSidebarItem*) _tmp166_); + gitg_sidebar_select ((GitgSidebar*) _tmp157_, (GitgSidebarItem*) _tmp158_); #line 1027 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (item); -#line 8749 "gitg-commit.c" +#line 8668 "gitg-commit.c" } } } } else { - GitgCommitSidebarItemType _tmp167_ = 0; + GitgCommitSidebarItemType _tmp159_ = 0; #line 1032 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp167_ = _data10_->selected_type; + _tmp159_ = _data10_->selected_type; #line 1032 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp167_ == GITG_COMMIT_SIDEBAR_ITEM_TYPE_STAGED) { -#line 8759 "gitg-commit.c" - GitgCommitPaned* _tmp168_ = NULL; - GitgCommitSidebar* _tmp169_ = NULL; - GitgCommitSidebar* _tmp170_ = NULL; - GitgSidebarStoreSidebarHeader* _tmp171_ = NULL; + if (_tmp159_ == GITG_COMMIT_SIDEBAR_ITEM_TYPE_STAGED) { +#line 8678 "gitg-commit.c" + GitgCommitPaned* _tmp160_ = NULL; + GitgCommitSidebar* _tmp161_ = NULL; + GitgCommitSidebar* _tmp162_ = NULL; + GitgSidebarStoreSidebarHeader* _tmp163_ = NULL; #line 1034 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp168_ = self->priv->d_main; + _tmp160_ = self->priv->d_main; #line 1034 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp169_ = gitg_commit_paned_get_sidebar (_tmp168_); + _tmp161_ = gitg_commit_paned_get_sidebar (_tmp160_); #line 1034 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp170_ = _tmp169_; + _tmp162_ = _tmp161_; #line 1034 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp171_ = staged_header; + _tmp163_ = staged_header; #line 1034 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_sidebar_select ((GitgSidebar*) _tmp170_, (GitgSidebarItem*) _tmp171_); -#line 8774 "gitg-commit.c" + gitg_sidebar_select ((GitgSidebar*) _tmp162_, (GitgSidebarItem*) _tmp163_); +#line 8693 "gitg-commit.c" } else { - GitgCommitPaned* _tmp172_ = NULL; - GitgCommitSidebar* _tmp173_ = NULL; - GitgCommitSidebar* _tmp174_ = NULL; - GitgSidebarStoreSidebarHeader* _tmp175_ = NULL; + GitgCommitPaned* _tmp164_ = NULL; + GitgCommitSidebar* _tmp165_ = NULL; + GitgCommitSidebar* _tmp166_ = NULL; + GitgSidebarStoreSidebarHeader* _tmp167_ = NULL; #line 1038 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp172_ = self->priv->d_main; + _tmp164_ = self->priv->d_main; #line 1038 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp173_ = gitg_commit_paned_get_sidebar (_tmp172_); + _tmp165_ = gitg_commit_paned_get_sidebar (_tmp164_); #line 1038 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp174_ = _tmp173_; + _tmp166_ = _tmp165_; #line 1038 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp175_ = unstaged_header; + _tmp167_ = unstaged_header; #line 1038 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_sidebar_select ((GitgSidebar*) _tmp174_, (GitgSidebarItem*) _tmp175_); -#line 8790 "gitg-commit.c" + gitg_sidebar_select ((GitgSidebar*) _tmp166_, (GitgSidebarItem*) _tmp167_); +#line 8709 "gitg-commit.c" } } #line 985 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" sel = (_vala_array_free (sel, sel_length1, (GDestroyNotify) g_object_unref), NULL); -#line 8795 "gitg-commit.c" +#line 8714 "gitg-commit.c" } else { - GitgStageStatusItem** _tmp176_ = NULL; - gint _tmp176__length1 = 0; + GitgStageStatusItem** _tmp168_ = NULL; + gint _tmp168__length1 = 0; #line 1044 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp176_ = unstaged; + _tmp168_ = unstaged; #line 1044 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp176__length1 = unstaged_length1; + _tmp168__length1 = unstaged_length1; #line 1044 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp176__length1 == 0) { -#line 8805 "gitg-commit.c" - GitgCommitPaned* _tmp177_ = NULL; - GitgCommitSidebar* _tmp178_ = NULL; - GitgCommitSidebar* _tmp179_ = NULL; - GitgSidebarStoreSidebarHeader* _tmp180_ = NULL; + if (_tmp168__length1 == 0) { +#line 8724 "gitg-commit.c" + GitgCommitPaned* _tmp169_ = NULL; + GitgCommitSidebar* _tmp170_ = NULL; + GitgCommitSidebar* _tmp171_ = NULL; + GitgSidebarStoreSidebarHeader* _tmp172_ = NULL; #line 1046 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp177_ = self->priv->d_main; + _tmp169_ = self->priv->d_main; #line 1046 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp178_ = gitg_commit_paned_get_sidebar (_tmp177_); + _tmp170_ = gitg_commit_paned_get_sidebar (_tmp169_); #line 1046 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp179_ = _tmp178_; + _tmp171_ = _tmp170_; #line 1046 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp180_ = staged_header; + _tmp172_ = staged_header; #line 1046 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_sidebar_select ((GitgSidebar*) _tmp179_, (GitgSidebarItem*) _tmp180_); -#line 8820 "gitg-commit.c" + gitg_sidebar_select ((GitgSidebar*) _tmp171_, (GitgSidebarItem*) _tmp172_); +#line 8739 "gitg-commit.c" } else { - GitgCommitPaned* _tmp181_ = NULL; - GitgCommitSidebar* _tmp182_ = NULL; - GitgCommitSidebar* _tmp183_ = NULL; - GitgSidebarStoreSidebarHeader* _tmp184_ = NULL; + GitgCommitPaned* _tmp173_ = NULL; + GitgCommitSidebar* _tmp174_ = NULL; + GitgCommitSidebar* _tmp175_ = NULL; + GitgSidebarStoreSidebarHeader* _tmp176_ = NULL; #line 1050 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp181_ = self->priv->d_main; + _tmp173_ = self->priv->d_main; #line 1050 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp182_ = gitg_commit_paned_get_sidebar (_tmp181_); + _tmp174_ = gitg_commit_paned_get_sidebar (_tmp173_); #line 1050 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp183_ = _tmp182_; + _tmp175_ = _tmp174_; #line 1050 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp184_ = unstaged_header; + _tmp176_ = unstaged_header; #line 1050 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_sidebar_select ((GitgSidebar*) _tmp183_, (GitgSidebarItem*) _tmp184_); -#line 8836 "gitg-commit.c" + gitg_sidebar_select ((GitgSidebar*) _tmp175_, (GitgSidebarItem*) _tmp176_); +#line 8755 "gitg-commit.c" } } #line 806 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -8858,7 +8777,7 @@ staged = (_vala_array_free (staged, staged_length1, (GDestroyNotify) g_object_unref), NULL); #line 806 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" items = (_vala_array_free (items, items_length1, (GDestroyNotify) g_object_unref), NULL); -#line 8861 "gitg-commit.c" +#line 8780 "gitg-commit.c" } @@ -8867,14 +8786,14 @@ __lambda14_ (self, source_object, res); #line 806 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" block10_data_unref (self); -#line 8870 "gitg-commit.c" +#line 8789 "gitg-commit.c" } static void _vala_GgitStatusOptions_free (GgitStatusOptions* self) { #line 750 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_boxed_free (ggit_status_options_get_type (), self); -#line 8877 "gitg-commit.c" +#line 8796 "gitg-commit.c" } @@ -8966,14 +8885,14 @@ if (_tmp7_ == NULL) { #line 756 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp6_ = TRUE; -#line 8969 "gitg-commit.c" +#line 8888 "gitg-commit.c" } else { gboolean _tmp8_ = FALSE; #line 756 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp8_ = self->priv->d_reloading; #line 756 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp6_ = _tmp8_; -#line 8976 "gitg-commit.c" +#line 8895 "gitg-commit.c" } #line 756 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp6_) { @@ -8985,7 +8904,7 @@ _data10_ = NULL; #line 758 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 8988 "gitg-commit.c" +#line 8907 "gitg-commit.c" } #line 761 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self->priv->d_reloading = TRUE; @@ -9039,7 +8958,7 @@ _tmp25_ = selected_items; #line 774 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp25__length1 = selected_items_length1; -#line 9042 "gitg-commit.c" +#line 8961 "gitg-commit.c" { GitgStageStatusItem** item_collection = NULL; gint item_collection_length1 = 0; @@ -9051,14 +8970,14 @@ item_collection_length1 = _tmp25__length1; #line 774 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" for (item_it = 0; item_it < _tmp25__length1; item_it = item_it + 1) { -#line 9054 "gitg-commit.c" +#line 8973 "gitg-commit.c" GitgStageStatusItem* _tmp26_ = NULL; GitgStageStatusItem* item = NULL; #line 774 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp26_ = _g_object_ref0 (item_collection[item_it]); #line 774 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" item = _tmp26_; -#line 9061 "gitg-commit.c" +#line 8980 "gitg-commit.c" { GeeHashSet* _tmp27_ = NULL; GitgStageStatusItem* _tmp28_ = NULL; @@ -9081,7 +9000,7 @@ _g_free0 (_tmp31_); #line 774 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (item); -#line 9084 "gitg-commit.c" +#line 9003 "gitg-commit.c" } } } @@ -9097,7 +9016,7 @@ _tmp36_ = _tmp35_; #line 779 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp36_) { -#line 9100 "gitg-commit.c" +#line 9019 "gitg-commit.c" { Block11Data* _data11_; GgitSignature* author = NULL; @@ -9122,7 +9041,7 @@ block11_data_unref (_data11_); #line 784 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data11_ = NULL; -#line 9125 "gitg-commit.c" +#line 9044 "gitg-commit.c" goto __catch20_g_error; } #line 785 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -9143,7 +9062,7 @@ block11_data_unref (_data11_); #line 782 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data11_ = NULL; -#line 9146 "gitg-commit.c" +#line 9065 "gitg-commit.c" } goto __finally20; __catch20_g_error: @@ -9152,7 +9071,7 @@ g_clear_error (&_inner_error_); #line 782 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _inner_error_ = NULL; -#line 9155 "gitg-commit.c" +#line 9074 "gitg-commit.c" } __finally20: #line 782 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -9173,7 +9092,7 @@ g_clear_error (&_inner_error_); #line 782 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 9176 "gitg-commit.c" +#line 9095 "gitg-commit.c" } } #line 793 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -9222,7 +9141,7 @@ block10_data_unref (_data10_); #line 750 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data10_ = NULL; -#line 9225 "gitg-commit.c" +#line 9144 "gitg-commit.c" } @@ -9232,7 +9151,7 @@ self = (GitgCommitActivity*) base; #line 1058 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_reload (self); -#line 9235 "gitg-commit.c" +#line 9154 "gitg-commit.c" } @@ -9241,7 +9160,7 @@ g_atomic_int_inc (&_data12_->_ref_count_); #line 1061 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data12_; -#line 9244 "gitg-commit.c" +#line 9163 "gitg-commit.c" } @@ -9250,7 +9169,7 @@ _data12_ = (Block12Data*) _userdata_; #line 1061 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data12_->_ref_count_)) { -#line 9253 "gitg-commit.c" +#line 9172 "gitg-commit.c" GitgCommitActivity* self; #line 1061 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data12_->self; @@ -9262,20 +9181,20 @@ _g_object_unref0 (self); #line 1061 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block12Data, _data12_); -#line 9265 "gitg-commit.c" +#line 9184 "gitg-commit.c" } } static void __lambda33_ (Block12Data* _data12_, GObject* obj, GAsyncResult* res) { GitgCommitActivity* self; - GitgCommitDialog* _tmp15_ = NULL; + GitgCommitDialog* _tmp14_ = NULL; GError * _inner_error_ = NULL; #line 1096 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data12_->self; #line 1096 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_return_if_fail (res != NULL); -#line 9278 "gitg-commit.c" +#line 9197 "gitg-commit.c" { GitgStage* _tmp0_ = NULL; GAsyncResult* _tmp1_ = NULL; @@ -9296,7 +9215,7 @@ __vala_GgitOId_free0 (_tmp3_); #line 1099 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9299 "gitg-commit.c" +#line 9218 "gitg-commit.c" goto __catch21_g_error; } #line 1100 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -9311,52 +9230,49 @@ g_signal_emit_by_name (_tmp6_, "repository-commits-changed"); #line 1102 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp6_); -#line 9314 "gitg-commit.c" +#line 9233 "gitg-commit.c" } goto __finally21; __catch21_g_error: { GError* e = NULL; gchar* msg = NULL; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + gchar* _tmp7_ = NULL; + GitgExtApplication* _tmp8_ = NULL; GitgExtApplication* _tmp9_ = NULL; GitgExtApplication* _tmp10_ = NULL; - GitgExtApplication* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - GError* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; + const gchar* _tmp11_ = NULL; + GError* _tmp12_ = NULL; + const gchar* _tmp13_ = NULL; #line 1097 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" e = _inner_error_; #line 1097 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _inner_error_ = NULL; #line 1106 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp7_ = _ ("Failed to commit"); -#line 1106 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp8_ = g_strdup (_tmp7_); + _tmp7_ = g_strdup (_ ("Failed to commit")); #line 1106 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - msg = _tmp8_; + msg = _tmp7_; +#line 1107 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _tmp8_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); #line 1107 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp9_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); + _tmp9_ = _tmp8_; #line 1107 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp10_ = _tmp9_; #line 1107 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp11_ = _tmp10_; -#line 1107 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp12_ = msg; + _tmp11_ = msg; #line 1107 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp13_ = e; + _tmp12_ = e; #line 1107 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp14_ = _tmp13_->message; + _tmp13_ = _tmp12_->message; #line 1107 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_application_show_infobar (_tmp11_, _tmp12_, _tmp14_, GTK_MESSAGE_ERROR); + gitg_ext_application_show_infobar (_tmp10_, _tmp11_, _tmp13_, GTK_MESSAGE_ERROR); #line 1107 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp10_); #line 1097 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_free0 (msg); #line 1097 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_error_free0 (e); -#line 9359 "gitg-commit.c" +#line 9275 "gitg-commit.c" } __finally21: #line 1097 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -9367,13 +9283,13 @@ g_clear_error (&_inner_error_); #line 1097 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 9370 "gitg-commit.c" +#line 9286 "gitg-commit.c" } #line 1110 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp15_ = _data12_->dlg; + _tmp14_ = _data12_->dlg; #line 1110 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gtk_widget_destroy ((GtkWidget*) _tmp15_); -#line 9376 "gitg-commit.c" + gtk_widget_destroy ((GtkWidget*) _tmp14_); +#line 9292 "gitg-commit.c" } @@ -9382,7 +9298,7 @@ __lambda33_ (self, source_object, res); #line 1093 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" block12_data_unref (self); -#line 9385 "gitg-commit.c" +#line 9301 "gitg-commit.c" } @@ -9403,18 +9319,18 @@ GitgCommitDialog* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; gboolean _tmp13_ = FALSE; - GitgCommitDialog* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; + GitgCommitDialog* _tmp17_ = NULL; + gboolean _tmp18_ = FALSE; + gboolean _tmp19_ = FALSE; gboolean _tmp21_ = FALSE; - gboolean _tmp23_ = FALSE; - GitgStage* _tmp25_ = NULL; - GitgCommitDialog* _tmp26_ = NULL; + GitgStage* _tmp23_ = NULL; + GitgCommitDialog* _tmp24_ = NULL; + gchar* _tmp25_ = NULL; + gchar* _tmp26_ = NULL; gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - GgitSignature* _tmp30_ = NULL; - GgitSignature* _tmp31_ = NULL; - GitgStageCommitOptions _tmp32_ = 0; + GgitSignature* _tmp28_ = NULL; + GgitSignature* _tmp29_ = NULL; + GitgStageCommitOptions _tmp30_ = 0; #line 1061 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_return_if_fail (self != NULL); #line 1061 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -9471,95 +9387,89 @@ _tmp13_ = _tmp12_; #line 1070 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp13_) { -#line 9474 "gitg-commit.c" +#line 9390 "gitg-commit.c" GitgStageCommitOptions _tmp14_ = 0; #line 1072 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp14_ = opts; #line 1072 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" opts = _tmp14_ | GITG_STAGE_COMMIT_OPTIONS_AMEND; -#line 9480 "gitg-commit.c" +#line 9396 "gitg-commit.c" } else { gboolean _tmp15_ = FALSE; #line 1074 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp15_ = self->priv->d_has_staged; #line 1074 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (!_tmp15_) { -#line 9487 "gitg-commit.c" +#line 9403 "gitg-commit.c" GitgCommitDialog* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; #line 1076 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp16_ = _data12_->dlg; #line 1076 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp17_ = _ ("There are no changes to be committed"); -#line 1076 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp18_ = _ ("Use amend to change the commit message of the previous commit"); -#line 1076 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_commit_dialog_show_infobar (_tmp16_, _tmp17_, _tmp18_, GTK_MESSAGE_WARNING); + gitg_commit_dialog_show_infobar (_tmp16_, _ ("There are no changes to be committed"), _ ("Use amend to change the commit message of the previous commit"), GTK_MESSAGE_WARNING); #line 1079 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" block12_data_unref (_data12_); #line 1079 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data12_ = NULL; #line 1079 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 9505 "gitg-commit.c" +#line 9415 "gitg-commit.c" } } #line 1082 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp19_ = _data12_->dlg; + _tmp17_ = _data12_->dlg; #line 1082 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp20_ = gitg_commit_dialog_get_sign_off (_tmp19_); + _tmp18_ = gitg_commit_dialog_get_sign_off (_tmp17_); #line 1082 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp21_ = _tmp20_; + _tmp19_ = _tmp18_; #line 1082 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp21_) { -#line 9516 "gitg-commit.c" - GitgStageCommitOptions _tmp22_ = 0; + if (_tmp19_) { +#line 9426 "gitg-commit.c" + GitgStageCommitOptions _tmp20_ = 0; #line 1084 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp22_ = opts; + _tmp20_ = opts; #line 1084 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - opts = _tmp22_ | GITG_STAGE_COMMIT_OPTIONS_SIGN_OFF; -#line 9522 "gitg-commit.c" + opts = _tmp20_ | GITG_STAGE_COMMIT_OPTIONS_SIGN_OFF; +#line 9432 "gitg-commit.c" } #line 1087 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp23_ = skip_hooks; + _tmp21_ = skip_hooks; #line 1087 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp23_) { -#line 9528 "gitg-commit.c" - GitgStageCommitOptions _tmp24_ = 0; + if (_tmp21_) { +#line 9438 "gitg-commit.c" + GitgStageCommitOptions _tmp22_ = 0; #line 1089 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp24_ = opts; + _tmp22_ = opts; #line 1089 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - opts = _tmp24_ | GITG_STAGE_COMMIT_OPTIONS_SKIP_HOOKS; -#line 9534 "gitg-commit.c" + opts = _tmp22_ | GITG_STAGE_COMMIT_OPTIONS_SKIP_HOOKS; +#line 9444 "gitg-commit.c" } #line 1092 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self->priv->d_ignore_external_changes = TRUE; #line 1093 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp25_ = _data12_->stage; + _tmp23_ = _data12_->stage; #line 1093 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp26_ = _data12_->dlg; + _tmp24_ = _data12_->dlg; #line 1093 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp27_ = gitg_commit_dialog_get_pretty_message (_tmp26_); + _tmp25_ = gitg_commit_dialog_get_pretty_message (_tmp24_); #line 1093 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp28_ = _tmp27_; + _tmp26_ = _tmp25_; #line 1093 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp29_ = _tmp28_; + _tmp27_ = _tmp26_; #line 1093 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp30_ = author; + _tmp28_ = author; #line 1093 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp31_ = committer; + _tmp29_ = committer; #line 1093 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp32_ = opts; + _tmp30_ = opts; #line 1093 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_stage_commit (_tmp25_, _tmp29_, _tmp30_, _tmp31_, _tmp32_, ___lambda33__gasync_ready_callback, block12_data_ref (_data12_)); + gitg_stage_commit (_tmp23_, _tmp27_, _tmp28_, _tmp29_, _tmp30_, ___lambda33__gasync_ready_callback, block12_data_ref (_data12_)); #line 1093 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_tmp29_); + _g_free0 (_tmp27_); #line 1061 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" block12_data_unref (_data12_); #line 1061 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data12_ = NULL; -#line 9562 "gitg-commit.c" +#line 9472 "gitg-commit.c" } @@ -9572,7 +9482,7 @@ _g_object_unref0 (_data_->self); #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (GitgCommitActivityPreCommitData, _data_); -#line 9575 "gitg-commit.c" +#line 9485 "gitg-commit.c" } @@ -9601,7 +9511,7 @@ _data_->author = _tmp2_; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_pre_commit_co (_data_); -#line 9604 "gitg-commit.c" +#line 9514 "gitg-commit.c" } @@ -9614,7 +9524,7 @@ result = _data_->result; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 9617 "gitg-commit.c" +#line 9527 "gitg-commit.c" } @@ -9628,7 +9538,7 @@ _data_->_res_ = _res_; #line 1118 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_pre_commit_co (_data_); -#line 9631 "gitg-commit.c" +#line 9541 "gitg-commit.c" } @@ -9637,16 +9547,16 @@ switch (_data_->_state_) { #line 1114 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 0: -#line 9640 "gitg-commit.c" +#line 9550 "gitg-commit.c" goto _state_0; #line 1114 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 1: -#line 9644 "gitg-commit.c" +#line 9554 "gitg-commit.c" goto _state_1; default: #line 1114 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_assert_not_reached (); -#line 9649 "gitg-commit.c" +#line 9559 "gitg-commit.c" } _state_0: { @@ -9696,7 +9606,7 @@ gitg_stage_pre_commit_hook (_data_->_tmp8_, _data_->_tmp9_, gitg_commit_activity_pre_commit_ready, _data_); #line 1118 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 9699 "gitg-commit.c" +#line 9609 "gitg-commit.c" _state_1: #line 1118 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_stage_pre_commit_hook_finish (_data_->_tmp8_, _data_->_res_, &_data_->_inner_error_); @@ -9710,7 +9620,7 @@ if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 1118 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_data_->_inner_error_->domain == GITG_STAGE_ERROR) { -#line 9713 "gitg-commit.c" +#line 9623 "gitg-commit.c" goto __catch22_gitg_stage_error; } #line 1118 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -9719,7 +9629,7 @@ g_clear_error (&_data_->_inner_error_); #line 1118 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 9722 "gitg-commit.c" +#line 9632 "gitg-commit.c" } } goto __finally22; @@ -9744,17 +9654,13 @@ #line 1122 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp13_ = NULL; #line 1122 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp13_ = _ ("Failed to pass pre-commit"); + _data_->_tmp13_ = _data_->e; #line 1122 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp14_ = NULL; #line 1122 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp14_ = _data_->e; + _data_->_tmp14_ = _data_->_tmp13_->message; #line 1122 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp15_ = NULL; -#line 1122 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data_->_tmp15_ = _data_->_tmp14_->message; -#line 1122 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_application_show_infobar (_data_->_tmp12_, _data_->_tmp13_, _data_->_tmp15_, GTK_MESSAGE_ERROR); + gitg_ext_application_show_infobar (_data_->_tmp12_, _ ("Failed to pass pre-commit"), _data_->_tmp14_, GTK_MESSAGE_ERROR); #line 1122 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_data_->_tmp12_); #line 1126 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -9765,17 +9671,17 @@ if (_data_->_state_ == 0) { #line 1126 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 9768 "gitg-commit.c" +#line 9674 "gitg-commit.c" } else { #line 1126 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 9772 "gitg-commit.c" +#line 9678 "gitg-commit.c" } #line 1126 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 1126 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 9778 "gitg-commit.c" +#line 9684 "gitg-commit.c" } __finally22: #line 1116 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -9786,7 +9692,7 @@ g_clear_error (&_data_->_inner_error_); #line 1116 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 9789 "gitg-commit.c" +#line 9695 "gitg-commit.c" } #line 1129 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->result = TRUE; @@ -9794,11 +9700,11 @@ if (_data_->_state_ == 0) { #line 1129 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 9797 "gitg-commit.c" +#line 9703 "gitg-commit.c" } else { #line 1129 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 9801 "gitg-commit.c" +#line 9707 "gitg-commit.c" } #line 1129 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); @@ -9808,17 +9714,17 @@ if (_data_->_state_ == 0) { #line 1114 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 9811 "gitg-commit.c" +#line 9717 "gitg-commit.c" } else { #line 1114 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 9815 "gitg-commit.c" +#line 9721 "gitg-commit.c" } #line 1114 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 1114 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 9821 "gitg-commit.c" +#line 9727 "gitg-commit.c" } @@ -9831,7 +9737,7 @@ _g_object_unref0 (_data_->self); #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (GitgCommitActivityGetHeadCommitData, _data_); -#line 9834 "gitg-commit.c" +#line 9740 "gitg-commit.c" } @@ -9850,7 +9756,7 @@ _data_->self = _tmp0_; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_get_head_commit_co (_data_); -#line 9853 "gitg-commit.c" +#line 9759 "gitg-commit.c" } @@ -9865,7 +9771,7 @@ _data_->result = NULL; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 9868 "gitg-commit.c" +#line 9774 "gitg-commit.c" } @@ -9874,7 +9780,7 @@ g_atomic_int_inc (&_data13_->_ref_count_); #line 1132 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data13_; -#line 9877 "gitg-commit.c" +#line 9783 "gitg-commit.c" } @@ -9883,7 +9789,7 @@ _data13_ = (Block13Data*) _userdata_; #line 1132 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data13_->_ref_count_)) { -#line 9886 "gitg-commit.c" +#line 9792 "gitg-commit.c" GitgCommitActivity* self; #line 1132 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data13_->self; @@ -9893,7 +9799,7 @@ _g_object_unref0 (self); #line 1132 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block13Data, _data13_); -#line 9896 "gitg-commit.c" +#line 9802 "gitg-commit.c" } } @@ -9926,7 +9832,7 @@ _g_object_unref0 (_tmp2_); #line 1139 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" repo = _tmp5_; -#line 9929 "gitg-commit.c" +#line 9835 "gitg-commit.c" { GitgRef* head = NULL; GitgRepository* _tmp6_ = NULL; @@ -9947,7 +9853,7 @@ head = _tmp7_; #line 1143 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9950 "gitg-commit.c" +#line 9856 "gitg-commit.c" goto __catch24_g_error; } #line 1144 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -9970,7 +9876,7 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1144 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (head); -#line 9973 "gitg-commit.c" +#line 9879 "gitg-commit.c" goto __catch24_g_error; } #line 1144 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -9985,7 +9891,7 @@ _g_object_unref0 (_tmp8_); #line 1141 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (head); -#line 9988 "gitg-commit.c" +#line 9894 "gitg-commit.c" } goto __finally24; __catch24_g_error: @@ -9994,7 +9900,7 @@ g_clear_error (&_inner_error_); #line 1141 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _inner_error_ = NULL; -#line 9997 "gitg-commit.c" +#line 9903 "gitg-commit.c" } __finally24: #line 1141 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -10005,18 +9911,18 @@ _g_object_unref0 (repo); #line 1141 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 10008 "gitg-commit.c" +#line 9914 "gitg-commit.c" } #line 1138 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (repo); -#line 10012 "gitg-commit.c" +#line 9918 "gitg-commit.c" } static void ____lambda34__gitg_async_thread_func (gpointer self, GError** error) { #line 1138 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" ___lambda34_ (self, error); -#line 10019 "gitg-commit.c" +#line 9925 "gitg-commit.c" } @@ -10030,7 +9936,7 @@ _data_->_res_ = _res_; #line 1138 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_get_head_commit_co (_data_); -#line 10033 "gitg-commit.c" +#line 9939 "gitg-commit.c" } @@ -10039,16 +9945,16 @@ switch (_data_->_state_) { #line 1132 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 0: -#line 10042 "gitg-commit.c" +#line 9948 "gitg-commit.c" goto _state_0; #line 1132 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 1: -#line 10046 "gitg-commit.c" +#line 9952 "gitg-commit.c" goto _state_1; default: #line 1132 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_assert_not_reached (); -#line 10051 "gitg-commit.c" +#line 9957 "gitg-commit.c" } _state_0: #line 1132 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -10061,7 +9967,7 @@ _data_->_data13_->_async_data_ = _data_; #line 1134 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_data13_->retval = NULL; -#line 10064 "gitg-commit.c" +#line 9970 "gitg-commit.c" { #line 1138 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_state_ = 1; @@ -10069,13 +9975,13 @@ gitg_async_thread (____lambda34__gitg_async_thread_func, _data_->_data13_, gitg_commit_activity_get_head_commit_ready, _data_); #line 1138 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 10072 "gitg-commit.c" +#line 9978 "gitg-commit.c" _state_1: #line 1138 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_async_thread_finish (_data_->_res_, &_data_->_inner_error_); #line 1138 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 10078 "gitg-commit.c" +#line 9984 "gitg-commit.c" goto __catch23_g_error; } } @@ -10086,7 +9992,7 @@ g_clear_error (&_data_->_inner_error_); #line 1136 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_inner_error_ = NULL; -#line 10089 "gitg-commit.c" +#line 9995 "gitg-commit.c" } __finally23: #line 1136 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -10101,7 +10007,7 @@ g_clear_error (&_data_->_inner_error_); #line 1136 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 10104 "gitg-commit.c" +#line 10010 "gitg-commit.c" } #line 1149 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp0_ = NULL; @@ -10117,11 +10023,11 @@ if (_data_->_state_ == 0) { #line 1149 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 10120 "gitg-commit.c" +#line 10026 "gitg-commit.c" } else { #line 1149 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 10124 "gitg-commit.c" +#line 10030 "gitg-commit.c" } #line 1149 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); @@ -10135,17 +10041,17 @@ if (_data_->_state_ == 0) { #line 1132 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 10138 "gitg-commit.c" +#line 10044 "gitg-commit.c" } else { #line 1132 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 10142 "gitg-commit.c" +#line 10048 "gitg-commit.c" } #line 1132 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 1132 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 10148 "gitg-commit.c" +#line 10054 "gitg-commit.c" } @@ -10158,7 +10064,7 @@ _g_object_unref0 (_data_->self); #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (GitgCommitActivityIndexDiffData, _data_); -#line 10161 "gitg-commit.c" +#line 10067 "gitg-commit.c" } @@ -10177,7 +10083,7 @@ _data_->self = _tmp0_; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_index_diff_co (_data_); -#line 10180 "gitg-commit.c" +#line 10086 "gitg-commit.c" } @@ -10192,7 +10098,7 @@ _data_->result = NULL; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 10195 "gitg-commit.c" +#line 10101 "gitg-commit.c" } @@ -10201,7 +10107,7 @@ g_atomic_int_inc (&_data14_->_ref_count_); #line 1152 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data14_; -#line 10204 "gitg-commit.c" +#line 10110 "gitg-commit.c" } @@ -10210,7 +10116,7 @@ _data14_ = (Block14Data*) _userdata_; #line 1152 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data14_->_ref_count_)) { -#line 10213 "gitg-commit.c" +#line 10119 "gitg-commit.c" GitgCommitActivity* self; #line 1152 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data14_->self; @@ -10226,7 +10132,7 @@ _g_object_unref0 (self); #line 1152 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block14Data, _data14_); -#line 10229 "gitg-commit.c" +#line 10135 "gitg-commit.c" } } @@ -10241,7 +10147,7 @@ _data_->_res_ = _res_; #line 1173 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_index_diff_co (_data_); -#line 10244 "gitg-commit.c" +#line 10150 "gitg-commit.c" } @@ -10250,7 +10156,7 @@ g_atomic_int_inc (&_data15_->_ref_count_); #line 1180 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data15_; -#line 10253 "gitg-commit.c" +#line 10159 "gitg-commit.c" } @@ -10259,7 +10165,7 @@ _data15_ = (Block15Data*) _userdata_; #line 1180 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data15_->_ref_count_)) { -#line 10262 "gitg-commit.c" +#line 10168 "gitg-commit.c" GitgCommitActivity* self; #line 1180 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data15_->_data14_->self; @@ -10271,7 +10177,7 @@ _data15_->_data14_ = NULL; #line 1180 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block15Data, _data15_); -#line 10274 "gitg-commit.c" +#line 10180 "gitg-commit.c" } } @@ -10309,7 +10215,7 @@ g_propagate_error (error, _inner_error_); #line 1185 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 10312 "gitg-commit.c" +#line 10218 "gitg-commit.c" } #line 1185 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp6_ = _tmp0_; @@ -10321,14 +10227,14 @@ _data14_->diff = _tmp6_; #line 1184 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp0_); -#line 10324 "gitg-commit.c" +#line 10230 "gitg-commit.c" } static void ____lambda35__gitg_async_thread_func (gpointer self, GError** error) { #line 1184 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" ___lambda35_ (self, error); -#line 10331 "gitg-commit.c" +#line 10237 "gitg-commit.c" } @@ -10337,20 +10243,20 @@ switch (_data_->_state_) { #line 1152 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 0: -#line 10340 "gitg-commit.c" +#line 10246 "gitg-commit.c" goto _state_0; #line 1152 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 1: -#line 10344 "gitg-commit.c" +#line 10250 "gitg-commit.c" goto _state_1; #line 1152 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 2: -#line 10348 "gitg-commit.c" +#line 10254 "gitg-commit.c" goto _state_2; default: #line 1152 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_assert_not_reached (); -#line 10353 "gitg-commit.c" +#line 10259 "gitg-commit.c" } _state_0: #line 1152 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -10429,7 +10335,7 @@ _data_->stage = _data_->_tmp12_; #line 1167 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_data14_->tree = NULL; -#line 10432 "gitg-commit.c" +#line 10338 "gitg-commit.c" { #line 1171 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp14_ = NULL; @@ -10443,7 +10349,7 @@ _data_->_tmp13_ = _data_->_tmp15_; #line 1171 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 10446 "gitg-commit.c" +#line 10352 "gitg-commit.c" goto __catch25_g_error; } #line 1171 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -10458,7 +10364,7 @@ gitg_stage_get_head_tree (_data_->_tmp17_, gitg_commit_activity_index_diff_ready, _data_); #line 1173 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 10461 "gitg-commit.c" +#line 10367 "gitg-commit.c" _state_1: #line 1173 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp18_ = NULL; @@ -10468,7 +10374,7 @@ _data_->_tmp16_ = _data_->_tmp18_; #line 1173 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 10471 "gitg-commit.c" +#line 10377 "gitg-commit.c" goto __catch25_g_error; } #line 1173 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -10483,7 +10389,7 @@ _data_->_data14_->tree = _data_->_tmp19_; #line 1171 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_data_->_tmp16_); -#line 10486 "gitg-commit.c" +#line 10392 "gitg-commit.c" } } goto __finally25; @@ -10505,17 +10411,17 @@ if (_data_->_state_ == 0) { #line 1176 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 10508 "gitg-commit.c" +#line 10414 "gitg-commit.c" } else { #line 1176 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 10512 "gitg-commit.c" +#line 10418 "gitg-commit.c" } #line 1176 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 1176 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 10518 "gitg-commit.c" +#line 10424 "gitg-commit.c" } __finally25: #line 1169 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -10532,11 +10438,11 @@ g_clear_error (&_data_->_inner_error_); #line 1169 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 10535 "gitg-commit.c" +#line 10441 "gitg-commit.c" } #line 1178 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_data14_->diff = NULL; -#line 10539 "gitg-commit.c" +#line 10445 "gitg-commit.c" { #line 1180 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_data15_ = g_slice_new0 (Block15Data); @@ -10560,7 +10466,7 @@ block15_data_unref (_data_->_data15_); #line 1182 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_data15_ = NULL; -#line 10563 "gitg-commit.c" +#line 10469 "gitg-commit.c" goto __catch26_g_error; } #line 1184 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -10569,7 +10475,7 @@ gitg_async_thread (____lambda35__gitg_async_thread_func, _data_->_data15_, gitg_commit_activity_index_diff_ready, _data_); #line 1184 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 10572 "gitg-commit.c" +#line 10478 "gitg-commit.c" _state_2: #line 1184 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_async_thread_finish (_data_->_res_, &_data_->_inner_error_); @@ -10579,14 +10485,14 @@ block15_data_unref (_data_->_data15_); #line 1184 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_data15_ = NULL; -#line 10582 "gitg-commit.c" +#line 10488 "gitg-commit.c" goto __catch26_g_error; } #line 1180 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" block15_data_unref (_data_->_data15_); #line 1180 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_data15_ = NULL; -#line 10589 "gitg-commit.c" +#line 10495 "gitg-commit.c" } goto __finally26; __catch26_g_error: @@ -10607,17 +10513,17 @@ if (_data_->_state_ == 0) { #line 1190 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 10610 "gitg-commit.c" +#line 10516 "gitg-commit.c" } else { #line 1190 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 10614 "gitg-commit.c" +#line 10520 "gitg-commit.c" } #line 1190 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 1190 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 10620 "gitg-commit.c" +#line 10526 "gitg-commit.c" } __finally26: #line 1180 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -10634,7 +10540,7 @@ g_clear_error (&_data_->_inner_error_); #line 1180 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 10637 "gitg-commit.c" +#line 10543 "gitg-commit.c" } #line 1192 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp22_ = NULL; @@ -10656,11 +10562,11 @@ if (_data_->_state_ == 0) { #line 1192 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 10659 "gitg-commit.c" +#line 10565 "gitg-commit.c" } else { #line 1192 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 10663 "gitg-commit.c" +#line 10569 "gitg-commit.c" } #line 1192 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); @@ -10676,17 +10582,17 @@ if (_data_->_state_ == 0) { #line 1152 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 10679 "gitg-commit.c" +#line 10585 "gitg-commit.c" } else { #line 1152 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 10683 "gitg-commit.c" +#line 10589 "gitg-commit.c" } #line 1152 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 1152 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 10689 "gitg-commit.c" +#line 10595 "gitg-commit.c" } @@ -10695,7 +10601,7 @@ g_atomic_int_inc (&_data16_->_ref_count_); #line 1195 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data16_; -#line 10698 "gitg-commit.c" +#line 10604 "gitg-commit.c" } @@ -10704,7 +10610,7 @@ _data16_ = (Block16Data*) _userdata_; #line 1195 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data16_->_ref_count_)) { -#line 10707 "gitg-commit.c" +#line 10613 "gitg-commit.c" GitgCommitActivity* self; #line 1195 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data16_->self; @@ -10716,7 +10622,7 @@ _g_object_unref0 (self); #line 1195 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block16Data, _data16_); -#line 10719 "gitg-commit.c" +#line 10625 "gitg-commit.c" } } @@ -10749,7 +10655,7 @@ gitg_commit_activity_run_commit_dialog_with_diff (self, _tmp2_, _tmp3_, _tmp4_, diff); #line 1199 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (diff); -#line 10752 "gitg-commit.c" +#line 10658 "gitg-commit.c" } @@ -10758,7 +10664,7 @@ __lambda36_ (self, source_object, res); #line 1199 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" block16_data_unref (self); -#line 10761 "gitg-commit.c" +#line 10667 "gitg-commit.c" } @@ -10807,7 +10713,7 @@ block16_data_unref (_data16_); #line 1195 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data16_ = NULL; -#line 10810 "gitg-commit.c" +#line 10716 "gitg-commit.c" } @@ -10816,7 +10722,7 @@ g_atomic_int_inc (&_data17_->_ref_count_); #line 1209 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data17_; -#line 10819 "gitg-commit.c" +#line 10725 "gitg-commit.c" } @@ -10825,7 +10731,7 @@ _data17_ = (Block17Data*) _userdata_; #line 1209 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data17_->_ref_count_)) { -#line 10828 "gitg-commit.c" +#line 10734 "gitg-commit.c" GitgCommitActivity* self; #line 1209 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data17_->self; @@ -10839,7 +10745,7 @@ _g_object_unref0 (self); #line 1209 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block17Data, _data17_); -#line 10842 "gitg-commit.c" +#line 10748 "gitg-commit.c" } } @@ -10855,7 +10761,7 @@ _tmp0_ = id; #line 1220 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) { -#line 10858 "gitg-commit.c" +#line 10764 "gitg-commit.c" gboolean _tmp1_ = FALSE; GgitSignature* _tmp2_ = NULL; GgitSignature* _tmp3_ = NULL; @@ -10875,14 +10781,14 @@ gitg_commit_activity_do_commit (self, _data17_->dlg, _tmp1_, _tmp4_, _tmp5_); #line 1222 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp4_); -#line 10878 "gitg-commit.c" +#line 10784 "gitg-commit.c" } else { GtkDialog* _tmp6_ = NULL; #line 1226 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp6_ = d; #line 1226 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gtk_widget_destroy ((GtkWidget*) _tmp6_); -#line 10885 "gitg-commit.c" +#line 10791 "gitg-commit.c" } } @@ -10890,7 +10796,7 @@ static void ___lambda37__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { #line 1219 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" __lambda37_ (self, _sender, response_id); -#line 10893 "gitg-commit.c" +#line 10799 "gitg-commit.c" } @@ -10899,21 +10805,21 @@ gchar* _result_ = NULL; gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; -#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1226 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1227 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1227 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1228 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1228 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1229 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _result_; -#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1229 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 10916 "gitg-commit.c" +#line 10822 "gitg-commit.c" } @@ -10937,7 +10843,7 @@ _tmp2_ = commit; #line 1240 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp2_ != NULL) { -#line 10940 "gitg-commit.c" +#line 10846 "gitg-commit.c" gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; @@ -10971,7 +10877,7 @@ _g_free0 (_tmp5_); #line 1242 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp10_) { -#line 10974 "gitg-commit.c" +#line 10880 "gitg-commit.c" GitgCommit* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; #line 1244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -10980,7 +10886,7 @@ _tmp12_ = ggit_commit_get_message ((GgitCommit*) _tmp11_); #line 1244 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_dialog_set_message (_data17_->dlg, _tmp12_); -#line 10983 "gitg-commit.c" +#line 10889 "gitg-commit.c" } #line 1247 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp13_ = commit; @@ -10992,11 +10898,11 @@ gitg_commit_dialog_set_author (_data17_->dlg, _tmp15_); #line 1247 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp15_); -#line 10995 "gitg-commit.c" +#line 10901 "gitg-commit.c" } #line 1237 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (commit); -#line 10999 "gitg-commit.c" +#line 10905 "gitg-commit.c" } @@ -11005,7 +10911,7 @@ ___lambda39_ (self, source_object, res); #line 1237 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" block17_data_unref (self); -#line 11008 "gitg-commit.c" +#line 10914 "gitg-commit.c" } @@ -11025,17 +10931,17 @@ _tmp1_ = _tmp0_; #line 1231 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (!_tmp1_) { -#line 11028 "gitg-commit.c" +#line 10934 "gitg-commit.c" GgitSignature* _tmp2_ = NULL; #line 1233 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp2_ = _data17_->author; #line 1233 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_dialog_set_author (_data17_->dlg, _tmp2_); -#line 11034 "gitg-commit.c" +#line 10940 "gitg-commit.c" } else { #line 1237 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_get_head_commit (self, ____lambda39__gasync_ready_callback, block17_data_ref (_data17_)); -#line 11038 "gitg-commit.c" +#line 10944 "gitg-commit.c" } } @@ -11043,7 +10949,7 @@ static void ___lambda38__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 1230 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" __lambda38_ (self, _sender, pspec); -#line 11046 "gitg-commit.c" +#line 10952 "gitg-commit.c" } @@ -11144,7 +11050,7 @@ block17_data_unref (_data17_); #line 1209 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data17_ = NULL; -#line 11147 "gitg-commit.c" +#line 11053 "gitg-commit.c" } @@ -11218,7 +11124,7 @@ g_propagate_error (error, _inner_error_); #line 1258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return NULL; -#line 11221 "gitg-commit.c" +#line 11127 "gitg-commit.c" } #line 1258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp16_ = _tmp0_; @@ -11230,7 +11136,7 @@ _g_object_unref0 (_tmp0_); #line 1258 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 11233 "gitg-commit.c" +#line 11139 "gitg-commit.c" } @@ -11239,7 +11145,7 @@ g_atomic_int_inc (&_data18_->_ref_count_); #line 1261 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data18_; -#line 11242 "gitg-commit.c" +#line 11148 "gitg-commit.c" } @@ -11248,7 +11154,7 @@ _data18_ = (Block18Data*) _userdata_; #line 1261 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data18_->_ref_count_)) { -#line 11251 "gitg-commit.c" +#line 11157 "gitg-commit.c" GitgCommitActivity* self; #line 1261 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data18_->self; @@ -11260,7 +11166,7 @@ _g_object_unref0 (self); #line 1261 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block18Data, _data18_); -#line 11263 "gitg-commit.c" +#line 11169 "gitg-commit.c" } } @@ -11283,7 +11189,7 @@ if (!_tmp1_) { #line 1291 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 11286 "gitg-commit.c" +#line 11192 "gitg-commit.c" } #line 1294 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp2_ = _data18_->author; @@ -11291,7 +11197,7 @@ _tmp3_ = _data18_->committer; #line 1294 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_run_commit_dialog (self, FALSE, _tmp2_, _tmp3_); -#line 11294 "gitg-commit.c" +#line 11200 "gitg-commit.c" } @@ -11300,7 +11206,7 @@ ___lambda40_ (self, source_object, res); #line 1288 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" block18_data_unref (self); -#line 11303 "gitg-commit.c" +#line 11209 "gitg-commit.c" } @@ -11347,7 +11253,7 @@ _data18_ = NULL; #line 1270 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 11350 "gitg-commit.c" +#line 11256 "gitg-commit.c" } { GgitSignature* _tmp5_ = NULL; @@ -11406,7 +11312,7 @@ _tmp5_ = _tmp19_; #line 1275 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 11409 "gitg-commit.c" +#line 11315 "gitg-commit.c" goto __catch27_g_error; } #line 1275 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -11419,7 +11325,7 @@ _data18_->author = _tmp20_; #line 1273 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp5_); -#line 11422 "gitg-commit.c" +#line 11328 "gitg-commit.c" } goto __finally27; __catch27_g_error: @@ -11438,7 +11344,7 @@ _g_object_unref0 (_data18_->author); #line 1279 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data18_->author = _tmp22_; -#line 11441 "gitg-commit.c" +#line 11347 "gitg-commit.c" } __finally27: #line 1273 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -11453,7 +11359,7 @@ g_clear_error (&_inner_error_); #line 1273 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 11456 "gitg-commit.c" +#line 11362 "gitg-commit.c" } #line 1282 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp23_ = self->priv->d_main; @@ -11463,7 +11369,7 @@ _tmp25_ = _tmp24_; #line 1282 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp25_) { -#line 11466 "gitg-commit.c" +#line 11372 "gitg-commit.c" GgitSignature* _tmp26_ = NULL; GgitSignature* _tmp27_ = NULL; #line 1284 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -11472,20 +11378,20 @@ _tmp27_ = _data18_->committer; #line 1284 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_run_commit_dialog (self, TRUE, _tmp26_, _tmp27_); -#line 11475 "gitg-commit.c" +#line 11381 "gitg-commit.c" } else { GgitSignature* _tmp28_ = NULL; #line 1288 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp28_ = _data18_->author; #line 1288 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_pre_commit (self, _tmp28_, ____lambda40__gasync_ready_callback, block18_data_ref (_data18_)); -#line 11482 "gitg-commit.c" +#line 11388 "gitg-commit.c" } #line 1261 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" block18_data_unref (_data18_); #line 1261 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data18_ = NULL; -#line 11488 "gitg-commit.c" +#line 11394 "gitg-commit.c" } @@ -11496,7 +11402,7 @@ _g_object_unref0 (_data_->self); #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (GitgCommitActivityStageUnstageSelectionData, _data_); -#line 11499 "gitg-commit.c" +#line 11405 "gitg-commit.c" } @@ -11520,7 +11426,7 @@ _data_->staging = _tmp1_; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_stage_unstage_selection_co (_data_); -#line 11523 "gitg-commit.c" +#line 11429 "gitg-commit.c" } @@ -11530,18 +11436,18 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 11533 "gitg-commit.c" +#line 11439 "gitg-commit.c" } #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 11537 "gitg-commit.c" +#line 11443 "gitg-commit.c" } static gpointer _gitg_patch_set_ref0 (gpointer self) { #line 1304 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return self ? gitg_patch_set_ref (self) : NULL; -#line 11544 "gitg-commit.c" +#line 11450 "gitg-commit.c" } @@ -11555,7 +11461,7 @@ _data_->_res_ = _res_; #line 1308 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_stage_unstage_selection_co (_data_); -#line 11558 "gitg-commit.c" +#line 11464 "gitg-commit.c" } @@ -11564,20 +11470,20 @@ switch (_data_->_state_) { #line 1299 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 0: -#line 11567 "gitg-commit.c" +#line 11473 "gitg-commit.c" goto _state_0; #line 1299 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 1: -#line 11571 "gitg-commit.c" +#line 11477 "gitg-commit.c" goto _state_1; #line 1299 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 2: -#line 11575 "gitg-commit.c" +#line 11481 "gitg-commit.c" goto _state_2; default: #line 1299 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_assert_not_reached (); -#line 11580 "gitg-commit.c" +#line 11486 "gitg-commit.c" } _state_0: #line 1301 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -11666,7 +11572,7 @@ _data_->_tmp14_ = _data_->selection; #line 1304 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp14__length1 = _data_->selection_length1; -#line 11669 "gitg-commit.c" +#line 11575 "gitg-commit.c" { #line 1304 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->pset_collection_length1 = 0; @@ -11684,7 +11590,7 @@ _data_->_tmp15_ = _gitg_patch_set_ref0 (_data_->pset_collection[_data_->pset_it]); #line 1304 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->pset = _data_->_tmp15_; -#line 11687 "gitg-commit.c" +#line 11593 "gitg-commit.c" { #line 1306 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp16_ = FALSE; @@ -11706,7 +11612,7 @@ gitg_stage_stage_patch (_data_->_tmp17_, _data_->_tmp18_, gitg_commit_activity_stage_unstage_selection_ready, _data_); #line 1308 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 11709 "gitg-commit.c" +#line 11615 "gitg-commit.c" _state_1: #line 1308 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_stage_stage_patch_finish (_data_->_tmp17_, _data_->_res_, &_data_->_inner_error_); @@ -11726,17 +11632,17 @@ if (_data_->_state_ == 0) { #line 1308 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 11729 "gitg-commit.c" +#line 11635 "gitg-commit.c" } else { #line 1308 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 11733 "gitg-commit.c" +#line 11639 "gitg-commit.c" } #line 1308 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 1308 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 11739 "gitg-commit.c" +#line 11645 "gitg-commit.c" } } else { #line 1312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -11753,7 +11659,7 @@ gitg_stage_unstage_patch (_data_->_tmp19_, _data_->_tmp20_, gitg_commit_activity_stage_unstage_selection_ready, _data_); #line 1312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 11756 "gitg-commit.c" +#line 11662 "gitg-commit.c" _state_2: #line 1312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_stage_unstage_patch_finish (_data_->_tmp19_, _data_->_res_, &_data_->_inner_error_); @@ -11773,22 +11679,22 @@ if (_data_->_state_ == 0) { #line 1312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 11776 "gitg-commit.c" +#line 11682 "gitg-commit.c" } else { #line 1312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 11780 "gitg-commit.c" +#line 11686 "gitg-commit.c" } #line 1312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 1312 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 11786 "gitg-commit.c" +#line 11692 "gitg-commit.c" } } #line 1304 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _gitg_patch_set_unref0 (_data_->pset); -#line 11791 "gitg-commit.c" +#line 11697 "gitg-commit.c" } } } @@ -11800,17 +11706,17 @@ if (_data_->_state_ == 0) { #line 1299 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 11803 "gitg-commit.c" +#line 11709 "gitg-commit.c" } else { #line 1299 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 11807 "gitg-commit.c" +#line 11713 "gitg-commit.c" } #line 1299 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 1299 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 11813 "gitg-commit.c" +#line 11719 "gitg-commit.c" } @@ -11821,7 +11727,7 @@ _g_object_unref0 (_data_->self); #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (GitgCommitActivityDiscardSelectionData, _data_); -#line 11824 "gitg-commit.c" +#line 11730 "gitg-commit.c" } @@ -11840,7 +11746,7 @@ _data_->self = _tmp0_; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_discard_selection_co (_data_); -#line 11843 "gitg-commit.c" +#line 11749 "gitg-commit.c" } @@ -11850,11 +11756,11 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 11853 "gitg-commit.c" +#line 11759 "gitg-commit.c" } #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 11857 "gitg-commit.c" +#line 11763 "gitg-commit.c" } @@ -11868,7 +11774,7 @@ _data_->_res_ = _res_; #line 1324 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_discard_selection_co (_data_); -#line 11871 "gitg-commit.c" +#line 11777 "gitg-commit.c" } @@ -11877,16 +11783,16 @@ switch (_data_->_state_) { #line 1317 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 0: -#line 11880 "gitg-commit.c" +#line 11786 "gitg-commit.c" goto _state_0; #line 1317 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 1: -#line 11884 "gitg-commit.c" +#line 11790 "gitg-commit.c" goto _state_1; default: #line 1317 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_assert_not_reached (); -#line 11889 "gitg-commit.c" +#line 11795 "gitg-commit.c" } _state_0: #line 1319 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -11975,7 +11881,7 @@ _data_->_tmp14_ = _data_->selection; #line 1322 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp14__length1 = _data_->selection_length1; -#line 11978 "gitg-commit.c" +#line 11884 "gitg-commit.c" { #line 1322 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->pset_collection_length1 = 0; @@ -11993,7 +11899,7 @@ _data_->_tmp15_ = _gitg_patch_set_ref0 (_data_->pset_collection[_data_->pset_it]); #line 1322 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->pset = _data_->_tmp15_; -#line 11996 "gitg-commit.c" +#line 11902 "gitg-commit.c" { #line 1324 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp16_ = NULL; @@ -12009,7 +11915,7 @@ gitg_stage_revert_patch (_data_->_tmp16_, _data_->_tmp17_, gitg_commit_activity_discard_selection_ready, _data_); #line 1324 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 12012 "gitg-commit.c" +#line 11918 "gitg-commit.c" _state_1: #line 1324 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_stage_revert_patch_finish (_data_->_tmp16_, _data_->_res_, &_data_->_inner_error_); @@ -12029,21 +11935,21 @@ if (_data_->_state_ == 0) { #line 1324 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 12032 "gitg-commit.c" +#line 11938 "gitg-commit.c" } else { #line 1324 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 12036 "gitg-commit.c" +#line 11942 "gitg-commit.c" } #line 1324 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 1324 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 12042 "gitg-commit.c" +#line 11948 "gitg-commit.c" } #line 1322 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _gitg_patch_set_unref0 (_data_->pset); -#line 12046 "gitg-commit.c" +#line 11952 "gitg-commit.c" } } } @@ -12055,17 +11961,17 @@ if (_data_->_state_ == 0) { #line 1317 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 12058 "gitg-commit.c" +#line 11964 "gitg-commit.c" } else { #line 1317 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 12062 "gitg-commit.c" +#line 11968 "gitg-commit.c" } #line 1317 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 1317 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 12068 "gitg-commit.c" +#line 11974 "gitg-commit.c" } @@ -12074,7 +11980,7 @@ g_atomic_int_inc (&_data19_->_ref_count_); #line 1328 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data19_; -#line 12077 "gitg-commit.c" +#line 11983 "gitg-commit.c" } @@ -12083,7 +11989,7 @@ _data19_ = (Block19Data*) _userdata_; #line 1328 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data19_->_ref_count_)) { -#line 12086 "gitg-commit.c" +#line 11992 "gitg-commit.c" GitgCommitActivity* self; #line 1328 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data19_->self; @@ -12093,7 +11999,7 @@ _g_object_unref0 (self); #line 1328 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block19Data, _data19_); -#line 12096 "gitg-commit.c" +#line 12002 "gitg-commit.c" } } @@ -12110,7 +12016,7 @@ _tmp0_ = r; #line 1347 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp0_ == GTK_RESPONSE_OK) { -#line 12113 "gitg-commit.c" +#line 12019 "gitg-commit.c" gboolean _tmp1_ = FALSE; #line 1349 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp1_ = gitg_commit_activity_do_discard_selection (self, _data19_->q); @@ -12118,13 +12024,13 @@ result = _tmp1_; #line 1349 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 12121 "gitg-commit.c" +#line 12027 "gitg-commit.c" } #line 1352 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result = TRUE; #line 1352 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 12127 "gitg-commit.c" +#line 12033 "gitg-commit.c" } @@ -12133,29 +12039,25 @@ result = __lambda41_ (self, _sender, response_type); #line 1346 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 12136 "gitg-commit.c" +#line 12042 "gitg-commit.c" } static void gitg_commit_activity_on_discard_clicked (GitgCommitActivity* self) { Block19Data* _data19_; gchar* primary = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; gchar* secondary = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - GitgExtUserQuery* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - GitgExtUserQueryResponse* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - GitgExtUserQueryResponse* _tmp8_ = NULL; - GitgExtUserQueryResponse** _tmp9_ = NULL; - GitgExtUserQueryResponse** _tmp10_ = NULL; - gint _tmp10__length1 = 0; - GitgExtApplication* _tmp11_ = NULL; - GitgExtApplication* _tmp12_ = NULL; - GitgExtApplication* _tmp13_ = NULL; + gchar* _tmp1_ = NULL; + GitgExtUserQuery* _tmp2_ = NULL; + GitgExtUserQueryResponse* _tmp3_ = NULL; + GitgExtUserQueryResponse* _tmp4_ = NULL; + GitgExtUserQueryResponse** _tmp5_ = NULL; + GitgExtUserQueryResponse** _tmp6_ = NULL; + gint _tmp6__length1 = 0; + GitgExtApplication* _tmp7_ = NULL; + GitgExtApplication* _tmp8_ = NULL; + GitgExtApplication* _tmp9_ = NULL; #line 1328 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_return_if_fail (self != NULL); #line 1328 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -12165,21 +12067,17 @@ #line 1328 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data19_->self = g_object_ref (self); #line 1330 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp0_ = _ ("Discard changes"); + _tmp0_ = g_strdup (_ ("Discard changes")); #line 1330 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 1330 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - primary = _tmp1_; + primary = _tmp0_; #line 1331 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp2_ = _ ("Are you sure you want to permanently discard the selected changes?"); + _tmp1_ = g_strdup (_ ("Are you sure you want to permanently discard the selected changes?")); #line 1331 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp3_ = g_strdup (_tmp2_); -#line 1331 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - secondary = _tmp3_; + secondary = _tmp1_; #line 1333 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp4_ = gitg_ext_user_query_new (); + _tmp2_ = gitg_ext_user_query_new (); #line 1333 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data19_->q = _tmp4_; + _data19_->q = _tmp2_; #line 1335 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_ext_user_query_set_title (_data19_->q, primary); #line 1336 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -12187,41 +12085,37 @@ #line 1337 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_ext_user_query_set_message_type (_data19_->q, GTK_MESSAGE_QUESTION); #line 1339 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp5_ = _ ("_Cancel"); -#line 1339 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp6_ = gitg_ext_user_query_response_new (_tmp5_, GTK_RESPONSE_CANCEL); + _tmp3_ = gitg_ext_user_query_response_new (_ ("_Cancel"), GTK_RESPONSE_CANCEL); #line 1339 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp7_ = _ ("Discard"); + _tmp4_ = gitg_ext_user_query_response_new (_ ("Discard"), GTK_RESPONSE_OK); #line 1339 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp8_ = gitg_ext_user_query_response_new (_tmp7_, GTK_RESPONSE_OK); + _tmp5_ = g_new0 (GitgExtUserQueryResponse*, 2 + 1); #line 1339 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp9_ = g_new0 (GitgExtUserQueryResponse*, 2 + 1); + _tmp5_[0] = _tmp3_; #line 1339 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp9_[0] = _tmp6_; + _tmp5_[1] = _tmp4_; #line 1339 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp9_[1] = _tmp8_; -#line 1339 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp10_ = _tmp9_; + _tmp6_ = _tmp5_; #line 1339 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp10__length1 = 2; + _tmp6__length1 = 2; #line 1339 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_user_query_set_responses (_data19_->q, _tmp10_, 2); + gitg_ext_user_query_set_responses (_data19_->q, _tmp6_, 2); #line 1339 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp10_ = (_vala_array_free (_tmp10_, _tmp10__length1, (GDestroyNotify) g_object_unref), NULL); + _tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_object_unref), NULL); #line 1344 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_ext_user_query_set_default_response (_data19_->q, GTK_RESPONSE_OK); #line 1346 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_signal_connect_data (_data19_->q, "response", (GCallback) ___lambda41__gitg_ext_user_query_response, block19_data_ref (_data19_), (GClosureNotify) block19_data_unref, 0); #line 1355 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp11_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); + _tmp7_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); #line 1355 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 1355 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp13_ = _tmp12_; + _tmp9_ = _tmp8_; #line 1355 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_application_user_query (_tmp13_, _data19_->q); + gitg_ext_application_user_query (_tmp9_, _data19_->q); #line 1355 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp9_); #line 1328 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_free0 (secondary); #line 1328 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -12230,7 +12124,7 @@ block19_data_unref (_data19_); #line 1328 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data19_ = NULL; -#line 12233 "gitg-commit.c" +#line 12127 "gitg-commit.c" } @@ -12239,7 +12133,7 @@ g_atomic_int_inc (&_data20_->_ref_count_); #line 1358 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data20_; -#line 12242 "gitg-commit.c" +#line 12136 "gitg-commit.c" } @@ -12248,7 +12142,7 @@ _data20_ = (Block20Data*) _userdata_; #line 1358 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data20_->_ref_count_)) { -#line 12251 "gitg-commit.c" +#line 12145 "gitg-commit.c" GitgCommitActivity* self; #line 1358 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data20_->self; @@ -12258,23 +12152,23 @@ _g_object_unref0 (self); #line 1358 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block20Data, _data20_); -#line 12261 "gitg-commit.c" +#line 12155 "gitg-commit.c" } } static void __lambda42_ (Block20Data* _data20_, GObject* obj, GAsyncResult* res) { GitgCommitActivity* self; - GitgExtUserQuery* _tmp7_ = NULL; + GitgExtUserQuery* _tmp6_ = NULL; + GitgExtApplication* _tmp7_ = NULL; GitgExtApplication* _tmp8_ = NULL; GitgExtApplication* _tmp9_ = NULL; - GitgExtApplication* _tmp10_ = NULL; GError * _inner_error_ = NULL; #line 1363 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data20_->self; #line 1363 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_return_if_fail (res != NULL); -#line 12277 "gitg-commit.c" +#line 12171 "gitg-commit.c" { GAsyncResult* _tmp0_ = NULL; #line 1366 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -12283,7 +12177,7 @@ gitg_commit_activity_discard_selection_finish (self, _tmp0_, &_inner_error_); #line 1366 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12286 "gitg-commit.c" +#line 12180 "gitg-commit.c" goto __catch28_g_error; } } @@ -12294,9 +12188,8 @@ GitgExtApplication* _tmp1_ = NULL; GitgExtApplication* _tmp2_ = NULL; GitgExtApplication* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GError* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; + GError* _tmp4_ = NULL; + const gchar* _tmp5_ = NULL; #line 1364 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" e = _inner_error_; #line 1364 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -12308,18 +12201,16 @@ #line 1370 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp3_ = _tmp2_; #line 1370 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp4_ = _ ("Failed to discard selection"); -#line 1370 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp5_ = e; + _tmp4_ = e; #line 1370 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp6_ = _tmp5_->message; + _tmp5_ = _tmp4_->message; #line 1370 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_application_show_infobar (_tmp3_, _tmp4_, _tmp6_, GTK_MESSAGE_ERROR); + gitg_ext_application_show_infobar (_tmp3_, _ ("Failed to discard selection"), _tmp5_, GTK_MESSAGE_ERROR); #line 1370 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp3_); #line 1364 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_error_free0 (e); -#line 12322 "gitg-commit.c" +#line 12213 "gitg-commit.c" } __finally28: #line 1364 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -12330,25 +12221,25 @@ g_clear_error (&_inner_error_); #line 1364 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 12333 "gitg-commit.c" +#line 12224 "gitg-commit.c" } #line 1375 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp7_ = _data20_->q; + _tmp6_ = _data20_->q; #line 1375 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - g_signal_emit_by_name (_tmp7_, "quit"); + g_signal_emit_by_name (_tmp6_, "quit"); #line 1376 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp8_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); + _tmp7_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); #line 1376 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 1376 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 1376 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_application_set_busy (_tmp10_, FALSE); + gitg_ext_application_set_busy (_tmp9_, FALSE); #line 1376 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp9_); #line 1378 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_reload (self); -#line 12351 "gitg-commit.c" +#line 12242 "gitg-commit.c" } @@ -12357,7 +12248,7 @@ __lambda42_ (self, source_object, res); #line 1363 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" block20_data_unref (self); -#line 12360 "gitg-commit.c" +#line 12251 "gitg-commit.c" } @@ -12409,7 +12300,7 @@ _data20_ = NULL; #line 1381 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 12412 "gitg-commit.c" +#line 12303 "gitg-commit.c" } @@ -12418,7 +12309,7 @@ g_atomic_int_inc (&_data21_->_ref_count_); #line 1384 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data21_; -#line 12421 "gitg-commit.c" +#line 12312 "gitg-commit.c" } @@ -12427,7 +12318,7 @@ _data21_ = (Block21Data*) _userdata_; #line 1384 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data21_->_ref_count_)) { -#line 12430 "gitg-commit.c" +#line 12321 "gitg-commit.c" GitgCommitActivity* self; #line 1384 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data21_->self; @@ -12435,7 +12326,7 @@ _g_object_unref0 (self); #line 1384 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block21Data, _data21_); -#line 12438 "gitg-commit.c" +#line 12329 "gitg-commit.c" } } @@ -12447,7 +12338,7 @@ self = _data21_->self; #line 1389 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_return_if_fail (res != NULL); -#line 12450 "gitg-commit.c" +#line 12341 "gitg-commit.c" { GAsyncResult* _tmp0_ = NULL; #line 1392 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -12456,7 +12347,7 @@ gitg_commit_activity_stage_unstage_selection_finish (self, _tmp0_, &_inner_error_); #line 1392 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12459 "gitg-commit.c" +#line 12350 "gitg-commit.c" goto __catch29_g_error; } } @@ -12465,66 +12356,60 @@ { GError* e = NULL; gchar* msg = NULL; + GitgExtApplication* _tmp3_ = NULL; + GitgExtApplication* _tmp4_ = NULL; GitgExtApplication* _tmp5_ = NULL; - GitgExtApplication* _tmp6_ = NULL; - GitgExtApplication* _tmp7_ = NULL; + const gchar* _tmp6_ = NULL; + GError* _tmp7_ = NULL; const gchar* _tmp8_ = NULL; - GError* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; #line 1390 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" e = _inner_error_; #line 1390 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _inner_error_ = NULL; #line 1398 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_data21_->staging) { -#line 12480 "gitg-commit.c" - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; -#line 1400 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp1_ = _ ("Failed to stage selection"); +#line 12371 "gitg-commit.c" + gchar* _tmp1_ = NULL; #line 1400 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp1_ = g_strdup (_ ("Failed to stage selection")); #line 1400 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_free0 (msg); #line 1400 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - msg = _tmp2_; -#line 12491 "gitg-commit.c" + msg = _tmp1_; +#line 12379 "gitg-commit.c" } else { - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; -#line 1404 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp3_ = _ ("Failed to unstage selection"); + gchar* _tmp2_ = NULL; #line 1404 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp4_ = g_strdup (_tmp3_); + _tmp2_ = g_strdup (_ ("Failed to unstage selection")); #line 1404 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_free0 (msg); #line 1404 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - msg = _tmp4_; -#line 12503 "gitg-commit.c" + msg = _tmp2_; +#line 12388 "gitg-commit.c" } #line 1407 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp5_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); + _tmp3_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); #line 1407 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 1407 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 1407 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp8_ = msg; + _tmp6_ = msg; #line 1407 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp9_ = e; + _tmp7_ = e; #line 1407 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp10_ = _tmp9_->message; + _tmp8_ = _tmp7_->message; #line 1407 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_application_show_infobar (_tmp7_, _tmp8_, _tmp10_, GTK_MESSAGE_ERROR); + gitg_ext_application_show_infobar (_tmp5_, _tmp6_, _tmp8_, GTK_MESSAGE_ERROR); #line 1407 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp5_); #line 1408 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_free0 (msg); #line 1408 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_error_free0 (e); #line 1408 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 12527 "gitg-commit.c" +#line 12412 "gitg-commit.c" } __finally29: #line 1390 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -12535,11 +12420,11 @@ g_clear_error (&_inner_error_); #line 1390 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 12538 "gitg-commit.c" +#line 12423 "gitg-commit.c" } #line 1411 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_reload (self); -#line 12542 "gitg-commit.c" +#line 12427 "gitg-commit.c" } @@ -12548,7 +12433,7 @@ __lambda43_ (self, source_object, res); #line 1389 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" block21_data_unref (self); -#line 12551 "gitg-commit.c" +#line 12436 "gitg-commit.c" } @@ -12587,7 +12472,7 @@ block21_data_unref (_data21_); #line 1384 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data21_ = NULL; -#line 12590 "gitg-commit.c" +#line 12475 "gitg-commit.c" } @@ -12600,7 +12485,7 @@ _g_object_unref0 (_data_->self); #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (GitgCommitActivityRevertPathsData, _data_); -#line 12603 "gitg-commit.c" +#line 12488 "gitg-commit.c" } @@ -12625,7 +12510,7 @@ _data_->paths_length1 = paths_length1; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_revert_paths_co (_data_); -#line 12628 "gitg-commit.c" +#line 12513 "gitg-commit.c" } @@ -12635,11 +12520,11 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 12638 "gitg-commit.c" +#line 12523 "gitg-commit.c" } #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 12642 "gitg-commit.c" +#line 12527 "gitg-commit.c" } @@ -12653,7 +12538,7 @@ _data_->_res_ = _res_; #line 1421 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_revert_paths_co (_data_); -#line 12656 "gitg-commit.c" +#line 12541 "gitg-commit.c" } @@ -12662,16 +12547,16 @@ switch (_data_->_state_) { #line 1415 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 0: -#line 12665 "gitg-commit.c" +#line 12550 "gitg-commit.c" goto _state_0; #line 1415 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 1: -#line 12669 "gitg-commit.c" +#line 12554 "gitg-commit.c" goto _state_1; default: #line 1415 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_assert_not_reached (); -#line 12674 "gitg-commit.c" +#line 12559 "gitg-commit.c" } _state_0: #line 1417 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -12724,7 +12609,7 @@ _data_->_tmp9_ = _data_->paths; #line 1419 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp9__length1 = _data_->paths_length1; -#line 12727 "gitg-commit.c" +#line 12612 "gitg-commit.c" { #line 1419 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->path_collection_length1 = 0; @@ -12742,7 +12627,7 @@ _data_->_tmp10_ = g_strdup (_data_->path_collection[_data_->path_it]); #line 1419 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->path = _data_->_tmp10_; -#line 12745 "gitg-commit.c" +#line 12630 "gitg-commit.c" { #line 1421 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp11_ = NULL; @@ -12758,7 +12643,7 @@ gitg_stage_revert_path (_data_->_tmp11_, _data_->_tmp12_, gitg_commit_activity_revert_paths_ready, _data_); #line 1421 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 12761 "gitg-commit.c" +#line 12646 "gitg-commit.c" _state_1: #line 1421 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_stage_revert_path_finish (_data_->_tmp11_, _data_->_res_, &_data_->_inner_error_); @@ -12778,21 +12663,21 @@ if (_data_->_state_ == 0) { #line 1421 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 12781 "gitg-commit.c" +#line 12666 "gitg-commit.c" } else { #line 1421 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 12785 "gitg-commit.c" +#line 12670 "gitg-commit.c" } #line 1421 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 1421 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 12791 "gitg-commit.c" +#line 12676 "gitg-commit.c" } #line 1419 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_free0 (_data_->path); -#line 12795 "gitg-commit.c" +#line 12680 "gitg-commit.c" } } } @@ -12804,17 +12689,17 @@ if (_data_->_state_ == 0) { #line 1415 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 12807 "gitg-commit.c" +#line 12692 "gitg-commit.c" } else { #line 1415 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 12811 "gitg-commit.c" +#line 12696 "gitg-commit.c" } #line 1415 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 1415 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 12817 "gitg-commit.c" +#line 12702 "gitg-commit.c" } @@ -12871,7 +12756,7 @@ _tmp11_ = items; #line 1430 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp11__length1 = items_length1; -#line 12874 "gitg-commit.c" +#line 12759 "gitg-commit.c" { GitgStageStatusItem** item_collection = NULL; gint item_collection_length1 = 0; @@ -12883,14 +12768,14 @@ item_collection_length1 = _tmp11__length1; #line 1430 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" for (item_it = 0; item_it < _tmp11__length1; item_it = item_it + 1) { -#line 12886 "gitg-commit.c" +#line 12771 "gitg-commit.c" GitgStageStatusItem* _tmp12_ = NULL; GitgStageStatusItem* item = NULL; #line 1430 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp12_ = _g_object_ref0 (item_collection[item_it]); #line 1430 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" item = _tmp12_; -#line 12893 "gitg-commit.c" +#line 12778 "gitg-commit.c" { GFile* file = NULL; GFile* _tmp13_ = NULL; @@ -12918,7 +12803,7 @@ _g_free0 (_tmp17_); #line 1432 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" file = _tmp19_; -#line 12921 "gitg-commit.c" +#line 12806 "gitg-commit.c" { GdkScreen* _tmp20_ = NULL; GFile* _tmp21_ = NULL; @@ -12938,7 +12823,7 @@ _g_free0 (_tmp23_); #line 1436 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 12941 "gitg-commit.c" +#line 12826 "gitg-commit.c" goto __catch30_g_error; } } @@ -12977,7 +12862,7 @@ _g_free0 (_tmp28_); #line 1434 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_error_free0 (e); -#line 12980 "gitg-commit.c" +#line 12865 "gitg-commit.c" } __finally30: #line 1434 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -12996,13 +12881,13 @@ g_clear_error (&_inner_error_); #line 1434 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 12999 "gitg-commit.c" +#line 12884 "gitg-commit.c" } #line 1430 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (file); #line 1430 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (item); -#line 13005 "gitg-commit.c" +#line 12890 "gitg-commit.c" } } } @@ -13010,7 +12895,7 @@ _g_object_unref0 (root); #line 1425 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (screen); -#line 13013 "gitg-commit.c" +#line 12898 "gitg-commit.c" } @@ -13019,7 +12904,7 @@ g_atomic_int_inc (&_data22_->_ref_count_); #line 1445 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data22_; -#line 13022 "gitg-commit.c" +#line 12907 "gitg-commit.c" } @@ -13028,7 +12913,7 @@ _data22_ = (Block22Data*) _userdata_; #line 1445 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data22_->_ref_count_)) { -#line 13031 "gitg-commit.c" +#line 12916 "gitg-commit.c" GitgCommitActivity* self; #line 1445 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data22_->self; @@ -13038,7 +12923,7 @@ _g_object_unref0 (self); #line 1445 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block22Data, _data22_); -#line 13041 "gitg-commit.c" +#line 12926 "gitg-commit.c" } } @@ -13050,32 +12935,32 @@ result = g_new0 (gchar*, length + 1); #line 1457 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" for (i = 0; i < length; i++) { -#line 13053 "gitg-commit.c" +#line 12938 "gitg-commit.c" gchar* _tmp0_ = NULL; #line 1457 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp0_ = g_strdup (self[i]); #line 1457 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result[i] = _tmp0_; -#line 13059 "gitg-commit.c" +#line 12944 "gitg-commit.c" } #line 1457 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 13063 "gitg-commit.c" +#line 12948 "gitg-commit.c" } static void __lambda44_ (Block22Data* _data22_, GObject* o, GAsyncResult* ret) { GitgCommitActivity* self; + GitgExtApplication* _tmp6_ = NULL; GitgExtApplication* _tmp7_ = NULL; GitgExtApplication* _tmp8_ = NULL; - GitgExtApplication* _tmp9_ = NULL; - GitgExtUserQuery* _tmp10_ = NULL; + GitgExtUserQuery* _tmp9_ = NULL; GError * _inner_error_ = NULL; #line 1457 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data22_->self; #line 1457 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_return_if_fail (ret != NULL); -#line 13078 "gitg-commit.c" +#line 12963 "gitg-commit.c" { GAsyncResult* _tmp0_ = NULL; #line 1460 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -13084,7 +12969,7 @@ gitg_commit_activity_revert_paths_finish (self, _tmp0_, &_inner_error_); #line 1460 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 13087 "gitg-commit.c" +#line 12972 "gitg-commit.c" goto __catch31_g_error; } } @@ -13095,9 +12980,8 @@ GitgExtApplication* _tmp1_ = NULL; GitgExtApplication* _tmp2_ = NULL; GitgExtApplication* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GError* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; + GError* _tmp4_ = NULL; + const gchar* _tmp5_ = NULL; #line 1458 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" e = _inner_error_; #line 1458 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -13109,18 +12993,16 @@ #line 1464 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp3_ = _tmp2_; #line 1464 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp4_ = _ ("Failed to discard changes"); -#line 1464 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp5_ = e; + _tmp4_ = e; #line 1464 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp6_ = _tmp5_->message; + _tmp5_ = _tmp4_->message; #line 1464 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_application_show_infobar (_tmp3_, _tmp4_, _tmp6_, GTK_MESSAGE_ERROR); + gitg_ext_application_show_infobar (_tmp3_, _ ("Failed to discard changes"), _tmp5_, GTK_MESSAGE_ERROR); #line 1464 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp3_); #line 1458 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_error_free0 (e); -#line 13123 "gitg-commit.c" +#line 13005 "gitg-commit.c" } __finally31: #line 1458 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -13131,25 +13013,25 @@ g_clear_error (&_inner_error_); #line 1458 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 13134 "gitg-commit.c" +#line 13016 "gitg-commit.c" } #line 1469 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp7_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); + _tmp6_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); #line 1469 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 1469 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 1469 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_application_set_busy (_tmp9_, FALSE); + gitg_ext_application_set_busy (_tmp8_, FALSE); #line 1469 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 1470 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp10_ = _data22_->q; + _tmp9_ = _data22_->q; #line 1470 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - g_signal_emit_by_name (_tmp10_, "quit"); + g_signal_emit_by_name (_tmp9_, "quit"); #line 1472 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_reload (self); -#line 13152 "gitg-commit.c" +#line 13034 "gitg-commit.c" } @@ -13158,7 +13040,7 @@ __lambda44_ (self, source_object, res); #line 1457 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" block22_data_unref (self); -#line 13161 "gitg-commit.c" +#line 13043 "gitg-commit.c" } @@ -13220,19 +13102,19 @@ paths_length1 = _tmp5__length1; #line 1449 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _paths_size_ = paths_length1; -#line 13223 "gitg-commit.c" +#line 13105 "gitg-commit.c" { gint i = 0; #line 1451 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" i = 0; -#line 13228 "gitg-commit.c" +#line 13110 "gitg-commit.c" { gboolean _tmp7_ = FALSE; #line 1451 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp7_ = TRUE; #line 1451 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" while (TRUE) { -#line 13235 "gitg-commit.c" +#line 13117 "gitg-commit.c" gint _tmp9_ = 0; GitgStageStatusItem** _tmp10_ = NULL; gint _tmp10__length1 = 0; @@ -13248,13 +13130,13 @@ gchar* _tmp18_ = NULL; #line 1451 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (!_tmp7_) { -#line 13251 "gitg-commit.c" +#line 13133 "gitg-commit.c" gint _tmp8_ = 0; #line 1451 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp8_ = i; #line 1451 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" i = _tmp8_ + 1; -#line 13257 "gitg-commit.c" +#line 13139 "gitg-commit.c" } #line 1451 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp7_ = FALSE; @@ -13268,7 +13150,7 @@ if (!(_tmp9_ < _tmp10__length1)) { #line 1451 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" break; -#line 13271 "gitg-commit.c" +#line 13153 "gitg-commit.c" } #line 1453 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp11_ = paths; @@ -13294,7 +13176,7 @@ _tmp11_[_tmp12_] = _tmp17_; #line 1453 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp18_ = _tmp11_[_tmp12_]; -#line 13297 "gitg-commit.c" +#line 13179 "gitg-commit.c" } } } @@ -13320,7 +13202,7 @@ _data22_ = NULL; #line 1475 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 13323 "gitg-commit.c" +#line 13205 "gitg-commit.c" } @@ -13329,7 +13211,7 @@ g_atomic_int_inc (&_data23_->_ref_count_); #line 1478 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data23_; -#line 13332 "gitg-commit.c" +#line 13214 "gitg-commit.c" } @@ -13338,7 +13220,7 @@ _data23_ = (Block23Data*) _userdata_; #line 1478 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data23_->_ref_count_)) { -#line 13341 "gitg-commit.c" +#line 13223 "gitg-commit.c" GitgCommitActivity* self; #line 1478 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data23_->self; @@ -13348,20 +13230,20 @@ _g_object_unref0 (self); #line 1478 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block23Data, _data23_); -#line 13351 "gitg-commit.c" +#line 13233 "gitg-commit.c" } } static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 13364 "gitg-commit.c" +#line 13246 "gitg-commit.c" } @@ -13372,74 +13254,74 @@ gboolean _tmp2_ = FALSE; gchar** _tmp3_ = NULL; gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" separator = ""; -#line 13381 "gitg-commit.c" +#line 13263 "gitg-commit.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = TRUE; -#line 13391 "gitg-commit.c" +#line 13273 "gitg-commit.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; -#line 13401 "gitg-commit.c" +#line 13283 "gitg-commit.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 13407 "gitg-commit.c" +#line 13289 "gitg-commit.c" } else { gboolean _tmp5_ = FALSE; gchar** _tmp6_ = NULL; gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { -#line 13418 "gitg-commit.c" +#line 13300 "gitg-commit.c" gchar** _tmp7_ = NULL; gint _tmp7__length1 = 0; const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; -#line 13430 "gitg-commit.c" +#line 13312 "gitg-commit.c" } else { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = FALSE; -#line 13434 "gitg-commit.c" +#line 13316 "gitg-commit.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; -#line 13438 "gitg-commit.c" +#line 13320 "gitg-commit.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 13442 "gitg-commit.c" +#line 13324 "gitg-commit.c" gint i = 0; gsize len = 0UL; gint _tmp31_ = 0; @@ -13460,18 +13342,18 @@ const gchar* _tmp44_ = NULL; void* _tmp45_ = NULL; const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1075 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" len = (gsize) 1; -#line 13465 "gitg-commit.c" +#line 13347 "gitg-commit.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { -#line 13474 "gitg-commit.c" +#line 13356 "gitg-commit.c" gboolean _tmp11_ = FALSE; gboolean _tmp12_ = FALSE; gchar** _tmp13_ = NULL; @@ -13482,192 +13364,192 @@ gint _tmp23_ = 0; const gchar* _tmp24_ = NULL; gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp9_) { -#line 13487 "gitg-commit.c" +#line 13369 "gitg-commit.c" gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp10_ + 1; -#line 13493 "gitg-commit.c" +#line 13375 "gitg-commit.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { -#line 13503 "gitg-commit.c" +#line 13385 "gitg-commit.c" gint _tmp14_ = 0; gchar** _tmp15_ = NULL; gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; -#line 13515 "gitg-commit.c" +#line 13397 "gitg-commit.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 13519 "gitg-commit.c" +#line 13401 "gitg-commit.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = TRUE; -#line 13525 "gitg-commit.c" +#line 13407 "gitg-commit.c" } else { gboolean _tmp16_ = FALSE; gchar** _tmp17_ = NULL; gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { -#line 13536 "gitg-commit.c" +#line 13418 "gitg-commit.c" gchar** _tmp18_ = NULL; gint _tmp18__length1 = 0; gint _tmp19_ = 0; const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; -#line 13551 "gitg-commit.c" +#line 13433 "gitg-commit.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = FALSE; -#line 13555 "gitg-commit.c" +#line 13437 "gitg-commit.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; -#line 13559 "gitg-commit.c" +#line 13441 "gitg-commit.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" break; -#line 13565 "gitg-commit.c" +#line 13447 "gitg-commit.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { -#line 13577 "gitg-commit.c" +#line 13459 "gitg-commit.c" gchar** _tmp25_ = NULL; gint _tmp25__length1 = 0; gint _tmp26_ = 0; const gchar* _tmp27_ = NULL; gint _tmp28_ = 0; gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; -#line 13598 "gitg-commit.c" +#line 13480 "gitg-commit.c" } else { -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = 0; -#line 13602 "gitg-commit.c" +#line 13484 "gitg-commit.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; -#line 13608 "gitg-commit.c" +#line 13490 "gitg-commit.c" } } -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1079 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1079 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { -#line 13615 "gitg-commit.c" +#line 13497 "gitg-commit.c" gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1080 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1080 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1080 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 13623 "gitg-commit.c" +#line 13505 "gitg-commit.c" } -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1082 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1082 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1082 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1085 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1085 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1085 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp45_; -#line 13661 "gitg-commit.c" +#line 13543 "gitg-commit.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { -#line 13670 "gitg-commit.c" +#line 13552 "gitg-commit.c" gint _tmp48_ = 0; gchar** _tmp49_ = NULL; gint _tmp49__length1 = 0; @@ -13681,96 +13563,96 @@ const gchar* _tmp56_ = NULL; void* _tmp60_ = NULL; void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp46_) { -#line 13686 "gitg-commit.c" +#line 13568 "gitg-commit.c" gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp47_ + 1; -#line 13692 "gitg-commit.c" +#line 13574 "gitg-commit.c" } -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" break; -#line 13706 "gitg-commit.c" +#line 13588 "gitg-commit.c" } -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1088 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1088 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1088 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1088 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { -#line 13726 "gitg-commit.c" +#line 13608 "gitg-commit.c" gchar** _tmp57_ = NULL; gint _tmp57__length1 = 0; gint _tmp58_ = 0; const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; -#line 13741 "gitg-commit.c" +#line 13623 "gitg-commit.c" } else { -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = ""; -#line 13745 "gitg-commit.c" +#line 13627 "gitg-commit.c" } -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp61_; -#line 13753 "gitg-commit.c" +#line 13635 "gitg-commit.c" } } -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1092 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1092 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1092 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1092 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 13764 "gitg-commit.c" +#line 13646 "gitg-commit.c" } else { gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1094 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1094 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1094 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 13773 "gitg-commit.c" +#line 13655 "gitg-commit.c" } } @@ -13787,7 +13669,7 @@ _tmp0_ = r; #line 1513 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp0_ == GTK_RESPONSE_OK) { -#line 13790 "gitg-commit.c" +#line 13672 "gitg-commit.c" GitgStageStatusItem** _tmp1_ = NULL; gint _tmp1__length1 = 0; gboolean _tmp2_ = FALSE; @@ -13801,13 +13683,13 @@ result = _tmp2_; #line 1515 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 13804 "gitg-commit.c" +#line 13686 "gitg-commit.c" } #line 1518 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result = TRUE; #line 1518 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 13810 "gitg-commit.c" +#line 13692 "gitg-commit.c" } @@ -13816,7 +13698,7 @@ result = __lambda45_ (self, _sender, response_type); #line 1512 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 13819 "gitg-commit.c" +#line 13701 "gitg-commit.c" } @@ -13825,24 +13707,21 @@ GitgStageStatusItem** _tmp0_ = NULL; gint _tmp0__length1 = 0; gchar* primary = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + gchar* _tmp1_ = NULL; gchar* secondary = NULL; - GitgStageStatusItem** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - GitgExtUserQuery* _tmp39_ = NULL; - const gchar* _tmp40_ = NULL; - const gchar* _tmp41_ = NULL; - const gchar* _tmp42_ = NULL; - GitgExtUserQueryResponse* _tmp43_ = NULL; - const gchar* _tmp44_ = NULL; - GitgExtUserQueryResponse* _tmp45_ = NULL; - GitgExtUserQueryResponse** _tmp46_ = NULL; - GitgExtUserQueryResponse** _tmp47_ = NULL; - gint _tmp47__length1 = 0; - GitgExtApplication* _tmp48_ = NULL; - GitgExtApplication* _tmp49_ = NULL; - GitgExtApplication* _tmp50_ = NULL; + GitgStageStatusItem** _tmp2_ = NULL; + gint _tmp2__length1 = 0; + GitgExtUserQuery* _tmp36_ = NULL; + const gchar* _tmp37_ = NULL; + const gchar* _tmp38_ = NULL; + GitgExtUserQueryResponse* _tmp39_ = NULL; + GitgExtUserQueryResponse* _tmp40_ = NULL; + GitgExtUserQueryResponse** _tmp41_ = NULL; + GitgExtUserQueryResponse** _tmp42_ = NULL; + gint _tmp42__length1 = 0; + GitgExtApplication* _tmp43_ = NULL; + GitgExtApplication* _tmp44_ = NULL; + GitgExtApplication* _tmp45_ = NULL; #line 1478 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_return_if_fail (self != NULL); #line 1478 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -13860,263 +13739,251 @@ #line 1478 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data23_->items_length1 = _tmp0__length1; #line 1480 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp1_ = _ ("Discard changes"); -#line 1480 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp1_ = g_strdup (_ ("Discard changes")); #line 1480 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - primary = _tmp2_; + primary = _tmp1_; #line 1483 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp3_ = _data23_->items; + _tmp2_ = _data23_->items; #line 1483 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp3__length1 = _data23_->items_length1; + _tmp2__length1 = _data23_->items_length1; #line 1483 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp3__length1 == 1) { -#line 13874 "gitg-commit.c" - const gchar* _tmp4_ = NULL; - GitgStageStatusItem** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - GitgStageStatusItem* _tmp6_ = NULL; + if (_tmp2__length1 == 1) { +#line 13751 "gitg-commit.c" + GitgStageStatusItem** _tmp3_ = NULL; + gint _tmp3__length1 = 0; + GitgStageStatusItem* _tmp4_ = NULL; + gchar* _tmp5_ = NULL; + gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; -#line 1485 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp4_ = _ ("Are you sure you want to permanently discard all changes made to the f" \ -"ile `%s'?"); #line 1485 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp5_ = _data23_->items; + _tmp3_ = _data23_->items; #line 1485 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp5__length1 = _data23_->items_length1; + _tmp3__length1 = _data23_->items_length1; #line 1485 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp6_ = _tmp5_[0]; + _tmp4_ = _tmp3_[0]; #line 1485 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp7_ = gitg_stage_status_item_get_path (_tmp6_); + _tmp5_ = gitg_stage_status_item_get_path (_tmp4_); #line 1485 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 1485 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 1485 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp10_ = g_strdup_printf (_tmp4_, _tmp9_); + _tmp8_ = g_strdup_printf (_ ("Are you sure you want to permanently discard all changes made to the f" \ +"ile `%s'?"), _tmp7_); #line 1485 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_free0 (secondary); #line 1485 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - secondary = _tmp10_; + secondary = _tmp8_; #line 1485 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_tmp9_); -#line 13905 "gitg-commit.c" + _g_free0 (_tmp7_); +#line 13779 "gitg-commit.c" } else { gchar** paths = NULL; - GitgStageStatusItem** _tmp11_ = NULL; - gint _tmp11__length1 = 0; - gchar** _tmp12_ = NULL; + GitgStageStatusItem** _tmp9_ = NULL; + gint _tmp9__length1 = 0; + gchar** _tmp10_ = NULL; gint paths_length1 = 0; gint _paths_size_ = 0; - const gchar* _tmp28_ = NULL; - gchar** _tmp29_ = NULL; + gchar** _tmp26_ = NULL; + gint _tmp26__length1 = 0; + gchar* _tmp27_ = NULL; + gchar* _tmp28_ = NULL; + GitgStageStatusItem** _tmp29_ = NULL; gint _tmp29__length1 = 0; - gchar* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; - GitgStageStatusItem** _tmp32_ = NULL; - gint _tmp32__length1 = 0; - GitgStageStatusItem** _tmp33_ = NULL; - gint _tmp33__length1 = 0; - GitgStageStatusItem* _tmp34_ = NULL; + GitgStageStatusItem** _tmp30_ = NULL; + gint _tmp30__length1 = 0; + GitgStageStatusItem* _tmp31_ = NULL; + gchar* _tmp32_ = NULL; + gchar* _tmp33_ = NULL; + gchar* _tmp34_ = NULL; gchar* _tmp35_ = NULL; - gchar* _tmp36_ = NULL; - gchar* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; #line 1489 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp11_ = _data23_->items; + _tmp9_ = _data23_->items; #line 1489 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp11__length1 = _data23_->items_length1; + _tmp9__length1 = _data23_->items_length1; #line 1489 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp12_ = g_new0 (gchar*, (_tmp11__length1 - 1) + 1); + _tmp10_ = g_new0 (gchar*, (_tmp9__length1 - 1) + 1); #line 1489 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - paths = _tmp12_; + paths = _tmp10_; #line 1489 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - paths_length1 = _tmp11__length1 - 1; + paths_length1 = _tmp9__length1 - 1; #line 1489 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _paths_size_ = paths_length1; -#line 13939 "gitg-commit.c" +#line 13812 "gitg-commit.c" { gint i = 0; #line 1491 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" i = 0; -#line 13944 "gitg-commit.c" +#line 13817 "gitg-commit.c" { - gboolean _tmp13_ = FALSE; + gboolean _tmp11_ = FALSE; #line 1491 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp13_ = TRUE; + _tmp11_ = TRUE; #line 1491 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" while (TRUE) { -#line 13951 "gitg-commit.c" - gint _tmp15_ = 0; - GitgStageStatusItem** _tmp16_ = NULL; - gint _tmp16__length1 = 0; - gchar** _tmp17_ = NULL; +#line 13824 "gitg-commit.c" + gint _tmp13_ = 0; + GitgStageStatusItem** _tmp14_ = NULL; + gint _tmp14__length1 = 0; + gchar** _tmp15_ = NULL; + gint _tmp15__length1 = 0; + gint _tmp16_ = 0; + GitgStageStatusItem** _tmp17_ = NULL; gint _tmp17__length1 = 0; gint _tmp18_ = 0; - GitgStageStatusItem** _tmp19_ = NULL; - gint _tmp19__length1 = 0; - gint _tmp20_ = 0; - GitgStageStatusItem* _tmp21_ = NULL; + GitgStageStatusItem* _tmp19_ = NULL; + gchar* _tmp20_ = NULL; + gchar* _tmp21_ = NULL; gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; + const gchar* _tmp23_ = NULL; gchar* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; + gchar* _tmp25_ = NULL; #line 1491 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (!_tmp13_) { -#line 13970 "gitg-commit.c" - gint _tmp14_ = 0; + if (!_tmp11_) { +#line 13843 "gitg-commit.c" + gint _tmp12_ = 0; #line 1491 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp14_ = i; + _tmp12_ = i; #line 1491 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - i = _tmp14_ + 1; -#line 13976 "gitg-commit.c" + i = _tmp12_ + 1; +#line 13849 "gitg-commit.c" } #line 1491 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp13_ = FALSE; + _tmp11_ = FALSE; #line 1491 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp15_ = i; + _tmp13_ = i; #line 1491 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp16_ = _data23_->items; + _tmp14_ = _data23_->items; #line 1491 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp16__length1 = _data23_->items_length1; + _tmp14__length1 = _data23_->items_length1; #line 1491 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (!(_tmp15_ < (_tmp16__length1 - 1))) { + if (!(_tmp13_ < (_tmp14__length1 - 1))) { #line 1491 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" break; -#line 13990 "gitg-commit.c" +#line 13863 "gitg-commit.c" } #line 1493 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp17_ = paths; + _tmp15_ = paths; #line 1493 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp17__length1 = paths_length1; + _tmp15__length1 = paths_length1; #line 1493 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp18_ = i; + _tmp16_ = i; #line 1493 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp19_ = _data23_->items; + _tmp17_ = _data23_->items; #line 1493 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp19__length1 = _data23_->items_length1; + _tmp17__length1 = _data23_->items_length1; #line 1493 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp20_ = i; + _tmp18_ = i; #line 1493 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp21_ = _tmp19_[_tmp20_]; + _tmp19_ = _tmp17_[_tmp18_]; #line 1493 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp22_ = gitg_stage_status_item_get_path (_tmp21_); + _tmp20_ = gitg_stage_status_item_get_path (_tmp19_); #line 1493 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp23_ = _tmp22_; + _tmp21_ = _tmp20_; #line 1493 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp24_ = _tmp23_; + _tmp22_ = _tmp21_; #line 1493 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp25_ = string_to_string (_tmp24_); + _tmp23_ = string_to_string (_tmp22_); #line 1493 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp26_ = g_strconcat ("`", _tmp25_, "'", NULL); + _tmp24_ = g_strconcat ("`", _tmp23_, "'", NULL); #line 1493 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_tmp17_[_tmp18_]); + _g_free0 (_tmp15_[_tmp16_]); #line 1493 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp17_[_tmp18_] = _tmp26_; + _tmp15_[_tmp16_] = _tmp24_; #line 1493 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp27_ = _tmp17_[_tmp18_]; + _tmp25_ = _tmp15_[_tmp16_]; #line 1493 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_tmp24_); -#line 14024 "gitg-commit.c" + _g_free0 (_tmp22_); +#line 13897 "gitg-commit.c" } } } #line 1496 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp28_ = _ ("Are you sure you want to permanently discard all changes made to the f" \ -"iles %s and `%s'?"); + _tmp26_ = paths; #line 1496 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp29_ = paths; + _tmp26__length1 = paths_length1; #line 1496 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp29__length1 = paths_length1; + _tmp27_ = _vala_g_strjoinv (", ", _tmp26_, _tmp26__length1); #line 1496 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp30_ = _vala_g_strjoinv (", ", _tmp29_, _tmp29__length1); + _tmp28_ = _tmp27_; #line 1496 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp31_ = _tmp30_; -#line 1496 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp32_ = _data23_->items; + _tmp29_ = _data23_->items; #line 1496 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp32__length1 = _data23_->items_length1; + _tmp29__length1 = _data23_->items_length1; #line 1496 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp33_ = _data23_->items; + _tmp30_ = _data23_->items; #line 1496 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp33__length1 = _data23_->items_length1; + _tmp30__length1 = _data23_->items_length1; #line 1496 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp34_ = _tmp32_[_tmp33__length1 - 1]; + _tmp31_ = _tmp29_[_tmp30__length1 - 1]; #line 1496 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp35_ = gitg_stage_status_item_get_path (_tmp34_); + _tmp32_ = gitg_stage_status_item_get_path (_tmp31_); #line 1496 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp36_ = _tmp35_; + _tmp33_ = _tmp32_; #line 1496 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp37_ = _tmp36_; + _tmp34_ = _tmp33_; #line 1496 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp38_ = g_strdup_printf (_tmp28_, _tmp31_, _tmp37_); + _tmp35_ = g_strdup_printf (_ ("Are you sure you want to permanently discard all changes made to the f" \ +"iles %s and `%s'?"), _tmp28_, _tmp34_); #line 1496 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_free0 (secondary); #line 1496 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - secondary = _tmp38_; + secondary = _tmp35_; #line 1496 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_tmp37_); + _g_free0 (_tmp34_); #line 1496 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_tmp31_); + _g_free0 (_tmp28_); #line 1483 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" paths = (_vala_array_free (paths, paths_length1, (GDestroyNotify) g_free), NULL); -#line 14066 "gitg-commit.c" +#line 13937 "gitg-commit.c" } #line 1499 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp39_ = gitg_ext_user_query_new (); + _tmp36_ = gitg_ext_user_query_new (); #line 1499 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data23_->q = _tmp39_; + _data23_->q = _tmp36_; #line 1501 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp40_ = primary; + _tmp37_ = primary; #line 1501 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_user_query_set_title (_data23_->q, _tmp40_); + gitg_ext_user_query_set_title (_data23_->q, _tmp37_); #line 1502 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp41_ = secondary; + _tmp38_ = secondary; #line 1502 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_user_query_set_message (_data23_->q, _tmp41_); + gitg_ext_user_query_set_message (_data23_->q, _tmp38_); #line 1503 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_ext_user_query_set_message_type (_data23_->q, GTK_MESSAGE_QUESTION); #line 1505 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp42_ = _ ("_Cancel"); -#line 1505 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp43_ = gitg_ext_user_query_response_new (_tmp42_, GTK_RESPONSE_CANCEL); + _tmp39_ = gitg_ext_user_query_response_new (_ ("_Cancel"), GTK_RESPONSE_CANCEL); #line 1505 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp44_ = _ ("Discard"); + _tmp40_ = gitg_ext_user_query_response_new (_ ("Discard"), GTK_RESPONSE_OK); #line 1505 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp45_ = gitg_ext_user_query_response_new (_tmp44_, GTK_RESPONSE_OK); + _tmp41_ = g_new0 (GitgExtUserQueryResponse*, 2 + 1); #line 1505 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp46_ = g_new0 (GitgExtUserQueryResponse*, 2 + 1); + _tmp41_[0] = _tmp39_; #line 1505 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp46_[0] = _tmp43_; + _tmp41_[1] = _tmp40_; #line 1505 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp46_[1] = _tmp45_; -#line 1505 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp47_ = _tmp46_; + _tmp42_ = _tmp41_; #line 1505 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp47__length1 = 2; + _tmp42__length1 = 2; #line 1505 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_user_query_set_responses (_data23_->q, _tmp47_, 2); + gitg_ext_user_query_set_responses (_data23_->q, _tmp42_, 2); #line 1505 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp47_ = (_vala_array_free (_tmp47_, _tmp47__length1, (GDestroyNotify) g_object_unref), NULL); + _tmp42_ = (_vala_array_free (_tmp42_, _tmp42__length1, (GDestroyNotify) g_object_unref), NULL); #line 1510 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_ext_user_query_set_default_response (_data23_->q, GTK_RESPONSE_OK); #line 1512 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_signal_connect_data (_data23_->q, "response", (GCallback) ___lambda45__gitg_ext_user_query_response, block23_data_ref (_data23_), (GClosureNotify) block23_data_unref, 0); #line 1521 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp48_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); + _tmp43_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); #line 1521 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp49_ = _tmp48_; + _tmp44_ = _tmp43_; #line 1521 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp50_ = _tmp49_; + _tmp45_ = _tmp44_; #line 1521 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_application_user_query (_tmp50_, _data23_->q); + gitg_ext_application_user_query (_tmp45_, _data23_->q); #line 1521 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_tmp50_); + _g_object_unref0 (_tmp45_); #line 1478 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_free0 (secondary); #line 1478 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -14125,7 +13992,7 @@ block23_data_unref (_data23_); #line 1478 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data23_ = NULL; -#line 14126 "gitg-commit.c" +#line 13993 "gitg-commit.c" } @@ -14136,7 +14003,7 @@ _g_object_unref0 (_data_->self); #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (GitgCommitActivityDeleteFilesData, _data_); -#line 14137 "gitg-commit.c" +#line 14004 "gitg-commit.c" } @@ -14165,7 +14032,7 @@ _data_->files_length1 = _tmp1__length1; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_delete_files_co (_data_); -#line 14166 "gitg-commit.c" +#line 14033 "gitg-commit.c" } @@ -14175,11 +14042,11 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 14176 "gitg-commit.c" +#line 14043 "gitg-commit.c" } #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 14180 "gitg-commit.c" +#line 14047 "gitg-commit.c" } @@ -14188,7 +14055,7 @@ g_atomic_int_inc (&_data24_->_ref_count_); #line 1524 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data24_; -#line 14189 "gitg-commit.c" +#line 14056 "gitg-commit.c" } @@ -14197,7 +14064,7 @@ _data24_ = (Block24Data*) _userdata_; #line 1524 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data24_->_ref_count_)) { -#line 14198 "gitg-commit.c" +#line 14065 "gitg-commit.c" GitgCommitActivity* self; #line 1524 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data24_->self; @@ -14215,7 +14082,7 @@ _g_object_unref0 (self); #line 1524 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block24Data, _data24_); -#line 14216 "gitg-commit.c" +#line 14083 "gitg-commit.c" } } @@ -14225,7 +14092,7 @@ result = gitg_commit_activity_delete_files_co (self); #line 1526 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 14226 "gitg-commit.c" +#line 14093 "gitg-commit.c" } @@ -14234,7 +14101,7 @@ g_atomic_int_inc (&_data25_->_ref_count_); #line 1531 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data25_; -#line 14235 "gitg-commit.c" +#line 14102 "gitg-commit.c" } @@ -14243,7 +14110,7 @@ _data25_ = (Block25Data*) _userdata_; #line 1531 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data25_->_ref_count_)) { -#line 14244 "gitg-commit.c" +#line 14111 "gitg-commit.c" GitgCommitActivity* self; #line 1531 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data25_->_data24_->self; @@ -14255,7 +14122,7 @@ _data25_->_data24_ = NULL; #line 1531 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block25Data, _data25_); -#line 14256 "gitg-commit.c" +#line 14123 "gitg-commit.c" } } @@ -14263,7 +14130,7 @@ static gpointer _g_error_copy0 (gpointer self) { #line 1542 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return self ? g_error_copy (self) : NULL; -#line 14264 "gitg-commit.c" +#line 14131 "gitg-commit.c" } @@ -14279,7 +14146,7 @@ self = _data24_->self; #line 1535 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_return_if_fail (res != NULL); -#line 14280 "gitg-commit.c" +#line 14147 "gitg-commit.c" { GFile* _tmp0_ = NULL; GAsyncResult* _tmp1_ = NULL; @@ -14291,7 +14158,7 @@ g_file_delete_finish (_tmp0_, _tmp1_, &_inner_error_); #line 1538 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14292 "gitg-commit.c" +#line 14159 "gitg-commit.c" goto __catch32_g_error; } } @@ -14315,7 +14182,7 @@ _data24_->_error_ = _tmp3_; #line 1536 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_error_free0 (e); -#line 14316 "gitg-commit.c" +#line 14183 "gitg-commit.c" } __finally32: #line 1536 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -14326,7 +14193,7 @@ g_clear_error (&_inner_error_); #line 1536 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 14327 "gitg-commit.c" +#line 14194 "gitg-commit.c" } #line 1545 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp4_ = _data24_->n; @@ -14336,7 +14203,7 @@ _tmp5_ = _data24_->n; #line 1545 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp5_ == 0) { -#line 14337 "gitg-commit.c" +#line 14204 "gitg-commit.c" GSourceFunc _tmp6_ = NULL; void* _tmp6__target = NULL; #line 1547 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -14345,7 +14212,7 @@ _tmp6__target = _data24_->cb_target; #line 1547 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp6_ (_tmp6__target); -#line 14346 "gitg-commit.c" +#line 14213 "gitg-commit.c" } } @@ -14355,7 +14222,7 @@ _____lambda46_ (self, source_object, res); #line 1535 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" block25_data_unref (self); -#line 14356 "gitg-commit.c" +#line 14223 "gitg-commit.c" } @@ -14364,16 +14231,16 @@ switch (_data_->_state_) { #line 1524 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 0: -#line 14365 "gitg-commit.c" +#line 14232 "gitg-commit.c" goto _state_0; #line 1524 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" case 1: -#line 14369 "gitg-commit.c" +#line 14236 "gitg-commit.c" goto _state_1; default: #line 1524 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_assert_not_reached (); -#line 14374 "gitg-commit.c" +#line 14241 "gitg-commit.c" } _state_0: #line 1524 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -14402,11 +14269,11 @@ _data_->_tmp0__length1 = _data_->files_length1; #line 1529 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_data24_->n = _data_->_tmp0__length1; -#line 14403 "gitg-commit.c" +#line 14270 "gitg-commit.c" { #line 1531 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->i = 0; -#line 14407 "gitg-commit.c" +#line 14274 "gitg-commit.c" { #line 1531 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp1_ = TRUE; @@ -14426,7 +14293,7 @@ _data_->_tmp2_ = _data_->i; #line 1531 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->i = _data_->_tmp2_ + 1; -#line 14427 "gitg-commit.c" +#line 14294 "gitg-commit.c" } #line 1531 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp1_ = FALSE; @@ -14450,7 +14317,7 @@ _data_->_data25_ = NULL; #line 1531 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" break; -#line 14451 "gitg-commit.c" +#line 14318 "gitg-commit.c" } #line 1533 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_tmp5_ = NULL; @@ -14484,7 +14351,7 @@ block25_data_unref (_data_->_data25_); #line 1531 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data_->_data25_ = NULL; -#line 14485 "gitg-commit.c" +#line 14352 "gitg-commit.c" } } } @@ -14492,7 +14359,7 @@ _data_->_state_ = 1; #line 1552 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 14493 "gitg-commit.c" +#line 14360 "gitg-commit.c" _state_1: ; #line 1554 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -14523,17 +14390,17 @@ if (_data_->_state_ == 0) { #line 1556 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 14524 "gitg-commit.c" +#line 14391 "gitg-commit.c" } else { #line 1556 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 14528 "gitg-commit.c" +#line 14395 "gitg-commit.c" } #line 1556 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 1556 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 14534 "gitg-commit.c" +#line 14401 "gitg-commit.c" } #line 1524 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" block24_data_unref (_data_->_data24_); @@ -14543,17 +14410,17 @@ if (_data_->_state_ == 0) { #line 1524 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 14544 "gitg-commit.c" +#line 14411 "gitg-commit.c" } else { #line 1524 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_simple_async_result_complete (_data_->_async_result); -#line 14548 "gitg-commit.c" +#line 14415 "gitg-commit.c" } #line 1524 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_unref (_data_->_async_result); #line 1524 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return FALSE; -#line 14554 "gitg-commit.c" +#line 14421 "gitg-commit.c" } @@ -14562,7 +14429,7 @@ g_atomic_int_inc (&_data26_->_ref_count_); #line 1560 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data26_; -#line 14563 "gitg-commit.c" +#line 14430 "gitg-commit.c" } @@ -14571,7 +14438,7 @@ _data26_ = (Block26Data*) _userdata_; #line 1560 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data26_->_ref_count_)) { -#line 14572 "gitg-commit.c" +#line 14439 "gitg-commit.c" GitgCommitActivity* self; #line 1560 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data26_->self; @@ -14581,23 +14448,23 @@ _g_object_unref0 (self); #line 1560 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block26Data, _data26_); -#line 14582 "gitg-commit.c" +#line 14449 "gitg-commit.c" } } static void __lambda47_ (Block26Data* _data26_, GObject* o, GAsyncResult* ret) { GitgCommitActivity* self; + GitgExtApplication* _tmp6_ = NULL; GitgExtApplication* _tmp7_ = NULL; GitgExtApplication* _tmp8_ = NULL; - GitgExtApplication* _tmp9_ = NULL; - GitgExtUserQuery* _tmp10_ = NULL; + GitgExtUserQuery* _tmp9_ = NULL; GError * _inner_error_ = NULL; #line 1572 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data26_->self; #line 1572 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_return_if_fail (ret != NULL); -#line 14598 "gitg-commit.c" +#line 14465 "gitg-commit.c" { GAsyncResult* _tmp0_ = NULL; #line 1575 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -14606,7 +14473,7 @@ gitg_commit_activity_delete_files_finish (self, _tmp0_, &_inner_error_); #line 1575 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 14607 "gitg-commit.c" +#line 14474 "gitg-commit.c" goto __catch33_g_error; } } @@ -14617,9 +14484,8 @@ GitgExtApplication* _tmp1_ = NULL; GitgExtApplication* _tmp2_ = NULL; GitgExtApplication* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GError* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; + GError* _tmp4_ = NULL; + const gchar* _tmp5_ = NULL; #line 1573 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" e = _inner_error_; #line 1573 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -14631,18 +14497,16 @@ #line 1579 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp3_ = _tmp2_; #line 1579 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp4_ = _ ("Failed to delete files"); + _tmp4_ = e; #line 1579 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp5_ = e; + _tmp5_ = _tmp4_->message; #line 1579 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp6_ = _tmp5_->message; -#line 1579 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_application_show_infobar (_tmp3_, _tmp4_, _tmp6_, GTK_MESSAGE_ERROR); + gitg_ext_application_show_infobar (_tmp3_, _ ("Failed to delete files"), _tmp5_, GTK_MESSAGE_ERROR); #line 1579 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp3_); #line 1573 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_error_free0 (e); -#line 14643 "gitg-commit.c" +#line 14507 "gitg-commit.c" } __finally33: #line 1573 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -14653,25 +14517,25 @@ g_clear_error (&_inner_error_); #line 1573 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 14654 "gitg-commit.c" +#line 14518 "gitg-commit.c" } #line 1584 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp7_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); + _tmp6_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); #line 1584 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 1584 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 1584 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_application_set_busy (_tmp9_, FALSE); + gitg_ext_application_set_busy (_tmp8_, FALSE); #line 1584 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp8_); #line 1585 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp10_ = _data26_->q; + _tmp9_ = _data26_->q; #line 1585 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - g_signal_emit_by_name (_tmp10_, "quit"); + g_signal_emit_by_name (_tmp9_, "quit"); #line 1587 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_reload (self); -#line 14672 "gitg-commit.c" +#line 14536 "gitg-commit.c" } @@ -14680,7 +14544,7 @@ __lambda47_ (self, source_object, res); #line 1572 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" block26_data_unref (self); -#line 14681 "gitg-commit.c" +#line 14545 "gitg-commit.c" } @@ -14740,19 +14604,19 @@ files_length1 = _tmp5__length1; #line 1564 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _files_size_ = files_length1; -#line 14741 "gitg-commit.c" +#line 14605 "gitg-commit.c" { gint i = 0; #line 1566 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" i = 0; -#line 14746 "gitg-commit.c" +#line 14610 "gitg-commit.c" { gboolean _tmp7_ = FALSE; #line 1566 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp7_ = TRUE; #line 1566 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" while (TRUE) { -#line 14753 "gitg-commit.c" +#line 14617 "gitg-commit.c" gint _tmp9_ = 0; GitgStageStatusItem** _tmp10_ = NULL; gint _tmp10__length1 = 0; @@ -14778,13 +14642,13 @@ GFile* _tmp28_ = NULL; #line 1566 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (!_tmp7_) { -#line 14779 "gitg-commit.c" +#line 14643 "gitg-commit.c" gint _tmp8_ = 0; #line 1566 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp8_ = i; #line 1566 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" i = _tmp8_ + 1; -#line 14785 "gitg-commit.c" +#line 14649 "gitg-commit.c" } #line 1566 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp7_ = FALSE; @@ -14798,7 +14662,7 @@ if (!(_tmp9_ < _tmp10__length1)) { #line 1566 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" break; -#line 14799 "gitg-commit.c" +#line 14663 "gitg-commit.c" } #line 1568 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp11_ = files; @@ -14852,7 +14716,7 @@ _g_object_unref0 (_tmp18_); #line 1568 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp15_); -#line 14853 "gitg-commit.c" +#line 14717 "gitg-commit.c" } } } @@ -14874,7 +14738,7 @@ _data26_ = NULL; #line 1590 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 14875 "gitg-commit.c" +#line 14739 "gitg-commit.c" } @@ -14883,7 +14747,7 @@ g_atomic_int_inc (&_data27_->_ref_count_); #line 1593 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data27_; -#line 14884 "gitg-commit.c" +#line 14748 "gitg-commit.c" } @@ -14892,7 +14756,7 @@ _data27_ = (Block27Data*) _userdata_; #line 1593 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data27_->_ref_count_)) { -#line 14893 "gitg-commit.c" +#line 14757 "gitg-commit.c" GitgCommitActivity* self; #line 1593 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data27_->self; @@ -14902,7 +14766,7 @@ _g_object_unref0 (self); #line 1593 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block27Data, _data27_); -#line 14903 "gitg-commit.c" +#line 14767 "gitg-commit.c" } } @@ -14919,7 +14783,7 @@ _tmp0_ = r; #line 1629 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp0_ == GTK_RESPONSE_OK) { -#line 14920 "gitg-commit.c" +#line 14784 "gitg-commit.c" GitgStageStatusItem** _tmp1_ = NULL; gint _tmp1__length1 = 0; gboolean _tmp2_ = FALSE; @@ -14933,13 +14797,13 @@ result = _tmp2_; #line 1631 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 14934 "gitg-commit.c" +#line 14798 "gitg-commit.c" } #line 1634 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result = TRUE; #line 1634 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 14940 "gitg-commit.c" +#line 14804 "gitg-commit.c" } @@ -14948,7 +14812,7 @@ result = __lambda48_ (self, _sender, response_type); #line 1628 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 14949 "gitg-commit.c" +#line 14813 "gitg-commit.c" } @@ -14959,24 +14823,22 @@ gchar* primary = NULL; GitgStageStatusItem** _tmp1_ = NULL; gint _tmp1__length1 = 0; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + gchar* _tmp2_ = NULL; gchar* secondary = NULL; - GitgStageStatusItem** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - GitgExtUserQuery* _tmp40_ = NULL; + GitgStageStatusItem** _tmp3_ = NULL; + gint _tmp3__length1 = 0; + GitgExtUserQuery* _tmp37_ = NULL; + const gchar* _tmp38_ = NULL; + const gchar* _tmp39_ = NULL; + GitgExtUserQueryResponse* _tmp40_ = NULL; const gchar* _tmp41_ = NULL; - const gchar* _tmp42_ = NULL; - const gchar* _tmp43_ = NULL; - GitgExtUserQueryResponse* _tmp44_ = NULL; - const gchar* _tmp45_ = NULL; - GitgExtUserQueryResponse* _tmp46_ = NULL; - GitgExtUserQueryResponse** _tmp47_ = NULL; - GitgExtUserQueryResponse** _tmp48_ = NULL; - gint _tmp48__length1 = 0; - GitgExtApplication* _tmp49_ = NULL; - GitgExtApplication* _tmp50_ = NULL; - GitgExtApplication* _tmp51_ = NULL; + GitgExtUserQueryResponse* _tmp42_ = NULL; + GitgExtUserQueryResponse** _tmp43_ = NULL; + GitgExtUserQueryResponse** _tmp44_ = NULL; + gint _tmp44__length1 = 0; + GitgExtApplication* _tmp45_ = NULL; + GitgExtApplication* _tmp46_ = NULL; + GitgExtApplication* _tmp47_ = NULL; #line 1593 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_return_if_fail (self != NULL); #line 1593 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -14998,247 +14860,237 @@ #line 1595 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp1__length1 = _data27_->items_length1; #line 1595 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp2_ = g_dngettext (NULL, "Delete file", "Delete files", (gulong) _tmp1__length1); -#line 1595 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp2_ = g_strdup (g_dngettext (NULL, "Delete file", "Delete files", (gulong) _tmp1__length1)); #line 1595 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - primary = _tmp3_; + primary = _tmp2_; #line 1598 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp4_ = _data27_->items; + _tmp3_ = _data27_->items; #line 1598 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp4__length1 = _data27_->items_length1; + _tmp3__length1 = _data27_->items_length1; #line 1598 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp4__length1 == 1) { -#line 15010 "gitg-commit.c" - const gchar* _tmp5_ = NULL; - GitgStageStatusItem** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - GitgStageStatusItem* _tmp7_ = NULL; + if (_tmp3__length1 == 1) { +#line 14870 "gitg-commit.c" + GitgStageStatusItem** _tmp4_ = NULL; + gint _tmp4__length1 = 0; + GitgStageStatusItem* _tmp5_ = NULL; + gchar* _tmp6_ = NULL; + gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; -#line 1600 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp5_ = _ ("Are you sure you want to permanently delete the file `%s'?"); #line 1600 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp6_ = _data27_->items; + _tmp4_ = _data27_->items; #line 1600 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp6__length1 = _data27_->items_length1; + _tmp4__length1 = _data27_->items_length1; #line 1600 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp7_ = _tmp6_[0]; + _tmp5_ = _tmp4_[0]; #line 1600 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp8_ = gitg_stage_status_item_get_path (_tmp7_); + _tmp6_ = gitg_stage_status_item_get_path (_tmp5_); #line 1600 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 1600 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp10_ = _tmp9_; + _tmp8_ = _tmp7_; #line 1600 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp11_ = g_strdup_printf (_tmp5_, _tmp10_); + _tmp9_ = g_strdup_printf (_ ("Are you sure you want to permanently delete the file `%s'?"), _tmp8_); #line 1600 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_free0 (secondary); #line 1600 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - secondary = _tmp11_; + secondary = _tmp9_; #line 1600 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_tmp10_); -#line 15041 "gitg-commit.c" + _g_free0 (_tmp8_); +#line 14898 "gitg-commit.c" } else { gchar** paths = NULL; - GitgStageStatusItem** _tmp12_ = NULL; - gint _tmp12__length1 = 0; - gchar** _tmp13_ = NULL; + GitgStageStatusItem** _tmp10_ = NULL; + gint _tmp10__length1 = 0; + gchar** _tmp11_ = NULL; gint paths_length1 = 0; gint _paths_size_ = 0; - const gchar* _tmp29_ = NULL; - gchar** _tmp30_ = NULL; + gchar** _tmp27_ = NULL; + gint _tmp27__length1 = 0; + gchar* _tmp28_ = NULL; + gchar* _tmp29_ = NULL; + GitgStageStatusItem** _tmp30_ = NULL; gint _tmp30__length1 = 0; - gchar* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; - GitgStageStatusItem** _tmp33_ = NULL; - gint _tmp33__length1 = 0; - GitgStageStatusItem** _tmp34_ = NULL; - gint _tmp34__length1 = 0; - GitgStageStatusItem* _tmp35_ = NULL; + GitgStageStatusItem** _tmp31_ = NULL; + gint _tmp31__length1 = 0; + GitgStageStatusItem* _tmp32_ = NULL; + gchar* _tmp33_ = NULL; + gchar* _tmp34_ = NULL; + gchar* _tmp35_ = NULL; gchar* _tmp36_ = NULL; - gchar* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; - gchar* _tmp39_ = NULL; #line 1604 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp12_ = _data27_->items; + _tmp10_ = _data27_->items; #line 1604 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp12__length1 = _data27_->items_length1; + _tmp10__length1 = _data27_->items_length1; #line 1604 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp13_ = g_new0 (gchar*, (_tmp12__length1 - 1) + 1); + _tmp11_ = g_new0 (gchar*, (_tmp10__length1 - 1) + 1); #line 1604 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - paths = _tmp13_; + paths = _tmp11_; #line 1604 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - paths_length1 = _tmp12__length1 - 1; + paths_length1 = _tmp10__length1 - 1; #line 1604 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _paths_size_ = paths_length1; -#line 15075 "gitg-commit.c" +#line 14931 "gitg-commit.c" { gint i = 0; #line 1606 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" i = 0; -#line 15080 "gitg-commit.c" +#line 14936 "gitg-commit.c" { - gboolean _tmp14_ = FALSE; + gboolean _tmp12_ = FALSE; #line 1606 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp14_ = TRUE; + _tmp12_ = TRUE; #line 1606 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" while (TRUE) { -#line 15087 "gitg-commit.c" - gint _tmp16_ = 0; - GitgStageStatusItem** _tmp17_ = NULL; - gint _tmp17__length1 = 0; - gchar** _tmp18_ = NULL; +#line 14943 "gitg-commit.c" + gint _tmp14_ = 0; + GitgStageStatusItem** _tmp15_ = NULL; + gint _tmp15__length1 = 0; + gchar** _tmp16_ = NULL; + gint _tmp16__length1 = 0; + gint _tmp17_ = 0; + GitgStageStatusItem** _tmp18_ = NULL; gint _tmp18__length1 = 0; gint _tmp19_ = 0; - GitgStageStatusItem** _tmp20_ = NULL; - gint _tmp20__length1 = 0; - gint _tmp21_ = 0; - GitgStageStatusItem* _tmp22_ = NULL; + GitgStageStatusItem* _tmp20_ = NULL; + gchar* _tmp21_ = NULL; + gchar* _tmp22_ = NULL; gchar* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; + const gchar* _tmp24_ = NULL; gchar* _tmp25_ = NULL; - const gchar* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; + gchar* _tmp26_ = NULL; #line 1606 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (!_tmp14_) { -#line 15106 "gitg-commit.c" - gint _tmp15_ = 0; + if (!_tmp12_) { +#line 14962 "gitg-commit.c" + gint _tmp13_ = 0; #line 1606 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp15_ = i; + _tmp13_ = i; #line 1606 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - i = _tmp15_ + 1; -#line 15112 "gitg-commit.c" + i = _tmp13_ + 1; +#line 14968 "gitg-commit.c" } #line 1606 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp14_ = FALSE; + _tmp12_ = FALSE; #line 1606 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp16_ = i; + _tmp14_ = i; #line 1606 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp17_ = _data27_->items; + _tmp15_ = _data27_->items; #line 1606 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp17__length1 = _data27_->items_length1; + _tmp15__length1 = _data27_->items_length1; #line 1606 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (!(_tmp16_ < (_tmp17__length1 - 1))) { + if (!(_tmp14_ < (_tmp15__length1 - 1))) { #line 1606 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" break; -#line 15126 "gitg-commit.c" +#line 14982 "gitg-commit.c" } #line 1608 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp18_ = paths; + _tmp16_ = paths; #line 1608 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp18__length1 = paths_length1; + _tmp16__length1 = paths_length1; #line 1608 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp19_ = i; + _tmp17_ = i; #line 1608 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp20_ = _data27_->items; + _tmp18_ = _data27_->items; #line 1608 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp20__length1 = _data27_->items_length1; + _tmp18__length1 = _data27_->items_length1; #line 1608 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp21_ = i; + _tmp19_ = i; #line 1608 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp22_ = _tmp20_[_tmp21_]; + _tmp20_ = _tmp18_[_tmp19_]; #line 1608 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp23_ = gitg_stage_status_item_get_path (_tmp22_); + _tmp21_ = gitg_stage_status_item_get_path (_tmp20_); #line 1608 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp24_ = _tmp23_; + _tmp22_ = _tmp21_; #line 1608 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp25_ = _tmp24_; + _tmp23_ = _tmp22_; #line 1608 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp26_ = string_to_string (_tmp25_); + _tmp24_ = string_to_string (_tmp23_); #line 1608 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp27_ = g_strconcat ("`", _tmp26_, "'", NULL); + _tmp25_ = g_strconcat ("`", _tmp24_, "'", NULL); #line 1608 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_tmp18_[_tmp19_]); + _g_free0 (_tmp16_[_tmp17_]); #line 1608 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp18_[_tmp19_] = _tmp27_; + _tmp16_[_tmp17_] = _tmp25_; #line 1608 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp28_ = _tmp18_[_tmp19_]; + _tmp26_ = _tmp16_[_tmp17_]; #line 1608 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_tmp25_); -#line 15160 "gitg-commit.c" + _g_free0 (_tmp23_); +#line 15016 "gitg-commit.c" } } } #line 1611 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp29_ = _ ("Are you sure you want to permanently delete the files %s and `%s'?"); + _tmp27_ = paths; #line 1611 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp30_ = paths; + _tmp27__length1 = paths_length1; #line 1611 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp30__length1 = paths_length1; + _tmp28_ = _vala_g_strjoinv (", ", _tmp27_, _tmp27__length1); #line 1611 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp31_ = _vala_g_strjoinv (", ", _tmp30_, _tmp30__length1); -#line 1611 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp32_ = _tmp31_; + _tmp29_ = _tmp28_; #line 1611 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp33_ = _data27_->items; + _tmp30_ = _data27_->items; #line 1611 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp33__length1 = _data27_->items_length1; + _tmp30__length1 = _data27_->items_length1; #line 1611 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp34_ = _data27_->items; + _tmp31_ = _data27_->items; #line 1611 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp34__length1 = _data27_->items_length1; + _tmp31__length1 = _data27_->items_length1; #line 1611 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp35_ = _tmp33_[_tmp34__length1 - 1]; + _tmp32_ = _tmp30_[_tmp31__length1 - 1]; #line 1611 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp36_ = gitg_stage_status_item_get_path (_tmp35_); + _tmp33_ = gitg_stage_status_item_get_path (_tmp32_); #line 1611 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp37_ = _tmp36_; + _tmp34_ = _tmp33_; #line 1611 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp38_ = _tmp37_; + _tmp35_ = _tmp34_; #line 1611 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp39_ = g_strdup_printf (_tmp29_, _tmp32_, _tmp38_); + _tmp36_ = g_strdup_printf (_ ("Are you sure you want to permanently delete the files %s and `%s'?"), _tmp29_, _tmp35_); #line 1611 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_free0 (secondary); #line 1611 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - secondary = _tmp39_; + secondary = _tmp36_; #line 1611 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_tmp38_); + _g_free0 (_tmp35_); #line 1611 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_free0 (_tmp32_); + _g_free0 (_tmp29_); #line 1598 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" paths = (_vala_array_free (paths, paths_length1, (GDestroyNotify) g_free), NULL); -#line 15202 "gitg-commit.c" +#line 15056 "gitg-commit.c" } #line 1614 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp40_ = gitg_ext_user_query_new (); + _tmp37_ = gitg_ext_user_query_new (); #line 1614 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _data27_->q = _tmp40_; + _data27_->q = _tmp37_; #line 1616 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp41_ = primary; + _tmp38_ = primary; #line 1616 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_user_query_set_title (_data27_->q, _tmp41_); + gitg_ext_user_query_set_title (_data27_->q, _tmp38_); #line 1617 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp42_ = secondary; + _tmp39_ = secondary; #line 1617 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_user_query_set_message (_data27_->q, _tmp42_); + gitg_ext_user_query_set_message (_data27_->q, _tmp39_); #line 1618 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_ext_user_query_set_message_type (_data27_->q, GTK_MESSAGE_QUESTION); #line 1620 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp43_ = _ ("_Cancel"); -#line 1620 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp44_ = gitg_ext_user_query_response_new (_tmp43_, GTK_RESPONSE_CANCEL); + _tmp40_ = gitg_ext_user_query_response_new (_ ("_Cancel"), GTK_RESPONSE_CANCEL); #line 1620 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp45_ = primary; + _tmp41_ = primary; #line 1620 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp46_ = gitg_ext_user_query_response_new (_tmp45_, GTK_RESPONSE_OK); + _tmp42_ = gitg_ext_user_query_response_new (_tmp41_, GTK_RESPONSE_OK); #line 1620 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp47_ = g_new0 (GitgExtUserQueryResponse*, 2 + 1); + _tmp43_ = g_new0 (GitgExtUserQueryResponse*, 2 + 1); #line 1620 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp47_[0] = _tmp44_; + _tmp43_[0] = _tmp40_; #line 1620 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp47_[1] = _tmp46_; + _tmp43_[1] = _tmp42_; #line 1620 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp48_ = _tmp47_; + _tmp44_ = _tmp43_; #line 1620 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp48__length1 = 2; + _tmp44__length1 = 2; #line 1620 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_user_query_set_responses (_data27_->q, _tmp48_, 2); + gitg_ext_user_query_set_responses (_data27_->q, _tmp44_, 2); #line 1620 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp48_ = (_vala_array_free (_tmp48_, _tmp48__length1, (GDestroyNotify) g_object_unref), NULL); + _tmp44_ = (_vala_array_free (_tmp44_, _tmp44__length1, (GDestroyNotify) g_object_unref), NULL); #line 1625 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_ext_user_query_set_default_response (_data27_->q, GTK_RESPONSE_OK); #line 1626 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -15246,15 +15098,15 @@ #line 1628 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_signal_connect_data (_data27_->q, "response", (GCallback) ___lambda48__gitg_ext_user_query_response, block27_data_ref (_data27_), (GClosureNotify) block27_data_unref, 0); #line 1637 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp49_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); + _tmp45_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); #line 1637 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp50_ = _tmp49_; + _tmp46_ = _tmp45_; #line 1637 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp51_ = _tmp50_; + _tmp47_ = _tmp46_; #line 1637 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gitg_ext_application_user_query (_tmp51_, _data27_->q); + gitg_ext_application_user_query (_tmp47_, _data27_->q); #line 1637 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (_tmp51_); + _g_object_unref0 (_tmp47_); #line 1593 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_free0 (secondary); #line 1593 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -15263,7 +15115,7 @@ block27_data_unref (_data27_); #line 1593 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data27_ = NULL; -#line 15264 "gitg-commit.c" +#line 15116 "gitg-commit.c" } @@ -15272,7 +15124,7 @@ g_atomic_int_inc (&_data28_->_ref_count_); #line 1640 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data28_; -#line 15273 "gitg-commit.c" +#line 15125 "gitg-commit.c" } @@ -15281,7 +15133,7 @@ _data28_ = (Block28Data*) _userdata_; #line 1640 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data28_->_ref_count_)) { -#line 15282 "gitg-commit.c" +#line 15134 "gitg-commit.c" GitgCommitActivity* self; #line 1640 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data28_->self; @@ -15291,7 +15143,7 @@ _g_object_unref0 (self); #line 1640 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block28Data, _data28_); -#line 15292 "gitg-commit.c" +#line 15144 "gitg-commit.c" } } @@ -15308,14 +15160,14 @@ _tmp0__length1 = _data28_->sitems_length1; #line 1663 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_on_unstaged_activated (self, _tmp0_, _tmp0__length1); -#line 15309 "gitg-commit.c" +#line 15161 "gitg-commit.c" } static void ____lambda49__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 1662 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" ___lambda49_ (self); -#line 15316 "gitg-commit.c" +#line 15168 "gitg-commit.c" } @@ -15331,14 +15183,14 @@ _tmp0__length1 = _data28_->sitems_length1; #line 1675 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_on_staged_activated (self, _tmp0_, _tmp0__length1); -#line 15332 "gitg-commit.c" +#line 15184 "gitg-commit.c" } static void ____lambda50__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 1674 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" ___lambda50_ (self); -#line 15339 "gitg-commit.c" +#line 15191 "gitg-commit.c" } @@ -15354,14 +15206,14 @@ _tmp0__length1 = _data28_->sitems_length1; #line 1687 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_on_discard_menu_activated (self, _tmp0_, _tmp0__length1); -#line 15355 "gitg-commit.c" +#line 15207 "gitg-commit.c" } static void ____lambda51__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 1686 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" ___lambda51_ (self); -#line 15362 "gitg-commit.c" +#line 15214 "gitg-commit.c" } @@ -15377,14 +15229,14 @@ _tmp0__length1 = _data28_->sitems_length1; #line 1699 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_on_delete_menu_activated (self, _tmp0_, _tmp0__length1); -#line 15378 "gitg-commit.c" +#line 15230 "gitg-commit.c" } static void ____lambda52__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 1698 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" ___lambda52_ (self); -#line 15385 "gitg-commit.c" +#line 15237 "gitg-commit.c" } @@ -15400,14 +15252,14 @@ _tmp0__length1 = _data28_->sitems_length1; #line 1727 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_do_edit_items (self, _tmp0_, _tmp0__length1); -#line 15401 "gitg-commit.c" +#line 15253 "gitg-commit.c" } static void ____lambda53__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 1726 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" ___lambda53_ (self); -#line 15408 "gitg-commit.c" +#line 15260 "gitg-commit.c" } @@ -15434,12 +15286,12 @@ gint _tmp10__length1 = 0; gboolean _tmp11_ = FALSE; GitgCommitSidebarItemType _tmp12_ = 0; - GitgCommitSidebarItemType _tmp21_ = 0; - GitgCommitSidebarItemType _tmp29_ = 0; - GitgCommitSidebarItemType _tmp37_ = 0; + GitgCommitSidebarItemType _tmp20_ = 0; + GitgCommitSidebarItemType _tmp27_ = 0; + GitgCommitSidebarItemType _tmp34_ = 0; gboolean canedit = FALSE; - gboolean _tmp46_ = FALSE; - gboolean _tmp56_ = FALSE; + gboolean _tmp42_ = FALSE; + gboolean _tmp52_ = FALSE; #line 1640 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_return_if_fail (self != NULL); #line 1640 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -15478,7 +15330,7 @@ _data28_ = NULL; #line 1646 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 15479 "gitg-commit.c" +#line 15331 "gitg-commit.c" } #line 1651 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp6_ = items; @@ -15506,253 +15358,241 @@ if (_tmp12_ == GITG_COMMIT_SIDEBAR_ITEM_TYPE_UNSTAGED) { #line 1654 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp11_ = TRUE; -#line 15507 "gitg-commit.c" +#line 15359 "gitg-commit.c" } else { GitgCommitSidebarItemType _tmp13_ = 0; #line 1655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp13_ = type; #line 1655 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp11_ = _tmp13_ == GITG_COMMIT_SIDEBAR_ITEM_TYPE_UNTRACKED; -#line 15514 "gitg-commit.c" +#line 15366 "gitg-commit.c" } #line 1654 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp11_) { -#line 15518 "gitg-commit.c" +#line 15370 "gitg-commit.c" GtkMenuItem* stage = NULL; - const gchar* _tmp14_ = NULL; + GtkMenuItem* _tmp14_ = NULL; GtkMenuItem* _tmp15_ = NULL; - GtkMenuItem* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; - GtkMenu* _tmp18_ = NULL; + gboolean _tmp16_ = FALSE; + GtkMenu* _tmp17_ = NULL; + GtkMenuItem* _tmp18_ = NULL; GtkMenuItem* _tmp19_ = NULL; - GtkMenuItem* _tmp20_ = NULL; #line 1657 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp14_ = _ ("_Stage changes"); + _tmp14_ = (GtkMenuItem*) gtk_menu_item_new_with_mnemonic (_ ("_Stage changes")); #line 1657 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp15_ = (GtkMenuItem*) gtk_menu_item_new_with_mnemonic (_tmp14_); + g_object_ref_sink (_tmp14_); #line 1657 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - g_object_ref_sink (_tmp15_); -#line 1657 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - stage = _tmp15_; + stage = _tmp14_; #line 1658 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp16_ = stage; + _tmp15_ = stage; #line 1658 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp17_ = hasitems; + _tmp16_ = hasitems; #line 1658 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gtk_widget_set_sensitive ((GtkWidget*) _tmp16_, _tmp17_); + gtk_widget_set_sensitive ((GtkWidget*) _tmp15_, _tmp16_); #line 1660 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp18_ = menu; + _tmp17_ = menu; #line 1660 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp19_ = stage; + _tmp18_ = stage; #line 1660 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gtk_menu_shell_append ((GtkMenuShell*) _tmp18_, (GtkWidget*) _tmp19_); + gtk_menu_shell_append ((GtkMenuShell*) _tmp17_, (GtkWidget*) _tmp18_); #line 1662 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp20_ = stage; + _tmp19_ = stage; #line 1662 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - g_signal_connect_data (_tmp20_, "activate", (GCallback) ____lambda49__gtk_menu_item_activate, block28_data_ref (_data28_), (GClosureNotify) block28_data_unref, 0); + g_signal_connect_data (_tmp19_, "activate", (GCallback) ____lambda49__gtk_menu_item_activate, block28_data_ref (_data28_), (GClosureNotify) block28_data_unref, 0); #line 1654 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (stage); -#line 15553 "gitg-commit.c" +#line 15402 "gitg-commit.c" } #line 1667 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp21_ = type; + _tmp20_ = type; #line 1667 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp21_ == GITG_COMMIT_SIDEBAR_ITEM_TYPE_STAGED) { -#line 15559 "gitg-commit.c" + if (_tmp20_ == GITG_COMMIT_SIDEBAR_ITEM_TYPE_STAGED) { +#line 15408 "gitg-commit.c" GtkMenuItem* stage = NULL; - const gchar* _tmp22_ = NULL; - GtkMenuItem* _tmp23_ = NULL; - GtkMenuItem* _tmp24_ = NULL; - gboolean _tmp25_ = FALSE; - GtkMenu* _tmp26_ = NULL; - GtkMenuItem* _tmp27_ = NULL; - GtkMenuItem* _tmp28_ = NULL; -#line 1669 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp22_ = _ ("_Unstage changes"); + GtkMenuItem* _tmp21_ = NULL; + GtkMenuItem* _tmp22_ = NULL; + gboolean _tmp23_ = FALSE; + GtkMenu* _tmp24_ = NULL; + GtkMenuItem* _tmp25_ = NULL; + GtkMenuItem* _tmp26_ = NULL; #line 1669 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp23_ = (GtkMenuItem*) gtk_menu_item_new_with_mnemonic (_tmp22_); + _tmp21_ = (GtkMenuItem*) gtk_menu_item_new_with_mnemonic (_ ("_Unstage changes")); #line 1669 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - g_object_ref_sink (_tmp23_); + g_object_ref_sink (_tmp21_); #line 1669 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - stage = _tmp23_; + stage = _tmp21_; #line 1670 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp24_ = stage; + _tmp22_ = stage; #line 1670 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp25_ = hasitems; + _tmp23_ = hasitems; #line 1670 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gtk_widget_set_sensitive ((GtkWidget*) _tmp24_, _tmp25_); + gtk_widget_set_sensitive ((GtkWidget*) _tmp22_, _tmp23_); #line 1672 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp26_ = menu; + _tmp24_ = menu; #line 1672 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp27_ = stage; + _tmp25_ = stage; #line 1672 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gtk_menu_shell_append ((GtkMenuShell*) _tmp26_, (GtkWidget*) _tmp27_); + gtk_menu_shell_append ((GtkMenuShell*) _tmp24_, (GtkWidget*) _tmp25_); #line 1674 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp28_ = stage; + _tmp26_ = stage; #line 1674 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - g_signal_connect_data (_tmp28_, "activate", (GCallback) ____lambda50__gtk_menu_item_activate, block28_data_ref (_data28_), (GClosureNotify) block28_data_unref, 0); + g_signal_connect_data (_tmp26_, "activate", (GCallback) ____lambda50__gtk_menu_item_activate, block28_data_ref (_data28_), (GClosureNotify) block28_data_unref, 0); #line 1667 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (stage); -#line 15594 "gitg-commit.c" +#line 15440 "gitg-commit.c" } #line 1679 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp29_ = type; + _tmp27_ = type; #line 1679 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp29_ == GITG_COMMIT_SIDEBAR_ITEM_TYPE_UNSTAGED) { -#line 15600 "gitg-commit.c" + if (_tmp27_ == GITG_COMMIT_SIDEBAR_ITEM_TYPE_UNSTAGED) { +#line 15446 "gitg-commit.c" GtkMenuItem* discard = NULL; - const gchar* _tmp30_ = NULL; - GtkMenuItem* _tmp31_ = NULL; + GtkMenuItem* _tmp28_ = NULL; + GtkMenuItem* _tmp29_ = NULL; + gboolean _tmp30_ = FALSE; + GtkMenu* _tmp31_ = NULL; GtkMenuItem* _tmp32_ = NULL; - gboolean _tmp33_ = FALSE; - GtkMenu* _tmp34_ = NULL; - GtkMenuItem* _tmp35_ = NULL; - GtkMenuItem* _tmp36_ = NULL; -#line 1681 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp30_ = _ ("_Discard changes"); + GtkMenuItem* _tmp33_ = NULL; #line 1681 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp31_ = (GtkMenuItem*) gtk_menu_item_new_with_mnemonic (_tmp30_); + _tmp28_ = (GtkMenuItem*) gtk_menu_item_new_with_mnemonic (_ ("_Discard changes")); #line 1681 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - g_object_ref_sink (_tmp31_); + g_object_ref_sink (_tmp28_); #line 1681 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - discard = _tmp31_; + discard = _tmp28_; #line 1682 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp32_ = discard; + _tmp29_ = discard; #line 1682 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp33_ = hasitems; + _tmp30_ = hasitems; #line 1682 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gtk_widget_set_sensitive ((GtkWidget*) _tmp32_, _tmp33_); + gtk_widget_set_sensitive ((GtkWidget*) _tmp29_, _tmp30_); #line 1684 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp34_ = menu; + _tmp31_ = menu; #line 1684 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp35_ = discard; + _tmp32_ = discard; #line 1684 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gtk_menu_shell_append ((GtkMenuShell*) _tmp34_, (GtkWidget*) _tmp35_); + gtk_menu_shell_append ((GtkMenuShell*) _tmp31_, (GtkWidget*) _tmp32_); #line 1686 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp36_ = discard; + _tmp33_ = discard; #line 1686 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - g_signal_connect_data (_tmp36_, "activate", (GCallback) ____lambda51__gtk_menu_item_activate, block28_data_ref (_data28_), (GClosureNotify) block28_data_unref, 0); + g_signal_connect_data (_tmp33_, "activate", (GCallback) ____lambda51__gtk_menu_item_activate, block28_data_ref (_data28_), (GClosureNotify) block28_data_unref, 0); #line 1679 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (discard); -#line 15635 "gitg-commit.c" +#line 15478 "gitg-commit.c" } #line 1691 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp37_ = type; + _tmp34_ = type; #line 1691 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp37_ == GITG_COMMIT_SIDEBAR_ITEM_TYPE_UNTRACKED) { -#line 15641 "gitg-commit.c" + if (_tmp34_ == GITG_COMMIT_SIDEBAR_ITEM_TYPE_UNTRACKED) { +#line 15484 "gitg-commit.c" GtkMenuItem* del = NULL; - GitgStageStatusItem** _tmp38_ = NULL; - gint _tmp38__length1 = 0; - const gchar* _tmp39_ = NULL; + GitgStageStatusItem** _tmp35_ = NULL; + gint _tmp35__length1 = 0; + GtkMenuItem* _tmp36_ = NULL; + GtkMenuItem* _tmp37_ = NULL; + gboolean _tmp38_ = FALSE; + GtkMenu* _tmp39_ = NULL; GtkMenuItem* _tmp40_ = NULL; GtkMenuItem* _tmp41_ = NULL; - gboolean _tmp42_ = FALSE; - GtkMenu* _tmp43_ = NULL; - GtkMenuItem* _tmp44_ = NULL; - GtkMenuItem* _tmp45_ = NULL; #line 1693 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp38_ = _data28_->sitems; + _tmp35_ = _data28_->sitems; #line 1693 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp38__length1 = _data28_->sitems_length1; + _tmp35__length1 = _data28_->sitems_length1; #line 1693 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp39_ = g_dngettext (NULL, "D_elete file", "D_elete files", (gulong) _tmp38__length1); + _tmp36_ = (GtkMenuItem*) gtk_menu_item_new_with_mnemonic (g_dngettext (NULL, "D_elete file", "D_elete files", (gulong) _tmp35__length1)); #line 1693 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp40_ = (GtkMenuItem*) gtk_menu_item_new_with_mnemonic (_tmp39_); + g_object_ref_sink (_tmp36_); #line 1693 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - g_object_ref_sink (_tmp40_); -#line 1693 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - del = _tmp40_; + del = _tmp36_; #line 1694 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp41_ = del; + _tmp37_ = del; #line 1694 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp42_ = hasitems; + _tmp38_ = hasitems; #line 1694 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gtk_widget_set_sensitive ((GtkWidget*) _tmp41_, _tmp42_); + gtk_widget_set_sensitive ((GtkWidget*) _tmp37_, _tmp38_); #line 1696 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp43_ = menu; + _tmp39_ = menu; #line 1696 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp44_ = del; + _tmp40_ = del; #line 1696 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gtk_menu_shell_append ((GtkMenuShell*) _tmp43_, (GtkWidget*) _tmp44_); + gtk_menu_shell_append ((GtkMenuShell*) _tmp39_, (GtkWidget*) _tmp40_); #line 1698 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp45_ = del; + _tmp41_ = del; #line 1698 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - g_signal_connect_data (_tmp45_, "activate", (GCallback) ____lambda52__gtk_menu_item_activate, block28_data_ref (_data28_), (GClosureNotify) block28_data_unref, 0); + g_signal_connect_data (_tmp41_, "activate", (GCallback) ____lambda52__gtk_menu_item_activate, block28_data_ref (_data28_), (GClosureNotify) block28_data_unref, 0); #line 1691 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (del); -#line 15682 "gitg-commit.c" +#line 15522 "gitg-commit.c" } #line 1703 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" canedit = FALSE; #line 1705 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp46_ = hasitems; + _tmp42_ = hasitems; #line 1705 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp46_) { -#line 15690 "gitg-commit.c" - GitgStageStatusItem** _tmp47_ = NULL; - gint _tmp47__length1 = 0; + if (_tmp42_) { +#line 15530 "gitg-commit.c" + GitgStageStatusItem** _tmp43_ = NULL; + gint _tmp43__length1 = 0; #line 1707 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" canedit = TRUE; #line 1709 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp47_ = _data28_->sitems; + _tmp43_ = _data28_->sitems; #line 1709 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp47__length1 = _data28_->sitems_length1; -#line 15699 "gitg-commit.c" + _tmp43__length1 = _data28_->sitems_length1; +#line 15539 "gitg-commit.c" { GitgStageStatusItem** item_collection = NULL; gint item_collection_length1 = 0; gint _item_collection_size_ = 0; gint item_it = 0; #line 1709 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - item_collection = _tmp47_; + item_collection = _tmp43_; #line 1709 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - item_collection_length1 = _tmp47__length1; + item_collection_length1 = _tmp43__length1; #line 1709 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - for (item_it = 0; item_it < _tmp47__length1; item_it = item_it + 1) { -#line 15711 "gitg-commit.c" - GitgStageStatusItem* _tmp48_ = NULL; + for (item_it = 0; item_it < _tmp43__length1; item_it = item_it + 1) { +#line 15551 "gitg-commit.c" + GitgStageStatusItem* _tmp44_ = NULL; GitgStageStatusItem* item = NULL; #line 1709 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp48_ = _g_object_ref0 (item_collection[item_it]); + _tmp44_ = _g_object_ref0 (item_collection[item_it]); #line 1709 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - item = _tmp48_; -#line 15718 "gitg-commit.c" + item = _tmp44_; +#line 15558 "gitg-commit.c" { GitgStageStatusFile* file = NULL; - GitgStageStatusItem* _tmp49_ = NULL; - GitgStageStatusFile* _tmp50_ = NULL; - gboolean _tmp51_ = FALSE; - GitgStageStatusFile* _tmp52_ = NULL; + GitgStageStatusItem* _tmp45_ = NULL; + GitgStageStatusFile* _tmp46_ = NULL; + gboolean _tmp47_ = FALSE; + GitgStageStatusFile* _tmp48_ = NULL; #line 1711 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp49_ = item; + _tmp45_ = item; #line 1711 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp50_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp49_, GITG_TYPE_STAGE_STATUS_FILE) ? ((GitgStageStatusFile*) _tmp49_) : NULL); + _tmp46_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp45_, GITG_TYPE_STAGE_STATUS_FILE) ? ((GitgStageStatusFile*) _tmp45_) : NULL); #line 1711 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - file = _tmp50_; + file = _tmp46_; #line 1713 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp52_ = file; + _tmp48_ = file; #line 1713 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp52_ == NULL) { + if (_tmp48_ == NULL) { #line 1713 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp51_ = TRUE; -#line 15737 "gitg-commit.c" + _tmp47_ = TRUE; +#line 15577 "gitg-commit.c" } else { - GitgStageStatusFile* _tmp53_ = NULL; - GgitStatusFlags _tmp54_ = 0; - GgitStatusFlags _tmp55_ = 0; + GitgStageStatusFile* _tmp49_ = NULL; + GgitStatusFlags _tmp50_ = 0; + GgitStatusFlags _tmp51_ = 0; #line 1713 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp53_ = file; + _tmp49_ = file; #line 1713 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp54_ = gitg_stage_status_file_get_flags (_tmp53_); + _tmp50_ = gitg_stage_status_file_get_flags (_tmp49_); #line 1713 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp55_ = _tmp54_; + _tmp51_ = _tmp50_; #line 1713 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp51_ = (_tmp55_ & GGIT_STATUS_WORKING_TREE_DELETED) != 0; -#line 15750 "gitg-commit.c" + _tmp47_ = (_tmp51_ & GGIT_STATUS_WORKING_TREE_DELETED) != 0; +#line 15590 "gitg-commit.c" } #line 1713 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp51_) { + if (_tmp47_) { #line 1715 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" canedit = FALSE; #line 1716 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -15761,49 +15601,46 @@ _g_object_unref0 (item); #line 1716 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" break; -#line 15762 "gitg-commit.c" +#line 15602 "gitg-commit.c" } #line 1709 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (file); #line 1709 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (item); -#line 15768 "gitg-commit.c" +#line 15608 "gitg-commit.c" } } } } #line 1721 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp56_ = canedit; + _tmp52_ = canedit; #line 1721 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - if (_tmp56_) { -#line 15777 "gitg-commit.c" + if (_tmp52_) { +#line 15617 "gitg-commit.c" GtkMenuItem* edit = NULL; - const gchar* _tmp57_ = NULL; - GtkMenuItem* _tmp58_ = NULL; - GtkMenu* _tmp59_ = NULL; - GtkMenuItem* _tmp60_ = NULL; - GtkMenuItem* _tmp61_ = NULL; + GtkMenuItem* _tmp53_ = NULL; + GtkMenu* _tmp54_ = NULL; + GtkMenuItem* _tmp55_ = NULL; + GtkMenuItem* _tmp56_ = NULL; #line 1723 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp57_ = _ ("_Edit file"); + _tmp53_ = (GtkMenuItem*) gtk_menu_item_new_with_mnemonic (_ ("_Edit file")); #line 1723 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp58_ = (GtkMenuItem*) gtk_menu_item_new_with_mnemonic (_tmp57_); + g_object_ref_sink (_tmp53_); #line 1723 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - g_object_ref_sink (_tmp58_); -#line 1723 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - edit = _tmp58_; + edit = _tmp53_; #line 1724 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp59_ = menu; + _tmp54_ = menu; #line 1724 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp60_ = edit; + _tmp55_ = edit; #line 1724 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - gtk_menu_shell_append ((GtkMenuShell*) _tmp59_, (GtkWidget*) _tmp60_); + gtk_menu_shell_append ((GtkMenuShell*) _tmp54_, (GtkWidget*) _tmp55_); #line 1726 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp61_ = edit; + _tmp56_ = edit; #line 1726 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - g_signal_connect_data (_tmp61_, "activate", (GCallback) ____lambda53__gtk_menu_item_activate, block28_data_ref (_data28_), (GClosureNotify) block28_data_unref, 0); + g_signal_connect_data (_tmp56_, "activate", (GCallback) ____lambda53__gtk_menu_item_activate, block28_data_ref (_data28_), (GClosureNotify) block28_data_unref, 0); #line 1721 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (edit); -#line 15804 "gitg-commit.c" +#line 15641 "gitg-commit.c" } #line 1640 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" items = (_vala_array_free (items, items_length1, (GDestroyNotify) g_object_unref), NULL); @@ -15811,7 +15648,7 @@ block28_data_unref (_data28_); #line 1640 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data28_ = NULL; -#line 15812 "gitg-commit.c" +#line 15649 "gitg-commit.c" } @@ -15839,19 +15676,19 @@ ret_length1 = _tmp0__length1; #line 1734 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _ret_size_ = ret_length1; -#line 15840 "gitg-commit.c" +#line 15677 "gitg-commit.c" { gint i = 0; #line 1736 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" i = 0; -#line 15845 "gitg-commit.c" +#line 15682 "gitg-commit.c" { gboolean _tmp2_ = FALSE; #line 1736 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp2_ = TRUE; #line 1736 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" while (TRUE) { -#line 15852 "gitg-commit.c" +#line 15689 "gitg-commit.c" gint _tmp4_ = 0; GitgStageStatusItem** _tmp5_ = NULL; gint _tmp5__length1 = 0; @@ -15868,13 +15705,13 @@ GitgStageStatusItem* _tmp14_ = NULL; #line 1736 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (!_tmp2_) { -#line 15869 "gitg-commit.c" +#line 15706 "gitg-commit.c" gint _tmp3_ = 0; #line 1736 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp3_ = i; #line 1736 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" i = _tmp3_ + 1; -#line 15875 "gitg-commit.c" +#line 15712 "gitg-commit.c" } #line 1736 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp2_ = FALSE; @@ -15888,7 +15725,7 @@ if (!(_tmp4_ < _tmp5__length1)) { #line 1736 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" break; -#line 15889 "gitg-commit.c" +#line 15726 "gitg-commit.c" } #line 1738 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp6_ = ret; @@ -15916,7 +15753,7 @@ _tmp6_[_tmp7_] = _tmp13_; #line 1738 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp14_ = _tmp6_[_tmp7_]; -#line 15917 "gitg-commit.c" +#line 15754 "gitg-commit.c" } } } @@ -15928,13 +15765,13 @@ if (result_length1) { #line 1741 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" *result_length1 = _tmp15__length1; -#line 15929 "gitg-commit.c" +#line 15766 "gitg-commit.c" } #line 1741 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result = _tmp15_; #line 1741 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 15935 "gitg-commit.c" +#line 15772 "gitg-commit.c" } @@ -15986,30 +15823,30 @@ if (result_length1) { #line 1746 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" *result_length1 = _tmp10__length1; -#line 15987 "gitg-commit.c" +#line 15824 "gitg-commit.c" } #line 1746 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result = _tmp10_; #line 1746 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 15993 "gitg-commit.c" +#line 15830 "gitg-commit.c" } -static void _vala_array_add7 (GitgStageStatusItem*** array, int* length, int* size, GitgStageStatusItem* value) { +static void _vala_array_add7 (GitgStageStatusItem** * array, int* length, int* size, GitgStageStatusItem* value) { #line 1770 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if ((*length) == (*size)) { #line 1770 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1770 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" *array = g_renew (GitgStageStatusItem*, *array, (*size) + 1); -#line 16004 "gitg-commit.c" +#line 15841 "gitg-commit.c" } #line 1770 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" (*array)[(*length)++] = value; #line 1770 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" (*array)[*length] = NULL; -#line 16010 "gitg-commit.c" +#line 15847 "gitg-commit.c" } @@ -16051,7 +15888,7 @@ _tmp3_ = items; #line 1756 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp3__length1 = items_length1; -#line 16052 "gitg-commit.c" +#line 15889 "gitg-commit.c" { GitgSidebarItem** item_collection = NULL; gint item_collection_length1 = 0; @@ -16063,14 +15900,14 @@ item_collection_length1 = _tmp3__length1; #line 1756 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" for (item_it = 0; item_it < _tmp3__length1; item_it = item_it + 1) { -#line 16064 "gitg-commit.c" +#line 15901 "gitg-commit.c" GitgSidebarItem* _tmp4_ = NULL; GitgSidebarItem* item = NULL; #line 1756 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp4_ = _g_object_ref0 (item_collection[item_it]); #line 1756 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" item = _tmp4_; -#line 16071 "gitg-commit.c" +#line 15908 "gitg-commit.c" { GitgSidebarStoreSidebarHeader* header = NULL; GitgSidebarItem* _tmp5_ = NULL; @@ -16090,7 +15927,7 @@ _tmp7_ = header; #line 1760 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp7_ != NULL) { -#line 16091 "gitg-commit.c" +#line 15928 "gitg-commit.c" GitgSidebarStoreSidebarHeader* _tmp8_ = NULL; guint _tmp9_ = 0U; guint _tmp10_ = 0U; @@ -16119,7 +15956,7 @@ if (result_length1) { #line 1763 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" *result_length1 = _tmp14__length1; -#line 16120 "gitg-commit.c" +#line 15957 "gitg-commit.c" } #line 1763 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result = _tmp14_; @@ -16133,11 +15970,11 @@ if (type) { #line 1763 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" *type = _vala_type; -#line 16134 "gitg-commit.c" +#line 15971 "gitg-commit.c" } #line 1763 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 16138 "gitg-commit.c" +#line 15975 "gitg-commit.c" } #line 1766 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp15_ = item; @@ -16149,7 +15986,7 @@ _tmp17_ = sitem; #line 1768 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp17_ != NULL) { -#line 16150 "gitg-commit.c" +#line 15987 "gitg-commit.c" GitgStageStatusItem** _tmp18_ = NULL; gint _tmp18__length1 = 0; GitgCommitSidebarItem* _tmp19_ = NULL; @@ -16181,7 +16018,7 @@ _tmp25_ = _tmp24_; #line 1771 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _vala_type = _tmp25_; -#line 16182 "gitg-commit.c" +#line 16019 "gitg-commit.c" } #line 1756 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (sitem); @@ -16189,7 +16026,7 @@ _g_object_unref0 (header); #line 1756 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (item); -#line 16190 "gitg-commit.c" +#line 16027 "gitg-commit.c" } } } @@ -16201,7 +16038,7 @@ if (result_length1) { #line 1775 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" *result_length1 = _tmp26__length1; -#line 16202 "gitg-commit.c" +#line 16039 "gitg-commit.c" } #line 1775 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result = _tmp26_; @@ -16209,11 +16046,11 @@ if (type) { #line 1775 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" *type = _vala_type; -#line 16210 "gitg-commit.c" +#line 16047 "gitg-commit.c" } #line 1775 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 16214 "gitg-commit.c" +#line 16051 "gitg-commit.c" } @@ -16252,7 +16089,7 @@ _tmp4__length1 = sitems_length1; #line 1784 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp4__length1 == 0) { -#line 16253 "gitg-commit.c" +#line 16090 "gitg-commit.c" GitgCommitPaned* _tmp5_ = NULL; GitgDiffView* _tmp6_ = NULL; GitgDiffView* _tmp7_ = NULL; @@ -16270,13 +16107,13 @@ sitems = (_vala_array_free (sitems, sitems_length1, (GDestroyNotify) g_object_unref), NULL); #line 1788 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 16271 "gitg-commit.c" +#line 16108 "gitg-commit.c" } #line 1791 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp8_ = type; #line 1791 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp8_ == GITG_COMMIT_SIDEBAR_ITEM_TYPE_SUBMODULE) { -#line 16277 "gitg-commit.c" +#line 16114 "gitg-commit.c" GitgStageStatusItem** _tmp9_ = NULL; gint _tmp9__length1 = 0; GitgStageStatusItem* _tmp10_ = NULL; @@ -16288,14 +16125,14 @@ _tmp10_ = _tmp9_[0]; #line 1793 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_show_submodule_diff (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GITG_TYPE_STAGE_STATUS_SUBMODULE, GitgStageStatusSubmodule)); -#line 16289 "gitg-commit.c" +#line 16126 "gitg-commit.c" } else { GitgCommitSidebarItemType _tmp11_ = 0; #line 1795 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp11_ = type; #line 1795 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp11_ == GITG_COMMIT_SIDEBAR_ITEM_TYPE_STAGED) { -#line 16296 "gitg-commit.c" +#line 16133 "gitg-commit.c" GitgStageStatusItem** _tmp12_ = NULL; gint _tmp12__length1 = 0; #line 1797 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -16304,7 +16141,7 @@ _tmp12__length1 = sitems_length1; #line 1797 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_show_staged_diff (self, _tmp12_, _tmp12__length1); -#line 16305 "gitg-commit.c" +#line 16142 "gitg-commit.c" } else { GitgStageStatusItem** _tmp13_ = NULL; gint _tmp13__length1 = 0; @@ -16314,12 +16151,12 @@ _tmp13__length1 = sitems_length1; #line 1801 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_show_unstaged_diff (self, _tmp13_, _tmp13__length1); -#line 16315 "gitg-commit.c" +#line 16152 "gitg-commit.c" } } #line 1778 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" sitems = (_vala_array_free (sitems, sitems_length1, (GDestroyNotify) g_object_unref), NULL); -#line 16320 "gitg-commit.c" +#line 16157 "gitg-commit.c" } @@ -16380,7 +16217,7 @@ _tmp10__length1 = sitems_length1; #line 1812 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp10__length1 != 0) { -#line 16381 "gitg-commit.c" +#line 16218 "gitg-commit.c" gboolean _tmp11_ = FALSE; GitgCommitSidebarItemType _tmp12_ = 0; #line 1812 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -16389,26 +16226,26 @@ if (_tmp12_ == GITG_COMMIT_SIDEBAR_ITEM_TYPE_UNSTAGED) { #line 1812 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp11_ = TRUE; -#line 16390 "gitg-commit.c" +#line 16227 "gitg-commit.c" } else { GitgCommitSidebarItemType _tmp13_ = 0; #line 1813 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp13_ = type; #line 1813 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp11_ = _tmp13_ == GITG_COMMIT_SIDEBAR_ITEM_TYPE_UNTRACKED; -#line 16397 "gitg-commit.c" +#line 16234 "gitg-commit.c" } #line 1812 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp9_ = _tmp11_; -#line 16401 "gitg-commit.c" +#line 16238 "gitg-commit.c" } else { #line 1812 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp9_ = FALSE; -#line 16405 "gitg-commit.c" +#line 16242 "gitg-commit.c" } #line 1812 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp9_) { -#line 16409 "gitg-commit.c" +#line 16246 "gitg-commit.c" GitgStageStatusItem** _tmp14_ = NULL; gint _tmp14__length1 = 0; #line 1815 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -16417,13 +16254,13 @@ _tmp14__length1 = sitems_length1; #line 1815 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_on_unstaged_activated (self, _tmp14_, _tmp14__length1); -#line 16418 "gitg-commit.c" +#line 16255 "gitg-commit.c" } #line 1805 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" sitems = (_vala_array_free (sitems, sitems_length1, (GDestroyNotify) g_object_unref), NULL); #line 1805 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" sel = (_vala_array_free (sel, sel_length1, (GDestroyNotify) g_object_unref), NULL); -#line 16424 "gitg-commit.c" +#line 16261 "gitg-commit.c" } @@ -16484,21 +16321,21 @@ _tmp10__length1 = sitems_length1; #line 1826 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp10__length1 != 0) { -#line 16485 "gitg-commit.c" +#line 16322 "gitg-commit.c" GitgCommitSidebarItemType _tmp11_ = 0; #line 1826 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp11_ = type; #line 1826 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp9_ = _tmp11_ == GITG_COMMIT_SIDEBAR_ITEM_TYPE_STAGED; -#line 16491 "gitg-commit.c" +#line 16328 "gitg-commit.c" } else { #line 1826 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp9_ = FALSE; -#line 16495 "gitg-commit.c" +#line 16332 "gitg-commit.c" } #line 1826 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp9_) { -#line 16499 "gitg-commit.c" +#line 16336 "gitg-commit.c" GitgStageStatusItem** _tmp12_ = NULL; gint _tmp12__length1 = 0; #line 1828 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -16507,13 +16344,13 @@ _tmp12__length1 = sitems_length1; #line 1828 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_on_staged_activated (self, _tmp12_, _tmp12__length1); -#line 16508 "gitg-commit.c" +#line 16345 "gitg-commit.c" } #line 1819 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" sitems = (_vala_array_free (sitems, sitems_length1, (GDestroyNotify) g_object_unref), NULL); #line 1819 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" sel = (_vala_array_free (sel, sel_length1, (GDestroyNotify) g_object_unref), NULL); -#line 16514 "gitg-commit.c" +#line 16351 "gitg-commit.c" } @@ -16522,7 +16359,7 @@ g_atomic_int_inc (&_data29_->_ref_count_); #line 1832 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return _data29_; -#line 16523 "gitg-commit.c" +#line 16360 "gitg-commit.c" } @@ -16531,7 +16368,7 @@ _data29_ = (Block29Data*) _userdata_; #line 1832 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (g_atomic_int_dec_and_test (&_data29_->_ref_count_)) { -#line 16532 "gitg-commit.c" +#line 16369 "gitg-commit.c" GitgCommitActivity* self; #line 1832 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = _data29_->self; @@ -16543,7 +16380,7 @@ _g_object_unref0 (self); #line 1832 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_slice_free (Block29Data, _data29_); -#line 16544 "gitg-commit.c" +#line 16381 "gitg-commit.c" } } @@ -16557,7 +16394,7 @@ _tmp0__target = self->priv->d_update_diff_callback_target; #line 1837 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp0_ != NULL) { -#line 16558 "gitg-commit.c" +#line 16395 "gitg-commit.c" GitgCommitActivityUpdateDiffCallback _tmp1_ = NULL; void* _tmp1__target = NULL; #line 1839 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -16566,7 +16403,7 @@ _tmp1__target = self->priv->d_update_diff_callback_target; #line 1839 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp1_ (_tmp1__target); -#line 16567 "gitg-commit.c" +#line 16404 "gitg-commit.c" } } @@ -16574,7 +16411,7 @@ static void ___lambda54__gitg_diff_view_options_changed (GitgDiffView* _sender, gpointer self) { #line 1836 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" __lambda54_ ((GitgCommitActivity*) self); -#line 16575 "gitg-commit.c" +#line 16412 "gitg-commit.c" } @@ -16590,28 +16427,28 @@ _tmp2_ = _tmp1_; #line 1847 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_diff_view_set_diff (_tmp2_, NULL); -#line 16591 "gitg-commit.c" +#line 16428 "gitg-commit.c" } static void ___lambda55__gitg_sidebar_deselected (GitgSidebar* _sender, gpointer self) { #line 1846 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" __lambda55_ ((GitgCommitActivity*) self); -#line 16598 "gitg-commit.c" +#line 16435 "gitg-commit.c" } static void _gitg_commit_activity_on_stage_selected_items_gitg_commit_sidebar_stage_selection (GitgCommitSidebar* _sender, gpointer self) { #line 1850 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_on_stage_selected_items ((GitgCommitActivity*) self); -#line 16605 "gitg-commit.c" +#line 16442 "gitg-commit.c" } static void _gitg_commit_activity_on_unstage_selected_items_gitg_commit_sidebar_unstage_selection (GitgCommitSidebar* _sender, gpointer self) { #line 1851 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_on_unstage_selected_items ((GitgCommitActivity*) self); -#line 16612 "gitg-commit.c" +#line 16449 "gitg-commit.c" } @@ -16670,21 +16507,21 @@ _tmp10__length1 = sitems_length1; #line 1859 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp10__length1 != 0) { -#line 16671 "gitg-commit.c" +#line 16508 "gitg-commit.c" GitgCommitSidebarItemType _tmp11_ = 0; #line 1859 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp11_ = type; #line 1859 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp9_ = _tmp11_ == GITG_COMMIT_SIDEBAR_ITEM_TYPE_UNSTAGED; -#line 16677 "gitg-commit.c" +#line 16514 "gitg-commit.c" } else { #line 1859 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp9_ = FALSE; -#line 16681 "gitg-commit.c" +#line 16518 "gitg-commit.c" } #line 1859 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp9_) { -#line 16685 "gitg-commit.c" +#line 16522 "gitg-commit.c" GitgStageStatusItem** _tmp12_ = NULL; gint _tmp12__length1 = 0; #line 1861 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -16693,20 +16530,20 @@ _tmp12__length1 = sitems_length1; #line 1861 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_on_discard_menu_activated (self, _tmp12_, _tmp12__length1); -#line 16694 "gitg-commit.c" +#line 16531 "gitg-commit.c" } #line 1853 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" sitems = (_vala_array_free (sitems, sitems_length1, (GDestroyNotify) g_object_unref), NULL); #line 1853 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" sel = (_vala_array_free (sel, sel_length1, (GDestroyNotify) g_object_unref), NULL); -#line 16700 "gitg-commit.c" +#line 16537 "gitg-commit.c" } static void ___lambda56__gitg_commit_sidebar_discard_selection (GitgCommitSidebar* _sender, gpointer self) { #line 1853 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" __lambda56_ ((GitgCommitActivity*) self); -#line 16707 "gitg-commit.c" +#line 16544 "gitg-commit.c" } @@ -16756,63 +16593,63 @@ sitems = (_vala_array_free (sitems, sitems_length1, (GDestroyNotify) g_object_unref), NULL); #line 1865 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" sel = (_vala_array_free (sel, sel_length1, (GDestroyNotify) g_object_unref), NULL); -#line 16757 "gitg-commit.c" +#line 16594 "gitg-commit.c" } static void ___lambda57__gitg_commit_sidebar_edit_selection (GitgCommitSidebar* _sender, gpointer self) { #line 1865 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" __lambda57_ ((GitgCommitActivity*) self); -#line 16764 "gitg-commit.c" +#line 16601 "gitg-commit.c" } static void _gitg_commit_activity_sidebar_selection_changed_gitg_commit_sidebar_selected_items_changed (GitgCommitSidebar* _sender, GitgSidebarItem** items, int items_length1, gpointer self) { #line 1873 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_sidebar_selection_changed ((GitgCommitActivity*) self, items, items_length1); -#line 16771 "gitg-commit.c" +#line 16608 "gitg-commit.c" } static void __lambda58_ (GitgCommitActivity* self) { #line 1876 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_on_commit_clicked (self); -#line 16778 "gitg-commit.c" +#line 16615 "gitg-commit.c" } static void ___lambda58__gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1875 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" __lambda58_ ((GitgCommitActivity*) self); -#line 16785 "gitg-commit.c" +#line 16622 "gitg-commit.c" } static void __lambda59_ (GitgCommitActivity* self) { #line 1880 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_on_stage_clicked (self); -#line 16792 "gitg-commit.c" +#line 16629 "gitg-commit.c" } static void ___lambda59__gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1879 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" __lambda59_ ((GitgCommitActivity*) self); -#line 16799 "gitg-commit.c" +#line 16636 "gitg-commit.c" } static void __lambda60_ (GitgCommitActivity* self) { #line 1884 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_on_discard_clicked (self); -#line 16806 "gitg-commit.c" +#line 16643 "gitg-commit.c" } static void ___lambda60__gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1883 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" __lambda60_ ((GitgCommitActivity*) self); -#line 16813 "gitg-commit.c" +#line 16650 "gitg-commit.c" } @@ -16824,7 +16661,7 @@ result = FALSE; #line 1894 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 16825 "gitg-commit.c" +#line 16662 "gitg-commit.c" } @@ -16833,7 +16670,7 @@ result = ___lambda62_ ((GitgCommitActivity*) self); #line 1892 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 16834 "gitg-commit.c" +#line 16671 "gitg-commit.c" } @@ -16841,7 +16678,7 @@ GError * _inner_error_ = NULL; #line 1887 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_return_if_fail (submodule != NULL); -#line 16842 "gitg-commit.c" +#line 16679 "gitg-commit.c" { GgitRepository* _tmp0_ = NULL; GgitSubmodule* _tmp1_ = NULL; @@ -16861,7 +16698,7 @@ _tmp0_ = _tmp2_; #line 1890 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 16862 "gitg-commit.c" +#line 16699 "gitg-commit.c" goto __catch34_g_error; } #line 1890 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -16886,7 +16723,7 @@ _g_object_unref0 (app); #line 1888 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp0_); -#line 16887 "gitg-commit.c" +#line 16724 "gitg-commit.c" } goto __finally34; __catch34_g_error: @@ -16909,7 +16746,7 @@ fprintf (_tmp9_, "Failed to open submodule repository: %s\n", _tmp11_); #line 1888 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_error_free0 (e); -#line 16910 "gitg-commit.c" +#line 16747 "gitg-commit.c" } __finally34: #line 1888 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -16920,7 +16757,7 @@ g_clear_error (&_inner_error_); #line 1888 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return; -#line 16921 "gitg-commit.c" +#line 16758 "gitg-commit.c" } } @@ -16928,14 +16765,14 @@ static void ___lambda61__gitg_commit_submodule_info_request_open_repository (GitgCommitSubmoduleInfo* _sender, GgitSubmodule* submodule, gpointer self) { #line 1887 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" __lambda61_ ((GitgCommitActivity*) self, submodule); -#line 16929 "gitg-commit.c" +#line 16766 "gitg-commit.c" } static void _gitg_commit_activity_do_populate_menu_gitg_sidebar_populate_popup (GitgSidebar* _sender, GtkMenu* menu, gpointer self) { #line 1904 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_do_populate_menu ((GitgCommitActivity*) self, menu); -#line 16936 "gitg-commit.c" +#line 16773 "gitg-commit.c" } @@ -16954,7 +16791,7 @@ _tmp0_ = self->priv->d_submodule_history_select_first; #line 1911 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp0_) { -#line 16955 "gitg-commit.c" +#line 16792 "gitg-commit.c" GtkTreeSelection* _tmp1_ = NULL; GtkTreePath* _tmp2_ = NULL; #line 1913 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -16965,7 +16802,7 @@ _tmp2_ = path; #line 1914 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gtk_tree_selection_select_path (_tmp1_, _tmp2_); -#line 16966 "gitg-commit.c" +#line 16803 "gitg-commit.c" } } @@ -16973,7 +16810,7 @@ static void ___lambda63__gtk_tree_model_row_inserted (GtkTreeModel* _sender, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { #line 1910 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" __lambda63_ (self, _sender, path, iter); -#line 16974 "gitg-commit.c" +#line 16811 "gitg-commit.c" } @@ -17004,7 +16841,7 @@ iter = _tmp2_; #line 1922 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp3_) { -#line 17005 "gitg-commit.c" +#line 16842 "gitg-commit.c" GtkTreeIter _tmp5_ = {0}; GitgCommit* _tmp6_ = NULL; GitgCommit* _tmp7_ = NULL; @@ -17018,22 +16855,22 @@ gitg_commit_activity_submodule_history_selection_changed (self, _tmp7_); #line 1924 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp7_); -#line 17019 "gitg-commit.c" +#line 16856 "gitg-commit.c" } else { #line 1928 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_submodule_history_selection_changed (self, NULL); -#line 17023 "gitg-commit.c" +#line 16860 "gitg-commit.c" } #line 1918 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (m); -#line 17027 "gitg-commit.c" +#line 16864 "gitg-commit.c" } static void ___lambda64__gtk_tree_selection_changed (GtkTreeSelection* _sender, gpointer self) { #line 1918 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" __lambda64_ (self, _sender); -#line 17034 "gitg-commit.c" +#line 16871 "gitg-commit.c" } @@ -17066,14 +16903,14 @@ _tmp0_ (_tmp3_, _tmp0__target); #line 1933 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp3_); -#line 17067 "gitg-commit.c" +#line 16904 "gitg-commit.c" } static void ___lambda65__gtk_tree_view_row_activated (GtkTreeView* _sender, GtkTreePath* path, GtkTreeViewColumn* column, gpointer self) { #line 1932 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" __lambda65_ (self, _sender, path, column); -#line 17074 "gitg-commit.c" +#line 16911 "gitg-commit.c" } @@ -17451,7 +17288,7 @@ block29_data_unref (_data29_); #line 1832 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _data29_ = NULL; -#line 17452 "gitg-commit.c" +#line 17289 "gitg-commit.c" } @@ -17470,27 +17307,31 @@ result = _tmp1_; #line 46 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 17471 "gitg-commit.c" +#line 17308 "gitg-commit.c" } static void gitg_commit_activity_real_set_application (GitgExtUIElement* base, GitgExtApplication* value) { GitgCommitActivity* self; - GitgExtApplication* _tmp0_ = NULL; - GitgExtApplication* _tmp1_ = NULL; #line 46 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = (GitgCommitActivity*) base; #line 46 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp0_ = value; + if (gitg_commit_activity_real_get_application (self) != value) { +#line 17318 "gitg-commit.c" + GitgExtApplication* _tmp0_ = NULL; + GitgExtApplication* _tmp1_ = NULL; #line 46 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 46 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _g_object_unref0 (self->priv->_application); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 46 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" + _g_object_unref0 (self->priv->_application); #line 46 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - self->priv->_application = _tmp1_; + self->priv->_application = _tmp1_; #line 46 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - g_object_notify ((GObject *) self, "application"); -#line 17491 "gitg-commit.c" + g_object_notify ((GObject *) self, "application"); +#line 17331 "gitg-commit.c" + } } @@ -17506,7 +17347,7 @@ result = _tmp0_; #line 55 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 17507 "gitg-commit.c" +#line 17348 "gitg-commit.c" } @@ -17519,7 +17360,7 @@ g_object_notify ((GObject*) self, "enabled"); #line 60 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_notify ((GObject *) self, "repository"); -#line 17520 "gitg-commit.c" +#line 17361 "gitg-commit.c" } @@ -17556,7 +17397,7 @@ _g_object_unref0 (_tmp3_); #line 79 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" if (_tmp7_) { -#line 17557 "gitg-commit.c" +#line 17398 "gitg-commit.c" GitgExtApplication* _tmp8_ = NULL; GitgExtApplication* _tmp9_ = NULL; GitgExtApplication* _tmp10_ = NULL; @@ -17587,55 +17428,49 @@ _g_object_unref0 (_tmp13_); #line 79 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _g_object_unref0 (_tmp10_); -#line 17588 "gitg-commit.c" +#line 17429 "gitg-commit.c" } else { #line 79 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp0_ = FALSE; -#line 17592 "gitg-commit.c" +#line 17433 "gitg-commit.c" } #line 79 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" result = _tmp0_; #line 79 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 17598 "gitg-commit.c" +#line 17439 "gitg-commit.c" } static gchar* gitg_commit_activity_real_get_display_name (GitgExtUIElement* base) { gchar* result; GitgCommitActivity* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 113 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = (GitgCommitActivity*) base; #line 113 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp0_ = C_ ("Activity", "Commit"); -#line 113 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (C_ ("Activity", "Commit")); #line 113 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - result = _tmp1_; + result = _tmp0_; #line 113 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 17617 "gitg-commit.c" +#line 17455 "gitg-commit.c" } static gchar* gitg_commit_activity_real_get_description (GitgExtUIElement* base) { gchar* result; GitgCommitActivity* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 118 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = (GitgCommitActivity*) base; #line 118 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp0_ = _ ("Create new commits and manage the staging area"); + _tmp0_ = g_strdup (_ ("Create new commits and manage the staging area")); #line 118 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 118 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - result = _tmp1_; + result = _tmp0_; #line 118 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 17636 "gitg-commit.c" +#line 17471 "gitg-commit.c" } @@ -17651,7 +17486,7 @@ result = _tmp0_; #line 123 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 17652 "gitg-commit.c" +#line 17487 "gitg-commit.c" } @@ -17669,7 +17504,7 @@ if (_tmp0_ == NULL) { #line 132 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_build_ui (self); -#line 17670 "gitg-commit.c" +#line 17505 "gitg-commit.c" } #line 135 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" _tmp1_ = self->priv->d_main; @@ -17679,14 +17514,14 @@ result = _tmp2_; #line 135 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return result; -#line 17680 "gitg-commit.c" +#line 17515 "gitg-commit.c" } static void _gitg_commit_activity_repository_changed_externally_gitg_ext_application_repository_changed_externally (GitgExtApplication* _sender, GitgExtExternalChangeHint hint, gpointer self) { #line 72 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_repository_changed_externally ((GitgCommitActivity*) self, hint); -#line 17687 "gitg-commit.c" +#line 17522 "gitg-commit.c" } @@ -17731,7 +17566,7 @@ _g_object_unref0 (_tmp5_); #line 67 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" return obj; -#line 17732 "gitg-commit.c" +#line 17567 "gitg-commit.c" } @@ -17766,7 +17601,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_COMMIT_ACTIVITY_ICON, g_param_spec_string ("icon", "icon", "icon", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_COMMIT_ACTIVITY_WIDGET, g_param_spec_object ("widget", "widget", "widget", gtk_widget_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 17767 "gitg-commit.c" +#line 17602 "gitg-commit.c" } @@ -17774,7 +17609,7 @@ #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_gitg_ext_ui_element_parent_iface = g_type_interface_peek_parent (iface); #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - iface->activate = (void (*)(GitgExtUIElement*)) gitg_commit_activity_real_activate; + iface->activate = (void (*) (GitgExtUIElement *)) gitg_commit_activity_real_activate; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" iface->get_application = gitg_commit_activity_real_get_application; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" @@ -17791,7 +17626,7 @@ iface->get_icon = gitg_commit_activity_real_get_icon; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" iface->get_widget = gitg_commit_activity_real_get_widget; -#line 17792 "gitg-commit.c" +#line 17627 "gitg-commit.c" } @@ -17799,19 +17634,19 @@ #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" gitg_commit_activity_gitg_ext_activity_parent_iface = g_type_interface_peek_parent (iface); #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" - iface->is_default_for = (gboolean (*)(GitgExtActivity*, const gchar*)) gitg_commit_activity_real_is_default_for; -#line 17801 "gitg-commit.c" + iface->is_default_for = (gboolean (*) (GitgExtActivity *, const gchar*)) gitg_commit_activity_real_is_default_for; +#line 17636 "gitg-commit.c" } static void gitg_commit_activity_instance_init (GitgCommitActivity * self) { #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self->priv = GITG_COMMIT_ACTIVITY_GET_PRIVATE (self); -#line 17808 "gitg-commit.c" +#line 17643 "gitg-commit.c" } -static void gitg_commit_activity_finalize (GObject* obj) { +static void gitg_commit_activity_finalize (GObject * obj) { GitgCommitActivity * self; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_COMMIT_TYPE_ACTIVITY, GitgCommitActivity); @@ -17843,7 +17678,7 @@ self->priv->d_stage_unstage_submodule_commit_callback_target_destroy_notify = NULL; #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" G_OBJECT_CLASS (gitg_commit_activity_parent_class)->finalize (obj); -#line 17844 "gitg-commit.c" +#line 17679 "gitg-commit.c" } @@ -17910,13 +17745,13 @@ g_value_take_object (value, gitg_ext_ui_element_get_widget ((GitgExtUIElement*) self)); #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" break; -#line 17911 "gitg-commit.c" +#line 17746 "gitg-commit.c" default: #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" break; -#line 17917 "gitg-commit.c" +#line 17752 "gitg-commit.c" } } @@ -17938,13 +17773,13 @@ gitg_commit_activity_set_repository (self, g_value_get_object (value)); #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" break; -#line 17939 "gitg-commit.c" +#line 17774 "gitg-commit.c" default: #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 22 "/home/jesse/dev/gitg/gitg/commit/gitg-commit.vala" break; -#line 17945 "gitg-commit.c" +#line 17780 "gitg-commit.c" } } diff -Nru gitg-3.22.0/gitg/commit/gitg-commit-dialog.c gitg-3.23.0/gitg/commit/gitg-commit-dialog.c --- gitg-3.22.0/gitg/commit/gitg-commit-dialog.c 2016-08-25 15:03:07.000000000 +0000 +++ gitg-3.23.0/gitg/commit/gitg-commit-dialog.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-commit-dialog.c generated by valac 0.32.1, the Vala compiler +/* gitg-commit-dialog.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-commit-dialog.vala, do not modify */ /* @@ -218,7 +218,7 @@ static void __gitg_commit_dialog___lambda9__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self); static void _gitg_commit_dialog___lambda10_ (GitgCommitDialog* self); static void __gitg_commit_dialog___lambda10__gtk_text_buffer_changed (GtkTextBuffer* _sender, gpointer self); -static void gitg_commit_dialog_finalize (GObject* obj); +static void gitg_commit_dialog_finalize (GObject * obj); static void _vala_gitg_commit_dialog_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_commit_dialog_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -305,25 +305,22 @@ __catch0_g_error: { const gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; + gchar* _tmp6_ = NULL; #line 302 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" g_clear_error (&_inner_error_); #line 302 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _inner_error_ = NULL; #line 308 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp5_ = _ ("Cannot set spell checking language: %s"); + _tmp5_ = self->priv->d_spell_checking_language; #line 308 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp6_ = self->priv->d_spell_checking_language; -#line 308 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - g_warning (_tmp5_, _tmp6_); + g_warning (_ ("Cannot set spell checking language: %s"), _tmp5_); #line 309 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp7_ = g_strdup (""); + _tmp6_ = g_strdup (""); #line 309 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_free0 (self->priv->d_spell_checking_language); #line 309 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - self->priv->d_spell_checking_language = _tmp7_; -#line 327 "gitg-commit-dialog.c" + self->priv->d_spell_checking_language = _tmp6_; +#line 324 "gitg-commit-dialog.c" } __finally0: #line 302 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" @@ -334,7 +331,7 @@ g_clear_error (&_inner_error_); #line 302 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return; -#line 338 "gitg-commit-dialog.c" +#line 335 "gitg-commit-dialog.c" } } } @@ -342,13 +339,13 @@ static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 352 "gitg-commit-dialog.c" +#line 349 "gitg-commit-dialog.c" } @@ -357,7 +354,7 @@ g_atomic_int_inc (&_data1_->_ref_count_); #line 378 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return _data1_; -#line 361 "gitg-commit-dialog.c" +#line 358 "gitg-commit-dialog.c" } @@ -366,7 +363,7 @@ _data1_ = (Block1Data*) _userdata_; #line 378 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { -#line 370 "gitg-commit-dialog.c" +#line 367 "gitg-commit-dialog.c" GitgCommitDialog* self; #line 378 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" self = _data1_->self; @@ -376,7 +373,7 @@ _g_object_unref0 (self); #line 378 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" g_slice_free (Block1Data, _data1_); -#line 380 "gitg-commit-dialog.c" +#line 377 "gitg-commit-dialog.c" } } @@ -412,13 +409,13 @@ _g_object_unref0 (pixbuf); #line 388 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return; -#line 416 "gitg-commit-dialog.c" +#line 413 "gitg-commit-dialog.c" } #line 391 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp5_ = pixbuf; #line 391 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (_tmp5_ != NULL) { -#line 422 "gitg-commit-dialog.c" +#line 419 "gitg-commit-dialog.c" GtkImage* _tmp6_ = NULL; GdkPixbuf* _tmp7_ = NULL; #line 393 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" @@ -427,18 +424,18 @@ _tmp7_ = pixbuf; #line 393 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" gtk_image_set_from_pixbuf (_tmp6_, _tmp7_); -#line 431 "gitg-commit-dialog.c" +#line 428 "gitg-commit-dialog.c" } else { GtkImage* _tmp8_ = NULL; #line 397 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp8_ = self->priv->d_image_avatar; #line 397 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" gtk_image_set_from_icon_name (_tmp8_, "avatar-default-symbolic", GTK_ICON_SIZE_DIALOG); -#line 438 "gitg-commit-dialog.c" +#line 435 "gitg-commit-dialog.c" } #line 383 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_object_unref0 (pixbuf); -#line 442 "gitg-commit-dialog.c" +#line 439 "gitg-commit-dialog.c" } @@ -447,7 +444,7 @@ ___lambda4_ (self, source_object, res); #line 383 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" block1_data_unref (self); -#line 451 "gitg-commit-dialog.c" +#line 448 "gitg-commit-dialog.c" } @@ -497,7 +494,7 @@ _tmp0_ = self->priv->d_cancel_avatar; #line 331 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (_tmp0_ != NULL) { -#line 501 "gitg-commit-dialog.c" +#line 498 "gitg-commit-dialog.c" GCancellable* _tmp1_ = NULL; GCancellable* _tmp2_ = NULL; #line 333 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" @@ -510,7 +507,7 @@ _g_object_unref0 (self->priv->d_cancel_avatar); #line 334 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" self->priv->d_cancel_avatar = _tmp2_; -#line 514 "gitg-commit-dialog.c" +#line 511 "gitg-commit-dialog.c" } #line 337 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp3_ = self->priv->d_author; @@ -560,20 +557,20 @@ _tmp20_ = pango_find_base_dir (_tmp19_, -1); #line 345 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (_tmp18_ == (_tmp20_ != PANGO_DIRECTION_RTL)) { -#line 564 "gitg-commit-dialog.c" +#line 561 "gitg-commit-dialog.c" GtkLabel* _tmp21_ = NULL; #line 347 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp21_ = self->priv->d_label_user; #line 347 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" gtk_widget_set_halign ((GtkWidget*) _tmp21_, GTK_ALIGN_END); -#line 570 "gitg-commit-dialog.c" +#line 567 "gitg-commit-dialog.c" } else { GtkLabel* _tmp22_ = NULL; #line 351 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp22_ = self->priv->d_label_user; #line 351 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" gtk_widget_set_halign ((GtkWidget*) _tmp22_, GTK_ALIGN_START); -#line 577 "gitg-commit-dialog.c" +#line 574 "gitg-commit-dialog.c" } #line 354 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp23_ = self->priv->d_author; @@ -593,7 +590,7 @@ _tmp28_ = g_date_time_difference (_tmp26_, _tmp27_); #line 358 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (_tmp28_ < (G_TIME_SPAN_SECOND * 5)) { -#line 597 "gitg-commit-dialog.c" +#line 594 "gitg-commit-dialog.c" gchar* _tmp29_ = NULL; #line 360 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp29_ = g_strdup (""); @@ -601,7 +598,7 @@ _g_free0 (date_string); #line 360 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" date_string = _tmp29_; -#line 605 "gitg-commit-dialog.c" +#line 602 "gitg-commit-dialog.c" } else { GDateTime* _tmp30_ = NULL; GitgDate* _tmp31_ = NULL; @@ -621,7 +618,7 @@ date_string = _tmp33_; #line 364 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_object_unref0 (_tmp32_); -#line 625 "gitg-commit-dialog.c" +#line 622 "gitg-commit-dialog.c" } #line 367 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp34_ = self->priv->d_label_date; @@ -637,20 +634,20 @@ _tmp38_ = pango_find_base_dir (_tmp37_, -1); #line 369 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (_tmp36_ == (_tmp38_ != PANGO_DIRECTION_RTL)) { -#line 641 "gitg-commit-dialog.c" +#line 638 "gitg-commit-dialog.c" GtkLabel* _tmp39_ = NULL; #line 371 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp39_ = self->priv->d_label_date; #line 371 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" gtk_widget_set_halign ((GtkWidget*) _tmp39_, GTK_ALIGN_END); -#line 647 "gitg-commit-dialog.c" +#line 644 "gitg-commit-dialog.c" } else { GtkLabel* _tmp40_ = NULL; #line 375 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp40_ = self->priv->d_label_date; #line 375 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" gtk_widget_set_halign ((GtkWidget*) _tmp40_, GTK_ALIGN_START); -#line 654 "gitg-commit-dialog.c" +#line 651 "gitg-commit-dialog.c" } #line 378 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp41_ = gitg_commit_dialog_get_use_gravatar (self); @@ -658,7 +655,7 @@ _tmp42_ = _tmp41_; #line 378 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (_tmp42_) { -#line 662 "gitg-commit-dialog.c" +#line 659 "gitg-commit-dialog.c" Block1Data* _data1_; GitgAvatarCache* _tmp43_ = NULL; GCancellable* _tmp44_ = NULL; @@ -696,14 +693,14 @@ block1_data_unref (_data1_); #line 378 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _data1_ = NULL; -#line 700 "gitg-commit-dialog.c" +#line 697 "gitg-commit-dialog.c" } else { GtkImage* _tmp49_ = NULL; #line 403 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp49_ = self->priv->d_image_avatar; #line 403 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" gtk_image_set_from_icon_name (_tmp49_, "avatar-default-symbolic", GTK_ICON_SIZE_DIALOG); -#line 707 "gitg-commit-dialog.c" +#line 704 "gitg-commit-dialog.c" } #line 329 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_free0 (date_string); @@ -717,7 +714,7 @@ _g_free0 (email); #line 329 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_free0 (name); -#line 721 "gitg-commit-dialog.c" +#line 718 "gitg-commit-dialog.c" } @@ -730,13 +727,13 @@ _tmp0_ = self->priv->d_cancel_avatar; #line 409 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (_tmp0_ != NULL) { -#line 734 "gitg-commit-dialog.c" +#line 731 "gitg-commit-dialog.c" GCancellable* _tmp1_ = NULL; #line 411 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp1_ = self->priv->d_cancel_avatar; #line 411 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" g_cancellable_cancel (_tmp1_); -#line 740 "gitg-commit-dialog.c" +#line 737 "gitg-commit-dialog.c" } #line 414 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_object_unref0 (self->priv->d_message_settings); @@ -752,7 +749,7 @@ self->priv->d_commit_settings = NULL; #line 418 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" GTK_WIDGET_CLASS (gitg_commit_dialog_parent_class)->destroy ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog)); -#line 756 "gitg-commit-dialog.c" +#line 753 "gitg-commit-dialog.c" } @@ -761,7 +758,7 @@ g_atomic_int_inc (&_data2_->_ref_count_); #line 517 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return _data2_; -#line 765 "gitg-commit-dialog.c" +#line 762 "gitg-commit-dialog.c" } @@ -770,7 +767,7 @@ _data2_ = (Block2Data*) _userdata_; #line 517 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { -#line 774 "gitg-commit-dialog.c" +#line 771 "gitg-commit-dialog.c" GitgCommitDialog* self; #line 517 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" self = _data2_->self; @@ -778,7 +775,7 @@ _g_object_unref0 (self); #line 517 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" g_slice_free (Block2Data, _data2_); -#line 782 "gitg-commit-dialog.c" +#line 779 "gitg-commit-dialog.c" } } @@ -786,7 +783,7 @@ static gpointer _ggit_diff_file_ref0 (gpointer self) { #line 541 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return self ? ggit_diff_file_ref (self) : NULL; -#line 790 "gitg-commit-dialog.c" +#line 787 "gitg-commit-dialog.c" } @@ -799,14 +796,14 @@ _tmp0_ = _data2_->num; #line 568 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" gitg_commit_dialog_update_min_stat_size (self, _tmp0_); -#line 803 "gitg-commit-dialog.c" +#line 800 "gitg-commit-dialog.c" } static void ___lambda5__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) { #line 567 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" __lambda5_ (self); -#line 810 "gitg-commit-dialog.c" +#line 807 "gitg-commit-dialog.c" } @@ -844,19 +841,19 @@ n = _tmp4_; #line 520 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _data2_->num = 0; -#line 848 "gitg-commit-dialog.c" +#line 845 "gitg-commit-dialog.c" { gint i = 0; #line 522 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" i = 0; -#line 853 "gitg-commit-dialog.c" +#line 850 "gitg-commit-dialog.c" { gboolean _tmp5_ = FALSE; #line 522 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp5_ = TRUE; #line 522 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" while (TRUE) { -#line 860 "gitg-commit-dialog.c" +#line 857 "gitg-commit-dialog.c" gint _tmp7_ = 0; gsize _tmp8_ = 0UL; GgitPatch* patch = NULL; @@ -901,13 +898,13 @@ gint _tmp49_ = 0; #line 522 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (!_tmp5_) { -#line 905 "gitg-commit-dialog.c" +#line 902 "gitg-commit-dialog.c" gint _tmp6_ = 0; #line 522 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp6_ = i; #line 522 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" i = _tmp6_ + 1; -#line 911 "gitg-commit-dialog.c" +#line 908 "gitg-commit-dialog.c" } #line 522 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp5_ = FALSE; @@ -919,7 +916,7 @@ if (!(((gsize) _tmp7_) < _tmp8_)) { #line 522 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" break; -#line 923 "gitg-commit-dialog.c" +#line 920 "gitg-commit-dialog.c" } { GgitPatch* _tmp9_ = NULL; @@ -948,7 +945,7 @@ _tmp9_ = _tmp15_; #line 528 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 952 "gitg-commit-dialog.c" +#line 949 "gitg-commit-dialog.c" goto __catch1_g_error; } #line 528 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" @@ -961,7 +958,7 @@ patch = _tmp16_; #line 526 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _ggit_patch_unref0 (_tmp9_); -#line 965 "gitg-commit-dialog.c" +#line 962 "gitg-commit-dialog.c" } goto __finally1; __catch1_g_error: @@ -974,7 +971,7 @@ _ggit_patch_unref0 (patch); #line 529 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" continue; -#line 978 "gitg-commit-dialog.c" +#line 975 "gitg-commit-dialog.c" } __finally1: #line 526 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" @@ -991,7 +988,7 @@ g_clear_error (&_inner_error_); #line 526 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return; -#line 995 "gitg-commit-dialog.c" +#line 992 "gitg-commit-dialog.c" } { GgitPatch* _tmp17_ = NULL; @@ -1007,7 +1004,7 @@ remove = _tmp19_; #line 536 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1011 "gitg-commit-dialog.c" +#line 1008 "gitg-commit-dialog.c" goto __catch2_g_error; } } @@ -1022,7 +1019,7 @@ _ggit_patch_unref0 (patch); #line 537 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" continue; -#line 1026 "gitg-commit-dialog.c" +#line 1023 "gitg-commit-dialog.c" } __finally2: #line 534 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" @@ -1039,7 +1036,7 @@ g_clear_error (&_inner_error_); #line 534 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return; -#line 1043 "gitg-commit-dialog.c" +#line 1040 "gitg-commit-dialog.c" } #line 539 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp20_ = patch; @@ -1159,7 +1156,7 @@ _ggit_diff_delta_unref0 (delta); #line 522 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _ggit_patch_unref0 (patch); -#line 1163 "gitg-commit-dialog.c" +#line 1160 "gitg-commit-dialog.c" } } } @@ -1171,14 +1168,14 @@ block2_data_unref (_data2_); #line 517 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _data2_ = NULL; -#line 1175 "gitg-commit-dialog.c" +#line 1172 "gitg-commit-dialog.c" } static gpointer _g_object_ref0 (gpointer self) { #line 582 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return self ? g_object_ref (self) : NULL; -#line 1182 "gitg-commit-dialog.c" +#line 1179 "gitg-commit-dialog.c" } @@ -1209,7 +1206,7 @@ _tmp0_ = num; #line 574 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (_tmp0_ == 0) { -#line 1213 "gitg-commit-dialog.c" +#line 1210 "gitg-commit-dialog.c" GtkScrolledWindow* _tmp1_ = NULL; #line 576 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp1_ = self->priv->d_scrolled_window_stats; @@ -1217,7 +1214,7 @@ gtk_widget_hide ((GtkWidget*) _tmp1_); #line 577 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return; -#line 1221 "gitg-commit-dialog.c" +#line 1218 "gitg-commit-dialog.c" } #line 580 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp2_ = num; @@ -1249,13 +1246,13 @@ _tmp12_ = num; #line 587 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (_tmp11_ == _tmp12_) { -#line 1253 "gitg-commit-dialog.c" +#line 1250 "gitg-commit-dialog.c" GtkScrolledWindow* _tmp13_ = NULL; #line 589 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp13_ = self->priv->d_scrolled_window_stats; #line 589 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" gtk_scrolled_window_set_policy (_tmp13_, GTK_POLICY_NEVER, GTK_POLICY_NEVER); -#line 1259 "gitg-commit-dialog.c" +#line 1256 "gitg-commit-dialog.c" } #line 593 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp14_ = self->priv->d_scrolled_window_stats; @@ -1271,7 +1268,7 @@ gtk_scrolled_window_set_min_content_height (_tmp14_, _tmp16_ + _tmp18_); #line 572 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_object_unref0 (lastrow); -#line 1275 "gitg-commit-dialog.c" +#line 1272 "gitg-commit-dialog.c" } @@ -1326,7 +1323,7 @@ g_object_set (_tmp7_, "foreground-rgba", &_tmp8_, NULL); #line 596 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_object_unref0 (ctx); -#line 1330 "gitg-commit-dialog.c" +#line 1327 "gitg-commit-dialog.c" } @@ -1356,7 +1353,7 @@ _tmp4_ = _tmp3_->state; #line 617 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if ((_tmp2_ & _tmp4_) == GDK_CONTROL_MASK) { -#line 1360 "gitg-commit-dialog.c" +#line 1357 "gitg-commit-dialog.c" gboolean _tmp5_ = FALSE; GdkEventKey* _tmp6_ = NULL; guint _tmp7_ = 0U; @@ -1368,7 +1365,7 @@ if (_tmp7_ == ((guint) GDK_KEY_Return)) { #line 618 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp5_ = TRUE; -#line 1372 "gitg-commit-dialog.c" +#line 1369 "gitg-commit-dialog.c" } else { GdkEventKey* _tmp8_ = NULL; guint _tmp9_ = 0U; @@ -1378,19 +1375,19 @@ _tmp9_ = _tmp8_->keyval; #line 618 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp5_ = _tmp9_ == ((guint) GDK_KEY_KP_Enter); -#line 1382 "gitg-commit-dialog.c" +#line 1379 "gitg-commit-dialog.c" } #line 618 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp1_ = _tmp5_; -#line 1386 "gitg-commit-dialog.c" +#line 1383 "gitg-commit-dialog.c" } else { #line 617 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp1_ = FALSE; -#line 1390 "gitg-commit-dialog.c" +#line 1387 "gitg-commit-dialog.c" } #line 617 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (_tmp1_) { -#line 1394 "gitg-commit-dialog.c" +#line 1391 "gitg-commit-dialog.c" GtkButton* _tmp10_ = NULL; #line 620 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp10_ = self->priv->d_button_ok; @@ -1400,13 +1397,13 @@ result = TRUE; #line 621 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return result; -#line 1404 "gitg-commit-dialog.c" +#line 1401 "gitg-commit-dialog.c" } #line 624 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" result = FALSE; #line 624 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return result; -#line 1410 "gitg-commit-dialog.c" +#line 1407 "gitg-commit-dialog.c" } @@ -1415,35 +1412,35 @@ result = gitg_commit_dialog_on_commit_message_key_press_event ((GitgCommitDialog*) self, _sender, event); #line 629 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return result; -#line 1419 "gitg-commit-dialog.c" +#line 1416 "gitg-commit-dialog.c" } static void __lambda6_ (GitgCommitDialog* self) { #line 641 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" gitg_commit_dialog_update_too_long_tag (self); -#line 1426 "gitg-commit-dialog.c" +#line 1423 "gitg-commit-dialog.c" } static void ___lambda6__gtk_widget_style_updated (GtkWidget* _sender, gpointer self) { #line 640 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" __lambda6_ ((GitgCommitDialog*) self); -#line 1433 "gitg-commit-dialog.c" +#line 1430 "gitg-commit-dialog.c" } static void __lambda7_ (GitgCommitDialog* self) { #line 645 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" gitg_commit_dialog_do_highlight (self); -#line 1440 "gitg-commit-dialog.c" +#line 1437 "gitg-commit-dialog.c" } static void ___lambda7__gtk_text_buffer_changed (GtkTextBuffer* _sender, gpointer self) { #line 644 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" __lambda7_ ((GitgCommitDialog*) self); -#line 1447 "gitg-commit-dialog.c" +#line 1444 "gitg-commit-dialog.c" } @@ -1452,21 +1449,21 @@ gchar* _result_ = NULL; gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; -#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1226 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1227 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1227 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1228 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1228 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1229 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _result_; -#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1229 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1470 "gitg-commit-dialog.c" +#line 1467 "gitg-commit-dialog.c" } @@ -1536,7 +1533,7 @@ gitg_commit_dialog_update_highlight (self); #line 650 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" gitg_commit_dialog_set_default_message (self, ""); -#line 1540 "gitg-commit-dialog.c" +#line 1537 "gitg-commit-dialog.c" { GgitConfig* config = NULL; GgitConfig* _tmp13_ = NULL; @@ -1574,7 +1571,7 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 656 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_object_unref0 (config); -#line 1578 "gitg-commit-dialog.c" +#line 1575 "gitg-commit-dialog.c" goto __catch3_g_error; } #line 656 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" @@ -1597,7 +1594,7 @@ _g_object_unref0 (_tmp13_); #line 656 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_object_unref0 (config); -#line 1601 "gitg-commit-dialog.c" +#line 1598 "gitg-commit-dialog.c" goto __catch3_g_error; } #line 656 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" @@ -1624,14 +1621,14 @@ _g_object_unref0 (_tmp13_); #line 658 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_object_unref0 (config); -#line 1628 "gitg-commit-dialog.c" +#line 1625 "gitg-commit-dialog.c" goto __catch3_g_error; } #line 660 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp28_ = template_path; #line 660 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (_tmp28_ != NULL) { -#line 1635 "gitg-commit-dialog.c" +#line 1632 "gitg-commit-dialog.c" gchar* path = NULL; const gchar* _tmp29_ = NULL; gchar* _tmp30_ = NULL; @@ -1664,7 +1661,7 @@ _tmp32_ = g_path_is_absolute (_tmp31_); #line 664 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (!_tmp32_) { -#line 1668 "gitg-commit-dialog.c" +#line 1665 "gitg-commit-dialog.c" GitgRepository* _tmp33_ = NULL; GitgRepository* _tmp34_ = NULL; GitgRepository* _tmp35_ = NULL; @@ -1702,7 +1699,7 @@ _g_object_unref0 (_tmp37_); #line 666 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_object_unref0 (_tmp35_); -#line 1706 "gitg-commit-dialog.c" +#line 1703 "gitg-commit-dialog.c" } #line 672 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp42_ = path; @@ -1728,7 +1725,7 @@ _g_object_unref0 (_tmp13_); #line 672 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_object_unref0 (config); -#line 1732 "gitg-commit-dialog.c" +#line 1729 "gitg-commit-dialog.c" goto __catch3_g_error; } #line 674 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" @@ -1763,7 +1760,7 @@ _g_free0 (contents); #line 660 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_free0 (path); -#line 1767 "gitg-commit-dialog.c" +#line 1764 "gitg-commit-dialog.c" } #line 652 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_free0 (template_path); @@ -1773,7 +1770,7 @@ _g_object_unref0 (_tmp13_); #line 652 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_object_unref0 (config); -#line 1777 "gitg-commit-dialog.c" +#line 1774 "gitg-commit-dialog.c" } goto __finally3; __catch3_g_error: @@ -1782,7 +1779,7 @@ g_clear_error (&_inner_error_); #line 652 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _inner_error_ = NULL; -#line 1786 "gitg-commit-dialog.c" +#line 1783 "gitg-commit-dialog.c" } __finally3: #line 652 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" @@ -1795,11 +1792,11 @@ g_clear_error (&_inner_error_); #line 652 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return; -#line 1799 "gitg-commit-dialog.c" +#line 1796 "gitg-commit-dialog.c" } #line 627 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_object_unref0 (b); -#line 1803 "gitg-commit-dialog.c" +#line 1800 "gitg-commit-dialog.c" } @@ -1818,23 +1815,23 @@ if (!_tmp0_) { #line 685 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return; -#line 1822 "gitg-commit-dialog.c" +#line 1819 "gitg-commit-dialog.c" } #line 688 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp2_ = self->priv->d_show_markup; #line 688 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (_tmp2_) { -#line 1828 "gitg-commit-dialog.c" +#line 1825 "gitg-commit-dialog.c" gboolean _tmp3_ = FALSE; #line 688 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp3_ = self->priv->d_show_right_margin; #line 688 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp1_ = _tmp3_; -#line 1834 "gitg-commit-dialog.c" +#line 1831 "gitg-commit-dialog.c" } else { #line 688 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp1_ = FALSE; -#line 1838 "gitg-commit-dialog.c" +#line 1835 "gitg-commit-dialog.c" } #line 688 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp4_ = self->priv->d_source_view_message; @@ -1848,7 +1845,7 @@ gtk_source_view_set_right_margin_position (_tmp5_, (guint) _tmp6_); #line 691 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" gitg_commit_dialog_do_highlight (self); -#line 1852 "gitg-commit-dialog.c" +#line 1849 "gitg-commit-dialog.c" } @@ -1931,7 +1928,7 @@ _g_object_unref0 (b); #line 707 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return; -#line 1935 "gitg-commit-dialog.c" +#line 1932 "gitg-commit-dialog.c" } #line 713 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp18_ = gtk_text_iter_forward_search (&start, "\n\n", GTK_TEXT_SEARCH_TEXT_ONLY, &_tmp16_, &_tmp17_, NULL); @@ -1941,7 +1938,7 @@ send = _tmp17_; #line 713 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (!_tmp18_) { -#line 1945 "gitg-commit-dialog.c" +#line 1942 "gitg-commit-dialog.c" GtkTextIter _tmp19_ = {0}; GtkTextIter _tmp20_ = {0}; #line 719 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" @@ -1952,7 +1949,7 @@ _tmp20_ = end; #line 720 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" send = _tmp20_; -#line 1956 "gitg-commit-dialog.c" +#line 1953 "gitg-commit-dialog.c" } #line 723 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp21_ = b; @@ -1968,7 +1965,7 @@ _tmp25_ = self->priv->d_show_subject_margin; #line 725 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (_tmp25_) { -#line 1972 "gitg-commit-dialog.c" +#line 1969 "gitg-commit-dialog.c" GtkTextIter toolong = {0}; GtkTextIter _tmp26_ = {0}; #line 727 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" @@ -1977,7 +1974,7 @@ toolong = _tmp26_; #line 729 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" while (TRUE) { -#line 1981 "gitg-commit-dialog.c" +#line 1978 "gitg-commit-dialog.c" gint off = 0; gint _tmp27_ = 0; gint _tmp28_ = 0; @@ -1995,7 +1992,7 @@ _tmp29_ = self->priv->d_subject_margin_position; #line 733 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (_tmp28_ > _tmp29_) { -#line 1999 "gitg-commit-dialog.c" +#line 1996 "gitg-commit-dialog.c" GtkTextIter border = {0}; GtkTextIter _tmp30_ = {0}; gint _tmp31_ = 0; @@ -2021,7 +2018,7 @@ _tmp35_ = toolong; #line 738 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" gtk_text_buffer_apply_tag (_tmp32_, _tmp33_, &_tmp34_, &_tmp35_); -#line 2025 "gitg-commit-dialog.c" +#line 2022 "gitg-commit-dialog.c" } #line 741 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp36_ = gtk_text_iter_get_line (&toolong); @@ -2029,7 +2026,7 @@ if (_tmp36_ == 0) { #line 743 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" break; -#line 2033 "gitg-commit-dialog.c" +#line 2030 "gitg-commit-dialog.c" } #line 746 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp37_ = gtk_text_iter_backward_line (&toolong); @@ -2037,7 +2034,7 @@ if (!_tmp37_) { #line 748 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" break; -#line 2041 "gitg-commit-dialog.c" +#line 2038 "gitg-commit-dialog.c" } #line 751 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp38_ = gtk_text_iter_forward_to_line_end (&toolong); @@ -2045,7 +2042,7 @@ if (!_tmp38_) { #line 753 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" break; -#line 2049 "gitg-commit-dialog.c" +#line 2046 "gitg-commit-dialog.c" } } } @@ -2055,7 +2052,7 @@ if (_tmp39_) { #line 760 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" while (TRUE) { -#line 2059 "gitg-commit-dialog.c" +#line 2056 "gitg-commit-dialog.c" GtkTextIter _tmp40_ = {0}; gboolean _tmp41_ = FALSE; gboolean _tmp42_ = FALSE; @@ -2070,7 +2067,7 @@ if (!(!_tmp41_)) { #line 760 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" break; -#line 2074 "gitg-commit-dialog.c" +#line 2071 "gitg-commit-dialog.c" } #line 762 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp42_ = gtk_text_iter_ends_line (&send); @@ -2078,7 +2075,7 @@ if (!_tmp42_) { #line 764 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" gtk_text_iter_forward_to_line_end (&send); -#line 2082 "gitg-commit-dialog.c" +#line 2079 "gitg-commit-dialog.c" } #line 767 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp43_ = gtk_text_iter_get_line_offset (&send); @@ -2086,7 +2083,7 @@ _tmp44_ = self->priv->d_right_margin_position; #line 767 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (_tmp43_ > _tmp44_) { -#line 2090 "gitg-commit-dialog.c" +#line 2087 "gitg-commit-dialog.c" GtkTextIter lstart = {0}; GtkTextIter _tmp45_ = {0}; gint _tmp46_ = 0; @@ -2112,7 +2109,7 @@ _tmp50_ = send; #line 772 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" gtk_text_buffer_apply_tag (_tmp47_, _tmp48_, &_tmp49_, &_tmp50_); -#line 2116 "gitg-commit-dialog.c" +#line 2113 "gitg-commit-dialog.c" } #line 775 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp51_ = gtk_text_iter_forward_line (&send); @@ -2120,13 +2117,13 @@ if (!_tmp51_) { #line 777 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" break; -#line 2124 "gitg-commit-dialog.c" +#line 2121 "gitg-commit-dialog.c" } } } #line 694 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_object_unref0 (b); -#line 2130 "gitg-commit-dialog.c" +#line 2127 "gitg-commit-dialog.c" } @@ -2149,21 +2146,21 @@ self = (GitgCommitDialog*) g_object_new (object_type, "repository", _tmp0_, "author", _tmp1_, "diff", _tmp2_, "use-header-bar", 1, NULL); #line 783 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return self; -#line 2153 "gitg-commit-dialog.c" +#line 2150 "gitg-commit-dialog.c" } GitgCommitDialog* gitg_commit_dialog_new (GitgRepository* repository, GgitSignature* author, GgitDiff* diff) { #line 783 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return gitg_commit_dialog_construct (GITG_COMMIT_TYPE_DIALOG, repository, author, diff); -#line 2160 "gitg-commit-dialog.c" +#line 2157 "gitg-commit-dialog.c" } static void _vala_PangoFontDescription_free (PangoFontDescription* self) { #line 790 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" g_boxed_free (pango_font_description_get_type (), self); -#line 2167 "gitg-commit-dialog.c" +#line 2164 "gitg-commit-dialog.c" } @@ -2194,7 +2191,7 @@ __vala_PangoFontDescription_free0 (desc); #line 790 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_free0 (mfont); -#line 2198 "gitg-commit-dialog.c" +#line 2195 "gitg-commit-dialog.c" } @@ -2276,7 +2273,7 @@ _g_free0 (secondary); #line 798 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_free0 (primary); -#line 2280 "gitg-commit-dialog.c" +#line 2277 "gitg-commit-dialog.c" } @@ -2294,26 +2291,30 @@ result = _tmp1_; #line 87 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return result; -#line 2298 "gitg-commit-dialog.c" +#line 2295 "gitg-commit-dialog.c" } void gitg_commit_dialog_set_diff (GitgCommitDialog* self, GgitDiff* value) { - GgitDiff* _tmp0_ = NULL; - GgitDiff* _tmp1_ = NULL; #line 88 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" g_return_if_fail (self != NULL); #line 88 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp0_ = value; + if (gitg_commit_dialog_get_diff (self) != value) { +#line 2304 "gitg-commit-dialog.c" + GgitDiff* _tmp0_ = NULL; + GgitDiff* _tmp1_ = NULL; #line 88 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 88 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _g_object_unref0 (self->priv->d_diff); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 88 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" + _g_object_unref0 (self->priv->d_diff); #line 88 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - self->priv->d_diff = _tmp1_; + self->priv->d_diff = _tmp1_; #line 88 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - g_object_notify ((GObject *) self, "diff"); + g_object_notify ((GObject *) self, "diff"); #line 2317 "gitg-commit-dialog.c" + } } @@ -2331,26 +2332,30 @@ result = _tmp1_; #line 93 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return result; -#line 2335 "gitg-commit-dialog.c" +#line 2336 "gitg-commit-dialog.c" } void gitg_commit_dialog_set_repository (GitgCommitDialog* self, GitgRepository* value) { - GitgRepository* _tmp0_ = NULL; - GitgRepository* _tmp1_ = NULL; #line 93 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" g_return_if_fail (self != NULL); #line 93 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp0_ = value; + if (gitg_commit_dialog_get_repository (self) != value) { +#line 2345 "gitg-commit-dialog.c" + GitgRepository* _tmp0_ = NULL; + GitgRepository* _tmp1_ = NULL; #line 93 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 93 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _g_object_unref0 (self->priv->_repository); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 93 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - self->priv->_repository = _tmp1_; + _g_object_unref0 (self->priv->_repository); #line 93 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - g_object_notify ((GObject *) self, "repository"); -#line 2354 "gitg-commit-dialog.c" + self->priv->_repository = _tmp1_; +#line 93 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" + g_object_notify ((GObject *) self, "repository"); +#line 2358 "gitg-commit-dialog.c" + } } @@ -2365,21 +2370,25 @@ result = _tmp0_; #line 98 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return result; -#line 2369 "gitg-commit-dialog.c" +#line 2374 "gitg-commit-dialog.c" } void gitg_commit_dialog_set_max_visible_stat_items (GitgCommitDialog* self, gint value) { - gint _tmp0_ = 0; #line 99 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" g_return_if_fail (self != NULL); #line 99 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp0_ = value; + if (gitg_commit_dialog_get_max_visible_stat_items (self) != value) { +#line 2383 "gitg-commit-dialog.c" + gint _tmp0_ = 0; #line 99 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - self->priv->_max_visible_stat_items = _tmp0_; + _tmp0_ = value; #line 99 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - g_object_notify ((GObject *) self, "max-visible-stat-items"); -#line 2383 "gitg-commit-dialog.c" + self->priv->_max_visible_stat_items = _tmp0_; +#line 99 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" + g_object_notify ((GObject *) self, "max-visible-stat-items"); +#line 2391 "gitg-commit-dialog.c" + } } @@ -2394,7 +2403,7 @@ result = _tmp0_; #line 105 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return result; -#line 2398 "gitg-commit-dialog.c" +#line 2407 "gitg-commit-dialog.c" } @@ -2427,7 +2436,7 @@ _tmp5_ = pretty; #line 114 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (_tmp5_ == NULL) { -#line 2431 "gitg-commit-dialog.c" +#line 2440 "gitg-commit-dialog.c" gchar* _tmp6_ = NULL; #line 116 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp6_ = g_strdup (""); @@ -2437,17 +2446,17 @@ _g_free0 (pretty); #line 116 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return result; -#line 2441 "gitg-commit-dialog.c" +#line 2450 "gitg-commit-dialog.c" } else { #line 120 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" result = pretty; #line 120 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return result; -#line 2447 "gitg-commit-dialog.c" +#line 2456 "gitg-commit-dialog.c" } #line 110 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_free0 (pretty); -#line 2451 "gitg-commit-dialog.c" +#line 2460 "gitg-commit-dialog.c" } @@ -2462,26 +2471,30 @@ result = _tmp0_; #line 127 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return result; -#line 2466 "gitg-commit-dialog.c" +#line 2475 "gitg-commit-dialog.c" } static void gitg_commit_dialog_set_default_message (GitgCommitDialog* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; #line 127 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" g_return_if_fail (self != NULL); #line 127 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp0_ = value; + if (g_strcmp0 (value, gitg_commit_dialog_get_default_message (self)) != 0) { +#line 2484 "gitg-commit-dialog.c" + const gchar* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; #line 127 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = value; #line 127 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _g_free0 (self->priv->_default_message); + _tmp1_ = g_strdup (_tmp0_); #line 127 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - self->priv->_default_message = _tmp1_; + _g_free0 (self->priv->_default_message); #line 127 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - g_object_notify ((GObject *) self, "default-message"); -#line 2485 "gitg-commit-dialog.c" + self->priv->_default_message = _tmp1_; +#line 127 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" + g_object_notify ((GObject *) self, "default-message"); +#line 2497 "gitg-commit-dialog.c" + } } @@ -2529,30 +2542,34 @@ _g_object_unref0 (b); #line 140 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return result; -#line 2533 "gitg-commit-dialog.c" +#line 2546 "gitg-commit-dialog.c" } void gitg_commit_dialog_set_message (GitgCommitDialog* self, const gchar* value) { - GtkSourceView* _tmp0_ = NULL; - GtkTextBuffer* _tmp1_ = NULL; - GtkTextBuffer* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; #line 142 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" g_return_if_fail (self != NULL); +#line 142 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" + if (g_strcmp0 (value, gitg_commit_dialog_get_message (self)) != 0) { +#line 2555 "gitg-commit-dialog.c" + GtkSourceView* _tmp0_ = NULL; + GtkTextBuffer* _tmp1_ = NULL; + GtkTextBuffer* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; #line 144 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp0_ = self->priv->d_source_view_message; + _tmp0_ = self->priv->d_source_view_message; #line 144 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp1_ = gtk_text_view_get_buffer ((GtkTextView*) _tmp0_); + _tmp1_ = gtk_text_view_get_buffer ((GtkTextView*) _tmp0_); #line 144 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp2_ = _tmp1_; + _tmp2_ = _tmp1_; #line 144 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp3_ = value; + _tmp3_ = value; #line 144 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - gtk_text_buffer_set_text (_tmp2_, _tmp3_, -1); + gtk_text_buffer_set_text (_tmp2_, _tmp3_, -1); #line 142 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - g_object_notify ((GObject *) self, "message"); -#line 2556 "gitg-commit-dialog.c" + g_object_notify ((GObject *) self, "message"); +#line 2572 "gitg-commit-dialog.c" + } } @@ -2567,50 +2584,54 @@ result = _tmp0_; #line 152 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return result; -#line 2571 "gitg-commit-dialog.c" +#line 2588 "gitg-commit-dialog.c" } void gitg_commit_dialog_set_amend (GitgCommitDialog* self, gboolean value) { - gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; #line 154 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" g_return_if_fail (self != NULL); +#line 154 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" + if (gitg_commit_dialog_get_amend (self) != value) { +#line 2597 "gitg-commit-dialog.c" + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; #line 156 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp0_ = value; + _tmp0_ = value; #line 156 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - self->priv->d_amend = _tmp0_; + self->priv->d_amend = _tmp0_; #line 158 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp1_ = value; + _tmp1_ = value; #line 158 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - if (_tmp1_) { -#line 2588 "gitg-commit-dialog.c" - GtkRevealer* _tmp2_ = NULL; + if (_tmp1_) { +#line 2608 "gitg-commit-dialog.c" + GtkRevealer* _tmp2_ = NULL; #line 160 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp2_ = self->priv->d_infobar_revealer; + _tmp2_ = self->priv->d_infobar_revealer; #line 160 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - gtk_revealer_set_reveal_child (_tmp2_, FALSE); -#line 2594 "gitg-commit-dialog.c" - } else { - gboolean _tmp3_ = FALSE; + gtk_revealer_set_reveal_child (_tmp2_, FALSE); +#line 2614 "gitg-commit-dialog.c" + } else { + gboolean _tmp3_ = FALSE; #line 163 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp3_ = self->priv->d_infobar_shown; + _tmp3_ = self->priv->d_infobar_shown; #line 163 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - if (_tmp3_) { -#line 2601 "gitg-commit-dialog.c" - GtkRevealer* _tmp4_ = NULL; + if (_tmp3_) { +#line 2621 "gitg-commit-dialog.c" + GtkRevealer* _tmp4_ = NULL; #line 165 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp4_ = self->priv->d_infobar_revealer; + _tmp4_ = self->priv->d_infobar_revealer; #line 165 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - gtk_revealer_set_reveal_child (_tmp4_, TRUE); -#line 2607 "gitg-commit-dialog.c" + gtk_revealer_set_reveal_child (_tmp4_, TRUE); +#line 2627 "gitg-commit-dialog.c" + } } - } #line 168 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - gitg_commit_dialog_update_sensitivity (self); + gitg_commit_dialog_update_sensitivity (self); #line 154 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - g_object_notify ((GObject *) self, "amend"); -#line 2614 "gitg-commit-dialog.c" + g_object_notify ((GObject *) self, "amend"); +#line 2634 "gitg-commit-dialog.c" + } } @@ -2625,21 +2646,25 @@ result = _tmp0_; #line 177 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return result; -#line 2629 "gitg-commit-dialog.c" +#line 2650 "gitg-commit-dialog.c" } void gitg_commit_dialog_set_sign_off (GitgCommitDialog* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 177 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" g_return_if_fail (self != NULL); #line 177 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp0_ = value; + if (gitg_commit_dialog_get_sign_off (self) != value) { +#line 2659 "gitg-commit-dialog.c" + gboolean _tmp0_ = FALSE; +#line 177 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" + _tmp0_ = value; #line 177 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - self->priv->_sign_off = _tmp0_; + self->priv->_sign_off = _tmp0_; #line 177 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - g_object_notify ((GObject *) self, "sign-off"); -#line 2643 "gitg-commit-dialog.c" + g_object_notify ((GObject *) self, "sign-off"); +#line 2667 "gitg-commit-dialog.c" + } } @@ -2654,23 +2679,27 @@ result = _tmp0_; #line 181 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return result; -#line 2658 "gitg-commit-dialog.c" +#line 2683 "gitg-commit-dialog.c" } void gitg_commit_dialog_set_show_markup (GitgCommitDialog* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 183 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" g_return_if_fail (self != NULL); +#line 183 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" + if (gitg_commit_dialog_get_show_markup (self) != value) { +#line 2692 "gitg-commit-dialog.c" + gboolean _tmp0_ = FALSE; #line 185 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp0_ = value; + _tmp0_ = value; #line 185 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - self->priv->d_show_markup = _tmp0_; + self->priv->d_show_markup = _tmp0_; #line 186 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - gitg_commit_dialog_update_highlight (self); + gitg_commit_dialog_update_highlight (self); #line 183 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - g_object_notify ((GObject *) self, "show-markup"); -#line 2674 "gitg-commit-dialog.c" + g_object_notify ((GObject *) self, "show-markup"); +#line 2702 "gitg-commit-dialog.c" + } } @@ -2685,23 +2714,27 @@ result = _tmp0_; #line 194 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return result; -#line 2689 "gitg-commit-dialog.c" +#line 2718 "gitg-commit-dialog.c" } void gitg_commit_dialog_set_show_right_margin (GitgCommitDialog* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 196 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" g_return_if_fail (self != NULL); +#line 196 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" + if (gitg_commit_dialog_get_show_right_margin (self) != value) { +#line 2727 "gitg-commit-dialog.c" + gboolean _tmp0_ = FALSE; #line 198 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp0_ = value; + _tmp0_ = value; #line 198 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - self->priv->d_show_right_margin = _tmp0_; + self->priv->d_show_right_margin = _tmp0_; #line 199 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - gitg_commit_dialog_update_highlight (self); + gitg_commit_dialog_update_highlight (self); #line 196 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - g_object_notify ((GObject *) self, "show-right-margin"); -#line 2705 "gitg-commit-dialog.c" + g_object_notify ((GObject *) self, "show-right-margin"); +#line 2737 "gitg-commit-dialog.c" + } } @@ -2716,23 +2749,27 @@ result = _tmp0_; #line 207 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return result; -#line 2720 "gitg-commit-dialog.c" +#line 2753 "gitg-commit-dialog.c" } void gitg_commit_dialog_set_show_subject_margin (GitgCommitDialog* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 209 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" g_return_if_fail (self != NULL); +#line 209 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" + if (gitg_commit_dialog_get_show_subject_margin (self) != value) { +#line 2762 "gitg-commit-dialog.c" + gboolean _tmp0_ = FALSE; #line 211 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp0_ = value; + _tmp0_ = value; #line 211 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - self->priv->d_show_subject_margin = _tmp0_; + self->priv->d_show_subject_margin = _tmp0_; #line 212 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - gitg_commit_dialog_update_highlight (self); + gitg_commit_dialog_update_highlight (self); #line 209 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - g_object_notify ((GObject *) self, "show-subject-margin"); -#line 2736 "gitg-commit-dialog.c" + g_object_notify ((GObject *) self, "show-subject-margin"); +#line 2772 "gitg-commit-dialog.c" + } } @@ -2747,23 +2784,27 @@ result = _tmp0_; #line 220 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return result; -#line 2751 "gitg-commit-dialog.c" +#line 2788 "gitg-commit-dialog.c" } void gitg_commit_dialog_set_right_margin_position (GitgCommitDialog* self, gint value) { - gint _tmp0_ = 0; #line 222 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" g_return_if_fail (self != NULL); +#line 222 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" + if (gitg_commit_dialog_get_right_margin_position (self) != value) { +#line 2797 "gitg-commit-dialog.c" + gint _tmp0_ = 0; #line 224 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp0_ = value; + _tmp0_ = value; #line 224 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - self->priv->d_right_margin_position = _tmp0_; + self->priv->d_right_margin_position = _tmp0_; #line 225 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - gitg_commit_dialog_update_highlight (self); + gitg_commit_dialog_update_highlight (self); #line 222 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - g_object_notify ((GObject *) self, "right-margin-position"); -#line 2767 "gitg-commit-dialog.c" + g_object_notify ((GObject *) self, "right-margin-position"); +#line 2807 "gitg-commit-dialog.c" + } } @@ -2778,23 +2819,27 @@ result = _tmp0_; #line 233 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return result; -#line 2782 "gitg-commit-dialog.c" +#line 2823 "gitg-commit-dialog.c" } void gitg_commit_dialog_set_subject_margin_position (GitgCommitDialog* self, gint value) { - gint _tmp0_ = 0; #line 235 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" g_return_if_fail (self != NULL); +#line 235 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" + if (gitg_commit_dialog_get_subject_margin_position (self) != value) { +#line 2832 "gitg-commit-dialog.c" + gint _tmp0_ = 0; #line 237 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp0_ = value; + _tmp0_ = value; #line 237 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - self->priv->d_subject_margin_position = _tmp0_; + self->priv->d_subject_margin_position = _tmp0_; #line 238 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - gitg_commit_dialog_update_highlight (self); + gitg_commit_dialog_update_highlight (self); #line 235 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - g_object_notify ((GObject *) self, "subject-margin-position"); -#line 2798 "gitg-commit-dialog.c" + g_object_notify ((GObject *) self, "subject-margin-position"); +#line 2842 "gitg-commit-dialog.c" + } } @@ -2812,28 +2857,32 @@ result = _tmp1_; #line 246 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return result; -#line 2816 "gitg-commit-dialog.c" +#line 2861 "gitg-commit-dialog.c" } void gitg_commit_dialog_set_author (GitgCommitDialog* self, GgitSignature* value) { - GgitSignature* _tmp0_ = NULL; - GgitSignature* _tmp1_ = NULL; #line 248 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" g_return_if_fail (self != NULL); +#line 248 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" + if (gitg_commit_dialog_get_author (self) != value) { +#line 2870 "gitg-commit-dialog.c" + GgitSignature* _tmp0_ = NULL; + GgitSignature* _tmp1_ = NULL; #line 250 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp0_ = value; + _tmp0_ = value; #line 250 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 250 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _g_object_unref0 (self->priv->d_author); + _g_object_unref0 (self->priv->d_author); #line 250 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - self->priv->d_author = _tmp1_; + self->priv->d_author = _tmp1_; #line 251 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - gitg_commit_dialog_load_author_info (self); + gitg_commit_dialog_load_author_info (self); #line 248 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - g_object_notify ((GObject *) self, "author"); -#line 2837 "gitg-commit-dialog.c" + g_object_notify ((GObject *) self, "author"); +#line 2885 "gitg-commit-dialog.c" + } } @@ -2848,28 +2897,32 @@ result = _tmp0_; #line 257 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return result; -#line 2852 "gitg-commit-dialog.c" +#line 2901 "gitg-commit-dialog.c" } void gitg_commit_dialog_set_spell_checking_language (GitgCommitDialog* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; #line 259 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" g_return_if_fail (self != NULL); +#line 259 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" + if (g_strcmp0 (value, gitg_commit_dialog_get_spell_checking_language (self)) != 0) { +#line 2910 "gitg-commit-dialog.c" + const gchar* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; #line 261 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp0_ = value; + _tmp0_ = value; #line 261 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp1_ = g_strdup (_tmp0_); #line 261 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _g_free0 (self->priv->d_spell_checking_language); + _g_free0 (self->priv->d_spell_checking_language); #line 261 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - self->priv->d_spell_checking_language = _tmp1_; + self->priv->d_spell_checking_language = _tmp1_; #line 262 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - gitg_commit_dialog_set_spell_language (self); + gitg_commit_dialog_set_spell_language (self); #line 259 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - g_object_notify ((GObject *) self, "spell-checking-language"); -#line 2873 "gitg-commit-dialog.c" + g_object_notify ((GObject *) self, "spell-checking-language"); +#line 2925 "gitg-commit-dialog.c" + } } @@ -2884,7 +2937,7 @@ result = _tmp0_; #line 268 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return result; -#line 2888 "gitg-commit-dialog.c" +#line 2941 "gitg-commit-dialog.c" } @@ -2897,85 +2950,89 @@ _tmp1_ = gtk_spell_checker_get_language (_tmp0_); #line 283 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" gitg_commit_dialog_set_spell_checking_language (self, _tmp1_); -#line 2901 "gitg-commit-dialog.c" +#line 2954 "gitg-commit-dialog.c" } static void __gitg_commit_dialog_enable_spell_checking_____lambda8__gtk_spell_checker_language_changed (GtkSpellChecker* _sender, const gchar* new_lang, gpointer self) { #line 282 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _gitg_commit_dialog_enable_spell_checking_____lambda8_ ((GitgCommitDialog*) self); -#line 2908 "gitg-commit-dialog.c" +#line 2961 "gitg-commit-dialog.c" } void gitg_commit_dialog_set_enable_spell_checking (GitgCommitDialog* self, gboolean value) { - gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; #line 269 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" g_return_if_fail (self != NULL); +#line 269 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" + if (gitg_commit_dialog_get_enable_spell_checking (self) != value) { +#line 2970 "gitg-commit-dialog.c" + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; #line 271 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp0_ = value; + _tmp0_ = value; #line 271 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - self->priv->d_enable_spell_checking = _tmp0_; + self->priv->d_enable_spell_checking = _tmp0_; #line 273 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp1_ = self->priv->d_enable_spell_checking; + _tmp1_ = self->priv->d_enable_spell_checking; #line 273 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - if (_tmp1_) { -#line 2925 "gitg-commit-dialog.c" - GtkSpellChecker* _tmp2_ = NULL; + if (_tmp1_) { +#line 2981 "gitg-commit-dialog.c" + GtkSpellChecker* _tmp2_ = NULL; #line 275 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp2_ = self->priv->d_spell_checker; + _tmp2_ = self->priv->d_spell_checker; #line 275 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - if (_tmp2_ == NULL) { -#line 2931 "gitg-commit-dialog.c" - GtkSpellChecker* _tmp3_ = NULL; - GtkSpellChecker* _tmp4_ = NULL; - GtkSourceView* _tmp5_ = NULL; - GtkSpellChecker* _tmp6_ = NULL; + if (_tmp2_ == NULL) { +#line 2987 "gitg-commit-dialog.c" + GtkSpellChecker* _tmp3_ = NULL; + GtkSpellChecker* _tmp4_ = NULL; + GtkSourceView* _tmp5_ = NULL; + GtkSpellChecker* _tmp6_ = NULL; #line 277 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp3_ = gtk_spell_checker_new (); + _tmp3_ = gtk_spell_checker_new (); #line 277 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - g_object_ref_sink (_tmp3_); + g_object_ref_sink (_tmp3_); #line 277 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _g_object_unref0 (self->priv->d_spell_checker); + _g_object_unref0 (self->priv->d_spell_checker); #line 277 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - self->priv->d_spell_checker = _tmp3_; + self->priv->d_spell_checker = _tmp3_; #line 278 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp4_ = self->priv->d_spell_checker; + _tmp4_ = self->priv->d_spell_checker; #line 278 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp5_ = self->priv->d_source_view_message; + _tmp5_ = self->priv->d_source_view_message; #line 278 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - gtk_spell_checker_attach (_tmp4_, (GtkTextView*) _tmp5_); + gtk_spell_checker_attach (_tmp4_, (GtkTextView*) _tmp5_); #line 280 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - gitg_commit_dialog_set_spell_language (self); + gitg_commit_dialog_set_spell_language (self); #line 282 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp6_ = self->priv->d_spell_checker; + _tmp6_ = self->priv->d_spell_checker; #line 282 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - g_signal_connect_object (_tmp6_, "language-changed", (GCallback) __gitg_commit_dialog_enable_spell_checking_____lambda8__gtk_spell_checker_language_changed, self, 0); -#line 2956 "gitg-commit-dialog.c" - } - } else { - GtkSpellChecker* _tmp7_ = NULL; + g_signal_connect_object (_tmp6_, "language-changed", (GCallback) __gitg_commit_dialog_enable_spell_checking_____lambda8__gtk_spell_checker_language_changed, self, 0); +#line 3012 "gitg-commit-dialog.c" + } + } else { + GtkSpellChecker* _tmp7_ = NULL; #line 289 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp7_ = self->priv->d_spell_checker; + _tmp7_ = self->priv->d_spell_checker; #line 289 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - if (_tmp7_ != NULL) { -#line 2964 "gitg-commit-dialog.c" - GtkSpellChecker* _tmp8_ = NULL; + if (_tmp7_ != NULL) { +#line 3020 "gitg-commit-dialog.c" + GtkSpellChecker* _tmp8_ = NULL; #line 291 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp8_ = self->priv->d_spell_checker; + _tmp8_ = self->priv->d_spell_checker; #line 291 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - gtk_spell_checker_detach (_tmp8_); + gtk_spell_checker_detach (_tmp8_); #line 292 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _g_object_unref0 (self->priv->d_spell_checker); + _g_object_unref0 (self->priv->d_spell_checker); #line 292 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - self->priv->d_spell_checker = NULL; -#line 2974 "gitg-commit-dialog.c" + self->priv->d_spell_checker = NULL; +#line 3030 "gitg-commit-dialog.c" + } } - } #line 269 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - g_object_notify ((GObject *) self, "enable-spell-checking"); -#line 2979 "gitg-commit-dialog.c" + g_object_notify ((GObject *) self, "enable-spell-checking"); +#line 3035 "gitg-commit-dialog.c" + } } @@ -2990,34 +3047,38 @@ result = _tmp0_; #line 318 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return result; -#line 2994 "gitg-commit-dialog.c" +#line 3051 "gitg-commit-dialog.c" } void gitg_commit_dialog_set_use_gravatar (GitgCommitDialog* self, gboolean value) { - gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; #line 319 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" g_return_if_fail (self != NULL); +#line 319 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" + if (gitg_commit_dialog_get_use_gravatar (self) != value) { +#line 3060 "gitg-commit-dialog.c" + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; #line 321 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp0_ = self->priv->d_use_gravatar; + _tmp0_ = self->priv->d_use_gravatar; #line 321 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp1_ = value; + _tmp1_ = value; #line 321 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - if (_tmp0_ != _tmp1_) { -#line 3009 "gitg-commit-dialog.c" - gboolean _tmp2_ = FALSE; + if (_tmp0_ != _tmp1_) { +#line 3069 "gitg-commit-dialog.c" + gboolean _tmp2_ = FALSE; #line 323 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp2_ = value; + _tmp2_ = value; #line 323 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - self->priv->d_use_gravatar = _tmp2_; + self->priv->d_use_gravatar = _tmp2_; #line 324 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - gitg_commit_dialog_load_author_info (self); -#line 3017 "gitg-commit-dialog.c" - } + gitg_commit_dialog_load_author_info (self); +#line 3077 "gitg-commit-dialog.c" + } #line 319 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - g_object_notify ((GObject *) self, "use-gravatar"); -#line 3021 "gitg-commit-dialog.c" + g_object_notify ((GObject *) self, "use-gravatar"); +#line 3081 "gitg-commit-dialog.c" + } } @@ -3028,28 +3089,28 @@ g_return_if_fail (k != NULL); #line 428 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" gitg_commit_dialog_update_font_settings (self); -#line 3032 "gitg-commit-dialog.c" +#line 3093 "gitg-commit-dialog.c" } static void __gitg_commit_dialog___lambda9__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) { #line 427 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _gitg_commit_dialog___lambda9_ ((GitgCommitDialog*) self, _sender, key); -#line 3039 "gitg-commit-dialog.c" +#line 3100 "gitg-commit-dialog.c" } static void _gitg_commit_dialog___lambda10_ (GitgCommitDialog* self) { #line 434 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" gitg_commit_dialog_update_sensitivity (self); -#line 3046 "gitg-commit-dialog.c" +#line 3107 "gitg-commit-dialog.c" } static void __gitg_commit_dialog___lambda10__gtk_text_buffer_changed (GtkTextBuffer* _sender, gpointer self) { #line 433 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _gitg_commit_dialog___lambda10_ ((GitgCommitDialog*) self); -#line 3053 "gitg-commit-dialog.c" +#line 3114 "gitg-commit-dialog.c" } @@ -3199,7 +3260,7 @@ _g_object_unref0 (_tmp26_); #line 502 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (_tmp27_) { -#line 3203 "gitg-commit-dialog.c" +#line 3264 "gitg-commit-dialog.c" GgitDiff* _tmp28_ = NULL; GgitDiff* _tmp29_ = NULL; GgitDiff* _tmp30_ = NULL; @@ -3216,27 +3277,21 @@ _tmp23_ = _tmp31_ != ((gsize) 0); #line 502 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_object_unref0 (_tmp30_); -#line 3220 "gitg-commit-dialog.c" +#line 3281 "gitg-commit-dialog.c" } else { #line 502 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _tmp23_ = FALSE; -#line 3224 "gitg-commit-dialog.c" +#line 3285 "gitg-commit-dialog.c" } #line 502 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" if (_tmp23_) { #line 504 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" gitg_commit_dialog_iterate_diff (self); -#line 3230 "gitg-commit-dialog.c" +#line 3291 "gitg-commit-dialog.c" } else { - const gchar* _tmp32_ = NULL; - const gchar* _tmp33_ = NULL; -#line 508 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp32_ = _ ("There are no changes to be committed"); -#line 508 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - _tmp33_ = _ ("Use amend to change the commit message of the previous commit"); #line 508 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" - gitg_commit_dialog_show_infobar (self, _tmp32_, _tmp33_, GTK_MESSAGE_WARNING); -#line 3240 "gitg-commit-dialog.c" + gitg_commit_dialog_show_infobar (self, _ ("There are no changes to be committed"), _ ("Use amend to change the commit message of the previous commit"), GTK_MESSAGE_WARNING); +#line 3295 "gitg-commit-dialog.c" } #line 421 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" _g_object_unref0 (interface_settings); @@ -3244,7 +3299,7 @@ _g_object_unref0 (b); #line 421 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" return obj; -#line 3248 "gitg-commit-dialog.c" +#line 3303 "gitg-commit-dialog.c" } @@ -3330,7 +3385,7 @@ gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "list_box_stats", FALSE, GitgCommitDialog_private_offset + G_STRUCT_OFFSET (GitgCommitDialogPrivate, d_list_box_stats)); #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "scrolled_window_stats", FALSE, GitgCommitDialog_private_offset + G_STRUCT_OFFSET (GitgCommitDialogPrivate, d_scrolled_window_stats)); -#line 3334 "gitg-commit-dialog.c" +#line 3389 "gitg-commit-dialog.c" } @@ -3341,11 +3396,11 @@ self->priv->_max_visible_stat_items = 3; #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 3345 "gitg-commit-dialog.c" +#line 3400 "gitg-commit-dialog.c" } -static void gitg_commit_dialog_finalize (GObject* obj) { +static void gitg_commit_dialog_finalize (GObject * obj) { GitgCommitDialog * self; #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_COMMIT_TYPE_DIALOG, GitgCommitDialog); @@ -3401,7 +3456,7 @@ _g_object_unref0 (self->priv->d_too_long_tag); #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" G_OBJECT_CLASS (gitg_commit_dialog_parent_class)->finalize (obj); -#line 3405 "gitg-commit-dialog.c" +#line 3460 "gitg-commit-dialog.c" } @@ -3530,13 +3585,13 @@ g_value_set_boolean (value, gitg_commit_dialog_get_use_gravatar (self)); #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" break; -#line 3534 "gitg-commit-dialog.c" +#line 3589 "gitg-commit-dialog.c" default: #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" break; -#line 3540 "gitg-commit-dialog.c" +#line 3595 "gitg-commit-dialog.c" } } @@ -3642,13 +3697,13 @@ gitg_commit_dialog_set_use_gravatar (self, g_value_get_boolean (value)); #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" break; -#line 3646 "gitg-commit-dialog.c" +#line 3701 "gitg-commit-dialog.c" default: #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-dialog.vala" break; -#line 3652 "gitg-commit-dialog.c" +#line 3707 "gitg-commit-dialog.c" } } diff -Nru gitg-3.22.0/gitg/commit/gitg-commit-paned.c gitg-3.23.0/gitg/commit/gitg-commit-paned.c --- gitg-3.22.0/gitg/commit/gitg-commit-paned.c 2016-09-12 19:56:37.000000000 +0000 +++ gitg-3.23.0/gitg/commit/gitg-commit-paned.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-commit-paned.c generated by valac 0.32.1, the Vala compiler +/* gitg-commit-paned.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-commit-paned.vala, do not modify */ /* @@ -119,7 +119,7 @@ GtkButton* gitg_commit_paned_get_button_stage (GitgCommitPaned* self); GtkButton* gitg_commit_paned_get_button_discard (GitgCommitPaned* self); static GObject * gitg_commit_paned_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); -static void gitg_commit_paned_finalize (GObject* obj); +static void gitg_commit_paned_finalize (GObject * obj); static void _vala_gitg_commit_paned_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); @@ -351,18 +351,18 @@ #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-paned.vala" self->priv = GITG_COMMIT_PANED_GET_PRIVATE (self); #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-paned.vala" + g_type_ensure (GITG_COMMIT_TYPE_SIDEBAR); +#line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-paned.vala" g_type_ensure (GITG_COMMIT_TYPE_SUBMODULE_HISTORY_VIEW); #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-paned.vala" g_type_ensure (GITG_COMMIT_TYPE_SUBMODULE_DIFF_VIEW); #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-paned.vala" - g_type_ensure (GITG_COMMIT_TYPE_SIDEBAR); -#line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-paned.vala" gtk_widget_init_template (GTK_WIDGET (self)); #line 362 "gitg-commit-paned.c" } -static void gitg_commit_paned_finalize (GObject* obj) { +static void gitg_commit_paned_finalize (GObject * obj) { GitgCommitPaned * self; #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-paned.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_COMMIT_TYPE_PANED, GitgCommitPaned); diff -Nru gitg-3.22.0/gitg/commit/gitg-commit-sidebar.c gitg-3.23.0/gitg/commit/gitg-commit-sidebar.c --- gitg-3.22.0/gitg/commit/gitg-commit-sidebar.c 2016-08-09 09:50:54.000000000 +0000 +++ gitg-3.23.0/gitg/commit/gitg-commit-sidebar.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-commit-sidebar.c generated by valac 0.32.1, the Vala compiler +/* gitg-commit-sidebar.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-commit-sidebar.vala, do not modify */ /* @@ -52,6 +52,15 @@ typedef struct _GitgCommitSidebarItemClass GitgCommitSidebarItemClass; typedef struct _Block3Data Block3Data; typedef struct _GitgCommitSidebarItemPrivate GitgCommitSidebarItemPrivate; +enum { + GITG_COMMIT_SIDEBAR_STAGE_SELECTION_SIGNAL, + GITG_COMMIT_SIDEBAR_UNSTAGE_SELECTION_SIGNAL, + GITG_COMMIT_SIDEBAR_DISCARD_SELECTION_SIGNAL, + GITG_COMMIT_SIDEBAR_EDIT_SELECTION_SIGNAL, + GITG_COMMIT_SIDEBAR_SELECTED_ITEMS_CHANGED_SIGNAL, + GITG_COMMIT_SIDEBAR_LAST_SIGNAL +}; +static guint gitg_commit_sidebar_signals[GITG_COMMIT_SIDEBAR_LAST_SIGNAL] = {0}; struct _GitgCommitSidebar { GitgSidebar parent_instance; @@ -96,7 +105,7 @@ static gpointer gitg_commit_sidebar_parent_class = NULL; static gpointer gitg_commit_sidebar_item_parent_class = NULL; -static GitgSidebarItemIface* gitg_commit_sidebar_item_gitg_sidebar_item_parent_iface = NULL; +static GitgSidebarItemIface * gitg_commit_sidebar_item_gitg_sidebar_item_parent_iface = NULL; GType gitg_commit_sidebar_get_type (void) G_GNUC_CONST; enum { @@ -113,7 +122,7 @@ static Block3Data* block3_data_ref (Block3Data* _data3_); static void block3_data_unref (void * _userdata_); static gboolean __lambda11_ (Block3Data* _data3_, GtkTreeModel* m, GtkTreePath* path, GtkTreeIter* iter); -static void _vala_array_add1 (GitgCommitSidebarItem*** array, int* length, int* size, GitgCommitSidebarItem* value); +static void _vala_array_add1 (GitgCommitSidebarItem** * array, int* length, int* size, GitgCommitSidebarItem* value); static gboolean ___lambda11__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); static GitgCommitSidebarItem** _vala_array_dup1 (GitgCommitSidebarItem** self, int length); GitgCommitSidebar* gitg_commit_sidebar_new (void); @@ -131,7 +140,7 @@ GitgCommitSidebarItem* gitg_commit_sidebar_item_new (GitgStageStatusItem* item, GitgCommitSidebarItemType type); GitgCommitSidebarItem* gitg_commit_sidebar_item_construct (GType object_type, GitgStageStatusItem* item, GitgCommitSidebarItemType type); GitgStageStatusItem* gitg_commit_sidebar_item_get_item (GitgCommitSidebarItem* self); -static void gitg_commit_sidebar_item_finalize (GObject* obj); +static void gitg_commit_sidebar_item_finalize (GObject * obj); static void _vala_gitg_commit_sidebar_item_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -140,7 +149,7 @@ static gpointer _g_object_ref0 (gpointer self) { #line 114 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return self ? g_object_ref (self) : NULL; -#line 144 "gitg-commit-sidebar.c" +#line 153 "gitg-commit-sidebar.c" } @@ -168,7 +177,7 @@ _tmp2_ = header; #line 116 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" if (_tmp2_ != NULL) { -#line 172 "gitg-commit-sidebar.c" +#line 181 "gitg-commit-sidebar.c" GitgSidebarStoreSidebarHeader* _tmp3_ = NULL; guint _tmp4_ = 0U; guint _tmp5_ = 0U; @@ -184,7 +193,7 @@ _g_object_unref0 (header); #line 118 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return result; -#line 188 "gitg-commit-sidebar.c" +#line 197 "gitg-commit-sidebar.c" } #line 121 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" _tmp6_ = item; @@ -196,7 +205,7 @@ _tmp8_ = sitem; #line 123 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" if (_tmp8_ != NULL) { -#line 200 "gitg-commit-sidebar.c" +#line 209 "gitg-commit-sidebar.c" GitgCommitSidebarItem* _tmp9_ = NULL; GitgCommitSidebarItemType _tmp10_ = 0; GitgCommitSidebarItemType _tmp11_ = 0; @@ -214,7 +223,7 @@ _g_object_unref0 (header); #line 125 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return result; -#line 218 "gitg-commit-sidebar.c" +#line 227 "gitg-commit-sidebar.c" } #line 128 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" result = GITG_COMMIT_SIDEBAR_ITEM_TYPE_NONE; @@ -224,7 +233,7 @@ _g_object_unref0 (header); #line 128 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return result; -#line 228 "gitg-commit-sidebar.c" +#line 237 "gitg-commit-sidebar.c" } @@ -236,7 +245,7 @@ g_return_val_if_fail (self != NULL, 0); #line 133 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" _tmp1_ = gitg_sidebar_get_selected_items ((GitgSidebar*) self, GITG_TYPE_SIDEBAR_ITEM, (GBoxedCopyFunc) g_object_ref, g_object_unref, &_tmp0_); -#line 240 "gitg-commit-sidebar.c" +#line 249 "gitg-commit-sidebar.c" { GitgSidebarItem** item_collection = NULL; gint item_collection_length1 = 0; @@ -248,14 +257,14 @@ item_collection_length1 = _tmp0_; #line 133 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" for (item_it = 0; item_it < _tmp0_; item_it = item_it + 1) { -#line 252 "gitg-commit-sidebar.c" +#line 261 "gitg-commit-sidebar.c" GitgSidebarItem* _tmp2_ = NULL; GitgSidebarItem* item = NULL; #line 133 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" _tmp2_ = _g_object_ref0 (item_collection[item_it]); #line 133 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" item = _tmp2_; -#line 259 "gitg-commit-sidebar.c" +#line 268 "gitg-commit-sidebar.c" { GitgCommitSidebarItemType tp = 0; GitgSidebarItem* _tmp3_ = NULL; @@ -279,22 +288,22 @@ item_collection = (_vala_array_free (item_collection, item_collection_length1, (GDestroyNotify) g_object_unref), NULL); #line 139 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return result; -#line 283 "gitg-commit-sidebar.c" +#line 292 "gitg-commit-sidebar.c" } #line 133 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" _g_object_unref0 (item); -#line 287 "gitg-commit-sidebar.c" +#line 296 "gitg-commit-sidebar.c" } } #line 133 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" item_collection = (_vala_array_free (item_collection, item_collection_length1, (GDestroyNotify) g_object_unref), NULL); -#line 292 "gitg-commit-sidebar.c" +#line 301 "gitg-commit-sidebar.c" } #line 143 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" result = GITG_COMMIT_SIDEBAR_ITEM_TYPE_NONE; #line 143 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return result; -#line 298 "gitg-commit-sidebar.c" +#line 307 "gitg-commit-sidebar.c" } @@ -346,7 +355,7 @@ result = TRUE; #line 153 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return result; -#line 350 "gitg-commit-sidebar.c" +#line 359 "gitg-commit-sidebar.c" } #line 157 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" _tmp1_ = model; @@ -378,7 +387,7 @@ _g_object_unref0 (m); #line 166 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return result; -#line 382 "gitg-commit-sidebar.c" +#line 391 "gitg-commit-sidebar.c" } #line 169 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" _tmp9_ = m; @@ -398,7 +407,7 @@ _tmp14_ = header; #line 174 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" if (_tmp14_ != NULL) { -#line 402 "gitg-commit-sidebar.c" +#line 411 "gitg-commit-sidebar.c" GitgCommitSidebarItemType id = 0; GitgSidebarStoreSidebarHeader* _tmp15_ = NULL; guint _tmp16_ = 0U; @@ -419,14 +428,14 @@ if (_tmp19_ == GITG_COMMIT_SIDEBAR_ITEM_TYPE_UNTRACKED) { #line 178 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" _tmp18_ = TRUE; -#line 423 "gitg-commit-sidebar.c" +#line 432 "gitg-commit-sidebar.c" } else { GitgCommitSidebarItemType _tmp20_ = 0; #line 178 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" _tmp20_ = id; #line 178 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" _tmp18_ = _tmp20_ == GITG_COMMIT_SIDEBAR_ITEM_TYPE_SUBMODULE; -#line 430 "gitg-commit-sidebar.c" +#line 439 "gitg-commit-sidebar.c" } #line 178 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" if (_tmp18_) { @@ -440,7 +449,7 @@ _g_object_unref0 (m); #line 180 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return result; -#line 444 "gitg-commit-sidebar.c" +#line 453 "gitg-commit-sidebar.c" } } #line 184 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" @@ -461,7 +470,7 @@ _g_object_unref0 (m); #line 188 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return result; -#line 465 "gitg-commit-sidebar.c" +#line 474 "gitg-commit-sidebar.c" } #line 192 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" _tmp23_ = seltp; @@ -477,7 +486,7 @@ _g_object_unref0 (m); #line 194 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return result; -#line 481 "gitg-commit-sidebar.c" +#line 490 "gitg-commit-sidebar.c" } #line 197 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" _tmp24_ = item; @@ -499,7 +508,7 @@ _g_object_unref0 (m); #line 198 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return result; -#line 503 "gitg-commit-sidebar.c" +#line 512 "gitg-commit-sidebar.c" } @@ -532,7 +541,7 @@ if (_tmp3_) { #line 205 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return; -#line 536 "gitg-commit-sidebar.c" +#line 545 "gitg-commit-sidebar.c" } #line 208 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" _tmp5_ = gitg_sidebar_get_selected_items ((GitgSidebar*) self, GITG_TYPE_SIDEBAR_ITEM, (GBoxedCopyFunc) g_object_ref, g_object_unref, &_tmp4_); @@ -550,7 +559,7 @@ if (_tmp6__length1 == 0) { #line 212 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" g_signal_emit_by_name ((GitgSidebar*) self, "deselected"); -#line 554 "gitg-commit-sidebar.c" +#line 563 "gitg-commit-sidebar.c" } else { GitgSidebarItem** _tmp7_ = NULL; gint _tmp7__length1 = 0; @@ -559,12 +568,12 @@ #line 216 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" _tmp7__length1 = items_length1; #line 216 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" - g_signal_emit_by_name (self, "selected-items-changed", _tmp7_, _tmp7__length1); -#line 564 "gitg-commit-sidebar.c" + g_signal_emit (self, gitg_commit_sidebar_signals[GITG_COMMIT_SIDEBAR_SELECTED_ITEMS_CHANGED_SIGNAL], 0, _tmp7_, _tmp7__length1); +#line 573 "gitg-commit-sidebar.c" } #line 201 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" items = (_vala_array_free (items, items_length1, (GDestroyNotify) g_object_unref), NULL); -#line 568 "gitg-commit-sidebar.c" +#line 577 "gitg-commit-sidebar.c" } @@ -573,7 +582,7 @@ g_atomic_int_inc (&_data3_->_ref_count_); #line 220 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return _data3_; -#line 577 "gitg-commit-sidebar.c" +#line 586 "gitg-commit-sidebar.c" } @@ -582,7 +591,7 @@ _data3_ = (Block3Data*) _userdata_; #line 220 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) { -#line 586 "gitg-commit-sidebar.c" +#line 595 "gitg-commit-sidebar.c" GitgCommitSidebar* self; #line 220 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" self = _data3_->self; @@ -592,25 +601,25 @@ _g_object_unref0 (self); #line 220 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" g_slice_free (Block3Data, _data3_); -#line 596 "gitg-commit-sidebar.c" +#line 605 "gitg-commit-sidebar.c" } } -static void _vala_array_add1 (GitgCommitSidebarItem*** array, int* length, int* size, GitgCommitSidebarItem* value) { +static void _vala_array_add1 (GitgCommitSidebarItem** * array, int* length, int* size, GitgCommitSidebarItem* value) { #line 236 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" if ((*length) == (*size)) { #line 236 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" *size = (*size) ? (2 * (*size)) : 4; #line 236 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" *array = g_renew (GitgCommitSidebarItem*, *array, (*size) + 1); -#line 608 "gitg-commit-sidebar.c" +#line 617 "gitg-commit-sidebar.c" } #line 236 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" (*array)[(*length)++] = value; #line 236 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" (*array)[*length] = NULL; -#line 614 "gitg-commit-sidebar.c" +#line 623 "gitg-commit-sidebar.c" } @@ -656,7 +665,7 @@ _g_object_unref0 (item); #line 229 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return result; -#line 660 "gitg-commit-sidebar.c" +#line 669 "gitg-commit-sidebar.c" } #line 232 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" _tmp5_ = item; @@ -668,7 +677,7 @@ _tmp8_ = sitem; #line 234 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" if (_tmp8_ != NULL) { -#line 672 "gitg-commit-sidebar.c" +#line 681 "gitg-commit-sidebar.c" GitgCommitSidebarItem* _tmp9_ = NULL; GitgCommitSidebarItemType _tmp10_ = 0; GitgCommitSidebarItemType _tmp11_ = 0; @@ -683,15 +692,15 @@ _tmp12_ = _data3_->type; #line 234 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" _tmp7_ = _tmp11_ == _tmp12_; -#line 687 "gitg-commit-sidebar.c" +#line 696 "gitg-commit-sidebar.c" } else { #line 234 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" _tmp7_ = FALSE; -#line 691 "gitg-commit-sidebar.c" +#line 700 "gitg-commit-sidebar.c" } #line 234 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" if (_tmp7_) { -#line 695 "gitg-commit-sidebar.c" +#line 704 "gitg-commit-sidebar.c" GitgCommitSidebarItem* _tmp13_ = NULL; GitgCommitSidebarItem* _tmp14_ = NULL; #line 236 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" @@ -700,7 +709,7 @@ _tmp14_ = _g_object_ref0 (_tmp13_); #line 236 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" _vala_array_add1 (&_data3_->ret, &_data3_->ret_length1, &_data3_->_ret_size_, _tmp14_); -#line 704 "gitg-commit-sidebar.c" +#line 713 "gitg-commit-sidebar.c" } #line 239 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" result = FALSE; @@ -710,7 +719,7 @@ _g_object_unref0 (item); #line 239 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return result; -#line 714 "gitg-commit-sidebar.c" +#line 723 "gitg-commit-sidebar.c" } @@ -719,7 +728,7 @@ result = __lambda11_ (self, model, path, iter); #line 224 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return result; -#line 723 "gitg-commit-sidebar.c" +#line 732 "gitg-commit-sidebar.c" } @@ -730,17 +739,17 @@ result = g_new0 (GitgCommitSidebarItem*, length + 1); #line 242 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" for (i = 0; i < length; i++) { -#line 734 "gitg-commit-sidebar.c" +#line 743 "gitg-commit-sidebar.c" GitgCommitSidebarItem* _tmp0_ = NULL; #line 242 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 242 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" result[i] = _tmp0_; -#line 740 "gitg-commit-sidebar.c" +#line 749 "gitg-commit-sidebar.c" } #line 242 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return result; -#line 744 "gitg-commit-sidebar.c" +#line 753 "gitg-commit-sidebar.c" } @@ -793,7 +802,7 @@ if (result_length1) { #line 242 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" *result_length1 = _tmp5__length1; -#line 797 "gitg-commit-sidebar.c" +#line 806 "gitg-commit-sidebar.c" } #line 242 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" result = _tmp5_; @@ -803,7 +812,7 @@ _data3_ = NULL; #line 242 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return result; -#line 807 "gitg-commit-sidebar.c" +#line 816 "gitg-commit-sidebar.c" } @@ -813,14 +822,14 @@ self = (GitgCommitSidebar*) gitg_sidebar_construct (object_type); #line 23 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return self; -#line 817 "gitg-commit-sidebar.c" +#line 826 "gitg-commit-sidebar.c" } GitgCommitSidebar* gitg_commit_sidebar_new (void) { #line 23 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return gitg_commit_sidebar_construct (GITG_COMMIT_TYPE_SIDEBAR); -#line 824 "gitg-commit-sidebar.c" +#line 833 "gitg-commit-sidebar.c" } @@ -839,19 +848,19 @@ data1 = closure->data; #line 23 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" data2 = param_values->data[0].v_pointer; -#line 843 "gitg-commit-sidebar.c" +#line 852 "gitg-commit-sidebar.c" } else { #line 23 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" data1 = param_values->data[0].v_pointer; #line 23 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" data2 = closure->data; -#line 849 "gitg-commit-sidebar.c" +#line 858 "gitg-commit-sidebar.c" } #line 23 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" callback = (GMarshalFunc_VOID__POINTER_INT) (marshal_data ? marshal_data : cc->callback); #line 23 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" callback (data1, g_value_get_pointer (param_values + 1), g_value_get_int (param_values + 2), data2); -#line 855 "gitg-commit-sidebar.c" +#line 864 "gitg-commit-sidebar.c" } @@ -912,7 +921,7 @@ _g_object_unref0 (sel); #line 80 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return obj; -#line 916 "gitg-commit-sidebar.c" +#line 925 "gitg-commit-sidebar.c" } @@ -951,14 +960,14 @@ self->priv->d_type = _tmp2_; #line 53 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return self; -#line 955 "gitg-commit-sidebar.c" +#line 964 "gitg-commit-sidebar.c" } GitgCommitSidebarItem* gitg_commit_sidebar_item_new (GitgStageStatusItem* item, GitgCommitSidebarItemType type) { #line 53 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return gitg_commit_sidebar_item_construct (GITG_COMMIT_SIDEBAR_TYPE_ITEM, item, type); -#line 962 "gitg-commit-sidebar.c" +#line 971 "gitg-commit-sidebar.c" } @@ -973,7 +982,7 @@ result = _tmp0_; #line 61 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return result; -#line 977 "gitg-commit-sidebar.c" +#line 986 "gitg-commit-sidebar.c" } @@ -995,7 +1004,7 @@ result = _tmp2_; #line 66 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return result; -#line 999 "gitg-commit-sidebar.c" +#line 1008 "gitg-commit-sidebar.c" } @@ -1010,7 +1019,7 @@ result = _tmp0_; #line 71 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return result; -#line 1014 "gitg-commit-sidebar.c" +#line 1023 "gitg-commit-sidebar.c" } @@ -1032,7 +1041,7 @@ result = _tmp2_; #line 76 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" return result; -#line 1036 "gitg-commit-sidebar.c" +#line 1045 "gitg-commit-sidebar.c" } @@ -1053,7 +1062,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_COMMIT_SIDEBAR_ITEM_STAGE_TYPE, g_param_spec_enum ("stage-type", "stage-type", "stage-type", GITG_COMMIT_SIDEBAR_ITEM_TYPE_TYPE, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 39 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_COMMIT_SIDEBAR_ITEM_ICON_NAME, g_param_spec_string ("icon-name", "icon-name", "icon-name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1057 "gitg-commit-sidebar.c" +#line 1066 "gitg-commit-sidebar.c" } @@ -1064,18 +1073,18 @@ iface->get_text = gitg_commit_sidebar_item_real_get_text; #line 39 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" iface->get_icon_name = gitg_commit_sidebar_item_real_get_icon_name; -#line 1068 "gitg-commit-sidebar.c" +#line 1077 "gitg-commit-sidebar.c" } static void gitg_commit_sidebar_item_instance_init (GitgCommitSidebarItem * self) { #line 39 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" self->priv = GITG_COMMIT_SIDEBAR_ITEM_GET_PRIVATE (self); -#line 1075 "gitg-commit-sidebar.c" +#line 1084 "gitg-commit-sidebar.c" } -static void gitg_commit_sidebar_item_finalize (GObject* obj) { +static void gitg_commit_sidebar_item_finalize (GObject * obj) { GitgCommitSidebarItem * self; #line 39 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_COMMIT_SIDEBAR_TYPE_ITEM, GitgCommitSidebarItem); @@ -1083,7 +1092,7 @@ _g_object_unref0 (self->priv->d_item); #line 39 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" G_OBJECT_CLASS (gitg_commit_sidebar_item_parent_class)->finalize (obj); -#line 1087 "gitg-commit-sidebar.c" +#line 1096 "gitg-commit-sidebar.c" } @@ -1130,13 +1139,13 @@ g_value_take_string (value, gitg_sidebar_item_get_icon_name ((GitgSidebarItem*) self)); #line 39 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" break; -#line 1134 "gitg-commit-sidebar.c" +#line 1143 "gitg-commit-sidebar.c" default: #line 39 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 39 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" break; -#line 1140 "gitg-commit-sidebar.c" +#line 1149 "gitg-commit-sidebar.c" } } @@ -1151,16 +1160,16 @@ #line 23 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" G_OBJECT_CLASS (klass)->constructor = gitg_commit_sidebar_constructor; #line 23 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" - g_signal_new ("stage_selection", GITG_COMMIT_TYPE_SIDEBAR, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_commit_sidebar_signals[GITG_COMMIT_SIDEBAR_STAGE_SELECTION_SIGNAL] = g_signal_new ("stage_selection", GITG_COMMIT_TYPE_SIDEBAR, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 23 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" - g_signal_new ("unstage_selection", GITG_COMMIT_TYPE_SIDEBAR, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_commit_sidebar_signals[GITG_COMMIT_SIDEBAR_UNSTAGE_SELECTION_SIGNAL] = g_signal_new ("unstage_selection", GITG_COMMIT_TYPE_SIDEBAR, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 23 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" - g_signal_new ("discard_selection", GITG_COMMIT_TYPE_SIDEBAR, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_commit_sidebar_signals[GITG_COMMIT_SIDEBAR_DISCARD_SELECTION_SIGNAL] = g_signal_new ("discard_selection", GITG_COMMIT_TYPE_SIDEBAR, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 23 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" - g_signal_new ("edit_selection", GITG_COMMIT_TYPE_SIDEBAR, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_commit_sidebar_signals[GITG_COMMIT_SIDEBAR_EDIT_SELECTION_SIGNAL] = g_signal_new ("edit_selection", GITG_COMMIT_TYPE_SIDEBAR, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 23 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-sidebar.vala" - g_signal_new ("selected_items_changed", GITG_COMMIT_TYPE_SIDEBAR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__POINTER_INT, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_INT); -#line 1164 "gitg-commit-sidebar.c" + gitg_commit_sidebar_signals[GITG_COMMIT_SIDEBAR_SELECTED_ITEMS_CHANGED_SIGNAL] = g_signal_new ("selected_items_changed", GITG_COMMIT_TYPE_SIDEBAR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__POINTER_INT, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_INT); +#line 1173 "gitg-commit-sidebar.c" } diff -Nru gitg-3.22.0/gitg/commit/gitg-commit-submodule-diff-view.c gitg-3.23.0/gitg/commit/gitg-commit-submodule-diff-view.c --- gitg-3.22.0/gitg/commit/gitg-commit-submodule-diff-view.c 2016-08-09 09:50:54.000000000 +0000 +++ gitg-3.23.0/gitg/commit/gitg-commit-submodule-diff-view.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-commit-submodule-diff-view.c generated by valac 0.32.1, the Vala compiler +/* gitg-commit-submodule-diff-view.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-commit-submodule-diff-view.vala, do not modify */ /* @@ -83,7 +83,7 @@ GitgDiffView* gitg_commit_submodule_diff_view_get_diff_view_staged (GitgCommitSubmoduleDiffView* self); GitgDiffView* gitg_commit_submodule_diff_view_get_diff_view_unstaged (GitgCommitSubmoduleDiffView* self); static GObject * gitg_commit_submodule_diff_view_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); -static void gitg_commit_submodule_diff_view_finalize (GObject* obj); +static void gitg_commit_submodule_diff_view_finalize (GObject * obj); static void _vala_gitg_commit_submodule_diff_view_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); @@ -226,7 +226,7 @@ } -static void gitg_commit_submodule_diff_view_finalize (GObject* obj) { +static void gitg_commit_submodule_diff_view_finalize (GObject * obj) { GitgCommitSubmoduleDiffView * self; #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-diff-view.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_COMMIT_TYPE_SUBMODULE_DIFF_VIEW, GitgCommitSubmoduleDiffView); diff -Nru gitg-3.22.0/gitg/commit/gitg-commit-submodule-history-view.c gitg-3.23.0/gitg/commit/gitg-commit-submodule-history-view.c --- gitg-3.22.0/gitg/commit/gitg-commit-submodule-history-view.c 2016-08-09 09:50:54.000000000 +0000 +++ gitg-3.23.0/gitg/commit/gitg-commit-submodule-history-view.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-commit-submodule-history-view.c generated by valac 0.32.1, the Vala compiler +/* gitg-commit-submodule-history-view.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-commit-submodule-history-view.vala, do not modify */ /* @@ -66,7 +66,7 @@ GitgCommitSubmoduleHistoryView* gitg_commit_submodule_history_view_construct (GType object_type); GitgCommitListView* gitg_commit_submodule_history_view_get_commit_list_view (GitgCommitSubmoduleHistoryView* self); GitgDiffView* gitg_commit_submodule_history_view_get_diff_view (GitgCommitSubmoduleHistoryView* self); -static void gitg_commit_submodule_history_view_finalize (GObject* obj); +static void gitg_commit_submodule_history_view_finalize (GObject * obj); static void _vala_gitg_commit_submodule_history_view_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); @@ -152,7 +152,7 @@ } -static void gitg_commit_submodule_history_view_finalize (GObject* obj) { +static void gitg_commit_submodule_history_view_finalize (GObject * obj) { GitgCommitSubmoduleHistoryView * self; #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-history-view.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_COMMIT_TYPE_SUBMODULE_HISTORY_VIEW, GitgCommitSubmoduleHistoryView); diff -Nru gitg-3.22.0/gitg/commit/gitg-commit-submodule-info.c gitg-3.23.0/gitg/commit/gitg-commit-submodule-info.c --- gitg-3.22.0/gitg/commit/gitg-commit-submodule-info.c 2016-08-09 09:50:54.000000000 +0000 +++ gitg-3.23.0/gitg/commit/gitg-commit-submodule-info.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-commit-submodule-info.c generated by valac 0.32.1, the Vala compiler +/* gitg-commit-submodule-info.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-commit-submodule-info.vala, do not modify */ /* @@ -44,6 +44,11 @@ #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) #define __vala_GgitOId_free0(var) ((var == NULL) ? NULL : (var = (_vala_GgitOId_free (var), NULL))) +enum { + GITG_COMMIT_SUBMODULE_INFO_REQUEST_OPEN_REPOSITORY_SIGNAL, + GITG_COMMIT_SUBMODULE_INFO_LAST_SIGNAL +}; +static guint gitg_commit_submodule_info_signals[GITG_COMMIT_SUBMODULE_INFO_LAST_SIGNAL] = {0}; struct _GitgCommitSubmoduleInfo { GtkGrid parent_instance; @@ -79,7 +84,7 @@ void gitg_commit_submodule_info_set_submodule (GitgCommitSubmoduleInfo* self, GgitSubmodule* value); static void _vala_GgitOId_free (GgitOId* self); static void g_cclosure_user_marshal_VOID__BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void gitg_commit_submodule_info_finalize (GObject* obj); +static void gitg_commit_submodule_info_finalize (GObject * obj); static void _vala_gitg_commit_submodule_info_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -97,7 +102,7 @@ _tmp0_ = self->priv->d_label_subject; #line 46 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" gtk_label_set_text (_tmp0_, ""); -#line 101 "gitg-commit-submodule-info.c" +#line 106 "gitg-commit-submodule-info.c" { GgitRepository* _tmp1_ = NULL; GgitSubmodule* _tmp2_ = NULL; @@ -112,7 +117,7 @@ _tmp1_ = _tmp3_; #line 50 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 116 "gitg-commit-submodule-info.c" +#line 121 "gitg-commit-submodule-info.c" goto __catch4_g_error; } #line 50 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" @@ -125,7 +130,7 @@ if (_tmp5_ == NULL) { #line 50 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" _g_object_unref0 (_tmp4_); -#line 129 "gitg-commit-submodule-info.c" +#line 134 "gitg-commit-submodule-info.c" } #line 50 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" _g_object_unref0 (repo); @@ -133,7 +138,7 @@ repo = _tmp5_; #line 48 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" _g_object_unref0 (_tmp1_); -#line 137 "gitg-commit-submodule-info.c" +#line 142 "gitg-commit-submodule-info.c" } goto __finally4; __catch4_g_error: @@ -149,7 +154,7 @@ _g_object_unref0 (repo); #line 54 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" return; -#line 153 "gitg-commit-submodule-info.c" +#line 158 "gitg-commit-submodule-info.c" } __finally4: #line 48 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" @@ -162,7 +167,7 @@ g_clear_error (&_inner_error_); #line 48 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" return; -#line 166 "gitg-commit-submodule-info.c" +#line 171 "gitg-commit-submodule-info.c" } { GitgCommit* commit = NULL; @@ -180,14 +185,14 @@ commit = (GitgCommit*) _tmp8_; #line 59 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 184 "gitg-commit-submodule-info.c" +#line 189 "gitg-commit-submodule-info.c" goto __catch5_g_error; } #line 61 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" _tmp9_ = commit; #line 61 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" if (_tmp9_ != NULL) { -#line 191 "gitg-commit-submodule-info.c" +#line 196 "gitg-commit-submodule-info.c" GtkLabel* _tmp10_ = NULL; GitgCommit* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; @@ -199,11 +204,11 @@ _tmp12_ = ggit_commit_get_subject ((GgitCommit*) _tmp11_); #line 63 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" gtk_label_set_text (_tmp10_, _tmp12_); -#line 203 "gitg-commit-submodule-info.c" +#line 208 "gitg-commit-submodule-info.c" } #line 57 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" _g_object_unref0 (commit); -#line 207 "gitg-commit-submodule-info.c" +#line 212 "gitg-commit-submodule-info.c" } goto __finally5; __catch5_g_error: @@ -215,7 +220,7 @@ _inner_error_ = NULL; #line 57 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" _g_error_free0 (e); -#line 219 "gitg-commit-submodule-info.c" +#line 224 "gitg-commit-submodule-info.c" } __finally5: #line 57 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" @@ -228,11 +233,11 @@ g_clear_error (&_inner_error_); #line 57 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" return; -#line 232 "gitg-commit-submodule-info.c" +#line 237 "gitg-commit-submodule-info.c" } #line 42 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" _g_object_unref0 (repo); -#line 236 "gitg-commit-submodule-info.c" +#line 241 "gitg-commit-submodule-info.c" } @@ -243,15 +248,15 @@ #line 94 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" _tmp0_ = self->priv->d_submodule; #line 94 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" - g_signal_emit_by_name (self, "request-open-repository", _tmp0_); -#line 248 "gitg-commit-submodule-info.c" + g_signal_emit (self, gitg_commit_submodule_info_signals[GITG_COMMIT_SUBMODULE_INFO_REQUEST_OPEN_REPOSITORY_SIGNAL], 0, _tmp0_); +#line 253 "gitg-commit-submodule-info.c" } static void _gitg_commit_submodule_info_on_open_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" gitg_commit_submodule_info_on_open_button_clicked ((GitgCommitSubmoduleInfo*) self); -#line 255 "gitg-commit-submodule-info.c" +#line 260 "gitg-commit-submodule-info.c" } @@ -261,28 +266,28 @@ self = (GitgCommitSubmoduleInfo*) g_object_new (object_type, NULL); #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" return self; -#line 265 "gitg-commit-submodule-info.c" +#line 270 "gitg-commit-submodule-info.c" } GitgCommitSubmoduleInfo* gitg_commit_submodule_info_new (void) { #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" return gitg_commit_submodule_info_construct (GITG_COMMIT_TYPE_SUBMODULE_INFO); -#line 272 "gitg-commit-submodule-info.c" +#line 277 "gitg-commit-submodule-info.c" } static gpointer _ggit_submodule_ref0 (gpointer self) { #line 75 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" return self ? ggit_submodule_ref (self) : NULL; -#line 279 "gitg-commit-submodule-info.c" +#line 284 "gitg-commit-submodule-info.c" } static void _vala_GgitOId_free (GgitOId* self) { #line 77 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" g_boxed_free (ggit_oid_get_type (), self); -#line 286 "gitg-commit-submodule-info.c" +#line 291 "gitg-commit-submodule-info.c" } @@ -304,7 +309,7 @@ _tmp2_ = value; #line 77 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" if (_tmp2_ != NULL) { -#line 308 "gitg-commit-submodule-info.c" +#line 313 "gitg-commit-submodule-info.c" GtkLabel* _tmp3_ = NULL; GgitSubmodule* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; @@ -344,17 +349,17 @@ _tmp10_ = submodule_url; #line 81 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" if (_tmp10_ != NULL) { -#line 348 "gitg-commit-submodule-info.c" +#line 353 "gitg-commit-submodule-info.c" const gchar* _tmp11_ = NULL; #line 81 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" _tmp11_ = submodule_url; #line 81 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" _tmp9_ = _tmp11_; -#line 354 "gitg-commit-submodule-info.c" +#line 359 "gitg-commit-submodule-info.c" } else { #line 81 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" _tmp9_ = ""; -#line 358 "gitg-commit-submodule-info.c" +#line 363 "gitg-commit-submodule-info.c" } #line 81 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" _tmp12_ = self->priv->d_label_url; @@ -388,11 +393,11 @@ __vala_GgitOId_free0 (oid); #line 77 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" _g_free0 (submodule_url); -#line 392 "gitg-commit-submodule-info.c" +#line 397 "gitg-commit-submodule-info.c" } #line 73 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" g_object_notify ((GObject *) self, "submodule"); -#line 396 "gitg-commit-submodule-info.c" +#line 401 "gitg-commit-submodule-info.c" } @@ -411,19 +416,19 @@ data1 = closure->data; #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" data2 = param_values->data[0].v_pointer; -#line 415 "gitg-commit-submodule-info.c" +#line 420 "gitg-commit-submodule-info.c" } else { #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" data1 = param_values->data[0].v_pointer; #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" data2 = closure->data; -#line 421 "gitg-commit-submodule-info.c" +#line 426 "gitg-commit-submodule-info.c" } #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" callback = (GMarshalFunc_VOID__BOXED) (marshal_data ? marshal_data : cc->callback); #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" callback (data1, g_value_get_boxed (param_values + 1), data2); -#line 427 "gitg-commit-submodule-info.c" +#line 432 "gitg-commit-submodule-info.c" } @@ -444,7 +449,7 @@ #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/gitg/ui/gitg-commit-submodule-info.ui"); #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" - g_signal_new ("request_open_repository", GITG_COMMIT_TYPE_SUBMODULE_INFO, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOXED, G_TYPE_NONE, 1, ggit_submodule_get_type ()); + gitg_commit_submodule_info_signals[GITG_COMMIT_SUBMODULE_INFO_REQUEST_OPEN_REPOSITORY_SIGNAL] = g_signal_new ("request_open_repository", GITG_COMMIT_TYPE_SUBMODULE_INFO, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOXED, G_TYPE_NONE, 1, ggit_submodule_get_type ()); #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "label_path", FALSE, GitgCommitSubmoduleInfo_private_offset + G_STRUCT_OFFSET (GitgCommitSubmoduleInfoPrivate, d_label_path)); #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" @@ -455,7 +460,7 @@ gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "label_subject", FALSE, GitgCommitSubmoduleInfo_private_offset + G_STRUCT_OFFSET (GitgCommitSubmoduleInfoPrivate, d_label_subject)); #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_open_button_clicked", G_CALLBACK(_gitg_commit_submodule_info_on_open_button_clicked_gtk_button_clicked)); -#line 459 "gitg-commit-submodule-info.c" +#line 464 "gitg-commit-submodule-info.c" } @@ -464,11 +469,11 @@ self->priv = GITG_COMMIT_SUBMODULE_INFO_GET_PRIVATE (self); #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 468 "gitg-commit-submodule-info.c" +#line 473 "gitg-commit-submodule-info.c" } -static void gitg_commit_submodule_info_finalize (GObject* obj) { +static void gitg_commit_submodule_info_finalize (GObject * obj) { GitgCommitSubmoduleInfo * self; #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_COMMIT_TYPE_SUBMODULE_INFO, GitgCommitSubmoduleInfo); @@ -484,7 +489,7 @@ _ggit_submodule_unref0 (self->priv->d_submodule); #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" G_OBJECT_CLASS (gitg_commit_submodule_info_parent_class)->finalize (obj); -#line 488 "gitg-commit-submodule-info.c" +#line 493 "gitg-commit-submodule-info.c" } @@ -511,13 +516,13 @@ gitg_commit_submodule_info_set_submodule (self, g_value_get_boxed (value)); #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" break; -#line 515 "gitg-commit-submodule-info.c" +#line 520 "gitg-commit-submodule-info.c" default: #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 24 "/home/jesse/dev/gitg/gitg/commit/gitg-commit-submodule-info.vala" break; -#line 521 "gitg-commit-submodule-info.c" +#line 526 "gitg-commit-submodule-info.c" } } diff -Nru gitg-3.22.0/gitg/gitg-action-support.c gitg-3.23.0/gitg/gitg-action-support.c --- gitg-3.22.0/gitg/gitg-action-support.c 2016-08-14 08:26:41.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-action-support.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-action-support.c generated by valac 0.32.1, the Vala compiler +/* gitg-action-support.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-action-support.vala, do not modify */ /* @@ -138,11 +138,10 @@ GgitSignature* _tmp6_; GError* err; GitgSimpleNotification* _tmp7_; - const gchar* _tmp8_; - GError* _tmp9_; - const gchar* _tmp10_; + GError* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; GError * _inner_error_; }; @@ -157,22 +156,17 @@ gboolean result; gboolean _tmp0_; GitgExtUserQuery* q; - const gchar* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; + GitgExtUserQuery* _tmp1_; + GitgExtApplication* _tmp2_; + GitgExtApplication* _tmp3_; + GitgExtApplication* _tmp4_; GitgExtUserQuery* _tmp5_; - GitgExtApplication* _tmp6_; - GitgExtApplication* _tmp7_; - GitgExtApplication* _tmp8_; - GitgExtUserQuery* _tmp9_; - GtkResponseType _tmp10_; + GtkResponseType _tmp6_; + gboolean _tmp7_; + GitgSimpleNotification* _tmp8_; + GitgSimpleNotification* _tmp9_; + GitgRef* _tmp10_; gboolean _tmp11_; - GitgSimpleNotification* _tmp12_; - const gchar* _tmp13_; - GitgSimpleNotification* _tmp14_; - GitgRef* _tmp15_; - gboolean _tmp16_; }; struct _Block32Data { @@ -212,14 +206,12 @@ GitgRefActionCheckout* _tmp14_; gboolean _tmp15_; GitgSimpleNotification* _tmp16_; - const gchar* _tmp17_; GError* err; - GitgSimpleNotification* _tmp18_; + GitgSimpleNotification* _tmp17_; + GError* _tmp18_; const gchar* _tmp19_; - GError* _tmp20_; - const gchar* _tmp21_; - gchar* _tmp22_; - gchar* _tmp23_; + gchar* _tmp20_; + gchar* _tmp21_; GError * _inner_error_; }; @@ -254,78 +246,74 @@ GgitSignature* _tmp4_; GgitSignature* _tmp5_; GitgSimpleNotification* _tmp6_; - const gchar* _tmp7_; + GgitSignature* _tmp7_; GgitSignature* _tmp8_; - GgitSignature* _tmp9_; GitgStage* stage; + GitgExtApplication* _tmp10_; GitgExtApplication* _tmp11_; GitgExtApplication* _tmp12_; - GitgExtApplication* _tmp13_; + GitgRepository* _tmp13_; GitgRepository* _tmp14_; GitgRepository* _tmp15_; - GitgRepository* _tmp16_; + GitgStage* _tmp16_; GitgStage* _tmp17_; GitgStage* _tmp18_; - GitgStage* _tmp19_; GitgRef* head; gboolean ishead; - GitgRef* _tmp20_; - gboolean _tmp21_; + GitgRef* _tmp19_; + gboolean _tmp20_; GitgCommit* commit; - GgitObject* _tmp22_; - GitgRef* _tmp23_; + GgitObject* _tmp21_; + GitgRef* _tmp22_; + GgitObject* _tmp23_; GgitObject* _tmp24_; - GgitObject* _tmp25_; - GitgCommit* _tmp26_; + GitgCommit* _tmp25_; GError* e; - GitgSimpleNotification* _tmp27_; + GitgSimpleNotification* _tmp26_; + GError* _tmp27_; const gchar* _tmp28_; - GError* _tmp29_; - const gchar* _tmp30_; - gchar* _tmp31_; - gchar* _tmp32_; - gboolean _tmp33_; - GitgSimpleNotification* _tmp34_; - GitgRef* _tmp35_; - gboolean _tmp36_; - GitgCommit* _tmp37_; - GgitTree* _tmp38_; - GgitOId** _tmp39_; - gint _tmp39__length1; - GitgCommit* _tmp40_; - GgitOId* _tmp41_; - GgitOId** _tmp42_; + gchar* _tmp29_; + gchar* _tmp30_; + gboolean _tmp31_; + GitgSimpleNotification* _tmp32_; + GitgRef* _tmp33_; + gboolean _tmp34_; + GitgCommit* _tmp35_; + GgitTree* _tmp36_; + GgitOId** _tmp37_; + gint _tmp37__length1; + GitgCommit* _tmp38_; + GgitOId* _tmp39_; + GgitOId** _tmp40_; + GitgRef* _tmp41_; + gboolean _tmp42_; GitgRef* _tmp43_; - gboolean _tmp44_; - GitgRef* _tmp45_; - GitgRef* _tmp46_; - GgitOId* _tmp47_; - GitgStage* _tmp48_; - GgitIndex* _tmp49_; - const gchar* _tmp50_; - GgitSignature* _tmp51_; - GgitSignature* _tmp52_; - GgitOId** _tmp53_; - gint _tmp53__length1; - GgitOId* _tmp54_; - GgitOId* _tmp55_; + GitgRef* _tmp44_; + GgitOId* _tmp45_; + GitgStage* _tmp46_; + GgitIndex* _tmp47_; + const gchar* _tmp48_; + GgitSignature* _tmp49_; + GgitSignature* _tmp50_; + GgitOId** _tmp51_; + gint _tmp51__length1; + GgitOId* _tmp52_; + GgitOId* _tmp53_; GError* _vala1_e; - GitgSimpleNotification* _tmp56_; - const gchar* _tmp57_; - GError* _tmp58_; - const gchar* _tmp59_; - gchar* _tmp60_; - gchar* _tmp61_; - gboolean _tmp62_; + GitgSimpleNotification* _tmp54_; + GError* _tmp55_; + const gchar* _tmp56_; + gchar* _tmp57_; + gchar* _tmp58_; + gboolean _tmp59_; GError* _vala2_e; - GitgSimpleNotification* _tmp63_; - const gchar* _tmp64_; - GError* _tmp65_; - const gchar* _tmp66_; - gchar* _tmp67_; - gchar* _tmp68_; - GgitOId* _tmp69_; - GgitOId* _tmp70_; + GitgSimpleNotification* _tmp60_; + GError* _tmp61_; + const gchar* _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; + GgitOId* _tmp65_; + GgitOId* _tmp66_; GError * _inner_error_; }; @@ -367,7 +355,7 @@ static void ____lambda68__gitg_async_thread_func (gpointer self, GError** error); static void gitg_action_support_save_stash_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); void gitg_simple_notification_error (GitgSimpleNotification* self, const gchar* message); -gboolean gitg_action_support_reference_is_head (GitgActionSupport* self, GitgRef* reference, GitgRef** head); +gboolean gitg_action_support_reference_is_head (GitgActionSupport* self, GitgRef* reference, GitgRef* * head); static void gitg_action_support_stash_if_needed_data_free (gpointer _data); void gitg_action_support_stash_if_needed (GitgActionSupport* self, GitgSimpleNotification* notification, GitgRef* head, GAsyncReadyCallback _callback_, gpointer _user_data_); gboolean gitg_action_support_stash_if_needed_finish (GitgActionSupport* self, GAsyncResult* _res_); @@ -400,7 +388,7 @@ static GgitOId* _vala_GgitOId_copy (GgitOId* self); void gitg_action_support_set_application (GitgActionSupport* self, GitgExtApplication* value); void gitg_action_support_set_action_interface (GitgActionSupport* self, GitgExtRefActionInterface* value); -static void gitg_action_support_finalize (GObject* obj); +static void gitg_action_support_finalize (GObject * obj); static void _vala_gitg_action_support_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_action_support_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -423,14 +411,14 @@ self = (GitgActionSupport*) g_object_new (object_type, "application", _tmp0_, "action-interface", _tmp1_, NULL); #line 31 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return self; -#line 427 "gitg-action-support.c" +#line 415 "gitg-action-support.c" } GitgActionSupport* gitg_action_support_new (GitgExtApplication* application, GitgExtRefActionInterface* action_interface) { #line 31 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return gitg_action_support_construct (GITG_TYPE_ACTION_SUPPORT, application, action_interface); -#line 434 "gitg-action-support.c" +#line 422 "gitg-action-support.c" } @@ -441,14 +429,14 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_slice_free (GitgActionSupportWorkingDirectoryDirtyData, _data_); -#line 445 "gitg-action-support.c" +#line 433 "gitg-action-support.c" } static gpointer _g_object_ref0 (gpointer self) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return self ? g_object_ref (self) : NULL; -#line 452 "gitg-action-support.c" +#line 440 "gitg-action-support.c" } @@ -467,7 +455,7 @@ _data_->self = _tmp0_; #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" gitg_action_support_working_directory_dirty_co (_data_); -#line 471 "gitg-action-support.c" +#line 459 "gitg-action-support.c" } @@ -480,7 +468,7 @@ result = _data_->result; #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return result; -#line 484 "gitg-action-support.c" +#line 472 "gitg-action-support.c" } @@ -489,14 +477,14 @@ g_atomic_int_inc (&_data30_->_ref_count_); #line 36 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return _data30_; -#line 493 "gitg-action-support.c" +#line 481 "gitg-action-support.c" } static void _vala_GgitStatusOptions_free (GgitStatusOptions* self) { #line 36 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_boxed_free (ggit_status_options_get_type (), self); -#line 500 "gitg-action-support.c" +#line 488 "gitg-action-support.c" } @@ -505,7 +493,7 @@ _data30_ = (Block30Data*) _userdata_; #line 36 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" if (g_atomic_int_dec_and_test (&_data30_->_ref_count_)) { -#line 509 "gitg-action-support.c" +#line 497 "gitg-action-support.c" GitgActionSupport* self; #line 36 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" self = _data30_->self; @@ -515,7 +503,7 @@ _g_object_unref0 (self); #line 36 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_slice_free (Block30Data, _data30_); -#line 519 "gitg-action-support.c" +#line 507 "gitg-action-support.c" } } @@ -533,7 +521,7 @@ result = -1; #line 46 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return result; -#line 537 "gitg-action-support.c" +#line 525 "gitg-action-support.c" } @@ -542,7 +530,7 @@ result = __lambda67_ (self, path, status_flags); #line 44 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return result; -#line 546 "gitg-action-support.c" +#line 534 "gitg-action-support.c" } @@ -581,7 +569,7 @@ g_propagate_error (error, _inner_error_); #line 44 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return; -#line 585 "gitg-action-support.c" +#line 573 "gitg-action-support.c" } } @@ -589,7 +577,7 @@ static void ___lambda66__gitg_async_thread_func (gpointer self, GError** error) { #line 43 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" __lambda66_ (self, error); -#line 593 "gitg-action-support.c" +#line 581 "gitg-action-support.c" } @@ -603,7 +591,7 @@ _data_->_res_ = _res_; #line 43 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" gitg_action_support_working_directory_dirty_co (_data_); -#line 607 "gitg-action-support.c" +#line 595 "gitg-action-support.c" } @@ -612,16 +600,16 @@ switch (_data_->_state_) { #line 36 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" case 0: -#line 616 "gitg-action-support.c" +#line 604 "gitg-action-support.c" goto _state_0; #line 36 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" case 1: -#line 620 "gitg-action-support.c" +#line 608 "gitg-action-support.c" goto _state_1; default: #line 36 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_assert_not_reached (); -#line 625 "gitg-action-support.c" +#line 613 "gitg-action-support.c" } _state_0: #line 36 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -646,7 +634,7 @@ gitg_async_thread_try (___lambda66__gitg_async_thread_func, _data_->_data30_, gitg_action_support_working_directory_dirty_ready, _data_); #line 43 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 650 "gitg-action-support.c" +#line 638 "gitg-action-support.c" _state_1: #line 43 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" gitg_async_thread_try_finish (_data_->_res_); @@ -660,11 +648,11 @@ if (_data_->_state_ == 0) { #line 50 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 664 "gitg-action-support.c" +#line 652 "gitg-action-support.c" } else { #line 50 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 668 "gitg-action-support.c" +#line 656 "gitg-action-support.c" } #line 50 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); @@ -678,17 +666,17 @@ if (_data_->_state_ == 0) { #line 36 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 682 "gitg-action-support.c" +#line 670 "gitg-action-support.c" } else { #line 36 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 686 "gitg-action-support.c" +#line 674 "gitg-action-support.c" } #line 36 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 36 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 692 "gitg-action-support.c" +#line 680 "gitg-action-support.c" } @@ -701,7 +689,7 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_slice_free (GitgActionSupportSaveStashData, _data_); -#line 705 "gitg-action-support.c" +#line 693 "gitg-action-support.c" } @@ -740,7 +728,7 @@ _data_->head = _tmp4_; #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" gitg_action_support_save_stash_co (_data_); -#line 744 "gitg-action-support.c" +#line 732 "gitg-action-support.c" } @@ -753,7 +741,7 @@ result = _data_->result; #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return result; -#line 757 "gitg-action-support.c" +#line 745 "gitg-action-support.c" } @@ -762,7 +750,7 @@ g_atomic_int_inc (&_data31_->_ref_count_); #line 53 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return _data31_; -#line 766 "gitg-action-support.c" +#line 754 "gitg-action-support.c" } @@ -771,7 +759,7 @@ _data31_ = (Block31Data*) _userdata_; #line 53 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" if (g_atomic_int_dec_and_test (&_data31_->_ref_count_)) { -#line 775 "gitg-action-support.c" +#line 763 "gitg-action-support.c" GitgActionSupport* self; #line 53 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" self = _data31_->self; @@ -783,7 +771,7 @@ _g_object_unref0 (self); #line 53 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_slice_free (Block31Data, _data31_); -#line 787 "gitg-action-support.c" +#line 775 "gitg-action-support.c" } } @@ -805,124 +793,124 @@ glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1347 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { -#line 821 "gitg-action-support.c" +#line 809 "gitg-action-support.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; -#line 830 "gitg-action-support.c" +#line 818 "gitg-action-support.c" } -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { -#line 836 "gitg-action-support.c" +#line 824 "gitg-action-support.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; -#line 845 "gitg-action-support.c" +#line 833 "gitg-action-support.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { -#line 851 "gitg-action-support.c" +#line 839 "gitg-action-support.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; -#line 860 "gitg-action-support.c" +#line 848 "gitg-action-support.c" } else { -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = FALSE; -#line 864 "gitg-action-support.c" +#line 852 "gitg-action-support.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { -#line 872 "gitg-action-support.c" +#line 860 "gitg-action-support.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; -#line 881 "gitg-action-support.c" +#line 869 "gitg-action-support.c" } else { -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 885 "gitg-action-support.c" +#line 873 "gitg-action-support.c" } -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 907 "gitg-action-support.c" +#line 895 "gitg-action-support.c" } static void _vala_GgitOId_free (GgitOId* self) { #line 75 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_boxed_free (ggit_oid_get_type (), self); -#line 914 "gitg-action-support.c" +#line 902 "gitg-action-support.c" } static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 926 "gitg-action-support.c" +#line 914 "gitg-action-support.c" } @@ -947,7 +935,7 @@ _tmp0_ = _data31_->head; #line 68 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" if (_tmp0_ != NULL) { -#line 951 "gitg-action-support.c" +#line 939 "gitg-action-support.c" gchar* headname = NULL; GitgRef* _tmp1_ = NULL; GitgParsedRefName* _tmp2_ = NULL; @@ -974,7 +962,7 @@ _g_object_unref0 (_tmp4_); #line 70 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" headname = _tmp7_; -#line 978 "gitg-action-support.c" +#line 966 "gitg-action-support.c" { GgitRef* _tmp8_ = NULL; GitgRef* _tmp9_ = NULL; @@ -1014,7 +1002,7 @@ _tmp8_ = _tmp10_; #line 74 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1018 "gitg-action-support.c" +#line 1006 "gitg-action-support.c" goto __catch36_g_error; } #line 74 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -1035,7 +1023,7 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 74 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _g_object_unref0 (_tmp8_); -#line 1039 "gitg-action-support.c" +#line 1027 "gitg-action-support.c" goto __catch36_g_error; } #line 74 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -1048,7 +1036,7 @@ if (_tmp17_ == NULL) { #line 74 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _g_object_unref0 (_tmp16_); -#line 1052 "gitg-action-support.c" +#line 1040 "gitg-action-support.c" } #line 74 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" head_commit = _tmp17_; @@ -1108,7 +1096,7 @@ _g_object_unref0 (_tmp11_); #line 72 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _g_object_unref0 (_tmp8_); -#line 1112 "gitg-action-support.c" +#line 1100 "gitg-action-support.c" } goto __finally36; __catch36_g_error: @@ -1130,7 +1118,7 @@ _g_free0 (message); #line 82 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" message = _tmp37_; -#line 1134 "gitg-action-support.c" +#line 1122 "gitg-action-support.c" } __finally36: #line 72 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -1143,11 +1131,11 @@ _g_free0 (message); #line 72 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return; -#line 1147 "gitg-action-support.c" +#line 1135 "gitg-action-support.c" } #line 68 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _g_free0 (headname); -#line 1151 "gitg-action-support.c" +#line 1139 "gitg-action-support.c" } else { gchar* _tmp38_ = NULL; #line 87 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -1156,7 +1144,7 @@ _g_free0 (message); #line 87 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" message = _tmp38_; -#line 1160 "gitg-action-support.c" +#line 1148 "gitg-action-support.c" } #line 90 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _tmp39_ = gitg_action_support_get_application (self); @@ -1192,18 +1180,18 @@ _g_free0 (message); #line 90 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return; -#line 1196 "gitg-action-support.c" +#line 1184 "gitg-action-support.c" } #line 64 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _g_free0 (message); -#line 1200 "gitg-action-support.c" +#line 1188 "gitg-action-support.c" } static void ____lambda68__gitg_async_thread_func (gpointer self, GError** error) { #line 64 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" ___lambda68_ (self, error); -#line 1207 "gitg-action-support.c" +#line 1195 "gitg-action-support.c" } @@ -1217,7 +1205,7 @@ _data_->_res_ = _res_; #line 64 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" gitg_action_support_save_stash_co (_data_); -#line 1221 "gitg-action-support.c" +#line 1209 "gitg-action-support.c" } @@ -1226,16 +1214,16 @@ switch (_data_->_state_) { #line 53 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" case 0: -#line 1230 "gitg-action-support.c" +#line 1218 "gitg-action-support.c" goto _state_0; #line 53 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" case 1: -#line 1234 "gitg-action-support.c" +#line 1222 "gitg-action-support.c" goto _state_1; default: #line 53 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_assert_not_reached (); -#line 1239 "gitg-action-support.c" +#line 1227 "gitg-action-support.c" } _state_0: #line 53 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -1294,17 +1282,17 @@ if (_data_->_state_ == 0) { #line 59 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1298 "gitg-action-support.c" +#line 1286 "gitg-action-support.c" } else { #line 59 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1302 "gitg-action-support.c" +#line 1290 "gitg-action-support.c" } #line 59 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 59 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 1308 "gitg-action-support.c" +#line 1296 "gitg-action-support.c" } { #line 64 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -1313,13 +1301,13 @@ gitg_async_thread (____lambda68__gitg_async_thread_func, _data_->_data31_, gitg_action_support_save_stash_ready, _data_); #line 64 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 1317 "gitg-action-support.c" +#line 1305 "gitg-action-support.c" _state_1: #line 64 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" gitg_async_thread_finish (_data_->_res_, &_data_->_inner_error_); #line 64 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 1323 "gitg-action-support.c" +#line 1311 "gitg-action-support.c" goto __catch35_g_error; } } @@ -1337,27 +1325,23 @@ #line 95 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp8_ = NULL; #line 95 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp8_ = _ ("Failed to stash changes: %s"); + _data_->_tmp8_ = _data_->err; #line 95 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp9_ = NULL; #line 95 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp9_ = _data_->err; + _data_->_tmp9_ = _data_->_tmp8_->message; #line 95 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp10_ = NULL; #line 95 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp10_ = _data_->_tmp9_->message; + _data_->_tmp10_ = g_strdup_printf (_ ("Failed to stash changes: %s"), _data_->_tmp9_); #line 95 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp11_ = NULL; #line 95 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp11_ = g_strdup_printf (_data_->_tmp8_, _data_->_tmp10_); + _data_->_tmp11_ = _data_->_tmp10_; #line 95 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp12_ = NULL; -#line 95 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp12_ = _data_->_tmp11_; -#line 95 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - gitg_simple_notification_error (_data_->_tmp7_, _data_->_tmp12_); + gitg_simple_notification_error (_data_->_tmp7_, _data_->_tmp11_); #line 95 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _g_free0 (_data_->_tmp12_); + _g_free0 (_data_->_tmp11_); #line 96 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->result = FALSE; #line 96 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -1370,17 +1354,17 @@ if (_data_->_state_ == 0) { #line 96 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1374 "gitg-action-support.c" +#line 1358 "gitg-action-support.c" } else { #line 96 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1378 "gitg-action-support.c" +#line 1362 "gitg-action-support.c" } #line 96 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 96 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 1384 "gitg-action-support.c" +#line 1368 "gitg-action-support.c" } __finally35: #line 62 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -1395,7 +1379,7 @@ g_clear_error (&_data_->_inner_error_); #line 62 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 1399 "gitg-action-support.c" +#line 1383 "gitg-action-support.c" } #line 99 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->result = TRUE; @@ -1407,11 +1391,11 @@ if (_data_->_state_ == 0) { #line 99 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1411 "gitg-action-support.c" +#line 1395 "gitg-action-support.c" } else { #line 99 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1415 "gitg-action-support.c" +#line 1399 "gitg-action-support.c" } #line 99 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); @@ -1425,21 +1409,21 @@ if (_data_->_state_ == 0) { #line 53 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1429 "gitg-action-support.c" +#line 1413 "gitg-action-support.c" } else { #line 53 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1433 "gitg-action-support.c" +#line 1417 "gitg-action-support.c" } #line 53 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 53 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 1439 "gitg-action-support.c" +#line 1423 "gitg-action-support.c" } -gboolean gitg_action_support_reference_is_head (GitgActionSupport* self, GitgRef* reference, GitgRef** head) { +gboolean gitg_action_support_reference_is_head (GitgActionSupport* self, GitgRef* reference, GitgRef* * head) { gboolean result = FALSE; GgitBranch* branch = NULL; GitgRef* _tmp0_ = NULL; @@ -1471,7 +1455,7 @@ _g_object_unref0 (branch); #line 109 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return result; -#line 1475 "gitg-action-support.c" +#line 1459 "gitg-action-support.c" } { gboolean _tmp3_ = FALSE; @@ -1495,7 +1479,7 @@ _tmp3_ = _tmp5_; #line 114 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1499 "gitg-action-support.c" +#line 1483 "gitg-action-support.c" goto __catch37_g_error; } #line 114 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -1506,7 +1490,7 @@ _g_object_unref0 (branch); #line 116 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return result; -#line 1510 "gitg-action-support.c" +#line 1494 "gitg-action-support.c" } #line 119 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _tmp7_ = gitg_action_support_get_application (self); @@ -1532,7 +1516,7 @@ _tmp6_ = _tmp14_; #line 119 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1536 "gitg-action-support.c" +#line 1520 "gitg-action-support.c" goto __catch37_g_error; } #line 119 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -1545,7 +1529,7 @@ *head = _tmp15_; #line 112 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _g_object_unref0 (_tmp6_); -#line 1549 "gitg-action-support.c" +#line 1533 "gitg-action-support.c" } goto __finally37; __catch37_g_error: @@ -1554,7 +1538,7 @@ g_clear_error (&_inner_error_); #line 112 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _inner_error_ = NULL; -#line 1558 "gitg-action-support.c" +#line 1542 "gitg-action-support.c" } __finally37: #line 112 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -1567,7 +1551,7 @@ g_clear_error (&_inner_error_); #line 112 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 1571 "gitg-action-support.c" +#line 1555 "gitg-action-support.c" } #line 122 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _tmp16_ = *head; @@ -1577,7 +1561,7 @@ _g_object_unref0 (branch); #line 122 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return result; -#line 1581 "gitg-action-support.c" +#line 1565 "gitg-action-support.c" } @@ -1592,7 +1576,7 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_slice_free (GitgActionSupportStashIfNeededData, _data_); -#line 1596 "gitg-action-support.c" +#line 1580 "gitg-action-support.c" } @@ -1631,7 +1615,7 @@ _data_->head = _tmp4_; #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" gitg_action_support_stash_if_needed_co (_data_); -#line 1635 "gitg-action-support.c" +#line 1619 "gitg-action-support.c" } @@ -1644,7 +1628,7 @@ result = _data_->result; #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return result; -#line 1648 "gitg-action-support.c" +#line 1632 "gitg-action-support.c" } @@ -1658,7 +1642,7 @@ _data_->_res_ = _res_; #line 128 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" gitg_action_support_stash_if_needed_co (_data_); -#line 1662 "gitg-action-support.c" +#line 1646 "gitg-action-support.c" } @@ -1667,24 +1651,24 @@ switch (_data_->_state_) { #line 125 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" case 0: -#line 1671 "gitg-action-support.c" +#line 1655 "gitg-action-support.c" goto _state_0; #line 125 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" case 1: -#line 1675 "gitg-action-support.c" +#line 1659 "gitg-action-support.c" goto _state_1; #line 125 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" case 2: -#line 1679 "gitg-action-support.c" +#line 1663 "gitg-action-support.c" goto _state_2; #line 125 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" case 3: -#line 1683 "gitg-action-support.c" +#line 1667 "gitg-action-support.c" goto _state_3; default: #line 125 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_assert_not_reached (); -#line 1688 "gitg-action-support.c" +#line 1672 "gitg-action-support.c" } _state_0: #line 128 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -1693,7 +1677,7 @@ gitg_action_support_working_directory_dirty (_data_->self, gitg_action_support_stash_if_needed_ready, _data_); #line 128 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 1697 "gitg-action-support.c" +#line 1681 "gitg-action-support.c" _state_1: #line 128 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp0_ = FALSE; @@ -1704,72 +1688,52 @@ #line 130 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp1_ = NULL; #line 130 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp1_ = _ ("Unstaged changes"); -#line 130 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp2_ = NULL; -#line 130 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp2_ = _ ("You appear to have unstaged changes in your working directory. Would y" \ -"ou like to stash the changes before the checkout?"); -#line 130 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp3_ = NULL; -#line 130 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp3_ = _ ("Cancel"); -#line 130 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp4_ = NULL; -#line 130 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp4_ = _ ("Stash changes"); + _data_->_tmp1_ = gitg_ext_user_query_new_full (_ ("Unstaged changes"), _ ("You appear to have unstaged changes in your working directory. Would y" \ +"ou like to stash the changes before the checkout?"), GTK_MESSAGE_QUESTION, _ ("Cancel"), GTK_RESPONSE_CANCEL, _ ("Stash changes"), GTK_RESPONSE_OK, NULL); #line 130 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp5_ = NULL; -#line 130 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp5_ = gitg_ext_user_query_new_full (_data_->_tmp1_, _data_->_tmp2_, GTK_MESSAGE_QUESTION, _data_->_tmp3_, GTK_RESPONSE_CANCEL, _data_->_tmp4_, GTK_RESPONSE_OK, NULL); -#line 130 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->q = _data_->_tmp5_; + _data_->q = _data_->_tmp1_; #line 136 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp6_ = NULL; + _data_->_tmp2_ = NULL; #line 136 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp6_ = gitg_action_support_get_application (_data_->self); + _data_->_tmp2_ = gitg_action_support_get_application (_data_->self); #line 136 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp7_ = NULL; + _data_->_tmp3_ = NULL; #line 136 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp7_ = _data_->_tmp6_; + _data_->_tmp3_ = _data_->_tmp2_; #line 136 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp8_ = NULL; + _data_->_tmp4_ = NULL; #line 136 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp8_ = _data_->_tmp7_; + _data_->_tmp4_ = _data_->_tmp3_; #line 136 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp9_ = NULL; + _data_->_tmp5_ = NULL; #line 136 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp9_ = _data_->q; + _data_->_tmp5_ = _data_->q; #line 136 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_state_ = 2; #line 136 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - gitg_ext_application_user_query_async (_data_->_tmp8_, _data_->_tmp9_, gitg_action_support_stash_if_needed_ready, _data_); + gitg_ext_application_user_query_async (_data_->_tmp4_, _data_->_tmp5_, gitg_action_support_stash_if_needed_ready, _data_); #line 136 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 1749 "gitg-action-support.c" +#line 1717 "gitg-action-support.c" _state_2: #line 136 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp10_ = 0; + _data_->_tmp6_ = 0; #line 136 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp10_ = gitg_ext_application_user_query_finish (_data_->_tmp8_, _data_->_res_); + _data_->_tmp6_ = gitg_ext_application_user_query_finish (_data_->_tmp4_, _data_->_res_); #line 136 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp11_ = FALSE; + _data_->_tmp7_ = FALSE; #line 136 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp11_ = _data_->_tmp10_ != GTK_RESPONSE_OK; + _data_->_tmp7_ = _data_->_tmp6_ != GTK_RESPONSE_OK; #line 136 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _g_object_unref0 (_data_->_tmp8_); + _g_object_unref0 (_data_->_tmp4_); #line 136 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - if (_data_->_tmp11_) { + if (_data_->_tmp7_) { #line 138 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp12_ = NULL; + _data_->_tmp8_ = NULL; #line 138 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp12_ = _data_->notification; + _data_->_tmp8_ = _data_->notification; #line 138 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp13_ = NULL; -#line 138 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp13_ = _ ("Failed with conflicts"); -#line 138 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - gitg_simple_notification_error (_data_->_tmp12_, _data_->_tmp13_); + gitg_simple_notification_error (_data_->_tmp8_, _ ("Failed with conflicts")); #line 139 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->result = FALSE; #line 139 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -1778,40 +1742,40 @@ if (_data_->_state_ == 0) { #line 139 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1781 "gitg-action-support.c" +#line 1745 "gitg-action-support.c" } else { #line 139 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1785 "gitg-action-support.c" +#line 1749 "gitg-action-support.c" } #line 139 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 139 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 1791 "gitg-action-support.c" +#line 1755 "gitg-action-support.c" } #line 142 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp14_ = NULL; + _data_->_tmp9_ = NULL; #line 142 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp14_ = _data_->notification; + _data_->_tmp9_ = _data_->notification; #line 142 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp15_ = NULL; + _data_->_tmp10_ = NULL; #line 142 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp15_ = _data_->head; + _data_->_tmp10_ = _data_->head; #line 142 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_state_ = 3; #line 142 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - gitg_action_support_save_stash (_data_->self, _data_->_tmp14_, _data_->_tmp15_, gitg_action_support_stash_if_needed_ready, _data_); + gitg_action_support_save_stash (_data_->self, _data_->_tmp9_, _data_->_tmp10_, gitg_action_support_stash_if_needed_ready, _data_); #line 142 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 1807 "gitg-action-support.c" +#line 1771 "gitg-action-support.c" _state_3: #line 142 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp16_ = FALSE; + _data_->_tmp11_ = FALSE; #line 142 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp16_ = gitg_action_support_save_stash_finish (_data_->self, _data_->_res_); + _data_->_tmp11_ = gitg_action_support_save_stash_finish (_data_->self, _data_->_res_); #line 142 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - if (!_data_->_tmp16_) { + if (!_data_->_tmp11_) { #line 144 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->result = FALSE; #line 144 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -1820,21 +1784,21 @@ if (_data_->_state_ == 0) { #line 144 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1823 "gitg-action-support.c" +#line 1787 "gitg-action-support.c" } else { #line 144 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1827 "gitg-action-support.c" +#line 1791 "gitg-action-support.c" } #line 144 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 144 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 1833 "gitg-action-support.c" +#line 1797 "gitg-action-support.c" } #line 128 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _g_object_unref0 (_data_->q); -#line 1837 "gitg-action-support.c" +#line 1801 "gitg-action-support.c" } #line 148 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->result = TRUE; @@ -1842,11 +1806,11 @@ if (_data_->_state_ == 0) { #line 148 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1845 "gitg-action-support.c" +#line 1809 "gitg-action-support.c" } else { #line 148 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1849 "gitg-action-support.c" +#line 1813 "gitg-action-support.c" } #line 148 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); @@ -1856,17 +1820,17 @@ if (_data_->_state_ == 0) { #line 125 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1859 "gitg-action-support.c" +#line 1823 "gitg-action-support.c" } else { #line 125 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1863 "gitg-action-support.c" +#line 1827 "gitg-action-support.c" } #line 125 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 125 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 1869 "gitg-action-support.c" +#line 1833 "gitg-action-support.c" } @@ -1883,7 +1847,7 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_slice_free (GitgActionSupportCheckoutConflictsData, _data_); -#line 1886 "gitg-action-support.c" +#line 1850 "gitg-action-support.c" } @@ -1942,7 +1906,7 @@ _data_->head = _tmp8_; #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" gitg_action_support_checkout_conflicts_co (_data_); -#line 1945 "gitg-action-support.c" +#line 1909 "gitg-action-support.c" } @@ -1955,7 +1919,7 @@ result = _data_->result; #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return result; -#line 1958 "gitg-action-support.c" +#line 1922 "gitg-action-support.c" } @@ -1964,7 +1928,7 @@ g_atomic_int_inc (&_data32_->_ref_count_); #line 151 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return _data32_; -#line 1967 "gitg-action-support.c" +#line 1931 "gitg-action-support.c" } @@ -1973,7 +1937,7 @@ _data32_ = (Block32Data*) _userdata_; #line 151 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" if (g_atomic_int_dec_and_test (&_data32_->_ref_count_)) { -#line 1976 "gitg-action-support.c" +#line 1940 "gitg-action-support.c" GitgActionSupport* self; #line 151 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" self = _data32_->self; @@ -1983,7 +1947,7 @@ _g_object_unref0 (self); #line 151 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_slice_free (Block32Data, _data32_); -#line 1986 "gitg-action-support.c" +#line 1950 "gitg-action-support.c" } } @@ -1998,7 +1962,7 @@ _data_->_res_ = _res_; #line 153 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" gitg_action_support_checkout_conflicts_co (_data_); -#line 2001 "gitg-action-support.c" +#line 1965 "gitg-action-support.c" } @@ -2050,18 +2014,18 @@ _g_object_unref0 (opts); #line 176 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return; -#line 2053 "gitg-action-support.c" +#line 2017 "gitg-action-support.c" } #line 173 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _g_object_unref0 (opts); -#line 2057 "gitg-action-support.c" +#line 2021 "gitg-action-support.c" } static void ____lambda76__gitg_async_thread_func (gpointer self, GError** error) { #line 173 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" ___lambda76_ (self, error); -#line 2064 "gitg-action-support.c" +#line 2028 "gitg-action-support.c" } @@ -2070,24 +2034,24 @@ switch (_data_->_state_) { #line 151 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" case 0: -#line 2073 "gitg-action-support.c" +#line 2037 "gitg-action-support.c" goto _state_0; #line 151 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" case 1: -#line 2077 "gitg-action-support.c" +#line 2041 "gitg-action-support.c" goto _state_1; #line 151 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" case 2: -#line 2081 "gitg-action-support.c" +#line 2045 "gitg-action-support.c" goto _state_2; #line 151 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" case 3: -#line 2085 "gitg-action-support.c" +#line 2049 "gitg-action-support.c" goto _state_3; default: #line 151 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_assert_not_reached (); -#line 2090 "gitg-action-support.c" +#line 2054 "gitg-action-support.c" } _state_0: #line 151 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -2120,7 +2084,7 @@ gitg_action_support_stash_if_needed (_data_->self, _data_->_tmp1_, _data_->_tmp2_, gitg_action_support_checkout_conflicts_ready, _data_); #line 153 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 2123 "gitg-action-support.c" +#line 2087 "gitg-action-support.c" _state_1: #line 153 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp3_ = FALSE; @@ -2138,17 +2102,17 @@ if (_data_->_state_ == 0) { #line 155 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2141 "gitg-action-support.c" +#line 2105 "gitg-action-support.c" } else { #line 155 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2145 "gitg-action-support.c" +#line 2109 "gitg-action-support.c" } #line 155 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 155 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 2151 "gitg-action-support.c" +#line 2115 "gitg-action-support.c" } #line 158 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp4_ = NULL; @@ -2208,7 +2172,7 @@ gitg_ref_action_checkout_checkout (_data_->_tmp14_, gitg_action_support_checkout_conflicts_ready, _data_); #line 163 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 2211 "gitg-action-support.c" +#line 2175 "gitg-action-support.c" _state_2: #line 163 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp15_ = FALSE; @@ -2221,11 +2185,7 @@ #line 165 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp16_ = _data_->notification; #line 165 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp17_ = NULL; -#line 165 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp17_ = _ ("Failed with conflicts"); -#line 165 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - gitg_simple_notification_error (_data_->_tmp16_, _data_->_tmp17_); + gitg_simple_notification_error (_data_->_tmp16_, _ ("Failed with conflicts")); #line 166 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->result = FALSE; #line 166 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -2238,21 +2198,21 @@ if (_data_->_state_ == 0) { #line 166 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2241 "gitg-action-support.c" +#line 2201 "gitg-action-support.c" } else { #line 166 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2245 "gitg-action-support.c" +#line 2205 "gitg-action-support.c" } #line 166 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 166 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 2251 "gitg-action-support.c" +#line 2211 "gitg-action-support.c" } #line 158 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _g_object_unref0 (_data_->checkout); -#line 2255 "gitg-action-support.c" +#line 2215 "gitg-action-support.c" } { #line 173 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -2261,13 +2221,13 @@ gitg_async_thread (____lambda76__gitg_async_thread_func, _data_->_data32_, gitg_action_support_checkout_conflicts_ready, _data_); #line 173 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 2264 "gitg-action-support.c" +#line 2224 "gitg-action-support.c" _state_3: #line 173 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" gitg_async_thread_finish (_data_->_res_, &_data_->_inner_error_); #line 173 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 2270 "gitg-action-support.c" +#line 2230 "gitg-action-support.c" goto __catch38_g_error; } } @@ -2279,33 +2239,29 @@ #line 171 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_inner_error_ = NULL; #line 181 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" + _data_->_tmp17_ = NULL; +#line 181 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" + _data_->_tmp17_ = _data_->notification; +#line 181 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp18_ = NULL; #line 181 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp18_ = _data_->notification; + _data_->_tmp18_ = _data_->err; #line 181 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp19_ = NULL; #line 181 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp19_ = _ ("Failed to checkout conflicts: %s"); + _data_->_tmp19_ = _data_->_tmp18_->message; #line 181 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp20_ = NULL; #line 181 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp20_ = _data_->err; + _data_->_tmp20_ = g_strdup_printf (_ ("Failed to checkout conflicts: %s"), _data_->_tmp19_); #line 181 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp21_ = NULL; #line 181 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp21_ = _data_->_tmp20_->message; -#line 181 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp22_ = NULL; -#line 181 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp22_ = g_strdup_printf (_data_->_tmp19_, _data_->_tmp21_); + _data_->_tmp21_ = _data_->_tmp20_; #line 181 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp23_ = NULL; -#line 181 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp23_ = _data_->_tmp22_; -#line 181 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - gitg_simple_notification_error (_data_->_tmp18_, _data_->_tmp23_); + gitg_simple_notification_error (_data_->_tmp17_, _data_->_tmp21_); #line 181 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _g_free0 (_data_->_tmp23_); + _g_free0 (_data_->_tmp21_); #line 182 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->result = FALSE; #line 182 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -2318,17 +2274,17 @@ if (_data_->_state_ == 0) { #line 182 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2321 "gitg-action-support.c" +#line 2277 "gitg-action-support.c" } else { #line 182 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2325 "gitg-action-support.c" +#line 2281 "gitg-action-support.c" } #line 182 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 182 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 2331 "gitg-action-support.c" +#line 2287 "gitg-action-support.c" } __finally38: #line 171 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -2343,7 +2299,7 @@ g_clear_error (&_data_->_inner_error_); #line 171 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 2346 "gitg-action-support.c" +#line 2302 "gitg-action-support.c" } #line 185 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->result = TRUE; @@ -2355,11 +2311,11 @@ if (_data_->_state_ == 0) { #line 185 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2358 "gitg-action-support.c" +#line 2314 "gitg-action-support.c" } else { #line 185 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2362 "gitg-action-support.c" +#line 2318 "gitg-action-support.c" } #line 185 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); @@ -2373,17 +2329,17 @@ if (_data_->_state_ == 0) { #line 151 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2376 "gitg-action-support.c" +#line 2332 "gitg-action-support.c" } else { #line 151 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2380 "gitg-action-support.c" +#line 2336 "gitg-action-support.c" } #line 151 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 151 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 2386 "gitg-action-support.c" +#line 2342 "gitg-action-support.c" } @@ -2408,7 +2364,7 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_slice_free (GitgActionSupportCommitIndexData, _data_); -#line 2411 "gitg-action-support.c" +#line 2367 "gitg-action-support.c" } @@ -2483,7 +2439,7 @@ _data_->message = _tmp10_; #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" gitg_action_support_commit_index_co (_data_); -#line 2486 "gitg-action-support.c" +#line 2442 "gitg-action-support.c" } @@ -2498,7 +2454,7 @@ _data_->result = NULL; #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return result; -#line 2501 "gitg-action-support.c" +#line 2457 "gitg-action-support.c" } @@ -2507,7 +2463,7 @@ g_atomic_int_inc (&_data33_->_ref_count_); #line 188 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return _data33_; -#line 2510 "gitg-action-support.c" +#line 2466 "gitg-action-support.c" } @@ -2516,7 +2472,7 @@ _data33_ = (Block33Data*) _userdata_; #line 188 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" if (g_atomic_int_dec_and_test (&_data33_->_ref_count_)) { -#line 2519 "gitg-action-support.c" +#line 2475 "gitg-action-support.c" GitgActionSupport* self; #line 188 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" self = _data33_->self; @@ -2528,7 +2484,7 @@ _g_object_unref0 (self); #line 188 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_slice_free (Block33Data, _data33_); -#line 2531 "gitg-action-support.c" +#line 2487 "gitg-action-support.c" } } @@ -2543,7 +2499,7 @@ _data_->_res_ = _res_; #line 229 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" gitg_action_support_commit_index_co (_data_); -#line 2546 "gitg-action-support.c" +#line 2502 "gitg-action-support.c" } @@ -2624,7 +2580,7 @@ _g_object_unref0 (opts); #line 269 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return; -#line 2627 "gitg-action-support.c" +#line 2583 "gitg-action-support.c" } #line 270 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _tmp13_ = newcommit; @@ -2666,7 +2622,7 @@ _g_object_unref0 (opts); #line 272 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return; -#line 2669 "gitg-action-support.c" +#line 2625 "gitg-action-support.c" } #line 263 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _g_object_unref0 (newtree); @@ -2674,28 +2630,28 @@ _g_object_unref0 (newcommit); #line 263 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _g_object_unref0 (opts); -#line 2677 "gitg-action-support.c" +#line 2633 "gitg-action-support.c" } static void _____lambda77__gitg_async_thread_func (gpointer self, GError** error) { #line 263 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" ____lambda77_ (self, error); -#line 2684 "gitg-action-support.c" +#line 2640 "gitg-action-support.c" } static GgitOId* _vala_GgitOId_copy (GgitOId* self) { #line 282 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return g_boxed_copy (ggit_oid_get_type (), self); -#line 2691 "gitg-action-support.c" +#line 2647 "gitg-action-support.c" } static gpointer __vala_GgitOId_copy0 (gpointer self) { #line 282 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return self ? _vala_GgitOId_copy (self) : NULL; -#line 2698 "gitg-action-support.c" +#line 2654 "gitg-action-support.c" } @@ -2704,24 +2660,24 @@ switch (_data_->_state_) { #line 188 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" case 0: -#line 2707 "gitg-action-support.c" +#line 2663 "gitg-action-support.c" goto _state_0; #line 188 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" case 1: -#line 2711 "gitg-action-support.c" +#line 2667 "gitg-action-support.c" goto _state_1; #line 188 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" case 2: -#line 2715 "gitg-action-support.c" +#line 2671 "gitg-action-support.c" goto _state_2; #line 188 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" case 3: -#line 2719 "gitg-action-support.c" +#line 2675 "gitg-action-support.c" goto _state_3; default: #line 188 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_assert_not_reached (); -#line 2724 "gitg-action-support.c" +#line 2680 "gitg-action-support.c" } _state_0: #line 188 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -2767,11 +2723,7 @@ #line 199 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp6_ = _data_->notification; #line 199 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp7_ = NULL; -#line 199 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp7_ = _ ("Failed to obtain author details"); -#line 199 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - gitg_simple_notification_error (_data_->_tmp6_, _data_->_tmp7_); + gitg_simple_notification_error (_data_->_tmp6_, _ ("Failed to obtain author details")); #line 200 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->result = NULL; #line 200 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -2786,42 +2738,46 @@ if (_data_->_state_ == 0) { #line 200 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2789 "gitg-action-support.c" +#line 2741 "gitg-action-support.c" } else { #line 200 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2793 "gitg-action-support.c" +#line 2745 "gitg-action-support.c" } #line 200 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 200 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 2799 "gitg-action-support.c" +#line 2751 "gitg-action-support.c" } #line 203 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp8_ = NULL; + _data_->_tmp7_ = NULL; #line 203 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp8_ = _data_->author; + _data_->_tmp7_ = _data_->author; #line 203 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - if (_data_->_tmp8_ == NULL) { -#line 2807 "gitg-action-support.c" - GgitSignature* _tmp10_ = NULL; + if (_data_->_tmp7_ == NULL) { +#line 2759 "gitg-action-support.c" + GgitSignature* _tmp9_ = NULL; #line 205 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp9_ = NULL; + _data_->_tmp8_ = NULL; #line 205 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp9_ = _data_->committer; + _data_->_tmp8_ = _data_->committer; #line 205 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _tmp10_ = _g_object_ref0 (_data_->_tmp9_); + _tmp9_ = _g_object_ref0 (_data_->_tmp8_); #line 205 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _g_object_unref0 (_data_->author); #line 205 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->author = _tmp10_; -#line 2819 "gitg-action-support.c" + _data_->author = _tmp9_; +#line 2771 "gitg-action-support.c" } #line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" + _data_->_tmp10_ = NULL; +#line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" + _data_->_tmp10_ = gitg_action_support_get_application (_data_->self); +#line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp11_ = NULL; #line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp11_ = gitg_action_support_get_application (_data_->self); + _data_->_tmp11_ = _data_->_tmp10_; #line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp12_ = NULL; #line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -2829,11 +2785,11 @@ #line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp13_ = NULL; #line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp13_ = _data_->_tmp12_; + _data_->_tmp13_ = gitg_ext_application_get_repository (_data_->_tmp12_); #line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp14_ = NULL; #line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp14_ = gitg_ext_application_get_repository (_data_->_tmp13_); + _data_->_tmp14_ = _data_->_tmp13_; #line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp15_ = NULL; #line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -2841,83 +2797,79 @@ #line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp16_ = NULL; #line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp16_ = _data_->_tmp15_; + _data_->_tmp16_ = gitg_repository_get_stage (_data_->_tmp15_); #line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp17_ = NULL; #line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp17_ = gitg_repository_get_stage (_data_->_tmp16_); + _data_->_tmp17_ = _data_->_tmp16_; #line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp18_ = NULL; #line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp18_ = _data_->_tmp17_; #line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp19_ = NULL; -#line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp19_ = _data_->_tmp18_; + _g_object_unref0 (_data_->_tmp15_); #line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _g_object_unref0 (_data_->_tmp16_); + _g_object_unref0 (_data_->_tmp12_); #line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _g_object_unref0 (_data_->_tmp13_); -#line 208 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->stage = _data_->_tmp19_; + _data_->stage = _data_->_tmp18_; #line 210 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->head = NULL; #line 211 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp20_ = NULL; + _data_->_tmp19_ = NULL; #line 211 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp20_ = _data_->reference; + _data_->_tmp19_ = _data_->reference; #line 211 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp21_ = FALSE; + _data_->_tmp20_ = FALSE; #line 211 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp21_ = gitg_action_support_reference_is_head (_data_->self, _data_->_tmp20_, &_data_->head); + _data_->_tmp20_ = gitg_action_support_reference_is_head (_data_->self, _data_->_tmp19_, &_data_->head); #line 211 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->ishead = _data_->_tmp21_; + _data_->ishead = _data_->_tmp20_; #line 213 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_data33_->oid = NULL; #line 214 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_data33_->head_tree = NULL; #line 215 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->commit = NULL; -#line 2881 "gitg-action-support.c" +#line 2833 "gitg-action-support.c" { #line 219 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp23_ = NULL; + _data_->_tmp22_ = NULL; #line 219 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp23_ = _data_->reference; + _data_->_tmp22_ = _data_->reference; #line 219 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp24_ = NULL; + _data_->_tmp23_ = NULL; #line 219 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp24_ = ggit_ref_lookup ((GgitRef*) _data_->_tmp23_, &_data_->_inner_error_); + _data_->_tmp23_ = ggit_ref_lookup ((GgitRef*) _data_->_tmp22_, &_data_->_inner_error_); #line 219 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp22_ = _data_->_tmp24_; + _data_->_tmp21_ = _data_->_tmp23_; #line 219 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 2895 "gitg-action-support.c" +#line 2847 "gitg-action-support.c" goto __catch39_g_error; } #line 219 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp25_ = NULL; + _data_->_tmp24_ = NULL; #line 219 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp25_ = _data_->_tmp22_; + _data_->_tmp24_ = _data_->_tmp21_; #line 219 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp22_ = NULL; + _data_->_tmp21_ = NULL; #line 219 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp26_ = NULL; + _data_->_tmp25_ = NULL; #line 219 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp26_ = G_TYPE_CHECK_INSTANCE_TYPE (_data_->_tmp25_, GITG_TYPE_COMMIT) ? ((GitgCommit*) _data_->_tmp25_) : NULL; + _data_->_tmp25_ = G_TYPE_CHECK_INSTANCE_TYPE (_data_->_tmp24_, GITG_TYPE_COMMIT) ? ((GitgCommit*) _data_->_tmp24_) : NULL; #line 219 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - if (_data_->_tmp26_ == NULL) { + if (_data_->_tmp25_ == NULL) { #line 219 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _g_object_unref0 (_data_->_tmp25_); -#line 2912 "gitg-action-support.c" + _g_object_unref0 (_data_->_tmp24_); +#line 2864 "gitg-action-support.c" } #line 219 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _g_object_unref0 (_data_->commit); #line 219 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->commit = _data_->_tmp26_; + _data_->commit = _data_->_tmp25_; #line 217 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _g_object_unref0 (_data_->_tmp22_); -#line 2920 "gitg-action-support.c" + _g_object_unref0 (_data_->_tmp21_); +#line 2872 "gitg-action-support.c" } goto __finally39; __catch39_g_error: @@ -2927,33 +2879,29 @@ #line 217 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_inner_error_ = NULL; #line 223 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" + _data_->_tmp26_ = NULL; +#line 223 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" + _data_->_tmp26_ = _data_->notification; +#line 223 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp27_ = NULL; #line 223 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp27_ = _data_->notification; + _data_->_tmp27_ = _data_->e; #line 223 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp28_ = NULL; #line 223 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp28_ = _ ("Failed to lookup commit: %s"); + _data_->_tmp28_ = _data_->_tmp27_->message; #line 223 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp29_ = NULL; #line 223 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp29_ = _data_->e; + _data_->_tmp29_ = g_strdup_printf (_ ("Failed to lookup commit: %s"), _data_->_tmp28_); #line 223 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_tmp30_ = NULL; #line 223 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp30_ = _data_->_tmp29_->message; + _data_->_tmp30_ = _data_->_tmp29_; #line 223 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp31_ = NULL; + gitg_simple_notification_error (_data_->_tmp26_, _data_->_tmp30_); #line 223 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp31_ = g_strdup_printf (_data_->_tmp28_, _data_->_tmp30_); -#line 223 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp32_ = NULL; -#line 223 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp32_ = _data_->_tmp31_; -#line 223 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - gitg_simple_notification_error (_data_->_tmp27_, _data_->_tmp32_); -#line 223 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _g_free0 (_data_->_tmp32_); + _g_free0 (_data_->_tmp30_); #line 224 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->result = NULL; #line 224 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -2976,17 +2924,17 @@ if (_data_->_state_ == 0) { #line 224 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2979 "gitg-action-support.c" +#line 2927 "gitg-action-support.c" } else { #line 224 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2983 "gitg-action-support.c" +#line 2931 "gitg-action-support.c" } #line 224 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 224 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 2989 "gitg-action-support.c" +#line 2937 "gitg-action-support.c" } __finally39: #line 217 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -3011,36 +2959,36 @@ g_clear_error (&_data_->_inner_error_); #line 217 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 3014 "gitg-action-support.c" +#line 2962 "gitg-action-support.c" } #line 227 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp33_ = FALSE; + _data_->_tmp31_ = FALSE; #line 227 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp33_ = _data_->ishead; + _data_->_tmp31_ = _data_->ishead; #line 227 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - if (_data_->_tmp33_) { + if (_data_->_tmp31_) { #line 229 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp34_ = NULL; + _data_->_tmp32_ = NULL; #line 229 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp34_ = _data_->notification; + _data_->_tmp32_ = _data_->notification; #line 229 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp35_ = NULL; + _data_->_tmp33_ = NULL; #line 229 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp35_ = _data_->head; + _data_->_tmp33_ = _data_->head; #line 229 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_state_ = 1; #line 229 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - gitg_action_support_stash_if_needed (_data_->self, _data_->_tmp34_, _data_->_tmp35_, gitg_action_support_commit_index_ready, _data_); + gitg_action_support_stash_if_needed (_data_->self, _data_->_tmp32_, _data_->_tmp33_, gitg_action_support_commit_index_ready, _data_); #line 229 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 3036 "gitg-action-support.c" +#line 2984 "gitg-action-support.c" _state_1: #line 229 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp36_ = FALSE; + _data_->_tmp34_ = FALSE; #line 229 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp36_ = gitg_action_support_stash_if_needed_finish (_data_->self, _data_->_res_); + _data_->_tmp34_ = gitg_action_support_stash_if_needed_finish (_data_->self, _data_->_res_); #line 229 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - if (!_data_->_tmp36_) { + if (!_data_->_tmp34_) { #line 231 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->result = NULL; #line 231 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -3061,147 +3009,147 @@ if (_data_->_state_ == 0) { #line 231 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3064 "gitg-action-support.c" +#line 3012 "gitg-action-support.c" } else { #line 231 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3068 "gitg-action-support.c" +#line 3016 "gitg-action-support.c" } #line 231 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 231 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 3074 "gitg-action-support.c" +#line 3022 "gitg-action-support.c" } #line 234 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp37_ = NULL; + _data_->_tmp35_ = NULL; #line 234 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp37_ = _data_->commit; + _data_->_tmp35_ = _data_->commit; #line 234 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp38_ = NULL; + _data_->_tmp36_ = NULL; #line 234 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp38_ = ggit_commit_get_tree ((GgitCommit*) _data_->_tmp37_); + _data_->_tmp36_ = ggit_commit_get_tree ((GgitCommit*) _data_->_tmp35_); #line 234 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _g_object_unref0 (_data_->_data33_->head_tree); #line 234 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_data33_->head_tree = _data_->_tmp38_; -#line 3088 "gitg-action-support.c" + _data_->_data33_->head_tree = _data_->_tmp36_; +#line 3036 "gitg-action-support.c" } #line 237 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp39_ = NULL; + _data_->_tmp37_ = NULL; #line 237 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp39__length1 = 0; + _data_->_tmp37__length1 = 0; #line 237 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp39_ = _data_->parents; + _data_->_tmp37_ = _data_->parents; #line 237 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp39__length1 = _data_->parents_length1; + _data_->_tmp37__length1 = _data_->parents_length1; #line 237 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - if (_data_->_tmp39_ == NULL) { + if (_data_->_tmp37_ == NULL) { #line 239 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp40_ = NULL; + _data_->_tmp38_ = NULL; #line 239 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp40_ = _data_->commit; + _data_->_tmp38_ = _data_->commit; #line 239 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp41_ = NULL; + _data_->_tmp39_ = NULL; #line 239 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp41_ = ggit_object_get_id ((GgitObject*) _data_->_tmp40_); + _data_->_tmp39_ = ggit_object_get_id ((GgitObject*) _data_->_tmp38_); #line 239 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp42_ = NULL; + _data_->_tmp40_ = NULL; #line 239 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp42_ = g_new0 (GgitOId*, 1 + 1); + _data_->_tmp40_ = g_new0 (GgitOId*, 1 + 1); #line 239 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp42_[0] = _data_->_tmp41_; + _data_->_tmp40_[0] = _data_->_tmp39_; #line 239 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->parents = (_vala_array_free (_data_->parents, _data_->parents_length1, (GDestroyNotify) _vala_GgitOId_free), NULL); #line 239 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->parents = _data_->_tmp42_; + _data_->parents = _data_->_tmp40_; #line 239 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->parents_length1 = 1; -#line 3120 "gitg-action-support.c" +#line 3068 "gitg-action-support.c" } { #line 246 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp44_ = FALSE; + _data_->_tmp42_ = FALSE; #line 246 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp44_ = _data_->ishead; + _data_->_tmp42_ = _data_->ishead; #line 246 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - if (_data_->_tmp44_) { + if (_data_->_tmp42_) { #line 246 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp45_ = NULL; + _data_->_tmp43_ = NULL; #line 246 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp45_ = _data_->head; + _data_->_tmp43_ = _data_->head; #line 246 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp43_ = _data_->_tmp45_; -#line 3135 "gitg-action-support.c" + _data_->_tmp41_ = _data_->_tmp43_; +#line 3083 "gitg-action-support.c" } else { #line 246 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp46_ = NULL; + _data_->_tmp44_ = NULL; #line 246 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp46_ = _data_->reference; + _data_->_tmp44_ = _data_->reference; #line 246 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp43_ = _data_->_tmp46_; -#line 3143 "gitg-action-support.c" + _data_->_tmp41_ = _data_->_tmp44_; +#line 3091 "gitg-action-support.c" } #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp48_ = NULL; + _data_->_tmp46_ = NULL; #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp48_ = _data_->stage; + _data_->_tmp46_ = _data_->stage; #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp49_ = NULL; + _data_->_tmp47_ = NULL; #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp49_ = _data_->index; + _data_->_tmp47_ = _data_->index; #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp50_ = NULL; + _data_->_tmp48_ = NULL; #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp50_ = _data_->message; + _data_->_tmp48_ = _data_->message; #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp51_ = NULL; + _data_->_tmp49_ = NULL; #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp51_ = _data_->author; + _data_->_tmp49_ = _data_->author; #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp52_ = NULL; + _data_->_tmp50_ = NULL; #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp52_ = _data_->committer; + _data_->_tmp50_ = _data_->committer; #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp53_ = NULL; + _data_->_tmp51_ = NULL; #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp53__length1 = 0; + _data_->_tmp51__length1 = 0; #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp53_ = _data_->parents; + _data_->_tmp51_ = _data_->parents; #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp53__length1 = _data_->parents_length1; + _data_->_tmp51__length1 = _data_->parents_length1; #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_state_ = 2; #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - gitg_stage_commit_index (_data_->_tmp48_, _data_->_tmp49_, (GgitRef*) _data_->_tmp43_, _data_->_tmp50_, _data_->_tmp51_, _data_->_tmp52_, _data_->_tmp53_, _data_->_tmp53__length1, GITG_STAGE_COMMIT_OPTIONS_NONE, gitg_action_support_commit_index_ready, _data_); + gitg_stage_commit_index (_data_->_tmp46_, _data_->_tmp47_, (GgitRef*) _data_->_tmp41_, _data_->_tmp48_, _data_->_tmp49_, _data_->_tmp50_, _data_->_tmp51_, _data_->_tmp51__length1, GITG_STAGE_COMMIT_OPTIONS_NONE, gitg_action_support_commit_index_ready, _data_); #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 3179 "gitg-action-support.c" +#line 3127 "gitg-action-support.c" _state_2: #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp54_ = NULL; + _data_->_tmp52_ = NULL; #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp54_ = gitg_stage_commit_index_finish (_data_->_tmp48_, _data_->_res_, &_data_->_inner_error_); + _data_->_tmp52_ = gitg_stage_commit_index_finish (_data_->_tmp46_, _data_->_res_, &_data_->_inner_error_); #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp47_ = _data_->_tmp54_; + _data_->_tmp45_ = _data_->_tmp52_; #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 3189 "gitg-action-support.c" +#line 3137 "gitg-action-support.c" goto __catch40_g_error; } #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp55_ = NULL; + _data_->_tmp53_ = NULL; #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp55_ = _data_->_tmp47_; + _data_->_tmp53_ = _data_->_tmp45_; #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp47_ = NULL; + _data_->_tmp45_ = NULL; #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" __vala_GgitOId_free0 (_data_->_data33_->oid); #line 245 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_data33_->oid = _data_->_tmp55_; + _data_->_data33_->oid = _data_->_tmp53_; #line 242 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - __vala_GgitOId_free0 (_data_->_tmp47_); -#line 3204 "gitg-action-support.c" + __vala_GgitOId_free0 (_data_->_tmp45_); +#line 3152 "gitg-action-support.c" } goto __finally40; __catch40_g_error: @@ -3211,33 +3159,29 @@ #line 242 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_inner_error_ = NULL; #line 255 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp56_ = NULL; -#line 255 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp56_ = _data_->notification; -#line 255 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp57_ = NULL; + _data_->_tmp54_ = NULL; #line 255 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp57_ = _ ("Failed to create commit: %s"); + _data_->_tmp54_ = _data_->notification; #line 255 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp58_ = NULL; + _data_->_tmp55_ = NULL; #line 255 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp58_ = _data_->_vala1_e; + _data_->_tmp55_ = _data_->_vala1_e; #line 255 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp59_ = NULL; + _data_->_tmp56_ = NULL; #line 255 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp59_ = _data_->_tmp58_->message; + _data_->_tmp56_ = _data_->_tmp55_->message; #line 255 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp60_ = NULL; + _data_->_tmp57_ = NULL; #line 255 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp60_ = g_strdup_printf (_data_->_tmp57_, _data_->_tmp59_); + _data_->_tmp57_ = g_strdup_printf (_ ("Failed to create commit: %s"), _data_->_tmp56_); #line 255 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp61_ = NULL; + _data_->_tmp58_ = NULL; #line 255 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp61_ = _data_->_tmp60_; + _data_->_tmp58_ = _data_->_tmp57_; #line 255 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - gitg_simple_notification_error (_data_->_tmp56_, _data_->_tmp61_); + gitg_simple_notification_error (_data_->_tmp54_, _data_->_tmp58_); #line 255 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _g_free0 (_data_->_tmp61_); + _g_free0 (_data_->_tmp58_); #line 256 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->result = NULL; #line 256 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -3260,17 +3204,17 @@ if (_data_->_state_ == 0) { #line 256 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3263 "gitg-action-support.c" +#line 3207 "gitg-action-support.c" } else { #line 256 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3267 "gitg-action-support.c" +#line 3211 "gitg-action-support.c" } #line 256 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 256 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 3273 "gitg-action-support.c" +#line 3217 "gitg-action-support.c" } __finally40: #line 242 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -3295,15 +3239,15 @@ g_clear_error (&_data_->_inner_error_); #line 242 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 3298 "gitg-action-support.c" +#line 3242 "gitg-action-support.c" } #line 259 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp62_ = FALSE; + _data_->_tmp59_ = FALSE; #line 259 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp62_ = _data_->ishead; + _data_->_tmp59_ = _data_->ishead; #line 259 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - if (_data_->_tmp62_) { -#line 3306 "gitg-action-support.c" + if (_data_->_tmp59_) { +#line 3250 "gitg-action-support.c" { #line 263 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_state_ = 3; @@ -3311,13 +3255,13 @@ gitg_async_thread (_____lambda77__gitg_async_thread_func, _data_->_data33_, gitg_action_support_commit_index_ready, _data_); #line 263 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 3314 "gitg-action-support.c" +#line 3258 "gitg-action-support.c" _state_3: #line 263 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" gitg_async_thread_finish (_data_->_res_, &_data_->_inner_error_); #line 263 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 3320 "gitg-action-support.c" +#line 3264 "gitg-action-support.c" goto __catch41_g_error; } } @@ -3329,33 +3273,29 @@ #line 261 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->_inner_error_ = NULL; #line 277 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp63_ = NULL; + _data_->_tmp60_ = NULL; #line 277 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp63_ = _data_->notification; + _data_->_tmp60_ = _data_->notification; #line 277 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp64_ = NULL; + _data_->_tmp61_ = NULL; #line 277 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp64_ = _ ("Failed to checkout index: %s"); + _data_->_tmp61_ = _data_->_vala2_e; #line 277 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp65_ = NULL; + _data_->_tmp62_ = NULL; #line 277 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp65_ = _data_->_vala2_e; + _data_->_tmp62_ = _data_->_tmp61_->message; #line 277 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp66_ = NULL; -#line 277 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp66_ = _data_->_tmp65_->message; -#line 277 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp67_ = NULL; + _data_->_tmp63_ = NULL; #line 277 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp67_ = g_strdup_printf (_data_->_tmp64_, _data_->_tmp66_); + _data_->_tmp63_ = g_strdup_printf (_ ("Failed to checkout index: %s"), _data_->_tmp62_); #line 277 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp68_ = NULL; + _data_->_tmp64_ = NULL; #line 277 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp68_ = _data_->_tmp67_; + _data_->_tmp64_ = _data_->_tmp63_; #line 277 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - gitg_simple_notification_error (_data_->_tmp63_, _data_->_tmp68_); + gitg_simple_notification_error (_data_->_tmp60_, _data_->_tmp64_); #line 277 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _g_free0 (_data_->_tmp68_); + _g_free0 (_data_->_tmp64_); #line 278 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _data_->result = NULL; #line 278 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -3378,17 +3318,17 @@ if (_data_->_state_ == 0) { #line 278 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3381 "gitg-action-support.c" +#line 3321 "gitg-action-support.c" } else { #line 278 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3385 "gitg-action-support.c" +#line 3325 "gitg-action-support.c" } #line 278 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 278 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 3391 "gitg-action-support.c" +#line 3331 "gitg-action-support.c" } __finally41: #line 261 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -3413,19 +3353,19 @@ g_clear_error (&_data_->_inner_error_); #line 261 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 3416 "gitg-action-support.c" +#line 3356 "gitg-action-support.c" } } #line 282 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp69_ = NULL; + _data_->_tmp65_ = NULL; #line 282 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp69_ = _data_->_data33_->oid; + _data_->_tmp65_ = _data_->_data33_->oid; #line 282 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp70_ = NULL; + _data_->_tmp66_ = NULL; #line 282 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->_tmp70_ = __vala_GgitOId_copy0 (_data_->_tmp69_); + _data_->_tmp66_ = __vala_GgitOId_copy0 (_data_->_tmp65_); #line 282 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _data_->result = _data_->_tmp70_; + _data_->result = _data_->_tmp66_; #line 282 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" _g_object_unref0 (_data_->commit); #line 282 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" @@ -3444,11 +3384,11 @@ if (_data_->_state_ == 0) { #line 282 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3447 "gitg-action-support.c" +#line 3387 "gitg-action-support.c" } else { #line 282 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3451 "gitg-action-support.c" +#line 3391 "gitg-action-support.c" } #line 282 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); @@ -3472,17 +3412,17 @@ if (_data_->_state_ == 0) { #line 188 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3475 "gitg-action-support.c" +#line 3415 "gitg-action-support.c" } else { #line 188 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3479 "gitg-action-support.c" +#line 3419 "gitg-action-support.c" } #line 188 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 188 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return FALSE; -#line 3485 "gitg-action-support.c" +#line 3425 "gitg-action-support.c" } @@ -3500,26 +3440,30 @@ result = _tmp1_; #line 28 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return result; -#line 3503 "gitg-action-support.c" +#line 3443 "gitg-action-support.c" } void gitg_action_support_set_application (GitgActionSupport* self, GitgExtApplication* value) { - GitgExtApplication* _tmp0_ = NULL; - GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_return_if_fail (self != NULL); #line 28 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _tmp0_ = value; + if (gitg_action_support_get_application (self) != value) { +#line 3452 "gitg-action-support.c" + GitgExtApplication* _tmp0_ = NULL; + GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _g_object_unref0 (self->priv->_application); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 28 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" + _g_object_unref0 (self->priv->_application); #line 28 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - self->priv->_application = _tmp1_; + self->priv->_application = _tmp1_; #line 28 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - g_object_notify ((GObject *) self, "application"); -#line 3522 "gitg-action-support.c" + g_object_notify ((GObject *) self, "application"); +#line 3465 "gitg-action-support.c" + } } @@ -3537,26 +3481,30 @@ result = _tmp1_; #line 29 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" return result; -#line 3540 "gitg-action-support.c" +#line 3484 "gitg-action-support.c" } void gitg_action_support_set_action_interface (GitgActionSupport* self, GitgExtRefActionInterface* value) { - GitgExtRefActionInterface* _tmp0_ = NULL; - GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_return_if_fail (self != NULL); #line 29 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _tmp0_ = value; + if (gitg_action_support_get_action_interface (self) != value) { +#line 3493 "gitg-action-support.c" + GitgExtRefActionInterface* _tmp0_ = NULL; + GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 29 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - _g_object_unref0 (self->priv->_action_interface); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 29 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - self->priv->_action_interface = _tmp1_; + _g_object_unref0 (self->priv->_action_interface); #line 29 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" - g_object_notify ((GObject *) self, "action-interface"); -#line 3559 "gitg-action-support.c" + self->priv->_action_interface = _tmp1_; +#line 29 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" + g_object_notify ((GObject *) self, "action-interface"); +#line 3506 "gitg-action-support.c" + } } @@ -3575,18 +3523,18 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_ACTION_SUPPORT_APPLICATION, g_param_spec_object ("application", "application", "application", GITG_EXT_TYPE_APPLICATION, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_ACTION_SUPPORT_ACTION_INTERFACE, g_param_spec_object ("action-interface", "action-interface", "action-interface", GITG_EXT_TYPE_REF_ACTION_INTERFACE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); -#line 3578 "gitg-action-support.c" +#line 3526 "gitg-action-support.c" } static void gitg_action_support_instance_init (GitgActionSupport * self) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" self->priv = GITG_ACTION_SUPPORT_GET_PRIVATE (self); -#line 3585 "gitg-action-support.c" +#line 3533 "gitg-action-support.c" } -static void gitg_action_support_finalize (GObject* obj) { +static void gitg_action_support_finalize (GObject * obj) { GitgActionSupport * self; #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_ACTION_SUPPORT, GitgActionSupport); @@ -3596,7 +3544,7 @@ _g_object_unref0 (self->priv->_action_interface); #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" G_OBJECT_CLASS (gitg_action_support_parent_class)->finalize (obj); -#line 3599 "gitg-action-support.c" +#line 3547 "gitg-action-support.c" } @@ -3629,13 +3577,13 @@ g_value_take_object (value, gitg_action_support_get_action_interface (self)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" break; -#line 3632 "gitg-action-support.c" +#line 3580 "gitg-action-support.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" break; -#line 3638 "gitg-action-support.c" +#line 3586 "gitg-action-support.c" } } @@ -3657,13 +3605,13 @@ gitg_action_support_set_action_interface (self, g_value_get_object (value)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" break; -#line 3660 "gitg-action-support.c" +#line 3608 "gitg-action-support.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-action-support.vala" break; -#line 3666 "gitg-action-support.c" +#line 3614 "gitg-action-support.c" } } diff -Nru gitg-3.22.0/gitg/gitg-animated-paned.c gitg-3.23.0/gitg/gitg-animated-paned.c --- gitg-3.22.0/gitg/gitg-animated-paned.c 2016-08-09 09:50:54.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-animated-paned.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-animated-paned.c generated by valac 0.32.1, the Vala compiler +/* gitg-animated-paned.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-animated-paned.vala, do not modify */ /* @@ -166,7 +166,7 @@ GitgAnimatedPaned* gitg_animated_paned_construct (GType object_type); void gitg_animated_paned_set_transition_duration (GitgAnimatedPaned* self, guint value); gboolean gitg_animated_paned_get_is_animating (GitgAnimatedPaned* self); -static void gitg_animated_paned_finalize (GObject* obj); +static void gitg_animated_paned_finalize (GObject * obj); static void _vala_gitg_animated_paned_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_animated_paned_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -861,16 +861,20 @@ void gitg_animated_paned_set_transition_duration (GitgAnimatedPaned* self, guint value) { - guint _tmp0_ = 0U; #line 50 "/home/jesse/dev/gitg/gitg/gitg-animated-paned.vala" g_return_if_fail (self != NULL); #line 50 "/home/jesse/dev/gitg/gitg/gitg-animated-paned.vala" - _tmp0_ = value; + if (gitg_animated_paned_get_transition_duration (self) != value) { +#line 869 "gitg-animated-paned.c" + guint _tmp0_ = 0U; +#line 50 "/home/jesse/dev/gitg/gitg/gitg-animated-paned.vala" + _tmp0_ = value; #line 50 "/home/jesse/dev/gitg/gitg/gitg-animated-paned.vala" - self->priv->_transition_duration = _tmp0_; + self->priv->_transition_duration = _tmp0_; #line 50 "/home/jesse/dev/gitg/gitg/gitg-animated-paned.vala" - g_object_notify ((GObject *) self, "transition-duration"); -#line 874 "gitg-animated-paned.c" + g_object_notify ((GObject *) self, "transition-duration"); +#line 877 "gitg-animated-paned.c" + } } @@ -885,7 +889,7 @@ result = _tmp0_ != ((guint) 0); #line 116 "/home/jesse/dev/gitg/gitg/gitg-animated-paned.vala" return result; -#line 889 "gitg-animated-paned.c" +#line 893 "gitg-animated-paned.c" } @@ -906,7 +910,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_ANIMATED_PANED_TRANSITION_DURATION, g_param_spec_uint ("transition-duration", "transition-duration", "transition-duration", 0, G_MAXUINT, (guint) 250, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); #line 35 "/home/jesse/dev/gitg/gitg/gitg-animated-paned.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_ANIMATED_PANED_IS_ANIMATING, g_param_spec_boolean ("is-animating", "is-animating", "is-animating", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 910 "gitg-animated-paned.c" +#line 914 "gitg-animated-paned.c" } @@ -915,11 +919,11 @@ self->priv = GITG_ANIMATED_PANED_GET_PRIVATE (self); #line 47 "/home/jesse/dev/gitg/gitg/gitg-animated-paned.vala" self->priv->_transition_duration = (guint) 250; -#line 919 "gitg-animated-paned.c" +#line 923 "gitg-animated-paned.c" } -static void gitg_animated_paned_finalize (GObject* obj) { +static void gitg_animated_paned_finalize (GObject * obj) { GitgAnimatedPaned * self; #line 35 "/home/jesse/dev/gitg/gitg/gitg-animated-paned.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_ANIMATED_PANED, GitgAnimatedPaned); @@ -933,7 +937,7 @@ self->priv->d_async_callback_target_destroy_notify = NULL; #line 35 "/home/jesse/dev/gitg/gitg/gitg-animated-paned.vala" G_OBJECT_CLASS (gitg_animated_paned_parent_class)->finalize (obj); -#line 937 "gitg-animated-paned.c" +#line 941 "gitg-animated-paned.c" } @@ -966,13 +970,13 @@ g_value_set_boolean (value, gitg_animated_paned_get_is_animating (self)); #line 35 "/home/jesse/dev/gitg/gitg/gitg-animated-paned.vala" break; -#line 970 "gitg-animated-paned.c" +#line 974 "gitg-animated-paned.c" default: #line 35 "/home/jesse/dev/gitg/gitg/gitg-animated-paned.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 35 "/home/jesse/dev/gitg/gitg/gitg-animated-paned.vala" break; -#line 976 "gitg-animated-paned.c" +#line 980 "gitg-animated-paned.c" } } @@ -988,13 +992,13 @@ gitg_animated_paned_set_transition_duration (self, g_value_get_uint (value)); #line 35 "/home/jesse/dev/gitg/gitg/gitg-animated-paned.vala" break; -#line 992 "gitg-animated-paned.c" +#line 996 "gitg-animated-paned.c" default: #line 35 "/home/jesse/dev/gitg/gitg/gitg-animated-paned.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 35 "/home/jesse/dev/gitg/gitg/gitg-animated-paned.vala" break; -#line 998 "gitg-animated-paned.c" +#line 1002 "gitg-animated-paned.c" } } diff -Nru gitg-3.22.0/gitg/gitg-application.c gitg-3.23.0/gitg/gitg-application.c --- gitg-3.22.0/gitg/gitg-application.c 2016-08-09 09:50:54.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-application.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-application.c generated by valac 0.32.1, the Vala compiler +/* gitg-application.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-application.vala, do not modify */ /* @@ -181,17 +181,17 @@ GType gitg_history_command_line_get_type (void) G_GNUC_CONST; GitgHistoryCommandLine* gitg_history_command_line_new (void); GitgHistoryCommandLine* gitg_history_command_line_construct (GType object_type); -static void _vala_array_add8 (GitgExtCommandLine*** array, int* length, int* size, GitgExtCommandLine* value); +static void _vala_array_add8 (GitgExtCommandLine** * array, int* length, int* size, GitgExtCommandLine* value); GType gitg_plugins_engine_get_type (void) G_GNUC_CONST; GitgPluginsEngine* gitg_plugins_engine_get_default (void); static PeasPluginInfo* _vala_PeasPluginInfo_copy (PeasPluginInfo* self); -static void _vala_array_add9 (GitgExtCommandLine*** array, int* length, int* size, GitgExtCommandLine* value); +static void _vala_array_add9 (GitgExtCommandLine** * array, int* length, int* size, GitgExtCommandLine* value); static void _vala_PeasPluginInfo_free (PeasPluginInfo* self); static gboolean gitg_application_real_local_command_line (GApplication* base, gchar*** arguments, gint* exit_status); static gchar** _vala_array_dup16 (gchar** self, int length); void gitg_plugins_engine_initialize (void); static gint gitg_application_real_command_line (GApplication* base, GApplicationCommandLine* cmd); -static void _vala_array_add10 (GFile*** array, int* length, int* size, GFile* value); +static void _vala_array_add10 (GFile** * array, int* length, int* size, GFile* value); static void gitg_application_open_command_line (GitgApplication* self, GFile** files, int files_length1, const gchar* hint, GitgExtCommandLines* command_lines); static void gitg_application_activate_command_line (GitgApplication* self, GitgExtCommandLines* command_lines); static void gitg_application_new_window (GitgApplication* self, GitgRepository* repo, const gchar* hint, GitgExtCommandLines* command_lines); @@ -218,7 +218,7 @@ static void gitg_application_multi_accel_copy (const GitgApplicationMultiAccel* self, GitgApplicationMultiAccel* dest); static void gitg_application_multi_accel_destroy (GitgApplicationMultiAccel* self); static void gitg_application_add_css (GitgApplication* self, const gchar* path); -static void _vala_GitgApplicationMultiAccel_array_free (GitgApplicationMultiAccel* array, gint array_length); +static void _vala_GitgApplicationMultiAccel_array_free (GitgApplicationMultiAccel * array, gint array_length); static void gitg_application_real_shutdown (GApplication* base); static void gitg_application_present_window (GitgApplication* self, const gchar* activity, GitgExtCommandLines* command_lines); static void gitg_application_real_activate (GApplication* base); @@ -232,7 +232,7 @@ static GitgApplicationOptions* gitg_application_options_dup (const GitgApplicationOptions* self); static void gitg_application_options_free (GitgApplicationOptions* self); static gchar** _vala_array_dup17 (gchar** self, int length); -static void gitg_application_finalize (GObject* obj); +static void gitg_application_finalize (GObject * obj); static void _vala_gitg_application_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -328,7 +328,7 @@ } -static void _vala_array_add8 (GitgExtCommandLine*** array, int* length, int* size, GitgExtCommandLine* value) { +static void _vala_array_add8 (GitgExtCommandLine** * array, int* length, int* size, GitgExtCommandLine* value) { #line 102 "/home/jesse/dev/gitg/gitg/gitg-application.vala" if ((*length) == (*size)) { #line 102 "/home/jesse/dev/gitg/gitg/gitg-application.vala" @@ -359,7 +359,7 @@ } -static void _vala_array_add9 (GitgExtCommandLine*** array, int* length, int* size, GitgExtCommandLine* value) { +static void _vala_array_add9 (GitgExtCommandLine** * array, int* length, int* size, GitgExtCommandLine* value) { #line 117 "/home/jesse/dev/gitg/gitg/gitg-application.vala" if ((*length) == (*size)) { #line 117 "/home/jesse/dev/gitg/gitg/gitg-application.vala" @@ -386,185 +386,182 @@ static GitgExtCommandLines* gitg_application_parse_command_line (GitgApplication* self, gchar*** argv, int* argv_length1, GError** error) { GitgExtCommandLines* result = NULL; GOptionContext* ctx = NULL; - const gchar* _tmp0_ = NULL; + GOptionContext* _tmp0_ = NULL; GOptionContext* _tmp1_ = NULL; GOptionContext* _tmp2_ = NULL; - GOptionContext* _tmp3_ = NULL; - GOptionGroup* _tmp4_ = NULL; + GOptionGroup* _tmp3_ = NULL; GitgExtCommandLine** cmdexts = NULL; - GitgExtCommandLine** _tmp5_ = NULL; + GitgExtCommandLine** _tmp4_ = NULL; gint cmdexts_length1 = 0; gint _cmdexts_size_ = 0; GitgHistoryCommandLine* historycmd = NULL; - GitgHistoryCommandLine* _tmp6_ = NULL; - GitgExtCommandLine** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - GitgHistoryCommandLine* _tmp8_ = NULL; - GitgExtCommandLine* _tmp9_ = NULL; - GOptionContext* _tmp10_ = NULL; - GitgHistoryCommandLine* _tmp11_ = NULL; - GOptionGroup* _tmp12_ = NULL; + GitgHistoryCommandLine* _tmp5_ = NULL; + GitgExtCommandLine** _tmp6_ = NULL; + gint _tmp6__length1 = 0; + GitgHistoryCommandLine* _tmp7_ = NULL; + GitgExtCommandLine* _tmp8_ = NULL; + GOptionContext* _tmp9_ = NULL; + GitgHistoryCommandLine* _tmp10_ = NULL; + GOptionGroup* _tmp11_ = NULL; GitgPluginsEngine* engine = NULL; + GitgPluginsEngine* _tmp12_ = NULL; GitgPluginsEngine* _tmp13_ = NULL; - GitgPluginsEngine* _tmp14_ = NULL; - GList* _tmp15_ = NULL; - GOptionContext* _tmp30_ = NULL; + GList* _tmp14_ = NULL; + GOptionContext* _tmp29_ = NULL; GitgExtCommandLines* ret = NULL; - GitgExtCommandLine** _tmp31_ = NULL; - gint _tmp31__length1 = 0; + GitgExtCommandLine** _tmp30_ = NULL; + gint _tmp30__length1 = 0; + GitgExtCommandLines* _tmp31_ = NULL; GitgExtCommandLines* _tmp32_ = NULL; - GitgExtCommandLines* _tmp33_ = NULL; GError * _inner_error_ = NULL; #line 92 "/home/jesse/dev/gitg/gitg/gitg-application.vala" g_return_val_if_fail (self != NULL, NULL); #line 94 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp0_ = _ ("- Git repository viewer"); -#line 94 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp1_ = g_option_context_new (_tmp0_); + _tmp0_ = g_option_context_new (_ ("- Git repository viewer")); #line 94 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - ctx = _tmp1_; + ctx = _tmp0_; #line 96 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp2_ = ctx; + _tmp1_ = ctx; #line 96 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - g_option_context_add_main_entries (_tmp2_, GITG_APPLICATION_OPTIONS_entries, GETTEXT_PACKAGE); + g_option_context_add_main_entries (_tmp1_, GITG_APPLICATION_OPTIONS_entries, GETTEXT_PACKAGE); #line 97 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp3_ = ctx; + _tmp2_ = ctx; #line 97 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp4_ = gtk_get_option_group (TRUE); + _tmp3_ = gtk_get_option_group (TRUE); #line 97 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - g_option_context_add_group (_tmp3_, _tmp4_); + g_option_context_add_group (_tmp2_, _tmp3_); #line 99 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp5_ = g_new0 (GitgExtCommandLine*, 0 + 1); + _tmp4_ = g_new0 (GitgExtCommandLine*, 0 + 1); #line 99 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - cmdexts = _tmp5_; + cmdexts = _tmp4_; #line 99 "/home/jesse/dev/gitg/gitg/gitg-application.vala" cmdexts_length1 = 0; #line 99 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _cmdexts_size_ = cmdexts_length1; #line 101 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp6_ = gitg_history_command_line_new (); + _tmp5_ = gitg_history_command_line_new (); #line 101 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - historycmd = _tmp6_; + historycmd = _tmp5_; #line 102 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp7_ = cmdexts; + _tmp6_ = cmdexts; #line 102 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp7__length1 = cmdexts_length1; + _tmp6__length1 = cmdexts_length1; #line 102 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp8_ = historycmd; + _tmp7_ = historycmd; #line 102 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp9_ = _g_object_ref0 ((GitgExtCommandLine*) _tmp8_); + _tmp8_ = _g_object_ref0 ((GitgExtCommandLine*) _tmp7_); #line 102 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _vala_array_add8 (&cmdexts, &cmdexts_length1, &_cmdexts_size_, _tmp9_); + _vala_array_add8 (&cmdexts, &cmdexts_length1, &_cmdexts_size_, _tmp8_); #line 104 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp10_ = ctx; + _tmp9_ = ctx; #line 104 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp11_ = historycmd; + _tmp10_ = historycmd; #line 104 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp12_ = gitg_ext_command_line_get_option_group ((GitgExtCommandLine*) _tmp11_); + _tmp11_ = gitg_ext_command_line_get_option_group ((GitgExtCommandLine*) _tmp10_); #line 104 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - g_option_context_add_group (_tmp10_, _tmp12_); + g_option_context_add_group (_tmp9_, _tmp11_); #line 107 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp13_ = gitg_plugins_engine_get_default (); + _tmp12_ = gitg_plugins_engine_get_default (); #line 107 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - engine = _tmp13_; + engine = _tmp12_; #line 109 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp14_ = engine; + _tmp13_ = engine; #line 109 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp15_ = peas_engine_get_plugin_list ((PeasEngine*) _tmp14_); -#line 475 "gitg-application.c" + _tmp14_ = peas_engine_get_plugin_list ((PeasEngine*) _tmp13_); +#line 472 "gitg-application.c" { GList* info_collection = NULL; GList* info_it = NULL; #line 109 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - info_collection = _tmp15_; + info_collection = _tmp14_; #line 109 "/home/jesse/dev/gitg/gitg/gitg-application.vala" for (info_it = info_collection; info_it != NULL; info_it = info_it->next) { -#line 483 "gitg-application.c" - PeasPluginInfo* _tmp16_ = NULL; +#line 480 "gitg-application.c" + PeasPluginInfo* _tmp15_ = NULL; PeasPluginInfo* info = NULL; #line 109 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp16_ = __vala_PeasPluginInfo_copy0 ((PeasPluginInfo*) info_it->data); + _tmp15_ = __vala_PeasPluginInfo_copy0 ((PeasPluginInfo*) info_it->data); #line 109 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - info = _tmp16_; -#line 490 "gitg-application.c" + info = _tmp15_; +#line 487 "gitg-application.c" { - PeasPluginInfo* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; + PeasPluginInfo* _tmp16_ = NULL; + const gchar* _tmp17_ = NULL; #line 111 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp17_ = info; + _tmp16_ = info; #line 111 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp18_ = peas_plugin_info_get_external_data (_tmp17_, "CommandLine"); + _tmp17_ = peas_plugin_info_get_external_data (_tmp16_, "CommandLine"); #line 111 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - if (_tmp18_ != NULL) { -#line 500 "gitg-application.c" + if (_tmp17_ != NULL) { +#line 497 "gitg-application.c" GitgExtCommandLine* ext = NULL; - GitgPluginsEngine* _tmp19_ = NULL; - PeasPluginInfo* _tmp20_ = NULL; - PeasExtension* _tmp21_ = NULL; + GitgPluginsEngine* _tmp18_ = NULL; + PeasPluginInfo* _tmp19_ = NULL; + PeasExtension* _tmp20_ = NULL; + GitgExtCommandLine* _tmp21_ = NULL; GitgExtCommandLine* _tmp22_ = NULL; - GitgExtCommandLine* _tmp23_ = NULL; #line 113 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp19_ = engine; + _tmp18_ = engine; #line 113 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp20_ = info; + _tmp19_ = info; #line 113 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp21_ = peas_engine_create_extension ((PeasEngine*) _tmp19_, _tmp20_, GITG_EXT_TYPE_COMMAND_LINE, NULL); + _tmp20_ = peas_engine_create_extension ((PeasEngine*) _tmp18_, _tmp19_, GITG_EXT_TYPE_COMMAND_LINE, NULL); #line 113 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp22_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, GITG_EXT_TYPE_COMMAND_LINE) ? ((GitgExtCommandLine*) _tmp21_) : NULL; + _tmp21_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, GITG_EXT_TYPE_COMMAND_LINE) ? ((GitgExtCommandLine*) _tmp20_) : NULL; #line 113 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - if (_tmp22_ == NULL) { + if (_tmp21_ == NULL) { #line 113 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _g_object_unref0 (_tmp21_); -#line 519 "gitg-application.c" + _g_object_unref0 (_tmp20_); +#line 516 "gitg-application.c" } #line 113 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - ext = _tmp22_; + ext = _tmp21_; #line 115 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp23_ = ext; + _tmp22_ = ext; #line 115 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - if (_tmp23_ != NULL) { -#line 527 "gitg-application.c" - GitgExtCommandLine** _tmp24_ = NULL; - gint _tmp24__length1 = 0; + if (_tmp22_ != NULL) { +#line 524 "gitg-application.c" + GitgExtCommandLine** _tmp23_ = NULL; + gint _tmp23__length1 = 0; + GitgExtCommandLine* _tmp24_ = NULL; GitgExtCommandLine* _tmp25_ = NULL; - GitgExtCommandLine* _tmp26_ = NULL; - GOptionContext* _tmp27_ = NULL; - GitgExtCommandLine* _tmp28_ = NULL; - GOptionGroup* _tmp29_ = NULL; + GOptionContext* _tmp26_ = NULL; + GitgExtCommandLine* _tmp27_ = NULL; + GOptionGroup* _tmp28_ = NULL; #line 117 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp24_ = cmdexts; + _tmp23_ = cmdexts; #line 117 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp24__length1 = cmdexts_length1; + _tmp23__length1 = cmdexts_length1; #line 117 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp25_ = ext; + _tmp24_ = ext; #line 117 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp26_ = _g_object_ref0 (_tmp25_); + _tmp25_ = _g_object_ref0 (_tmp24_); #line 117 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _vala_array_add9 (&cmdexts, &cmdexts_length1, &_cmdexts_size_, _tmp26_); + _vala_array_add9 (&cmdexts, &cmdexts_length1, &_cmdexts_size_, _tmp25_); #line 118 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp27_ = ctx; + _tmp26_ = ctx; #line 118 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp28_ = ext; + _tmp27_ = ext; #line 118 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp29_ = gitg_ext_command_line_get_option_group (_tmp28_); + _tmp28_ = gitg_ext_command_line_get_option_group (_tmp27_); #line 118 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - g_option_context_add_group (_tmp27_, _tmp29_); -#line 553 "gitg-application.c" + g_option_context_add_group (_tmp26_, _tmp28_); +#line 550 "gitg-application.c" } #line 111 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_object_unref0 (ext); -#line 557 "gitg-application.c" +#line 554 "gitg-application.c" } #line 109 "/home/jesse/dev/gitg/gitg/gitg-application.vala" __vala_PeasPluginInfo_free0 (info); -#line 561 "gitg-application.c" +#line 558 "gitg-application.c" } } } #line 123 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp30_ = ctx; + _tmp29_ = ctx; #line 123 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - g_option_context_parse (_tmp30_, argv_length1, argv, &_inner_error_); + g_option_context_parse (_tmp29_, argv_length1, argv, &_inner_error_); #line 123 "/home/jesse/dev/gitg/gitg/gitg-application.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 123 "/home/jesse/dev/gitg/gitg/gitg-application.vala" @@ -581,7 +578,7 @@ _g_option_context_free0 (ctx); #line 123 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return NULL; -#line 585 "gitg-application.c" +#line 582 "gitg-application.c" } else { #line 123 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_object_unref0 (engine); @@ -597,21 +594,21 @@ g_clear_error (&_inner_error_); #line 123 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return NULL; -#line 601 "gitg-application.c" +#line 598 "gitg-application.c" } } #line 125 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp31_ = cmdexts; + _tmp30_ = cmdexts; #line 125 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp31__length1 = cmdexts_length1; + _tmp30__length1 = cmdexts_length1; #line 125 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp32_ = gitg_ext_command_lines_new (_tmp31_, _tmp31__length1); + _tmp31_ = gitg_ext_command_lines_new (_tmp30_, _tmp30__length1); #line 125 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - ret = _tmp32_; + ret = _tmp31_; #line 126 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp33_ = ret; + _tmp32_ = ret; #line 126 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - gitg_ext_command_lines_parse_finished (_tmp33_); + gitg_ext_command_lines_parse_finished (_tmp32_); #line 128 "/home/jesse/dev/gitg/gitg/gitg-application.vala" result = ret; #line 128 "/home/jesse/dev/gitg/gitg/gitg-application.vala" @@ -624,7 +621,7 @@ _g_option_context_free0 (ctx); #line 128 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return result; -#line 628 "gitg-application.c" +#line 625 "gitg-application.c" } @@ -635,17 +632,17 @@ result = g_new0 (gchar*, length + 1); #line 134 "/home/jesse/dev/gitg/gitg/gitg-application.vala" for (i = 0; i < length; i++) { -#line 639 "gitg-application.c" +#line 636 "gitg-application.c" gchar* _tmp0_ = NULL; #line 134 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp0_ = g_strdup (self[i]); #line 134 "/home/jesse/dev/gitg/gitg/gitg-application.vala" result[i] = _tmp0_; -#line 645 "gitg-application.c" +#line 642 "gitg-application.c" } #line 134 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return result; -#line 649 "gitg-application.c" +#line 646 "gitg-application.c" } @@ -697,7 +694,7 @@ _argv_size_ = argv_length1; #line 137 "/home/jesse/dev/gitg/gitg/gitg-application.vala" gitg_plugins_engine_initialize (); -#line 701 "gitg-application.c" +#line 698 "gitg-application.c" { GitgExtCommandLines* _tmp3_ = NULL; GitgExtCommandLines* _tmp4_ = NULL; @@ -709,7 +706,7 @@ _g_object_unref0 (_tmp4_); #line 142 "/home/jesse/dev/gitg/gitg/gitg-application.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 713 "gitg-application.c" +#line 710 "gitg-application.c" goto __catch42_g_error; } } @@ -744,11 +741,11 @@ if (exit_status) { #line 148 "/home/jesse/dev/gitg/gitg/gitg-application.vala" *exit_status = _vala_exit_status; -#line 748 "gitg-application.c" +#line 745 "gitg-application.c" } #line 148 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return result; -#line 752 "gitg-application.c" +#line 749 "gitg-application.c" } __finally42: #line 139 "/home/jesse/dev/gitg/gitg/gitg-application.vala" @@ -761,7 +758,7 @@ g_clear_error (&_inner_error_); #line 139 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return FALSE; -#line 765 "gitg-application.c" +#line 762 "gitg-application.c" } #line 151 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp8_ = gitg_application_options_quit; @@ -777,11 +774,11 @@ if (exit_status) { #line 154 "/home/jesse/dev/gitg/gitg/gitg-application.vala" *exit_status = _vala_exit_status; -#line 781 "gitg-application.c" +#line 778 "gitg-application.c" } #line 154 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return result; -#line 785 "gitg-application.c" +#line 782 "gitg-application.c" } #line 157 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp10_ = G_APPLICATION_CLASS (gitg_application_parent_class)->local_command_line ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_get_type (), GtkApplication), arguments, &_tmp9_); @@ -795,28 +792,28 @@ if (exit_status) { #line 157 "/home/jesse/dev/gitg/gitg/gitg-application.vala" *exit_status = _vala_exit_status; -#line 799 "gitg-application.c" +#line 796 "gitg-application.c" } #line 157 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return result; -#line 803 "gitg-application.c" +#line 800 "gitg-application.c" } -static void _vala_array_add10 (GFile*** array, int* length, int* size, GFile* value) { +static void _vala_array_add10 (GFile** * array, int* length, int* size, GFile* value) { #line 196 "/home/jesse/dev/gitg/gitg/gitg-application.vala" if ((*length) == (*size)) { #line 196 "/home/jesse/dev/gitg/gitg/gitg-application.vala" *size = (*size) ? (2 * (*size)) : 4; #line 196 "/home/jesse/dev/gitg/gitg/gitg-application.vala" *array = g_renew (GFile*, *array, (*size) + 1); -#line 814 "gitg-application.c" +#line 811 "gitg-application.c" } #line 196 "/home/jesse/dev/gitg/gitg/gitg-application.vala" (*array)[(*length)++] = value; #line 196 "/home/jesse/dev/gitg/gitg/gitg-application.vala" (*array)[*length] = NULL; -#line 820 "gitg-application.c" +#line 817 "gitg-application.c" } @@ -872,7 +869,7 @@ argv_length1 = _tmp3__length1; #line 163 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _argv_size_ = argv_length1; -#line 876 "gitg-application.c" +#line 873 "gitg-application.c" { GitgExtCommandLines* _tmp4_ = NULL; GitgExtCommandLines* _tmp5_ = NULL; @@ -883,7 +880,7 @@ _tmp4_ = _tmp5_; #line 168 "/home/jesse/dev/gitg/gitg/gitg-application.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 887 "gitg-application.c" +#line 884 "gitg-application.c" goto __catch43_g_error; } #line 168 "/home/jesse/dev/gitg/gitg/gitg-application.vala" @@ -896,7 +893,7 @@ command_lines = _tmp6_; #line 166 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_object_unref0 (_tmp4_); -#line 900 "gitg-application.c" +#line 897 "gitg-application.c" } goto __finally43; __catch43_g_error: @@ -927,7 +924,7 @@ arguments = (_vala_array_free (arguments, arguments_length1, (GDestroyNotify) g_free), NULL); #line 173 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return result; -#line 931 "gitg-application.c" +#line 928 "gitg-application.c" } __finally43: #line 166 "/home/jesse/dev/gitg/gitg/gitg-application.vala" @@ -942,7 +939,7 @@ g_clear_error (&_inner_error_); #line 166 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return 0; -#line 946 "gitg-application.c" +#line 943 "gitg-application.c" } #line 176 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp10_ = gitg_application_options_quit; @@ -956,7 +953,7 @@ arguments = (_vala_array_free (arguments, arguments_length1, (GDestroyNotify) g_free), NULL); #line 178 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return result; -#line 960 "gitg-application.c" +#line 957 "gitg-application.c" } #line 181 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp11_ = cmd; @@ -964,7 +961,7 @@ _tmp12_ = g_application_command_line_get_is_remote (_tmp11_); #line 181 "/home/jesse/dev/gitg/gitg/gitg-application.vala" if (!_tmp12_) { -#line 968 "gitg-application.c" +#line 965 "gitg-application.c" GApplicationCommandLine* _tmp13_ = NULL; GApplicationCommandLine* _tmp14_ = NULL; #line 183 "/home/jesse/dev/gitg/gitg/gitg-application.vala" @@ -975,7 +972,7 @@ _g_object_unref0 (gitg_application_options_command_line); #line 183 "/home/jesse/dev/gitg/gitg/gitg-application.vala" gitg_application_options_command_line = _tmp14_; -#line 979 "gitg-application.c" +#line 976 "gitg-application.c" } #line 186 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp15_ = gitg_application_options_command_line; @@ -997,7 +994,7 @@ _tmp19__length1 = argv_length1; #line 189 "/home/jesse/dev/gitg/gitg/gitg-application.vala" if (_tmp19__length1 > 1) { -#line 1001 "gitg-application.c" +#line 998 "gitg-application.c" GFile** files = NULL; gchar** _tmp20_ = NULL; gint _tmp20__length1 = 0; @@ -1037,7 +1034,7 @@ _tmp24_ = argv; #line 194 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp24__length1 = argv_length1; -#line 1041 "gitg-application.c" +#line 1038 "gitg-application.c" { gchar** arg_collection = NULL; gint arg_collection_length1 = 0; @@ -1049,14 +1046,14 @@ arg_collection_length1 = _tmp24__length1 - 1; #line 194 "/home/jesse/dev/gitg/gitg/gitg-application.vala" for (arg_it = 0; arg_it < (_tmp24__length1 - 1); arg_it = arg_it + 1) { -#line 1053 "gitg-application.c" +#line 1050 "gitg-application.c" gchar* _tmp25_ = NULL; gchar* arg = NULL; #line 194 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp25_ = g_strdup (arg_collection[arg_it]); #line 194 "/home/jesse/dev/gitg/gitg/gitg-application.vala" arg = _tmp25_; -#line 1060 "gitg-application.c" +#line 1057 "gitg-application.c" { GFile** _tmp26_ = NULL; gint _tmp26__length1 = 0; @@ -1074,7 +1071,7 @@ _vala_array_add10 (&files, &files_length1, &_files_size_, _tmp28_); #line 194 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_free0 (arg); -#line 1078 "gitg-application.c" +#line 1075 "gitg-application.c" } } } @@ -1090,14 +1087,14 @@ gitg_application_open_command_line (self, _tmp29_, _tmp29__length1, _tmp30_, _tmp31_); #line 189 "/home/jesse/dev/gitg/gitg/gitg-application.vala" files = (_vala_array_free (files, files_length1, (GDestroyNotify) g_object_unref), NULL); -#line 1094 "gitg-application.c" +#line 1091 "gitg-application.c" } else { GitgExtCommandLines* _tmp32_ = NULL; #line 203 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp32_ = command_lines; #line 203 "/home/jesse/dev/gitg/gitg/gitg-application.vala" gitg_application_activate_command_line (self, _tmp32_); -#line 1101 "gitg-application.c" +#line 1098 "gitg-application.c" } #line 206 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp33_ = tmpcmd; @@ -1117,7 +1114,7 @@ arguments = (_vala_array_free (arguments, arguments_length1, (GDestroyNotify) g_free), NULL); #line 207 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return result; -#line 1121 "gitg-application.c" +#line 1118 "gitg-application.c" } @@ -1126,7 +1123,7 @@ g_return_if_fail (self != NULL); #line 212 "/home/jesse/dev/gitg/gitg/gitg-application.vala" gitg_application_new_window (self, NULL, NULL, NULL); -#line 1130 "gitg-application.c" +#line 1127 "gitg-application.c" } @@ -1145,20 +1142,17 @@ gchar* copyright = NULL; gchar* _tmp5_ = NULL; gchar* comments = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; + gchar* _tmp6_ = NULL; GList* wnds = NULL; - GList* _tmp8_ = NULL; - GtkWindow* _tmp9_ = NULL; - GList* _tmp10_ = NULL; + GList* _tmp7_ = NULL; + GtkWindow* _tmp8_ = NULL; + GList* _tmp9_ = NULL; + gchar** _tmp12_ = NULL; + gint _tmp12__length1 = 0; gchar** _tmp13_ = NULL; gint _tmp13__length1 = 0; - gchar** _tmp14_ = NULL; - gint _tmp14__length1 = 0; + const gchar* _tmp14_ = NULL; const gchar* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; #line 215 "/home/jesse/dev/gitg/gitg/gitg-application.vala" g_return_if_fail (self != NULL); #line 217 "/home/jesse/dev/gitg/gitg/gitg-application.vala" @@ -1194,52 +1188,46 @@ #line 221 "/home/jesse/dev/gitg/gitg/gitg-application.vala" copyright = _tmp5_; #line 222 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp6_ = _ ("gitg is a Git repository viewer for gtk+/GNOME"); -#line 222 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp6_ = g_strdup (_ ("gitg is a Git repository viewer for gtk+/GNOME")); #line 222 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - comments = _tmp7_; + comments = _tmp6_; #line 224 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp8_ = gtk_application_get_windows ((GtkApplication*) self); + _tmp7_ = gtk_application_get_windows ((GtkApplication*) self); #line 224 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - wnds = _tmp8_; + wnds = _tmp7_; #line 226 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp10_ = wnds; + _tmp9_ = wnds; #line 226 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - if (_tmp10_ != NULL) { -#line 1211 "gitg-application.c" - GList* _tmp11_ = NULL; - gconstpointer _tmp12_ = NULL; + if (_tmp9_ != NULL) { +#line 1203 "gitg-application.c" + GList* _tmp10_ = NULL; + gconstpointer _tmp11_ = NULL; #line 226 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp11_ = wnds; + _tmp10_ = wnds; #line 226 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp12_ = _tmp11_->data; + _tmp11_ = _tmp10_->data; #line 226 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp9_ = (GtkWindow*) _tmp12_; -#line 1220 "gitg-application.c" + _tmp8_ = (GtkWindow*) _tmp11_; +#line 1212 "gitg-application.c" } else { #line 226 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp9_ = NULL; -#line 1224 "gitg-application.c" + _tmp8_ = NULL; +#line 1216 "gitg-application.c" } #line 226 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp13_ = artists; -#line 226 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp13__length1 = artists_length1; -#line 226 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp14_ = authors; + _tmp12_ = artists; #line 226 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp14__length1 = authors_length1; + _tmp12__length1 = artists_length1; #line 226 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp15_ = copyright; + _tmp13_ = authors; #line 226 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp16_ = comments; + _tmp13__length1 = authors_length1; #line 226 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp17_ = _ ("translator-credits"); + _tmp14_ = copyright; #line 226 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp18_ = _ ("gitg homepage"); + _tmp15_ = comments; #line 226 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - gtk_show_about_dialog (_tmp9_, "artists", _tmp13_, "authors", _tmp14_, "copyright", _tmp15_, "comments", _tmp16_, "translator-credits", _tmp17_, "version", VERSION, "website", PACKAGE_URL, "website-label", _tmp18_, "logo-icon-name", PACKAGE_NAME, "license-type", GTK_LICENSE_GPL_2_0, NULL); + gtk_show_about_dialog (_tmp8_, "artists", _tmp12_, "authors", _tmp13_, "copyright", _tmp14_, "comments", _tmp15_, "translator-credits", _ ("translator-credits"), "version", VERSION, "website", PACKAGE_URL, "website-label", _ ("gitg homepage"), "logo-icon-name", PACKAGE_NAME, "license-type", GTK_LICENSE_GPL_2_0, NULL); #line 215 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_free0 (comments); #line 215 "/home/jesse/dev/gitg/gitg/gitg-application.vala" @@ -1248,7 +1236,7 @@ authors = (_vala_array_free (authors, authors_length1, (GDestroyNotify) g_free), NULL); #line 215 "/home/jesse/dev/gitg/gitg/gitg-application.vala" artists = (_vala_array_free (artists, artists_length1, (GDestroyNotify) g_free), NULL); -#line 1252 "gitg-application.c" +#line 1240 "gitg-application.c" } @@ -1267,7 +1255,7 @@ wnds = _tmp1_; #line 243 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp2_ = wnds; -#line 1271 "gitg-application.c" +#line 1259 "gitg-application.c" { GList* window_collection = NULL; GList* window_it = NULL; @@ -1275,24 +1263,24 @@ window_collection = _tmp2_; #line 243 "/home/jesse/dev/gitg/gitg/gitg-application.vala" for (window_it = window_collection; window_it != NULL; window_it = window_it->next) { -#line 1279 "gitg-application.c" +#line 1267 "gitg-application.c" GtkWindow* window = NULL; #line 243 "/home/jesse/dev/gitg/gitg/gitg-application.vala" window = (GtkWindow*) window_it->data; -#line 1283 "gitg-application.c" +#line 1271 "gitg-application.c" { GtkWindow* _tmp3_ = NULL; #line 245 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp3_ = window; #line 245 "/home/jesse/dev/gitg/gitg/gitg-application.vala" gtk_widget_destroy ((GtkWidget*) _tmp3_); -#line 1290 "gitg-application.c" +#line 1278 "gitg-application.c" } } } #line 239 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_list_free0 (wnds); -#line 1296 "gitg-application.c" +#line 1284 "gitg-application.c" } @@ -1303,14 +1291,14 @@ _g_object_unref0 (self->priv->d_preferences); #line 259 "/home/jesse/dev/gitg/gitg/gitg-application.vala" self->priv->d_preferences = NULL; -#line 1307 "gitg-application.c" +#line 1295 "gitg-application.c" } static void ____lambda168__gtk_widget_destroy (GtkWidget* _sender, gpointer self) { #line 258 "/home/jesse/dev/gitg/gitg/gitg-application.vala" ___lambda168_ ((GitgApplication*) self, _sender); -#line 1314 "gitg-application.c" +#line 1302 "gitg-application.c" } @@ -1330,7 +1318,7 @@ _tmp1_ = self->priv->d_preferences; #line 254 "/home/jesse/dev/gitg/gitg/gitg-application.vala" if (_tmp1_ == NULL) { -#line 1334 "gitg-application.c" +#line 1322 "gitg-application.c" gpointer _tmp2_ = NULL; GitgPreferencesDialog* _tmp3_ = NULL; #line 256 "/home/jesse/dev/gitg/gitg/gitg-application.vala" @@ -1343,13 +1331,13 @@ _tmp3_ = self->priv->d_preferences; #line 258 "/home/jesse/dev/gitg/gitg/gitg-application.vala" g_signal_connect_object ((GtkWidget*) _tmp3_, "destroy", (GCallback) ____lambda168__gtk_widget_destroy, self, 0); -#line 1347 "gitg-application.c" +#line 1335 "gitg-application.c" } #line 263 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp4_ = wnds; #line 263 "/home/jesse/dev/gitg/gitg/gitg-application.vala" if (_tmp4_ != NULL) { -#line 1353 "gitg-application.c" +#line 1341 "gitg-application.c" GitgPreferencesDialog* _tmp5_ = NULL; GList* _tmp6_ = NULL; gconstpointer _tmp7_ = NULL; @@ -1361,13 +1349,13 @@ _tmp7_ = _tmp6_->data; #line 265 "/home/jesse/dev/gitg/gitg/gitg-application.vala" gtk_window_set_transient_for ((GtkWindow*) _tmp5_, (GtkWindow*) _tmp7_); -#line 1365 "gitg-application.c" +#line 1353 "gitg-application.c" } #line 268 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp8_ = self->priv->d_preferences; #line 268 "/home/jesse/dev/gitg/gitg/gitg-application.vala" gtk_window_present ((GtkWindow*) _tmp8_); -#line 1371 "gitg-application.c" +#line 1359 "gitg-application.c" } @@ -1378,14 +1366,14 @@ _g_object_unref0 (self->priv->d_shortcuts); #line 283 "/home/jesse/dev/gitg/gitg/gitg-application.vala" self->priv->d_shortcuts = NULL; -#line 1382 "gitg-application.c" +#line 1370 "gitg-application.c" } static void ____lambda169__gtk_widget_destroy (GtkWidget* _sender, gpointer self) { #line 282 "/home/jesse/dev/gitg/gitg/gitg-application.vala" ___lambda169_ ((GitgApplication*) self, _sender); -#line 1389 "gitg-application.c" +#line 1377 "gitg-application.c" } @@ -1405,7 +1393,7 @@ _tmp1_ = self->priv->d_shortcuts; #line 278 "/home/jesse/dev/gitg/gitg/gitg-application.vala" if (_tmp1_ == NULL) { -#line 1409 "gitg-application.c" +#line 1397 "gitg-application.c" gpointer _tmp2_ = NULL; GtkShortcutsWindow* _tmp3_ = NULL; #line 280 "/home/jesse/dev/gitg/gitg/gitg-application.vala" @@ -1418,13 +1406,13 @@ _tmp3_ = self->priv->d_shortcuts; #line 282 "/home/jesse/dev/gitg/gitg/gitg-application.vala" g_signal_connect_object ((GtkWidget*) _tmp3_, "destroy", (GCallback) ____lambda169__gtk_widget_destroy, self, 0); -#line 1422 "gitg-application.c" +#line 1410 "gitg-application.c" } #line 287 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp4_ = wnds; #line 287 "/home/jesse/dev/gitg/gitg/gitg-application.vala" if (_tmp4_ != NULL) { -#line 1428 "gitg-application.c" +#line 1416 "gitg-application.c" GtkShortcutsWindow* _tmp5_ = NULL; GList* _tmp6_ = NULL; gconstpointer _tmp7_ = NULL; @@ -1436,13 +1424,13 @@ _tmp7_ = _tmp6_->data; #line 289 "/home/jesse/dev/gitg/gitg/gitg-application.vala" gtk_window_set_transient_for ((GtkWindow*) _tmp5_, (GtkWindow*) _tmp7_); -#line 1440 "gitg-application.c" +#line 1428 "gitg-application.c" } #line 292 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp8_ = self->priv->d_shortcuts; #line 292 "/home/jesse/dev/gitg/gitg/gitg-application.vala" gtk_window_present ((GtkWindow*) _tmp8_); -#line 1446 "gitg-application.c" +#line 1434 "gitg-application.c" } @@ -1466,7 +1454,7 @@ _tmp1_ = wnds; #line 301 "/home/jesse/dev/gitg/gitg/gitg-application.vala" if (_tmp1_ != NULL) { -#line 1470 "gitg-application.c" +#line 1458 "gitg-application.c" GList* _tmp2_ = NULL; gconstpointer _tmp3_ = NULL; GtkWindow* _tmp4_ = NULL; @@ -1483,7 +1471,7 @@ _g_object_unref0 (window); #line 303 "/home/jesse/dev/gitg/gitg/gitg-application.vala" window = _tmp5_; -#line 1487 "gitg-application.c" +#line 1475 "gitg-application.c" } #line 306 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp6_ = window; @@ -1495,21 +1483,21 @@ _g_object_unref0 (_tmp8_); #line 296 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_object_unref0 (window); -#line 1499 "gitg-application.c" +#line 1487 "gitg-application.c" } static void __lambda170_ (GitgApplication* self) { #line 346 "/home/jesse/dev/gitg/gitg/gitg-application.vala" gtk_main_quit (); -#line 1506 "gitg-application.c" +#line 1494 "gitg-application.c" } static void ___lambda170__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { #line 346 "/home/jesse/dev/gitg/gitg/gitg-application.vala" __lambda170_ ((GitgApplication*) self); -#line 1513 "gitg-application.c" +#line 1501 "gitg-application.c" } @@ -1537,72 +1525,72 @@ gtk_widget_show ((GtkWidget*) dlg); #line 335 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_object_unref0 (dlg); -#line 1541 "gitg-application.c" +#line 1529 "gitg-application.c" } static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1553 "gitg-application.c" +#line 1541 "gitg-application.c" } -static void _vala_GitgApplicationMultiAccel_array_free (GitgApplicationMultiAccel* array, gint array_length) { +static void _vala_GitgApplicationMultiAccel_array_free (GitgApplicationMultiAccel * array, gint array_length) { #line 350 "/home/jesse/dev/gitg/gitg/gitg-application.vala" if (array != NULL) { -#line 1560 "gitg-application.c" +#line 1548 "gitg-application.c" int i; #line 350 "/home/jesse/dev/gitg/gitg/gitg-application.vala" for (i = 0; i < array_length; i = i + 1) { #line 350 "/home/jesse/dev/gitg/gitg/gitg-application.vala" gitg_application_multi_accel_destroy (&array[i]); -#line 1566 "gitg-application.c" +#line 1554 "gitg-application.c" } } #line 350 "/home/jesse/dev/gitg/gitg/gitg-application.vala" g_free (array); -#line 1571 "gitg-application.c" +#line 1559 "gitg-application.c" } static void gitg_application_real_startup (GApplication* base) { GitgApplication * self; + GSettings* _tmp2_ = NULL; GSettings* _tmp3_ = NULL; - GSettings* _tmp4_ = NULL; #line 384 "/home/jesse/dev/gitg/gitg/gitg-application.vala" static const GitgApplicationAccel single_accels[] = {{"app.new", "N"}, {"app.quit", "Q"}, {"app.help", "F1"}, {"win.search", "F"}, {"win.gear-menu", "F10"}, {"win.open-repository", "O"}, {"win.close", "W"}}; -#line 1581 "gitg-application.c" +#line 1569 "gitg-application.c" GitgApplicationMultiAccel* multi_accels = NULL; + gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar** _tmp8_ = NULL; - GitgApplicationMultiAccel _tmp9_ = {0}; - GitgApplicationMultiAccel* _tmp10_ = NULL; + gchar** _tmp7_ = NULL; + GitgApplicationMultiAccel _tmp8_ = {0}; + GitgApplicationMultiAccel* _tmp9_ = NULL; gint multi_accels_length1 = 0; gint _multi_accels_size_ = 0; - GitgApplicationMultiAccel* _tmp18_ = NULL; - gint _tmp18__length1 = 0; - GtkSettings* _tmp24_ = NULL; + GitgApplicationMultiAccel* _tmp17_ = NULL; + gint _tmp17__length1 = 0; + GtkSettings* _tmp23_ = NULL; + gboolean _tmp24_ = FALSE; gboolean _tmp25_ = FALSE; - gboolean _tmp26_ = FALSE; - const gchar* _tmp30_ = NULL; + const gchar* _tmp29_ = NULL; + gchar* _tmp30_ = NULL; gchar* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; GtkIconTheme* theme = NULL; + GtkIconTheme* _tmp32_ = NULL; GtkIconTheme* _tmp33_ = NULL; GtkIconTheme* _tmp34_ = NULL; - GtkIconTheme* _tmp35_ = NULL; + gchar* _tmp35_ = NULL; gchar* _tmp36_ = NULL; gchar* _tmp37_ = NULL; gchar* _tmp38_ = NULL; - gchar* _tmp39_ = NULL; GError * _inner_error_ = NULL; #line 350 "/home/jesse/dev/gitg/gitg/gitg-application.vala" self = (GitgApplication*) base; @@ -1610,13 +1598,13 @@ G_APPLICATION_CLASS (gitg_application_parent_class)->startup ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_get_type (), GtkApplication)); #line 354 "/home/jesse/dev/gitg/gitg/gitg-application.vala" gitg_platform_support_application_support_prepare_startup (); -#line 1614 "gitg-application.c" +#line 1602 "gitg-application.c" { #line 358 "/home/jesse/dev/gitg/gitg/gitg-application.vala" gitg_init (&_inner_error_); #line 358 "/home/jesse/dev/gitg/gitg/gitg-application.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1620 "gitg-application.c" +#line 1608 "gitg-application.c" goto __catch44_g_error; } } @@ -1633,36 +1621,33 @@ _tmp0_ = e; #line 362 "/home/jesse/dev/gitg/gitg/gitg-application.vala" if (g_error_matches (_tmp0_, GITG_INIT_ERROR, GITG_INIT_ERROR_THREADS_UNSAFE)) { -#line 1637 "gitg-application.c" +#line 1625 "gitg-application.c" gchar* errmsg = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + gchar* _tmp1_ = NULL; #line 364 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp1_ = _ ("We are terribly sorry, but gitg requires libgit2 (a library on which g" \ + _tmp1_ = g_strdup (_ ("We are terribly sorry, but gitg requires libgit2 (a library on which g" \ "itg depends) to be compiled with threading support.\n" \ "\n" \ "If you manually compiled libgit2, then please configure libgit2 with -" \ "DTHREADSAFE:BOOL=ON.\n" \ "\n" \ "Otherwise, report a bug in your distributions' bug reporting system fo" \ -"r providing libgit2 without threading support."); -#line 364 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp2_ = g_strdup (_tmp1_); +"r providing libgit2 without threading support.")); #line 364 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - errmsg = _tmp2_; + errmsg = _tmp1_; #line 366 "/home/jesse/dev/gitg/gitg/gitg-application.vala" gitg_application_init_error (self, errmsg); #line 367 "/home/jesse/dev/gitg/gitg/gitg-application.vala" g_error ("gitg-application.vala:367: %s", errmsg); #line 362 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_free0 (errmsg); -#line 1653 "gitg-application.c" +#line 1638 "gitg-application.c" } #line 370 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_error_free0 (e); #line 370 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return; -#line 1659 "gitg-application.c" +#line 1644 "gitg-application.c" } __finally44: #line 356 "/home/jesse/dev/gitg/gitg/gitg-application.vala" @@ -1673,59 +1658,59 @@ g_clear_error (&_inner_error_); #line 356 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return; -#line 1670 "gitg-application.c" +#line 1655 "gitg-application.c" } #line 374 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp3_ = g_settings_new ("org.gnome.gitg.state.window"); + _tmp2_ = g_settings_new ("org.gnome.gitg.state.window"); #line 374 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_object_unref0 (self->priv->d_state_settings); #line 374 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - self->priv->d_state_settings = _tmp3_; + self->priv->d_state_settings = _tmp2_; #line 375 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp4_ = self->priv->d_state_settings; + _tmp3_ = self->priv->d_state_settings; #line 375 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - g_settings_delay (_tmp4_); + g_settings_delay (_tmp3_); #line 378 "/home/jesse/dev/gitg/gitg/gitg-application.vala" g_action_map_add_action_entries ((GActionMap*) self, GITG_APPLICATION_app_entries, G_N_ELEMENTS (GITG_APPLICATION_app_entries), self); #line 381 "/home/jesse/dev/gitg/gitg/gitg-application.vala" g_action_map_add_action_entries ((GActionMap*) self, GITG_APPLICATION_shortcut_window_entries, G_N_ELEMENTS (GITG_APPLICATION_shortcut_window_entries), self); #line 395 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp5_ = g_strdup ("win.reload"); + _tmp4_ = g_strdup ("win.reload"); #line 395 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp6_ = g_strdup ("R"); + _tmp5_ = g_strdup ("R"); #line 395 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp7_ = g_strdup ("F5"); + _tmp6_ = g_strdup ("F5"); #line 395 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp8_ = g_new0 (gchar*, 2 + 1); + _tmp7_ = g_new0 (gchar*, 2 + 1); #line 395 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp8_[0] = _tmp6_; + _tmp7_[0] = _tmp5_; #line 395 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp8_[1] = _tmp7_; + _tmp7_[1] = _tmp6_; #line 395 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - memset (&_tmp9_, 0, sizeof (GitgApplicationMultiAccel)); + memset (&_tmp8_, 0, sizeof (GitgApplicationMultiAccel)); #line 395 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _g_free0 (_tmp9_.name); + _g_free0 (_tmp8_.name); #line 395 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp9_.name = _tmp5_; + _tmp8_.name = _tmp4_; #line 395 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp9_.accels = (_vala_array_free (_tmp9_.accels, _tmp9_.accels_length1, (GDestroyNotify) g_free), NULL); + _tmp8_.accels = (_vala_array_free (_tmp8_.accels, _tmp8_.accels_length1, (GDestroyNotify) g_free), NULL); #line 395 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp9_.accels = _tmp8_; + _tmp8_.accels = _tmp7_; #line 395 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp9_.accels_length1 = 2; + _tmp8_.accels_length1 = 2; #line 395 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp9_._accels_size_ = _tmp9_.accels_length1; + _tmp8_._accels_size_ = _tmp8_.accels_length1; #line 395 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp10_ = g_new0 (GitgApplicationMultiAccel, 1); + _tmp9_ = g_new0 (GitgApplicationMultiAccel, 1); #line 395 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp10_[0] = _tmp9_; + _tmp9_[0] = _tmp8_; #line 395 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - multi_accels = _tmp10_; + multi_accels = _tmp9_; #line 395 "/home/jesse/dev/gitg/gitg/gitg-application.vala" multi_accels_length1 = 1; #line 395 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _multi_accels_size_ = multi_accels_length1; -#line 1722 "gitg-application.c" +#line 1707 "gitg-application.c" { GitgApplicationAccel* accel_collection = NULL; gint accel_collection_length1 = 0; @@ -1737,165 +1722,165 @@ accel_collection_length1 = G_N_ELEMENTS (single_accels); #line 402 "/home/jesse/dev/gitg/gitg/gitg-application.vala" for (accel_it = 0; accel_it < G_N_ELEMENTS (single_accels); accel_it = accel_it + 1) { -#line 1734 "gitg-application.c" +#line 1719 "gitg-application.c" GitgApplicationAccel accel = {0}; #line 402 "/home/jesse/dev/gitg/gitg/gitg-application.vala" accel = accel_collection[accel_it]; -#line 1738 "gitg-application.c" +#line 1723 "gitg-application.c" { - GitgApplicationAccel _tmp11_ = {0}; - const gchar* _tmp12_ = NULL; - GitgApplicationAccel _tmp13_ = {0}; - const gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; + GitgApplicationAccel _tmp10_ = {0}; + const gchar* _tmp11_ = NULL; + GitgApplicationAccel _tmp12_ = {0}; + const gchar* _tmp13_ = NULL; + gchar* _tmp14_ = NULL; + gchar** _tmp15_ = NULL; gchar** _tmp16_ = NULL; - gchar** _tmp17_ = NULL; - gint _tmp17__length1 = 0; + gint _tmp16__length1 = 0; #line 404 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp11_ = accel; + _tmp10_ = accel; #line 404 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp12_ = _tmp11_.name; + _tmp11_ = _tmp10_.name; #line 404 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp13_ = accel; + _tmp12_ = accel; #line 404 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp14_ = _tmp13_.accel; + _tmp13_ = _tmp12_.accel; #line 404 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp15_ = g_strdup (_tmp14_); + _tmp14_ = g_strdup (_tmp13_); #line 404 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp16_ = g_new0 (gchar*, 1 + 1); + _tmp15_ = g_new0 (gchar*, 1 + 1); #line 404 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp16_[0] = _tmp15_; + _tmp15_[0] = _tmp14_; #line 404 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 404 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp17__length1 = 1; + _tmp16__length1 = 1; #line 404 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - gtk_application_set_accels_for_action ((GtkApplication*) self, _tmp12_, _tmp17_); + gtk_application_set_accels_for_action ((GtkApplication*) self, _tmp11_, _tmp16_); #line 404 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp17_ = (_vala_array_free (_tmp17_, _tmp17__length1, (GDestroyNotify) g_free), NULL); -#line 1770 "gitg-application.c" + _tmp16_ = (_vala_array_free (_tmp16_, _tmp16__length1, (GDestroyNotify) g_free), NULL); +#line 1755 "gitg-application.c" } } } #line 407 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp18_ = multi_accels; + _tmp17_ = multi_accels; #line 407 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp18__length1 = multi_accels_length1; -#line 1778 "gitg-application.c" + _tmp17__length1 = multi_accels_length1; +#line 1763 "gitg-application.c" { GitgApplicationMultiAccel* accel_collection = NULL; gint accel_collection_length1 = 0; gint _accel_collection_size_ = 0; gint accel_it = 0; #line 407 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - accel_collection = _tmp18_; + accel_collection = _tmp17_; #line 407 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - accel_collection_length1 = _tmp18__length1; + accel_collection_length1 = _tmp17__length1; #line 407 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - for (accel_it = 0; accel_it < _tmp18__length1; accel_it = accel_it + 1) { -#line 1790 "gitg-application.c" - GitgApplicationMultiAccel _tmp19_ = {0}; + for (accel_it = 0; accel_it < _tmp17__length1; accel_it = accel_it + 1) { +#line 1775 "gitg-application.c" + GitgApplicationMultiAccel _tmp18_ = {0}; GitgApplicationMultiAccel accel = {0}; #line 407 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - gitg_application_multi_accel_copy (&accel_collection[accel_it], &_tmp19_); + gitg_application_multi_accel_copy (&accel_collection[accel_it], &_tmp18_); #line 407 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - accel = _tmp19_; -#line 1797 "gitg-application.c" + accel = _tmp18_; +#line 1782 "gitg-application.c" { - GitgApplicationMultiAccel _tmp20_ = {0}; - const gchar* _tmp21_ = NULL; - GitgApplicationMultiAccel _tmp22_ = {0}; - gchar** _tmp23_ = NULL; - gint _tmp23__length1 = 0; + GitgApplicationMultiAccel _tmp19_ = {0}; + const gchar* _tmp20_ = NULL; + GitgApplicationMultiAccel _tmp21_ = {0}; + gchar** _tmp22_ = NULL; + gint _tmp22__length1 = 0; #line 409 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp20_ = accel; + _tmp19_ = accel; #line 409 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp21_ = _tmp20_.name; + _tmp20_ = _tmp19_.name; #line 409 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp22_ = accel; + _tmp21_ = accel; #line 409 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp23_ = _tmp22_.accels; + _tmp22_ = _tmp21_.accels; #line 409 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp23__length1 = _tmp22_.accels_length1; + _tmp22__length1 = _tmp21_.accels_length1; #line 409 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - gtk_application_set_accels_for_action ((GtkApplication*) self, _tmp21_, _tmp23_); + gtk_application_set_accels_for_action ((GtkApplication*) self, _tmp20_, _tmp22_); #line 407 "/home/jesse/dev/gitg/gitg/gitg-application.vala" gitg_application_multi_accel_destroy (&accel); -#line 1818 "gitg-application.c" +#line 1803 "gitg-application.c" } } } #line 412 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp24_ = gtk_settings_get_default (); + _tmp23_ = gtk_settings_get_default (); #line 412 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - g_object_get (_tmp24_, "gtk-shell-shows-app-menu", &_tmp25_, NULL); + g_object_get (_tmp23_, "gtk-shell-shows-app-menu", &_tmp24_, NULL); #line 412 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp26_ = _tmp25_; + _tmp25_ = _tmp24_; #line 412 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - if (_tmp26_) { -#line 1830 "gitg-application.c" + if (_tmp25_) { +#line 1815 "gitg-application.c" GMenuModel* menu = NULL; - gpointer _tmp27_ = NULL; - GMenuModel* _tmp28_ = NULL; + gpointer _tmp26_ = NULL; + GMenuModel* _tmp27_ = NULL; #line 414 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp27_ = gitg_builder_load_object (g_menu_model_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, "ui/gitg-menus.ui", "app-menu"); + _tmp26_ = gitg_builder_load_object (g_menu_model_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, "ui/gitg-menus.ui", "app-menu"); #line 414 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - menu = (GMenuModel*) _tmp27_; + menu = (GMenuModel*) _tmp26_; #line 416 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp28_ = menu; + _tmp27_ = menu; #line 416 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - if (_tmp28_ != NULL) { -#line 1842 "gitg-application.c" - GMenuModel* _tmp29_ = NULL; + if (_tmp27_ != NULL) { +#line 1827 "gitg-application.c" + GMenuModel* _tmp28_ = NULL; #line 418 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp29_ = menu; + _tmp28_ = menu; #line 418 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - gtk_application_set_app_menu ((GtkApplication*) self, _tmp29_); -#line 1848 "gitg-application.c" + gtk_application_set_app_menu ((GtkApplication*) self, _tmp28_); +#line 1833 "gitg-application.c" } #line 412 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_object_unref0 (menu); -#line 1852 "gitg-application.c" +#line 1837 "gitg-application.c" } #line 422 "/home/jesse/dev/gitg/gitg/gitg-application.vala" gitg_application_add_css (self, "style.css"); #line 423 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp30_ = string_to_string (PLATFORM_NAME); + _tmp29_ = string_to_string (PLATFORM_NAME); #line 423 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp31_ = g_strconcat ("style-", _tmp30_, ".css", NULL); + _tmp30_ = g_strconcat ("style-", _tmp29_, ".css", NULL); #line 423 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp32_ = _tmp31_; + _tmp31_ = _tmp30_; #line 423 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - gitg_application_add_css (self, _tmp32_); + gitg_application_add_css (self, _tmp31_); #line 423 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _g_free0 (_tmp32_); + _g_free0 (_tmp31_); #line 425 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp33_ = gtk_icon_theme_get_default (); + _tmp32_ = gtk_icon_theme_get_default (); #line 425 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp34_ = _g_object_ref0 (_tmp33_); + _tmp33_ = _g_object_ref0 (_tmp32_); #line 425 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - theme = _tmp34_; + theme = _tmp33_; #line 426 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp35_ = theme; + _tmp34_ = theme; #line 426 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp36_ = gitg_platform_support_get_data_dir (); + _tmp35_ = gitg_platform_support_get_data_dir (); #line 426 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp37_ = _tmp36_; + _tmp36_ = _tmp35_; #line 426 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp38_ = g_build_filename (_tmp37_, "icons", NULL); + _tmp37_ = g_build_filename (_tmp36_, "icons", NULL); #line 426 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _tmp39_ = _tmp38_; + _tmp38_ = _tmp37_; #line 426 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - gtk_icon_theme_prepend_search_path (_tmp35_, _tmp39_); + gtk_icon_theme_prepend_search_path (_tmp34_, _tmp38_); #line 426 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _g_free0 (_tmp39_); + _g_free0 (_tmp38_); #line 426 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - _g_free0 (_tmp37_); + _g_free0 (_tmp36_); #line 350 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_object_unref0 (theme); #line 350 "/home/jesse/dev/gitg/gitg/gitg-application.vala" multi_accels = (_vala_GitgApplicationMultiAccel_array_free (multi_accels, multi_accels_length1), NULL); -#line 1892 "gitg-application.c" +#line 1877 "gitg-application.c" } @@ -1918,7 +1903,7 @@ _tmp2_ = provider; #line 433 "/home/jesse/dev/gitg/gitg/gitg-application.vala" if (_tmp2_ != NULL) { -#line 1915 "gitg-application.c" +#line 1900 "gitg-application.c" GdkScreen* _tmp3_ = NULL; GtkCssProvider* _tmp4_ = NULL; #line 435 "/home/jesse/dev/gitg/gitg/gitg-application.vala" @@ -1927,11 +1912,11 @@ _tmp4_ = provider; #line 435 "/home/jesse/dev/gitg/gitg/gitg-application.vala" gtk_style_context_add_provider_for_screen (_tmp3_, (GtkStyleProvider*) _tmp4_, (guint) 600); -#line 1924 "gitg-application.c" +#line 1909 "gitg-application.c" } #line 429 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_object_unref0 (provider); -#line 1928 "gitg-application.c" +#line 1913 "gitg-application.c" } @@ -1946,7 +1931,7 @@ g_settings_apply (_tmp0_); #line 444 "/home/jesse/dev/gitg/gitg/gitg-application.vala" G_APPLICATION_CLASS (gitg_application_parent_class)->shutdown ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_get_type (), GtkApplication)); -#line 1943 "gitg-application.c" +#line 1928 "gitg-application.c" } @@ -1960,7 +1945,7 @@ _tmp0_ = gitg_application_options_no_wd; #line 449 "/home/jesse/dev/gitg/gitg/gitg-application.vala" if (_tmp0_) { -#line 1957 "gitg-application.c" +#line 1942 "gitg-application.c" const gchar* _tmp1_ = NULL; GitgExtCommandLines* _tmp2_ = NULL; #line 451 "/home/jesse/dev/gitg/gitg/gitg-application.vala" @@ -1969,7 +1954,7 @@ _tmp2_ = command_lines; #line 451 "/home/jesse/dev/gitg/gitg/gitg-application.vala" gitg_application_present_window (self, _tmp1_, _tmp2_); -#line 1966 "gitg-application.c" +#line 1951 "gitg-application.c" } else { gchar* wd = NULL; GApplicationCommandLine* _tmp3_ = NULL; @@ -2017,7 +2002,7 @@ gitg_application_present_window (self, _tmp11_, _tmp12_); #line 449 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_free0 (wd); -#line 2014 "gitg-application.c" +#line 1999 "gitg-application.c" } } @@ -2030,7 +2015,7 @@ gitg_application_present_window (self, NULL, NULL); #line 466 "/home/jesse/dev/gitg/gitg/gitg-application.vala" G_APPLICATION_CLASS (gitg_application_parent_class)->activate ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_get_type (), GtkApplication)); -#line 2027 "gitg-application.c" +#line 2012 "gitg-application.c" } @@ -2043,7 +2028,7 @@ g_return_val_if_fail (file != NULL, NULL); #line 471 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp0_ = gtk_application_get_windows ((GtkApplication*) self); -#line 2040 "gitg-application.c" +#line 2025 "gitg-application.c" { GList* window_collection = NULL; GList* window_it = NULL; @@ -2051,14 +2036,14 @@ window_collection = _tmp0_; #line 471 "/home/jesse/dev/gitg/gitg/gitg-application.vala" for (window_it = window_collection; window_it != NULL; window_it = window_it->next) { -#line 2048 "gitg-application.c" +#line 2033 "gitg-application.c" GtkWindow* _tmp1_ = NULL; GtkWindow* window = NULL; #line 471 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp1_ = _g_object_ref0 ((GtkWindow*) window_it->data); #line 471 "/home/jesse/dev/gitg/gitg/gitg-application.vala" window = _tmp1_; -#line 2055 "gitg-application.c" +#line 2040 "gitg-application.c" { GitgWindow* wnd = NULL; GtkWindow* _tmp2_ = NULL; @@ -2103,7 +2088,7 @@ _g_object_unref0 (window); #line 477 "/home/jesse/dev/gitg/gitg/gitg-application.vala" continue; -#line 2100 "gitg-application.c" +#line 2085 "gitg-application.c" } #line 480 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp9_ = wnd; @@ -2135,13 +2120,13 @@ _g_object_unref0 (window); #line 482 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return result; -#line 2132 "gitg-application.c" +#line 2117 "gitg-application.c" } #line 471 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_object_unref0 (wnd); #line 471 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_object_unref0 (window); -#line 2138 "gitg-application.c" +#line 2123 "gitg-application.c" } } } @@ -2149,7 +2134,7 @@ result = NULL; #line 486 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return result; -#line 2146 "gitg-application.c" +#line 2131 "gitg-application.c" } @@ -2170,7 +2155,7 @@ _tmp1_ = hint; #line 491 "/home/jesse/dev/gitg/gitg/gitg-application.vala" gitg_application_open_command_line (self, _tmp0_, _tmp0__length1, _tmp1_, NULL); -#line 2167 "gitg-application.c" +#line 2152 "gitg-application.c" } @@ -2190,13 +2175,13 @@ if (_tmp0__length1 == 0) { #line 499 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return; -#line 2187 "gitg-application.c" +#line 2172 "gitg-application.c" } #line 503 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp1_ = files; #line 503 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp1__length1 = files_length1; -#line 2193 "gitg-application.c" +#line 2178 "gitg-application.c" { GFile** f_collection = NULL; gint f_collection_length1 = 0; @@ -2208,14 +2193,14 @@ f_collection_length1 = _tmp1__length1; #line 503 "/home/jesse/dev/gitg/gitg/gitg-application.vala" for (f_it = 0; f_it < _tmp1__length1; f_it = f_it + 1) { -#line 2205 "gitg-application.c" +#line 2190 "gitg-application.c" GFile* _tmp2_ = NULL; GFile* f = NULL; #line 503 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp2_ = _g_object_ref0 (f_collection[f_it]); #line 503 "/home/jesse/dev/gitg/gitg/gitg-application.vala" f = _tmp2_; -#line 2212 "gitg-application.c" +#line 2197 "gitg-application.c" { GFile* resolved = NULL; GitgWindow* window = NULL; @@ -2239,7 +2224,7 @@ _tmp3_ = _tmp5_; #line 510 "/home/jesse/dev/gitg/gitg/gitg-application.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2236 "gitg-application.c" +#line 2221 "gitg-application.c" goto __catch45_g_error; } #line 510 "/home/jesse/dev/gitg/gitg/gitg-application.vala" @@ -2252,7 +2237,7 @@ resolved = _tmp6_; #line 508 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_object_unref0 (_tmp3_); -#line 2249 "gitg-application.c" +#line 2234 "gitg-application.c" } goto __finally45; __catch45_g_error: @@ -2267,7 +2252,7 @@ _g_object_unref0 (f); #line 512 "/home/jesse/dev/gitg/gitg/gitg-application.vala" continue; -#line 2264 "gitg-application.c" +#line 2249 "gitg-application.c" } __finally45: #line 508 "/home/jesse/dev/gitg/gitg/gitg-application.vala" @@ -2282,7 +2267,7 @@ g_clear_error (&_inner_error_); #line 508 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return; -#line 2279 "gitg-application.c" +#line 2264 "gitg-application.c" } #line 515 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp7_ = resolved; @@ -2294,7 +2279,7 @@ _tmp9_ = window; #line 517 "/home/jesse/dev/gitg/gitg/gitg-application.vala" if (_tmp9_ != NULL) { -#line 2291 "gitg-application.c" +#line 2276 "gitg-application.c" GitgWindow* _tmp10_ = NULL; GApplicationCommandLine* _tmp11_ = NULL; gchar** _tmp12_ = NULL; @@ -2326,7 +2311,7 @@ _g_object_unref0 (f); #line 522 "/home/jesse/dev/gitg/gitg/gitg-application.vala" continue; -#line 2323 "gitg-application.c" +#line 2308 "gitg-application.c" } { GitgRepository* _tmp17_ = NULL; @@ -2341,7 +2326,7 @@ _tmp17_ = _tmp19_; #line 530 "/home/jesse/dev/gitg/gitg/gitg-application.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2338 "gitg-application.c" +#line 2323 "gitg-application.c" goto __catch46_g_error; } #line 530 "/home/jesse/dev/gitg/gitg/gitg-application.vala" @@ -2354,7 +2339,7 @@ repo = _tmp20_; #line 528 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_object_unref0 (_tmp17_); -#line 2351 "gitg-application.c" +#line 2336 "gitg-application.c" } goto __finally46; __catch46_g_error: @@ -2373,7 +2358,7 @@ _g_object_unref0 (f); #line 532 "/home/jesse/dev/gitg/gitg/gitg-application.vala" continue; -#line 2370 "gitg-application.c" +#line 2355 "gitg-application.c" } __finally46: #line 528 "/home/jesse/dev/gitg/gitg/gitg-application.vala" @@ -2392,7 +2377,7 @@ g_clear_error (&_inner_error_); #line 528 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return; -#line 2389 "gitg-application.c" +#line 2374 "gitg-application.c" } #line 535 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp21_ = repo; @@ -2410,7 +2395,7 @@ _g_object_unref0 (resolved); #line 503 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_object_unref0 (f); -#line 2407 "gitg-application.c" +#line 2392 "gitg-application.c" } } } @@ -2439,7 +2424,7 @@ _tmp3_ = window; #line 543 "/home/jesse/dev/gitg/gitg/gitg-application.vala" if (_tmp3_ != NULL) { -#line 2436 "gitg-application.c" +#line 2421 "gitg-application.c" GitgWindow* _tmp4_ = NULL; GApplicationCommandLine* _tmp5_ = NULL; gchar** _tmp6_ = NULL; @@ -2452,7 +2437,7 @@ _tmp7_ = _tmp6_ = g_application_command_line_get_environ (_tmp5_); #line 545 "/home/jesse/dev/gitg/gitg/gitg-application.vala" gitg_window_set_environment (_tmp4_, _tmp7_, _vala_array_length (_tmp6_)); -#line 2449 "gitg-application.c" +#line 2434 "gitg-application.c" } #line 548 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp8_ = hint; @@ -2462,7 +2447,7 @@ gitg_application_present_window (self, _tmp8_, _tmp9_); #line 539 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_object_unref0 (window); -#line 2459 "gitg-application.c" +#line 2444 "gitg-application.c" } @@ -2496,7 +2481,7 @@ gitg_application_new_window (self, NULL, NULL, NULL); #line 562 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return; -#line 2493 "gitg-application.c" +#line 2478 "gitg-application.c" } #line 565 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp2_ = windows; @@ -2526,7 +2511,7 @@ gitg_window_present (_tmp10_, _tmp11_, _tmp12_); #line 551 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_object_unref0 (w); -#line 2523 "gitg-application.c" +#line 2508 "gitg-application.c" } @@ -2544,7 +2529,7 @@ result = _tmp1_; #line 29 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return result; -#line 2541 "gitg-application.c" +#line 2526 "gitg-application.c" } @@ -2561,7 +2546,7 @@ result = TRUE; #line 51 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return result; -#line 2558 "gitg-application.c" +#line 2543 "gitg-application.c" } @@ -2573,14 +2558,14 @@ memcpy (dup, self, sizeof (GitgApplicationOptions)); #line 40 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return dup; -#line 2570 "gitg-application.c" +#line 2555 "gitg-application.c" } static void gitg_application_options_free (GitgApplicationOptions* self) { #line 40 "/home/jesse/dev/gitg/gitg/gitg-application.vala" g_free (self); -#line 2577 "gitg-application.c" +#line 2562 "gitg-application.c" } @@ -2616,7 +2601,7 @@ _g_free0 ((*dest).accel); #line 323 "/home/jesse/dev/gitg/gitg/gitg-application.vala" (*dest).accel = _tmp3_; -#line 2613 "gitg-application.c" +#line 2598 "gitg-application.c" } @@ -2625,7 +2610,7 @@ _g_free0 ((*self).name); #line 326 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_free0 ((*self).accel); -#line 2622 "gitg-application.c" +#line 2607 "gitg-application.c" } @@ -2637,7 +2622,7 @@ gitg_application_accel_copy (self, dup); #line 323 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return dup; -#line 2634 "gitg-application.c" +#line 2619 "gitg-application.c" } @@ -2646,7 +2631,7 @@ gitg_application_accel_destroy (self); #line 323 "/home/jesse/dev/gitg/gitg/gitg-application.vala" g_free (self); -#line 2643 "gitg-application.c" +#line 2628 "gitg-application.c" } @@ -2668,17 +2653,17 @@ result = g_new0 (gchar*, length + 1); #line 329 "/home/jesse/dev/gitg/gitg/gitg-application.vala" for (i = 0; i < length; i++) { -#line 2665 "gitg-application.c" +#line 2650 "gitg-application.c" gchar* _tmp0_ = NULL; #line 329 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp0_ = g_strdup (self[i]); #line 329 "/home/jesse/dev/gitg/gitg/gitg-application.vala" result[i] = _tmp0_; -#line 2671 "gitg-application.c" +#line 2656 "gitg-application.c" } #line 329 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return result; -#line 2675 "gitg-application.c" +#line 2660 "gitg-application.c" } @@ -2713,7 +2698,7 @@ (*dest).accels_length1 = _tmp3__length1; #line 329 "/home/jesse/dev/gitg/gitg/gitg-application.vala" (*dest)._accels_size_ = (*dest).accels_length1; -#line 2710 "gitg-application.c" +#line 2695 "gitg-application.c" } @@ -2722,7 +2707,7 @@ _g_free0 ((*self).name); #line 332 "/home/jesse/dev/gitg/gitg/gitg-application.vala" (*self).accels = (_vala_array_free ((*self).accels, (*self).accels_length1, (GDestroyNotify) g_free), NULL); -#line 2719 "gitg-application.c" +#line 2704 "gitg-application.c" } @@ -2734,7 +2719,7 @@ gitg_application_multi_accel_copy (self, dup); #line 329 "/home/jesse/dev/gitg/gitg/gitg-application.vala" return dup; -#line 2731 "gitg-application.c" +#line 2716 "gitg-application.c" } @@ -2743,7 +2728,7 @@ gitg_application_multi_accel_destroy (self); #line 329 "/home/jesse/dev/gitg/gitg/gitg-application.vala" g_free (self); -#line 2740 "gitg-application.c" +#line 2725 "gitg-application.c" } @@ -2781,25 +2766,25 @@ #line 23 "/home/jesse/dev/gitg/gitg/gitg-application.vala" G_OBJECT_CLASS (klass)->finalize = gitg_application_finalize; #line 23 "/home/jesse/dev/gitg/gitg/gitg-application.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_APPLICATION_STATE_SETTINGS, g_param_spec_object ("state-settings", "state-settings", "state-settings", G_TYPE_SETTINGS, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_APPLICATION_STATE_SETTINGS, g_param_spec_object ("state-settings", "state-settings", "state-settings", g_settings_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 79 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _tmp0_ = g_strdup (""); #line 79 "/home/jesse/dev/gitg/gitg/gitg-application.vala" _g_free0 (gitg_application_options_activity); #line 79 "/home/jesse/dev/gitg/gitg/gitg-application.vala" gitg_application_options_activity = _tmp0_; -#line 2785 "gitg-application.c" +#line 2770 "gitg-application.c" } static void gitg_application_instance_init (GitgApplication * self) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-application.vala" self->priv = GITG_APPLICATION_GET_PRIVATE (self); -#line 2792 "gitg-application.c" +#line 2777 "gitg-application.c" } -static void gitg_application_finalize (GObject* obj) { +static void gitg_application_finalize (GObject * obj) { GitgApplication * self; #line 23 "/home/jesse/dev/gitg/gitg/gitg-application.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_APPLICATION, GitgApplication); @@ -2811,7 +2796,7 @@ _g_object_unref0 (self->priv->d_shortcuts); #line 23 "/home/jesse/dev/gitg/gitg/gitg-application.vala" G_OBJECT_CLASS (gitg_application_parent_class)->finalize (obj); -#line 2808 "gitg-application.c" +#line 2793 "gitg-application.c" } @@ -2838,13 +2823,13 @@ g_value_take_object (value, gitg_application_get_state_settings (self)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-application.vala" break; -#line 2835 "gitg-application.c" +#line 2820 "gitg-application.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-application.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-application.vala" break; -#line 2841 "gitg-application.c" +#line 2826 "gitg-application.c" } } diff -Nru gitg-3.22.0/gitg/gitg-author-details-dialog.c gitg-3.23.0/gitg/gitg-author-details-dialog.c --- gitg-3.22.0/gitg/gitg-author-details-dialog.c 2016-08-18 08:59:59.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-author-details-dialog.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-author-details-dialog.c generated by valac 0.32.1, the Vala compiler +/* gitg-author-details-dialog.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-author-details-dialog.vala, do not modify */ /* @@ -110,7 +110,7 @@ static void block34_data_unref (void * _userdata_); static void __lambda98_ (Block34Data* _data34_, GtkDialog* d, gint id); static void ___lambda98__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self); -static void gitg_author_details_dialog_finalize (GObject* obj); +static void gitg_author_details_dialog_finalize (GObject * obj); static gpointer _g_object_ref0 (gpointer self) { @@ -387,27 +387,21 @@ static void gitg_author_details_dialog_build_global (GitgAuthorDetailsDialog* self) { - const gchar* _tmp0_ = NULL; + GtkLabel* _tmp0_ = NULL; GtkLabel* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - GtkLabel* _tmp3_ = NULL; #line 95 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" g_return_if_fail (self != NULL); #line 97 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _tmp0_ = _ ("Author Details"); -#line 97 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - gtk_window_set_title ((GtkWindow*) self, _tmp0_); -#line 98 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _tmp1_ = self->priv->d_label_info; + gtk_window_set_title ((GtkWindow*) self, _ ("Author Details")); #line 98 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _tmp2_ = _ ("Enter default details used for all repositories:"); + _tmp0_ = self->priv->d_label_info; #line 98 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - gtk_label_set_label (_tmp1_, _tmp2_); + gtk_label_set_label (_tmp0_, _ ("Enter default details used for all repositories:")); #line 99 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _tmp3_ = self->priv->d_label_info; + _tmp1_ = self->priv->d_label_info; #line 99 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - gtk_widget_show ((GtkWidget*) _tmp3_); -#line 411 "gitg-author-details-dialog.c" + gtk_widget_show ((GtkWidget*) _tmp1_); +#line 405 "gitg-author-details-dialog.c" } @@ -418,7 +412,7 @@ g_return_val_if_fail (self != NULL, FALSE); #line 102 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" g_return_val_if_fail (name != NULL, FALSE); -#line 422 "gitg-author-details-dialog.c" +#line 416 "gitg-author-details-dialog.c" { GgitConfigEntry* entry = NULL; GgitConfig* _tmp0_ = NULL; @@ -435,7 +429,7 @@ entry = _tmp2_; #line 106 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 439 "gitg-author-details-dialog.c" +#line 433 "gitg-author-details-dialog.c" goto __catch49_g_error; } #line 107 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" @@ -446,7 +440,7 @@ _ggit_config_entry_unref0 (entry); #line 107 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" return result; -#line 450 "gitg-author-details-dialog.c" +#line 444 "gitg-author-details-dialog.c" } goto __finally49; __catch49_g_error: @@ -459,7 +453,7 @@ result = FALSE; #line 111 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" return result; -#line 463 "gitg-author-details-dialog.c" +#line 457 "gitg-author-details-dialog.c" } __finally49: #line 104 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" @@ -468,90 +462,84 @@ g_clear_error (&_inner_error_); #line 104 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" return FALSE; -#line 472 "gitg-author-details-dialog.c" +#line 466 "gitg-author-details-dialog.c" } static void _gitg_author_details_dialog_update_sensitivity_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 123 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" gitg_author_details_dialog_update_sensitivity ((GitgAuthorDetailsDialog*) self); -#line 479 "gitg-author-details-dialog.c" +#line 473 "gitg-author-details-dialog.c" } static void gitg_author_details_dialog_build_repository (GitgAuthorDetailsDialog* self) { const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - GtkCheckButton* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; - gboolean _tmp10_ = FALSE; + GtkCheckButton* _tmp3_ = NULL; + const gchar* _tmp4_ = NULL; + gchar* _tmp5_ = NULL; + gchar* _tmp6_ = NULL; + gboolean _tmp7_ = FALSE; + gboolean _tmp8_ = FALSE; + GtkCheckButton* _tmp10_ = NULL; + GtkCheckButton* _tmp11_ = NULL; GtkCheckButton* _tmp12_ = NULL; - GtkCheckButton* _tmp13_ = NULL; - GtkCheckButton* _tmp14_ = NULL; #line 115 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" g_return_if_fail (self != NULL); #line 117 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _tmp0_ = self->priv->d_repository_name; #line 117 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _tmp1_ = _ ("Author Details"); -#line 117 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _tmp2_ = g_strdup_printf ("%s - %s", _tmp0_, _tmp1_); + _tmp1_ = g_strdup_printf ("%s - %s", _tmp0_, _ ("Author Details")); #line 117 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 117 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - gtk_window_set_title ((GtkWindow*) self, _tmp3_); + gtk_window_set_title ((GtkWindow*) self, _tmp2_); #line 117 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _g_free0 (_tmp3_); -#line 120 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _tmp4_ = self->priv->d_checkbutton_override_global; + _g_free0 (_tmp2_); #line 120 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _tmp5_ = _ ("Override global details for repository '%s':"); + _tmp3_ = self->priv->d_checkbutton_override_global; #line 120 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _tmp6_ = self->priv->d_repository_name; + _tmp4_ = self->priv->d_repository_name; #line 120 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _tmp7_ = g_strdup_printf (_tmp5_, _tmp6_); + _tmp5_ = g_strdup_printf (_ ("Override global details for repository '%s':"), _tmp4_); #line 120 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _tmp8_ = _tmp7_; + _tmp6_ = _tmp5_; #line 120 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - gtk_button_set_label ((GtkButton*) _tmp4_, _tmp8_); + gtk_button_set_label ((GtkButton*) _tmp3_, _tmp6_); #line 120 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp6_); #line 121 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _tmp10_ = gitg_author_details_dialog_config_is_local (self, "user.name"); + _tmp8_ = gitg_author_details_dialog_config_is_local (self, "user.name"); #line 121 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - if (_tmp10_) { + if (_tmp8_) { #line 121 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _tmp9_ = TRUE; -#line 532 "gitg-author-details-dialog.c" + _tmp7_ = TRUE; +#line 520 "gitg-author-details-dialog.c" } else { - gboolean _tmp11_ = FALSE; + gboolean _tmp9_ = FALSE; #line 121 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _tmp11_ = gitg_author_details_dialog_config_is_local (self, "user.email"); + _tmp9_ = gitg_author_details_dialog_config_is_local (self, "user.email"); #line 121 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _tmp9_ = _tmp11_; -#line 539 "gitg-author-details-dialog.c" + _tmp7_ = _tmp9_; +#line 527 "gitg-author-details-dialog.c" } #line 121 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _tmp12_ = self->priv->d_checkbutton_override_global; + _tmp10_ = self->priv->d_checkbutton_override_global; #line 121 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - gtk_toggle_button_set_active ((GtkToggleButton*) _tmp12_, _tmp9_); + gtk_toggle_button_set_active ((GtkToggleButton*) _tmp10_, _tmp7_); #line 123 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _tmp13_ = self->priv->d_checkbutton_override_global; + _tmp11_ = self->priv->d_checkbutton_override_global; #line 123 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - g_signal_connect_object ((GObject*) _tmp13_, "notify::active", (GCallback) _gitg_author_details_dialog_update_sensitivity_g_object_notify, self, 0); + g_signal_connect_object ((GObject*) _tmp11_, "notify::active", (GCallback) _gitg_author_details_dialog_update_sensitivity_g_object_notify, self, 0); #line 124 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _tmp14_ = self->priv->d_checkbutton_override_global; + _tmp12_ = self->priv->d_checkbutton_override_global; #line 124 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - gtk_widget_show ((GtkWidget*) _tmp14_); + gtk_widget_show ((GtkWidget*) _tmp12_); #line 126 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" gitg_author_details_dialog_update_sensitivity (self); -#line 555 "gitg-author-details-dialog.c" +#line 543 "gitg-author-details-dialog.c" } @@ -591,7 +579,7 @@ gtk_widget_set_sensitive ((GtkWidget*) _tmp4_, _tmp7_); #line 134 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" config = NULL; -#line 595 "gitg-author-details-dialog.c" +#line 583 "gitg-author-details-dialog.c" { GtkCheckButton* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; @@ -604,7 +592,7 @@ _tmp10_ = _tmp9_; #line 138 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" if (!_tmp10_) { -#line 608 "gitg-author-details-dialog.c" +#line 596 "gitg-author-details-dialog.c" GgitConfig* _tmp11_ = NULL; GgitConfig* _tmp12_ = NULL; GgitConfig* _tmp13_ = NULL; @@ -617,7 +605,7 @@ _tmp11_ = _tmp13_; #line 140 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 621 "gitg-author-details-dialog.c" +#line 609 "gitg-author-details-dialog.c" goto __catch50_g_error; } #line 140 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" @@ -630,7 +618,7 @@ config = _tmp14_; #line 138 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _g_object_unref0 (_tmp11_); -#line 634 "gitg-author-details-dialog.c" +#line 622 "gitg-author-details-dialog.c" } else { GgitConfig* _tmp15_ = NULL; GgitConfig* _tmp16_ = NULL; @@ -642,7 +630,7 @@ _g_object_unref0 (config); #line 144 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" config = _tmp16_; -#line 646 "gitg-author-details-dialog.c" +#line 634 "gitg-author-details-dialog.c" } } goto __finally50; @@ -652,7 +640,7 @@ g_clear_error (&_inner_error_); #line 136 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _inner_error_ = NULL; -#line 656 "gitg-author-details-dialog.c" +#line 644 "gitg-author-details-dialog.c" } __finally50: #line 136 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" @@ -665,23 +653,23 @@ g_clear_error (&_inner_error_); #line 136 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" return; -#line 669 "gitg-author-details-dialog.c" +#line 657 "gitg-author-details-dialog.c" } #line 148 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _tmp17_ = config; #line 148 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" if (_tmp17_ != NULL) { -#line 675 "gitg-author-details-dialog.c" +#line 663 "gitg-author-details-dialog.c" GgitConfig* _tmp18_ = NULL; #line 150 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _tmp18_ = config; #line 150 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" gitg_author_details_dialog_update_entries (self, _tmp18_); -#line 681 "gitg-author-details-dialog.c" +#line 669 "gitg-author-details-dialog.c" } #line 129 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _g_object_unref0 (config); -#line 685 "gitg-author-details-dialog.c" +#line 673 "gitg-author-details-dialog.c" } @@ -699,17 +687,17 @@ if (_tmp0_ == NULL) { #line 160 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" gitg_author_details_dialog_build_global (self); -#line 703 "gitg-author-details-dialog.c" +#line 691 "gitg-author-details-dialog.c" } else { #line 164 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" gitg_author_details_dialog_build_repository (self); -#line 707 "gitg-author-details-dialog.c" +#line 695 "gitg-author-details-dialog.c" } #line 167 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _tmp1_ = self->priv->d_config; #line 167 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" gitg_author_details_dialog_update_entries (self, _tmp1_); -#line 713 "gitg-author-details-dialog.c" +#line 701 "gitg-author-details-dialog.c" } @@ -730,7 +718,7 @@ g_return_val_if_fail (defval != NULL, NULL); #line 172 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" ret = NULL; -#line 734 "gitg-author-details-dialog.c" +#line 722 "gitg-author-details-dialog.c" { GgitConfig* _tmp0_ = NULL; GgitConfig* _tmp1_ = NULL; @@ -750,7 +738,7 @@ _tmp0_ = _tmp2_; #line 176 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 754 "gitg-author-details-dialog.c" +#line 742 "gitg-author-details-dialog.c" goto __catch51_g_error; } #line 176 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" @@ -773,7 +761,7 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 176 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _g_object_unref0 (_tmp0_); -#line 777 "gitg-author-details-dialog.c" +#line 765 "gitg-author-details-dialog.c" goto __catch51_g_error; } #line 176 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" @@ -784,7 +772,7 @@ ret = _tmp9_; #line 174 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _g_object_unref0 (_tmp0_); -#line 788 "gitg-author-details-dialog.c" +#line 776 "gitg-author-details-dialog.c" } goto __finally51; __catch51_g_error: @@ -793,7 +781,7 @@ g_clear_error (&_inner_error_); #line 174 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _inner_error_ = NULL; -#line 797 "gitg-author-details-dialog.c" +#line 785 "gitg-author-details-dialog.c" } __finally51: #line 174 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" @@ -806,26 +794,26 @@ g_clear_error (&_inner_error_); #line 174 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" return NULL; -#line 810 "gitg-author-details-dialog.c" +#line 798 "gitg-author-details-dialog.c" } #line 179 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _tmp11_ = ret; #line 179 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" if (_tmp11_ != NULL) { -#line 816 "gitg-author-details-dialog.c" +#line 804 "gitg-author-details-dialog.c" const gchar* _tmp12_ = NULL; #line 179 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _tmp12_ = ret; #line 179 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _tmp10_ = _tmp12_; -#line 822 "gitg-author-details-dialog.c" +#line 810 "gitg-author-details-dialog.c" } else { const gchar* _tmp13_ = NULL; #line 179 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _tmp13_ = defval; #line 179 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _tmp10_ = _tmp13_; -#line 829 "gitg-author-details-dialog.c" +#line 817 "gitg-author-details-dialog.c" } #line 179 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _tmp14_ = g_strdup (_tmp10_); @@ -835,7 +823,7 @@ _g_free0 (ret); #line 179 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" return result; -#line 839 "gitg-author-details-dialog.c" +#line 827 "gitg-author-details-dialog.c" } @@ -844,21 +832,21 @@ gchar* _result_ = NULL; gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; -#line 1191 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1210 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1192 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1211 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1192 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1211 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1193 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1212 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1193 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1212 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_strchomp (_tmp1_); -#line 1194 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1213 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _result_; -#line 1194 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1213 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 862 "gitg-author-details-dialog.c" +#line 850 "gitg-author-details-dialog.c" } @@ -915,7 +903,7 @@ _g_free0 (_tmp11_); #line 185 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _g_free0 (_tmp9_); -#line 919 "gitg-author-details-dialog.c" +#line 907 "gitg-author-details-dialog.c" } @@ -923,7 +911,7 @@ GError * _inner_error_ = NULL; #line 188 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" g_return_if_fail (self != NULL); -#line 927 "gitg-author-details-dialog.c" +#line 915 "gitg-author-details-dialog.c" { GgitConfigEntry* _tmp0_ = NULL; GgitConfig* _tmp1_ = NULL; @@ -940,7 +928,7 @@ _tmp0_ = _tmp2_; #line 192 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 944 "gitg-author-details-dialog.c" +#line 932 "gitg-author-details-dialog.c" goto __catch52_g_error; } #line 192 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" @@ -957,7 +945,7 @@ _ggit_config_entry_unref0 (_tmp4_); #line 192 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" if (_tmp6_) { -#line 961 "gitg-author-details-dialog.c" +#line 949 "gitg-author-details-dialog.c" GgitConfig* _tmp7_ = NULL; #line 194 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _tmp7_ = self->priv->d_config; @@ -967,13 +955,13 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 194 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _ggit_config_entry_unref0 (_tmp0_); -#line 971 "gitg-author-details-dialog.c" +#line 959 "gitg-author-details-dialog.c" goto __catch52_g_error; } } #line 190 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _ggit_config_entry_unref0 (_tmp0_); -#line 977 "gitg-author-details-dialog.c" +#line 965 "gitg-author-details-dialog.c" } goto __finally52; __catch52_g_error: @@ -982,7 +970,7 @@ g_clear_error (&_inner_error_); #line 190 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _inner_error_ = NULL; -#line 986 "gitg-author-details-dialog.c" +#line 974 "gitg-author-details-dialog.c" } __finally52: #line 190 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" @@ -993,7 +981,7 @@ g_clear_error (&_inner_error_); #line 190 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" return; -#line 997 "gitg-author-details-dialog.c" +#line 985 "gitg-author-details-dialog.c" } { GgitConfigEntry* _tmp8_ = NULL; @@ -1011,7 +999,7 @@ _tmp8_ = _tmp10_; #line 200 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1015 "gitg-author-details-dialog.c" +#line 1003 "gitg-author-details-dialog.c" goto __catch53_g_error; } #line 200 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" @@ -1028,7 +1016,7 @@ _ggit_config_entry_unref0 (_tmp12_); #line 200 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" if (_tmp14_) { -#line 1032 "gitg-author-details-dialog.c" +#line 1020 "gitg-author-details-dialog.c" GgitConfig* _tmp15_ = NULL; #line 202 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _tmp15_ = self->priv->d_config; @@ -1038,13 +1026,13 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 202 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _ggit_config_entry_unref0 (_tmp8_); -#line 1042 "gitg-author-details-dialog.c" +#line 1030 "gitg-author-details-dialog.c" goto __catch53_g_error; } } #line 198 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _ggit_config_entry_unref0 (_tmp8_); -#line 1048 "gitg-author-details-dialog.c" +#line 1036 "gitg-author-details-dialog.c" } goto __finally53; __catch53_g_error: @@ -1053,7 +1041,7 @@ g_clear_error (&_inner_error_); #line 198 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _inner_error_ = NULL; -#line 1057 "gitg-author-details-dialog.c" +#line 1045 "gitg-author-details-dialog.c" } __finally53: #line 198 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" @@ -1064,7 +1052,7 @@ g_clear_error (&_inner_error_); #line 198 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" return; -#line 1068 "gitg-author-details-dialog.c" +#line 1056 "gitg-author-details-dialog.c" } } @@ -1079,14 +1067,14 @@ _tmp0_ = id; #line 208 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) { -#line 1083 "gitg-author-details-dialog.c" +#line 1071 "gitg-author-details-dialog.c" { const gchar* _tmp1_ = NULL; #line 212 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _tmp1_ = self->priv->d_repository_name; #line 212 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" if (_tmp1_ != NULL) { -#line 1090 "gitg-author-details-dialog.c" +#line 1078 "gitg-author-details-dialog.c" GtkCheckButton* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; gboolean _tmp4_ = FALSE; @@ -1098,7 +1086,7 @@ _tmp4_ = _tmp3_; #line 214 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" if (_tmp4_) { -#line 1102 "gitg-author-details-dialog.c" +#line 1090 "gitg-author-details-dialog.c" GgitConfig* _tmp5_ = NULL; GtkEntry* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; @@ -1115,7 +1103,7 @@ ggit_config_set_string (_tmp5_, "user.name", _tmp7_, &_inner_error_); #line 216 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1119 "gitg-author-details-dialog.c" +#line 1107 "gitg-author-details-dialog.c" goto __catch54_g_error; } #line 217 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" @@ -1128,13 +1116,13 @@ ggit_config_set_string (_tmp8_, "user.email", _tmp10_, &_inner_error_); #line 217 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1132 "gitg-author-details-dialog.c" +#line 1120 "gitg-author-details-dialog.c" goto __catch54_g_error; } } else { #line 221 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" gitg_author_details_dialog_delete_local_entries (self); -#line 1138 "gitg-author-details-dialog.c" +#line 1126 "gitg-author-details-dialog.c" } } else { GgitConfig* _tmp11_ = NULL; @@ -1153,7 +1141,7 @@ ggit_config_set_string (_tmp11_, "user.name", _tmp13_, &_inner_error_); #line 226 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1157 "gitg-author-details-dialog.c" +#line 1145 "gitg-author-details-dialog.c" goto __catch54_g_error; } #line 227 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" @@ -1166,7 +1154,7 @@ ggit_config_set_string (_tmp14_, "user.email", _tmp16_, &_inner_error_); #line 227 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1170 "gitg-author-details-dialog.c" +#line 1158 "gitg-author-details-dialog.c" goto __catch54_g_error; } } @@ -1175,28 +1163,25 @@ __catch54_g_error: { GError* e = NULL; - const gchar* _tmp17_ = NULL; - GError* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; + GError* _tmp17_ = NULL; + const gchar* _tmp18_ = NULL; #line 210 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" e = _inner_error_; #line 210 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _inner_error_ = NULL; #line 232 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _tmp17_ = _ ("Failed to set Git user config."); -#line 232 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _tmp18_ = e; + _tmp17_ = e; #line 232 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - _tmp19_ = _tmp18_->message; + _tmp18_ = _tmp17_->message; #line 232 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" - gitg_author_details_dialog_show_config_error (self, _tmp17_, _tmp19_); + gitg_author_details_dialog_show_config_error (self, _ ("Failed to set Git user config."), _tmp18_); #line 233 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" gtk_widget_destroy ((GtkWidget*) self); #line 234 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _g_error_free0 (e); #line 234 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" return; -#line 1200 "gitg-author-details-dialog.c" +#line 1185 "gitg-author-details-dialog.c" } __finally54: #line 210 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" @@ -1207,12 +1192,12 @@ g_clear_error (&_inner_error_); #line 210 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" return; -#line 1211 "gitg-author-details-dialog.c" +#line 1196 "gitg-author-details-dialog.c" } } #line 238 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" gtk_widget_destroy ((GtkWidget*) self); -#line 1216 "gitg-author-details-dialog.c" +#line 1201 "gitg-author-details-dialog.c" } @@ -1221,7 +1206,7 @@ g_atomic_int_inc (&_data34_->_ref_count_); #line 241 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" return _data34_; -#line 1225 "gitg-author-details-dialog.c" +#line 1210 "gitg-author-details-dialog.c" } @@ -1230,7 +1215,7 @@ _data34_ = (Block34Data*) _userdata_; #line 241 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" if (g_atomic_int_dec_and_test (&_data34_->_ref_count_)) { -#line 1234 "gitg-author-details-dialog.c" +#line 1219 "gitg-author-details-dialog.c" GitgAuthorDetailsDialog* self; #line 241 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" self = _data34_->self; @@ -1240,7 +1225,7 @@ _g_object_unref0 (self); #line 241 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" g_slice_free (Block34Data, _data34_); -#line 1244 "gitg-author-details-dialog.c" +#line 1229 "gitg-author-details-dialog.c" } } @@ -1253,14 +1238,14 @@ g_return_if_fail (d != NULL); #line 252 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" gtk_widget_destroy ((GtkWidget*) _data34_->error_dialog); -#line 1257 "gitg-author-details-dialog.c" +#line 1242 "gitg-author-details-dialog.c" } static void ___lambda98__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { #line 251 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" __lambda98_ (self, _sender, response_id); -#line 1264 "gitg-author-details-dialog.c" +#line 1249 "gitg-author-details-dialog.c" } @@ -1301,7 +1286,7 @@ block34_data_unref (_data34_); #line 241 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" _data34_ = NULL; -#line 1305 "gitg-author-details-dialog.c" +#line 1290 "gitg-author-details-dialog.c" } @@ -1329,7 +1314,7 @@ gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "label_info", FALSE, GitgAuthorDetailsDialog_private_offset + G_STRUCT_OFFSET (GitgAuthorDetailsDialogPrivate, d_label_info)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "checkbutton_override_global", FALSE, GitgAuthorDetailsDialog_private_offset + G_STRUCT_OFFSET (GitgAuthorDetailsDialogPrivate, d_checkbutton_override_global)); -#line 1333 "gitg-author-details-dialog.c" +#line 1318 "gitg-author-details-dialog.c" } @@ -1338,11 +1323,11 @@ self->priv = GITG_AUTHOR_DETAILS_DIALOG_GET_PRIVATE (self); #line 23 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 1342 "gitg-author-details-dialog.c" +#line 1327 "gitg-author-details-dialog.c" } -static void gitg_author_details_dialog_finalize (GObject* obj) { +static void gitg_author_details_dialog_finalize (GObject * obj) { GitgAuthorDetailsDialog * self; #line 23 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_AUTHOR_DETAILS_DIALOG, GitgAuthorDetailsDialog); @@ -1360,7 +1345,7 @@ _g_object_unref0 (self->priv->d_config); #line 23 "/home/jesse/dev/gitg/gitg/gitg-author-details-dialog.vala" G_OBJECT_CLASS (gitg_author_details_dialog_parent_class)->finalize (obj); -#line 1364 "gitg-author-details-dialog.c" +#line 1349 "gitg-author-details-dialog.c" } diff -Nru gitg-3.22.0/gitg/gitg-builder.c gitg-3.23.0/gitg/gitg-builder.c --- gitg-3.22.0/gitg/gitg-builder.c 2016-08-09 09:50:54.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-builder.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-builder.c generated by valac 0.32.1, the Vala compiler +/* gitg-builder.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-builder.vala, do not modify */ /* @@ -73,7 +73,7 @@ gpointer gitg_builder_load_object (GType t_type, GBoxedCopyFunc t_dup_func, GDestroyNotify t_destroy_func, const gchar* id, const gchar* object); GitgBuilder* gitg_builder_new (void); GitgBuilder* gitg_builder_construct (GType object_type); -static void gitg_builder_finalize (GitgBuilder* obj); +static void gitg_builder_finalize (GitgBuilder * obj); gpointer gitg_builder_load_object (GType t_type, GBoxedCopyFunc t_dup_func, GDestroyNotify t_destroy_func, const gchar* id, const gchar* object) { @@ -185,7 +185,7 @@ #line 20 "/home/jesse/dev/gitg/gitg/gitg-builder.vala" if (collect_values[0].v_pointer) { #line 188 "gitg-builder.c" - GitgBuilder* object; + GitgBuilder * object; object = collect_values[0].v_pointer; #line 20 "/home/jesse/dev/gitg/gitg/gitg-builder.vala" if (object->parent_instance.g_class == NULL) { @@ -212,7 +212,7 @@ static gchar* gitg_value_builder_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GitgBuilder** object_p; + GitgBuilder ** object_p; object_p = collect_values[0].v_pointer; #line 20 "/home/jesse/dev/gitg/gitg/gitg-builder.vala" if (!object_p) { @@ -264,7 +264,7 @@ void gitg_value_set_builder (GValue* value, gpointer v_object) { - GitgBuilder* old; + GitgBuilder * old; #line 20 "/home/jesse/dev/gitg/gitg/gitg-builder.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_BUILDER)); #line 20 "/home/jesse/dev/gitg/gitg/gitg-builder.vala" @@ -295,7 +295,7 @@ void gitg_value_take_builder (GValue* value, gpointer v_object) { - GitgBuilder* old; + GitgBuilder * old; #line 20 "/home/jesse/dev/gitg/gitg/gitg-builder.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_BUILDER)); #line 20 "/home/jesse/dev/gitg/gitg/gitg-builder.vala" @@ -339,7 +339,7 @@ } -static void gitg_builder_finalize (GitgBuilder* obj) { +static void gitg_builder_finalize (GitgBuilder * obj) { GitgBuilder * self; #line 20 "/home/jesse/dev/gitg/gitg/gitg-builder.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_BUILDER, GitgBuilder); @@ -364,7 +364,7 @@ gpointer gitg_builder_ref (gpointer instance) { - GitgBuilder* self; + GitgBuilder * self; self = instance; #line 20 "/home/jesse/dev/gitg/gitg/gitg-builder.vala" g_atomic_int_inc (&self->ref_count); @@ -375,7 +375,7 @@ void gitg_builder_unref (gpointer instance) { - GitgBuilder* self; + GitgBuilder * self; self = instance; #line 20 "/home/jesse/dev/gitg/gitg/gitg-builder.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { diff -Nru gitg-3.22.0/gitg/gitg.c gitg-3.23.0/gitg/gitg.c --- gitg-3.22.0/gitg/gitg.c 2016-08-09 09:50:55.000000000 +0000 +++ gitg-3.23.0/gitg/gitg.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg.c generated by valac 0.32.1, the Vala compiler +/* gitg.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg.vala, do not modify */ /* @@ -92,7 +92,7 @@ GitgApplication* gitg_application_construct (GType object_type); GitgMain* gitg_main_new (void); GitgMain* gitg_main_construct (GType object_type); -static void gitg_main_finalize (GitgMain* obj); +static void gitg_main_finalize (GitgMain * obj); gint gitg_main_main (gchar** args, int args_length1) { @@ -100,12 +100,11 @@ gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; GitgApplication* app = NULL; - GitgApplication* _tmp4_ = NULL; - gchar** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - gint _tmp6_ = 0; + GitgApplication* _tmp3_ = NULL; + gchar** _tmp4_ = NULL; + gint _tmp4__length1 = 0; + gint _tmp5_ = 0; #line 29 "/home/jesse/dev/gitg/gitg/gitg.vala" gtk_disable_setlocale (); #line 31 "/home/jesse/dev/gitg/gitg/gitg.vala" @@ -129,26 +128,24 @@ #line 38 "/home/jesse/dev/gitg/gitg/gitg.vala" g_set_prgname ("gitg"); #line 39 "/home/jesse/dev/gitg/gitg/gitg.vala" - _tmp3_ = _ ("gitg"); -#line 39 "/home/jesse/dev/gitg/gitg/gitg.vala" - g_set_application_name (_tmp3_); + g_set_application_name (_ ("gitg")); #line 41 "/home/jesse/dev/gitg/gitg/gitg.vala" - _tmp4_ = gitg_application_new (); + _tmp3_ = gitg_application_new (); #line 41 "/home/jesse/dev/gitg/gitg/gitg.vala" - app = _tmp4_; + app = _tmp3_; #line 42 "/home/jesse/dev/gitg/gitg/gitg.vala" - _tmp5_ = args; + _tmp4_ = args; #line 42 "/home/jesse/dev/gitg/gitg/gitg.vala" - _tmp5__length1 = args_length1; + _tmp4__length1 = args_length1; #line 42 "/home/jesse/dev/gitg/gitg/gitg.vala" - _tmp6_ = g_application_run ((GApplication*) app, _tmp5__length1, _tmp5_); + _tmp5_ = g_application_run ((GApplication*) app, _tmp4__length1, _tmp4_); #line 42 "/home/jesse/dev/gitg/gitg/gitg.vala" - result = _tmp6_; + result = _tmp5_; #line 42 "/home/jesse/dev/gitg/gitg/gitg.vala" _g_object_unref0 (app); #line 42 "/home/jesse/dev/gitg/gitg/gitg.vala" return result; -#line 152 "gitg.c" +#line 149 "gitg.c" } @@ -158,7 +155,7 @@ #endif #line 27 "/home/jesse/dev/gitg/gitg/gitg.vala" return gitg_main_main (argv, argc); -#line 162 "gitg.c" +#line 159 "gitg.c" } @@ -168,21 +165,21 @@ self = (GitgMain*) g_type_create_instance (object_type); #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" return self; -#line 172 "gitg.c" +#line 169 "gitg.c" } GitgMain* gitg_main_new (void) { #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" return gitg_main_construct (GITG_TYPE_MAIN); -#line 179 "gitg.c" +#line 176 "gitg.c" } static void gitg_value_main_init (GValue* value) { #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" value->data[0].v_pointer = NULL; -#line 186 "gitg.c" +#line 183 "gitg.c" } @@ -191,7 +188,7 @@ if (value->data[0].v_pointer) { #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" gitg_main_unref (value->data[0].v_pointer); -#line 195 "gitg.c" +#line 192 "gitg.c" } } @@ -201,11 +198,11 @@ if (src_value->data[0].v_pointer) { #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" dest_value->data[0].v_pointer = gitg_main_ref (src_value->data[0].v_pointer); -#line 205 "gitg.c" +#line 202 "gitg.c" } else { #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" dest_value->data[0].v_pointer = NULL; -#line 209 "gitg.c" +#line 206 "gitg.c" } } @@ -213,66 +210,66 @@ static gpointer gitg_value_main_peek_pointer (const GValue* value) { #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" return value->data[0].v_pointer; -#line 217 "gitg.c" +#line 214 "gitg.c" } static gchar* gitg_value_main_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" if (collect_values[0].v_pointer) { -#line 224 "gitg.c" - GitgMain* object; +#line 221 "gitg.c" + GitgMain * object; object = collect_values[0].v_pointer; #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" if (object->parent_instance.g_class == NULL) { #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 231 "gitg.c" +#line 228 "gitg.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 235 "gitg.c" +#line 232 "gitg.c" } #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" value->data[0].v_pointer = gitg_main_ref (object); -#line 239 "gitg.c" +#line 236 "gitg.c" } else { #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" value->data[0].v_pointer = NULL; -#line 243 "gitg.c" +#line 240 "gitg.c" } #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" return NULL; -#line 247 "gitg.c" +#line 244 "gitg.c" } static gchar* gitg_value_main_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GitgMain** object_p; + GitgMain ** object_p; object_p = collect_values[0].v_pointer; #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" if (!object_p) { #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 258 "gitg.c" +#line 255 "gitg.c" } #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" if (!value->data[0].v_pointer) { #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" *object_p = NULL; -#line 264 "gitg.c" +#line 261 "gitg.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" *object_p = value->data[0].v_pointer; -#line 268 "gitg.c" +#line 265 "gitg.c" } else { #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" *object_p = gitg_main_ref (value->data[0].v_pointer); -#line 272 "gitg.c" +#line 269 "gitg.c" } #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" return NULL; -#line 276 "gitg.c" +#line 273 "gitg.c" } @@ -286,7 +283,7 @@ G_PARAM_SPEC (spec)->value_type = object_type; #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" return G_PARAM_SPEC (spec); -#line 290 "gitg.c" +#line 287 "gitg.c" } @@ -295,12 +292,12 @@ g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_MAIN), NULL); #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" return value->data[0].v_pointer; -#line 299 "gitg.c" +#line 296 "gitg.c" } void gitg_value_set_main (GValue* value, gpointer v_object) { - GitgMain* old; + GitgMain * old; #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_MAIN)); #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" @@ -315,23 +312,23 @@ value->data[0].v_pointer = v_object; #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" gitg_main_ref (value->data[0].v_pointer); -#line 319 "gitg.c" +#line 316 "gitg.c" } else { #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" value->data[0].v_pointer = NULL; -#line 323 "gitg.c" +#line 320 "gitg.c" } #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" if (old) { #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" gitg_main_unref (old); -#line 329 "gitg.c" +#line 326 "gitg.c" } } void gitg_value_take_main (GValue* value, gpointer v_object) { - GitgMain* old; + GitgMain * old; #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_MAIN)); #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" @@ -344,17 +341,17 @@ g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" value->data[0].v_pointer = v_object; -#line 348 "gitg.c" +#line 345 "gitg.c" } else { #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" value->data[0].v_pointer = NULL; -#line 352 "gitg.c" +#line 349 "gitg.c" } #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" if (old) { #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" gitg_main_unref (old); -#line 358 "gitg.c" +#line 355 "gitg.c" } } @@ -364,24 +361,24 @@ gitg_main_parent_class = g_type_class_peek_parent (klass); #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" ((GitgMainClass *) klass)->finalize = gitg_main_finalize; -#line 368 "gitg.c" +#line 365 "gitg.c" } static void gitg_main_instance_init (GitgMain * self) { #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" self->ref_count = 1; -#line 375 "gitg.c" +#line 372 "gitg.c" } -static void gitg_main_finalize (GitgMain* obj) { +static void gitg_main_finalize (GitgMain * obj) { GitgMain * self; #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_MAIN, GitgMain); #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" g_signal_handlers_destroy (self); -#line 385 "gitg.c" +#line 382 "gitg.c" } @@ -400,18 +397,18 @@ gpointer gitg_main_ref (gpointer instance) { - GitgMain* self; + GitgMain * self; self = instance; #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" g_atomic_int_inc (&self->ref_count); #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" return instance; -#line 410 "gitg.c" +#line 407 "gitg.c" } void gitg_main_unref (gpointer instance) { - GitgMain* self; + GitgMain * self; self = instance; #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -419,7 +416,7 @@ GITG_MAIN_GET_CLASS (self)->finalize (self); #line 25 "/home/jesse/dev/gitg/gitg/gitg.vala" g_type_free_instance ((GTypeInstance *) self); -#line 423 "gitg.c" +#line 420 "gitg.c" } } diff -Nru gitg-3.22.0/gitg/gitg-clone-dialog.c gitg-3.23.0/gitg/gitg-clone-dialog.c --- gitg-3.22.0/gitg/gitg-clone-dialog.c 2016-08-09 09:50:54.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-clone-dialog.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-clone-dialog.c generated by valac 0.32.1, the Vala compiler +/* gitg-clone-dialog.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-clone-dialog.vala, do not modify */ /* @@ -89,7 +89,7 @@ static void __gitg_clone_dialog___lambda114__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self); static void _gitg_clone_dialog___lambda115_ (GitgCloneDialog* self, GtkEditable* e); static void __gitg_clone_dialog___lambda115__gtk_editable_changed (GtkEditable* _sender, gpointer self); -static void gitg_clone_dialog_finalize (GObject* obj); +static void gitg_clone_dialog_finalize (GObject * obj); static void _vala_gitg_clone_dialog_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); @@ -258,11 +258,11 @@ const gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; - GtkEntry* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - GtkEntry* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; + GtkEntry* _tmp6_ = NULL; + const gchar* _tmp7_ = NULL; + GtkEntry* _tmp8_ = NULL; + const gchar* _tmp9_ = NULL; + gboolean _tmp10_ = FALSE; #line 80 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" g_return_if_fail (e != NULL); #line 81 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" @@ -283,8 +283,7 @@ if (!_tmp3_) { #line 285 "gitg-clone-dialog.c" gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + gchar* _tmp5_ = NULL; #line 88 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" _tmp4_ = g_strdup ("dialog-warning-symbolic"); #line 88 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" @@ -292,43 +291,41 @@ #line 88 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" icon_name = _tmp4_; #line 89 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" - _tmp5_ = _ ("The URL introduced is not supported"); -#line 89 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" - _tmp6_ = g_strdup (_tmp5_); + _tmp5_ = g_strdup (_ ("The URL introduced is not supported")); #line 89 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" _g_free0 (tooltip_text); #line 89 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" - tooltip_text = _tmp6_; -#line 303 "gitg-clone-dialog.c" + tooltip_text = _tmp5_; +#line 300 "gitg-clone-dialog.c" } #line 92 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" - _tmp7_ = self->priv->d_entry_url; + _tmp6_ = self->priv->d_entry_url; #line 92 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" - _tmp8_ = icon_name; + _tmp7_ = icon_name; #line 92 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" - gtk_entry_set_icon_from_icon_name (_tmp7_, GTK_ENTRY_ICON_SECONDARY, _tmp8_); + gtk_entry_set_icon_from_icon_name (_tmp6_, GTK_ENTRY_ICON_SECONDARY, _tmp7_); #line 93 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" - _tmp9_ = self->priv->d_entry_url; + _tmp8_ = self->priv->d_entry_url; #line 93 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" - _tmp10_ = tooltip_text; + _tmp9_ = tooltip_text; #line 93 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" - gtk_entry_set_icon_tooltip_text (_tmp9_, GTK_ENTRY_ICON_SECONDARY, _tmp10_); + gtk_entry_set_icon_tooltip_text (_tmp8_, GTK_ENTRY_ICON_SECONDARY, _tmp9_); #line 95 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" - _tmp11_ = is_valid; + _tmp10_ = is_valid; #line 95 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" - gtk_dialog_set_response_sensitive ((GtkDialog*) self, (gint) GTK_RESPONSE_OK, _tmp11_); + gtk_dialog_set_response_sensitive ((GtkDialog*) self, (gint) GTK_RESPONSE_OK, _tmp10_); #line 80 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" _g_free0 (icon_name); #line 80 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" _g_free0 (tooltip_text); -#line 325 "gitg-clone-dialog.c" +#line 322 "gitg-clone-dialog.c" } static void __gitg_clone_dialog___lambda115__gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 80 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" _gitg_clone_dialog___lambda115_ ((GitgCloneDialog*) self, _sender); -#line 332 "gitg-clone-dialog.c" +#line 329 "gitg-clone-dialog.c" } @@ -374,7 +371,7 @@ _tmp3_ = default_dir; #line 70 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" if (g_strcmp0 (_tmp3_, "") == 0) { -#line 378 "gitg-clone-dialog.c" +#line 375 "gitg-clone-dialog.c" const gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; #line 72 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" @@ -385,7 +382,7 @@ _g_free0 (default_dir); #line 72 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" default_dir = _tmp5_; -#line 389 "gitg-clone-dialog.c" +#line 386 "gitg-clone-dialog.c" } #line 75 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" _tmp6_ = self->priv->d_button_location; @@ -409,7 +406,7 @@ _data35_ = NULL; #line 63 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" return obj; -#line 413 "gitg-clone-dialog.c" +#line 410 "gitg-clone-dialog.c" } @@ -428,7 +425,7 @@ #line 24 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_CLONE_DIALOG_IS_BARE, g_param_spec_boolean ("is-bare", "is-bare", "is-bare", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 24 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_CLONE_DIALOG_LOCATION, g_param_spec_object ("location", "location", "location", G_TYPE_FILE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_CLONE_DIALOG_LOCATION, g_param_spec_object ("location", "location", "location", g_file_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 24 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_CLONE_DIALOG_URL, g_param_spec_string ("url", "url", "url", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 24 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" @@ -441,7 +438,7 @@ gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "button_location", FALSE, GitgCloneDialog_private_offset + G_STRUCT_OFFSET (GitgCloneDialogPrivate, d_button_location)); #line 24 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "bare_repository", FALSE, GitgCloneDialog_private_offset + G_STRUCT_OFFSET (GitgCloneDialogPrivate, d_bare_repository)); -#line 445 "gitg-clone-dialog.c" +#line 442 "gitg-clone-dialog.c" } @@ -450,11 +447,11 @@ self->priv = GITG_CLONE_DIALOG_GET_PRIVATE (self); #line 24 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 454 "gitg-clone-dialog.c" +#line 451 "gitg-clone-dialog.c" } -static void gitg_clone_dialog_finalize (GObject* obj) { +static void gitg_clone_dialog_finalize (GObject * obj) { GitgCloneDialog * self; #line 24 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_CLONE_DIALOG, GitgCloneDialog); @@ -466,7 +463,7 @@ _g_object_unref0 (self->priv->d_bare_repository); #line 24 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" G_OBJECT_CLASS (gitg_clone_dialog_parent_class)->finalize (obj); -#line 470 "gitg-clone-dialog.c" +#line 467 "gitg-clone-dialog.c" } @@ -505,13 +502,13 @@ g_value_set_string (value, gitg_clone_dialog_get_url (self)); #line 24 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" break; -#line 509 "gitg-clone-dialog.c" +#line 506 "gitg-clone-dialog.c" default: #line 24 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 24 "/home/jesse/dev/gitg/gitg/gitg-clone-dialog.vala" break; -#line 515 "gitg-clone-dialog.c" +#line 512 "gitg-clone-dialog.c" } } diff -Nru gitg-3.22.0/gitg/gitg-commit-action-cherry-pick.c gitg-3.23.0/gitg/gitg-commit-action-cherry-pick.c --- gitg-3.22.0/gitg/gitg-commit-action-cherry-pick.c 2016-08-17 18:00:36.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-commit-action-cherry-pick.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-commit-action-cherry-pick.c generated by valac 0.32.1, the Vala compiler +/* gitg-commit-action-cherry-pick.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-commit-action-cherry-pick.vala, do not modify */ /* @@ -131,23 +131,21 @@ GitgSimpleNotification* _tmp12_; const gchar* _tmp13_; const gchar* _tmp14_; - const gchar* _tmp15_; + gchar* _tmp15_; gchar* _tmp16_; - gchar* _tmp17_; - GError* _tmp18_; - const gchar* _tmp19_; + GError* _tmp17_; + const gchar* _tmp18_; + gchar* _tmp19_; gchar* _tmp20_; - gchar* _tmp21_; - GgitMergeOptions* _tmp22_; + GgitMergeOptions* _tmp21_; GError* _vala1_e; - GitgSimpleNotification* _tmp23_; + GitgSimpleNotification* _tmp22_; + GError* _tmp23_; const gchar* _tmp24_; - GError* _tmp25_; - const gchar* _tmp26_; - gchar* _tmp27_; - gchar* _tmp28_; - GgitIndex* _tmp29_; - GgitIndex* _tmp30_; + gchar* _tmp25_; + gchar* _tmp26_; + GgitIndex* _tmp27_; + GgitIndex* _tmp28_; GError * _inner_error_; }; @@ -179,60 +177,52 @@ gchar* _tmp13_; gchar* _tmp14_; GitgSimpleNotification* _tmp15_; - const gchar* _tmp16_; GitgRef* head; gboolean ishead; - GitgActionSupport* _tmp17_; - GitgRef* _tmp18_; - gboolean _tmp19_; + GitgActionSupport* _tmp16_; + GitgRef* _tmp17_; + gboolean _tmp18_; gchar* message; - gboolean _tmp20_; + gboolean _tmp19_; + const gchar* _tmp20_; const gchar* _tmp21_; - const gchar* _tmp22_; - const gchar* _tmp23_; - gchar* _tmp24_; - gchar* _tmp25_; - const gchar* _tmp26_; - const gchar* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; - const gchar* _tmp30_; - const gchar* _tmp31_; + gchar* _tmp22_; + gchar* _tmp23_; + const gchar* _tmp24_; + const gchar* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; + const gchar* _tmp28_; + const gchar* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; gchar* _tmp32_; - gchar* _tmp33_; - gchar* _tmp34_; - const gchar* _tmp35_; - const gchar* _tmp36_; + const gchar* _tmp33_; + const gchar* _tmp34_; + gchar* _tmp35_; + gchar* _tmp36_; const gchar* _tmp37_; - gchar* _tmp38_; + const gchar* _tmp38_; gchar* _tmp39_; - const gchar* _tmp40_; - const gchar* _tmp41_; - gchar* _tmp42_; - gchar* _tmp43_; - gchar* _tmp44_; + gchar* _tmp40_; + gchar* _tmp41_; GitgExtUserQuery* q; - const gchar* _tmp45_; - const gchar* _tmp46_; - const gchar* _tmp47_; - const gchar* _tmp48_; - GitgExtUserQuery* _tmp49_; - GitgExtApplication* _tmp50_; - GitgExtApplication* _tmp51_; - GitgExtApplication* _tmp52_; - GitgExtUserQuery* _tmp53_; - GtkResponseType _tmp54_; - gboolean _tmp55_; - GitgSimpleNotification* _tmp56_; - const gchar* _tmp57_; - GitgActionSupport* _tmp58_; - GitgSimpleNotification* _tmp59_; - GitgRef* _tmp60_; - GgitIndex* _tmp61_; - GitgRef* _tmp62_; - gboolean _tmp63_; - GitgSimpleNotification* _tmp64_; - const gchar* _tmp65_; + const gchar* _tmp42_; + GitgExtUserQuery* _tmp43_; + GitgExtApplication* _tmp44_; + GitgExtApplication* _tmp45_; + GitgExtApplication* _tmp46_; + GitgExtUserQuery* _tmp47_; + GtkResponseType _tmp48_; + gboolean _tmp49_; + GitgSimpleNotification* _tmp50_; + GitgActionSupport* _tmp51_; + GitgSimpleNotification* _tmp52_; + GitgRef* _tmp53_; + GgitIndex* _tmp54_; + GitgRef* _tmp55_; + gboolean _tmp56_; + GitgSimpleNotification* _tmp57_; }; struct _GitgCommitActionCherryPickCherryPickData { @@ -263,51 +253,49 @@ GitgSimpleNotification* notification; const gchar* _tmp15_; const gchar* _tmp16_; - const gchar* _tmp17_; + gchar* _tmp17_; gchar* _tmp18_; - gchar* _tmp19_; + const gchar* _tmp19_; const gchar* _tmp20_; - const gchar* _tmp21_; + gchar* _tmp21_; gchar* _tmp22_; gchar* _tmp23_; gchar* _tmp24_; - gchar* _tmp25_; + GitgSimpleNotification* _tmp25_; GitgSimpleNotification* _tmp26_; - GitgSimpleNotification* _tmp27_; + GitgExtApplication* _tmp27_; GitgExtApplication* _tmp28_; GitgExtApplication* _tmp29_; - GitgExtApplication* _tmp30_; + GitgExtNotifications* _tmp30_; GitgExtNotifications* _tmp31_; GitgExtNotifications* _tmp32_; - GitgExtNotifications* _tmp33_; - GitgSimpleNotification* _tmp34_; + GitgSimpleNotification* _tmp33_; GgitIndex* index; - GitgSimpleNotification* _tmp35_; - GitgRef* _tmp36_; + GitgSimpleNotification* _tmp34_; + GitgRef* _tmp35_; + GgitIndex* _tmp36_; GgitIndex* _tmp37_; GgitIndex* _tmp38_; - GgitIndex* _tmp39_; - gboolean _tmp40_; - GitgSimpleNotification* _tmp41_; - GgitIndex* _tmp42_; - GitgRef* _tmp43_; + gboolean _tmp39_; + GitgSimpleNotification* _tmp40_; + GgitIndex* _tmp41_; + GitgRef* _tmp42_; GgitOId* oid; - GitgActionSupport* _tmp44_; - GitgSimpleNotification* _tmp45_; - GitgRef* _tmp46_; - GgitIndex* _tmp47_; + GitgActionSupport* _tmp43_; + GitgSimpleNotification* _tmp44_; + GitgRef* _tmp45_; + GgitIndex* _tmp46_; + GitgCommit* _tmp47_; GitgCommit* _tmp48_; - GitgCommit* _tmp49_; + GgitSignature* _tmp49_; GgitSignature* _tmp50_; - GgitSignature* _tmp51_; + GitgCommit* _tmp51_; GitgCommit* _tmp52_; - GitgCommit* _tmp53_; - const gchar* _tmp54_; + const gchar* _tmp53_; + GgitOId* _tmp54_; GgitOId* _tmp55_; GgitOId* _tmp56_; - GgitOId* _tmp57_; - GitgSimpleNotification* _tmp58_; - const gchar* _tmp59_; + GitgSimpleNotification* _tmp57_; }; struct _Block40Data { @@ -318,9 +306,9 @@ static gpointer gitg_commit_action_cherry_pick_parent_class = NULL; -static GitgExtUIElementIface* gitg_commit_action_cherry_pick_gitg_ext_ui_element_parent_iface = NULL; -static GitgExtActionIface* gitg_commit_action_cherry_pick_gitg_ext_action_parent_iface = NULL; -static GitgExtCommitActionIface* gitg_commit_action_cherry_pick_gitg_ext_commit_action_parent_iface = NULL; +static GitgExtUIElementIface * gitg_commit_action_cherry_pick_gitg_ext_ui_element_parent_iface = NULL; +static GitgExtActionIface * gitg_commit_action_cherry_pick_gitg_ext_action_parent_iface = NULL; +static GitgExtCommitActionIface * gitg_commit_action_cherry_pick_gitg_ext_commit_action_parent_iface = NULL; GType gitg_commit_action_cherry_pick_get_type (void) G_GNUC_CONST; GType gitg_action_support_get_type (void) G_GNUC_CONST; @@ -343,7 +331,7 @@ GitgActionSupport* gitg_action_support_construct (GType object_type, GitgExtApplication* application, GitgExtRefActionInterface* action_interface); static void gitg_commit_action_cherry_pick_ensure_destinations (GitgCommitActionCherryPick* self); static void _vala_GgitOId_free (GgitOId* self); -static void _vala_array_add11 (GitgRef*** array, int* length, int* size, GitgRef* value); +static void _vala_array_add11 (GitgRef** * array, int* length, int* size, GitgRef* value); static void gitg_commit_action_cherry_pick_create_index_data_free (gpointer _data); GType gitg_simple_notification_get_type (void) G_GNUC_CONST; static void gitg_commit_action_cherry_pick_create_index (GitgCommitActionCherryPick* self, GitgSimpleNotification* notification, GitgRef* destination, GAsyncReadyCallback _callback_, gpointer _user_data_); @@ -361,7 +349,7 @@ static gboolean gitg_commit_action_cherry_pick_checkout_conflicts_finish (GitgCommitActionCherryPick* self, GAsyncResult* _res_); static gboolean gitg_commit_action_cherry_pick_checkout_conflicts_co (GitgCommitActionCherryPickCheckoutConflictsData* _data_); void gitg_simple_notification_set_message (GitgSimpleNotification* self, const gchar* value); -gboolean gitg_action_support_reference_is_head (GitgActionSupport* self, GitgRef* reference, GitgRef** head); +gboolean gitg_action_support_reference_is_head (GitgActionSupport* self, GitgRef* reference, GitgRef* * head); static void gitg_commit_action_cherry_pick_checkout_conflicts_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); void gitg_action_support_checkout_conflicts (GitgActionSupport* self, GitgSimpleNotification* notification, GitgRef* reference, GgitIndex* index, GitgRef* head, GAsyncReadyCallback _callback_, gpointer _user_data_); gboolean gitg_action_support_checkout_conflicts_finish (GitgActionSupport* self, GAsyncResult* _res_); @@ -385,7 +373,7 @@ static void ____lambda157_ (Block40Data* _data40_); static void _____lambda157__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); static void gitg_commit_action_cherry_pick_real_activate (GitgExtUIElement* base); -static void gitg_commit_action_cherry_pick_finalize (GObject* obj); +static void gitg_commit_action_cherry_pick_finalize (GObject * obj); static void _vala_gitg_commit_action_cherry_pick_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_commit_action_cherry_pick_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -426,45 +414,45 @@ self->priv->d_support = _tmp5_; #line 35 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return self; -#line 430 "gitg-commit-action-cherry-pick.c" +#line 418 "gitg-commit-action-cherry-pick.c" } GitgCommitActionCherryPick* gitg_commit_action_cherry_pick_new (GitgExtApplication* application, GitgExtRefActionInterface* action_interface, GitgCommit* commit) { #line 35 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return gitg_commit_action_cherry_pick_construct (GITG_TYPE_COMMIT_ACTION_CHERRY_PICK, application, action_interface, commit); -#line 437 "gitg-commit-action-cherry-pick.c" +#line 425 "gitg-commit-action-cherry-pick.c" } static void _vala_GgitOId_free (GgitOId* self) { #line 97 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_boxed_free (ggit_oid_get_type (), self); -#line 444 "gitg-commit-action-cherry-pick.c" +#line 432 "gitg-commit-action-cherry-pick.c" } static gpointer _g_object_ref0 (gpointer self) { #line 99 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return self ? g_object_ref (self) : NULL; -#line 451 "gitg-commit-action-cherry-pick.c" +#line 439 "gitg-commit-action-cherry-pick.c" } -static void _vala_array_add11 (GitgRef*** array, int* length, int* size, GitgRef* value) { +static void _vala_array_add11 (GitgRef** * array, int* length, int* size, GitgRef* value) { #line 99 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" if ((*length) == (*size)) { #line 99 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" *size = (*size) ? (2 * (*size)) : 4; #line 99 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" *array = g_renew (GitgRef*, *array, (*size) + 1); -#line 462 "gitg-commit-action-cherry-pick.c" +#line 450 "gitg-commit-action-cherry-pick.c" } #line 99 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" (*array)[(*length)++] = value; #line 99 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" (*array)[*length] = NULL; -#line 468 "gitg-commit-action-cherry-pick.c" +#line 456 "gitg-commit-action-cherry-pick.c" } @@ -483,7 +471,7 @@ if (_tmp0_ != NULL) { #line 84 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return; -#line 487 "gitg-commit-action-cherry-pick.c" +#line 475 "gitg-commit-action-cherry-pick.c" } #line 87 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _tmp1_ = g_new0 (GitgRef*, 0 + 1); @@ -495,7 +483,7 @@ self->priv->d_destinations_length1 = 0; #line 87 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" self->priv->_d_destinations_size_ = self->priv->d_destinations_length1; -#line 499 "gitg-commit-action-cherry-pick.c" +#line 487 "gitg-commit-action-cherry-pick.c" { GeeList* _r_list = NULL; GitgExtRefActionInterface* _tmp2_ = NULL; @@ -529,7 +517,7 @@ _r_index = -1; #line 89 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" while (TRUE) { -#line 533 "gitg-commit-action-cherry-pick.c" +#line 521 "gitg-commit-action-cherry-pick.c" gint _tmp9_ = 0; gint _tmp10_ = 0; gint _tmp11_ = 0; @@ -551,7 +539,7 @@ if (!(_tmp10_ < _tmp11_)) { #line 89 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" break; -#line 555 "gitg-commit-action-cherry-pick.c" +#line 543 "gitg-commit-action-cherry-pick.c" } #line 89 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _tmp12_ = _r_list; @@ -567,7 +555,7 @@ _tmp16_ = ggit_ref_is_branch ((GgitRef*) _tmp15_); #line 91 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" if (_tmp16_) { -#line 571 "gitg-commit-action-cherry-pick.c" +#line 559 "gitg-commit-action-cherry-pick.c" { GgitObject* _tmp17_ = NULL; GitgRef* _tmp18_ = NULL; @@ -592,7 +580,7 @@ _tmp17_ = _tmp19_; #line 95 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 596 "gitg-commit-action-cherry-pick.c" +#line 584 "gitg-commit-action-cherry-pick.c" goto __catch64_g_error; } #line 95 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" @@ -605,7 +593,7 @@ if (_tmp21_ == NULL) { #line 95 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (_tmp20_); -#line 609 "gitg-commit-action-cherry-pick.c" +#line 597 "gitg-commit-action-cherry-pick.c" } #line 95 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" c = _tmp21_; @@ -633,7 +621,7 @@ __vala_GgitOId_free0 (_tmp24_); #line 97 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" if (_tmp30_) { -#line 637 "gitg-commit-action-cherry-pick.c" +#line 625 "gitg-commit-action-cherry-pick.c" GitgRef** _tmp31_ = NULL; gint _tmp31__length1 = 0; GitgRef* _tmp32_ = NULL; @@ -648,13 +636,13 @@ _tmp33_ = _g_object_ref0 (_tmp32_); #line 99 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _vala_array_add11 (&self->priv->d_destinations, &self->priv->d_destinations_length1, &self->priv->_d_destinations_size_, _tmp33_); -#line 652 "gitg-commit-action-cherry-pick.c" +#line 640 "gitg-commit-action-cherry-pick.c" } #line 93 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (c); #line 93 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (_tmp17_); -#line 658 "gitg-commit-action-cherry-pick.c" +#line 646 "gitg-commit-action-cherry-pick.c" } goto __finally64; __catch64_g_error: @@ -663,7 +651,7 @@ g_clear_error (&_inner_error_); #line 93 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _inner_error_ = NULL; -#line 667 "gitg-commit-action-cherry-pick.c" +#line 655 "gitg-commit-action-cherry-pick.c" } __finally64: #line 93 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" @@ -678,16 +666,16 @@ g_clear_error (&_inner_error_); #line 93 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return; -#line 682 "gitg-commit-action-cherry-pick.c" +#line 670 "gitg-commit-action-cherry-pick.c" } } #line 89 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (r); -#line 687 "gitg-commit-action-cherry-pick.c" +#line 675 "gitg-commit-action-cherry-pick.c" } #line 89 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (_r_list); -#line 691 "gitg-commit-action-cherry-pick.c" +#line 679 "gitg-commit-action-cherry-pick.c" } } @@ -705,7 +693,7 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_slice_free (GitgCommitActionCherryPickCreateIndexData, _data_); -#line 709 "gitg-commit-action-cherry-pick.c" +#line 697 "gitg-commit-action-cherry-pick.c" } @@ -744,7 +732,7 @@ _data_->destination = _tmp4_; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_create_index_co (_data_); -#line 748 "gitg-commit-action-cherry-pick.c" +#line 736 "gitg-commit-action-cherry-pick.c" } @@ -759,7 +747,7 @@ _data_->result = NULL; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return result; -#line 763 "gitg-commit-action-cherry-pick.c" +#line 751 "gitg-commit-action-cherry-pick.c" } @@ -768,14 +756,14 @@ g_atomic_int_inc (&_data39_->_ref_count_); #line 106 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return _data39_; -#line 772 "gitg-commit-action-cherry-pick.c" +#line 760 "gitg-commit-action-cherry-pick.c" } static void _vala_GgitMergeOptions_free (GgitMergeOptions* self) { #line 106 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_boxed_free (ggit_merge_options_get_type (), self); -#line 779 "gitg-commit-action-cherry-pick.c" +#line 767 "gitg-commit-action-cherry-pick.c" } @@ -784,7 +772,7 @@ _data39_ = (Block39Data*) _userdata_; #line 106 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" if (g_atomic_int_dec_and_test (&_data39_->_ref_count_)) { -#line 788 "gitg-commit-action-cherry-pick.c" +#line 776 "gitg-commit-action-cherry-pick.c" GitgCommitActionCherryPick* self; #line 106 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" self = _data39_->self; @@ -798,20 +786,20 @@ _g_object_unref0 (self); #line 106 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_slice_free (Block39Data, _data39_); -#line 802 "gitg-commit-action-cherry-pick.c" +#line 790 "gitg-commit-action-cherry-pick.c" } } static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 815 "gitg-commit-action-cherry-pick.c" +#line 803 "gitg-commit-action-cherry-pick.c" } @@ -870,7 +858,7 @@ g_propagate_error (error, _inner_error_); #line 127 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return; -#line 874 "gitg-commit-action-cherry-pick.c" +#line 862 "gitg-commit-action-cherry-pick.c" } #line 127 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _tmp13_ = _tmp0_; @@ -882,14 +870,14 @@ _data39_->index = _tmp13_; #line 126 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (_tmp0_); -#line 886 "gitg-commit-action-cherry-pick.c" +#line 874 "gitg-commit-action-cherry-pick.c" } static void ____lambda155__gitg_async_thread_func (gpointer self, GError** error) { #line 126 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" ___lambda155_ (self, error); -#line 893 "gitg-commit-action-cherry-pick.c" +#line 881 "gitg-commit-action-cherry-pick.c" } @@ -903,7 +891,7 @@ _data_->_res_ = _res_; #line 126 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_create_index_co (_data_); -#line 907 "gitg-commit-action-cherry-pick.c" +#line 895 "gitg-commit-action-cherry-pick.c" } @@ -912,16 +900,16 @@ switch (_data_->_state_) { #line 106 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" case 0: -#line 916 "gitg-commit-action-cherry-pick.c" +#line 904 "gitg-commit-action-cherry-pick.c" goto _state_0; #line 106 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" case 1: -#line 920 "gitg-commit-action-cherry-pick.c" +#line 908 "gitg-commit-action-cherry-pick.c" goto _state_1; default: #line 106 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_assert_not_reached (); -#line 925 "gitg-commit-action-cherry-pick.c" +#line 913 "gitg-commit-action-cherry-pick.c" } _state_0: #line 106 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" @@ -966,7 +954,7 @@ _g_object_unref0 (_data_->_tmp3_); #line 109 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->theirs_name = _data_->_tmp6_; -#line 970 "gitg-commit-action-cherry-pick.c" +#line 958 "gitg-commit-action-cherry-pick.c" { #line 113 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp8_ = NULL; @@ -980,7 +968,7 @@ _data_->_tmp7_ = _data_->_tmp9_; #line 113 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 984 "gitg-commit-action-cherry-pick.c" +#line 972 "gitg-commit-action-cherry-pick.c" goto __catch65_g_error; } #line 113 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" @@ -997,7 +985,7 @@ if (_data_->_tmp11_ == NULL) { #line 113 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (_data_->_tmp10_); -#line 1001 "gitg-commit-action-cherry-pick.c" +#line 989 "gitg-commit-action-cherry-pick.c" } #line 113 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (_data_->_data39_->theirs); @@ -1005,7 +993,7 @@ _data_->_data39_->theirs = _data_->_tmp11_; #line 111 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (_data_->_tmp7_); -#line 1009 "gitg-commit-action-cherry-pick.c" +#line 997 "gitg-commit-action-cherry-pick.c" } goto __finally65; __catch65_g_error: @@ -1021,45 +1009,41 @@ #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp13_ = NULL; #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp13_ = _ ("Failed to lookup the commit for branch %s: %s"); + _data_->_tmp13_ = _data_->theirs_name; #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp14_ = NULL; #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp14_ = _data_->theirs_name; + _data_->_tmp14_ = string_to_string (_data_->_tmp13_); #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp15_ = NULL; #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp15_ = string_to_string (_data_->_tmp14_); + _data_->_tmp15_ = g_strconcat ("'", _data_->_tmp14_, "'", NULL); #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp16_ = NULL; #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp16_ = g_strconcat ("'", _data_->_tmp15_, "'", NULL); + _data_->_tmp16_ = _data_->_tmp15_; #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp17_ = NULL; #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp17_ = _data_->_tmp16_; + _data_->_tmp17_ = _data_->e; #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp18_ = NULL; #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp18_ = _data_->e; + _data_->_tmp18_ = _data_->_tmp17_->message; #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp19_ = NULL; #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp19_ = _data_->_tmp18_->message; + _data_->_tmp19_ = g_strdup_printf (_ ("Failed to lookup the commit for branch %s: %s"), _data_->_tmp16_, _data_->_tmp18_); #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp20_ = NULL; #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp20_ = g_strdup_printf (_data_->_tmp13_, _data_->_tmp17_, _data_->_tmp19_); -#line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp21_ = NULL; -#line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp21_ = _data_->_tmp20_; + _data_->_tmp20_ = _data_->_tmp19_; #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - gitg_simple_notification_error (_data_->_tmp12_, _data_->_tmp21_); + gitg_simple_notification_error (_data_->_tmp12_, _data_->_tmp20_); #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_data_->_tmp21_); + _g_free0 (_data_->_tmp20_); #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_data_->_tmp17_); + _g_free0 (_data_->_tmp16_); #line 118 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->result = NULL; #line 118 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" @@ -1074,17 +1058,17 @@ if (_data_->_state_ == 0) { #line 118 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1078 "gitg-commit-action-cherry-pick.c" +#line 1062 "gitg-commit-action-cherry-pick.c" } else { #line 118 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1082 "gitg-commit-action-cherry-pick.c" +#line 1066 "gitg-commit-action-cherry-pick.c" } #line 118 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (_data_->_async_result); #line 118 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 1088 "gitg-commit-action-cherry-pick.c" +#line 1072 "gitg-commit-action-cherry-pick.c" } __finally65: #line 111 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" @@ -1101,17 +1085,17 @@ g_clear_error (&_data_->_inner_error_); #line 111 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 1105 "gitg-commit-action-cherry-pick.c" +#line 1089 "gitg-commit-action-cherry-pick.c" } #line 121 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp22_ = NULL; + _data_->_tmp21_ = NULL; #line 121 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp22_ = ggit_merge_options_new (); + _data_->_tmp21_ = ggit_merge_options_new (); #line 121 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_data39_->merge_options = _data_->_tmp22_; + _data_->_data39_->merge_options = _data_->_tmp21_; #line 122 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_data39_->index = NULL; -#line 1115 "gitg-commit-action-cherry-pick.c" +#line 1099 "gitg-commit-action-cherry-pick.c" { #line 126 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_state_ = 1; @@ -1119,13 +1103,13 @@ gitg_async_thread (____lambda155__gitg_async_thread_func, _data_->_data39_, gitg_commit_action_cherry_pick_create_index_ready, _data_); #line 126 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 1123 "gitg-commit-action-cherry-pick.c" +#line 1107 "gitg-commit-action-cherry-pick.c" _state_1: #line 126 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" gitg_async_thread_finish (_data_->_res_, &_data_->_inner_error_); #line 126 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 1129 "gitg-commit-action-cherry-pick.c" +#line 1113 "gitg-commit-action-cherry-pick.c" goto __catch66_g_error; } } @@ -1137,33 +1121,29 @@ #line 124 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_inner_error_ = NULL; #line 132 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp22_ = NULL; +#line 132 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp22_ = _data_->notification; +#line 132 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp23_ = NULL; #line 132 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp23_ = _data_->notification; + _data_->_tmp23_ = _data_->_vala1_e; #line 132 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp24_ = NULL; #line 132 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp24_ = _ ("Failed to cherry-pick the commit: %s"); + _data_->_tmp24_ = _data_->_tmp23_->message; #line 132 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp25_ = NULL; #line 132 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp25_ = _data_->_vala1_e; + _data_->_tmp25_ = g_strdup_printf (_ ("Failed to cherry-pick the commit: %s"), _data_->_tmp24_); #line 132 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp26_ = NULL; #line 132 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp26_ = _data_->_tmp25_->message; + _data_->_tmp26_ = _data_->_tmp25_; #line 132 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp27_ = NULL; -#line 132 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp27_ = g_strdup_printf (_data_->_tmp24_, _data_->_tmp26_); -#line 132 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp28_ = NULL; -#line 132 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp28_ = _data_->_tmp27_; -#line 132 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - gitg_simple_notification_error (_data_->_tmp23_, _data_->_tmp28_); + gitg_simple_notification_error (_data_->_tmp22_, _data_->_tmp26_); #line 132 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_data_->_tmp28_); + _g_free0 (_data_->_tmp26_); #line 133 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->result = NULL; #line 133 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" @@ -1178,17 +1158,17 @@ if (_data_->_state_ == 0) { #line 133 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1182 "gitg-commit-action-cherry-pick.c" +#line 1162 "gitg-commit-action-cherry-pick.c" } else { #line 133 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1186 "gitg-commit-action-cherry-pick.c" +#line 1166 "gitg-commit-action-cherry-pick.c" } #line 133 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (_data_->_async_result); #line 133 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 1192 "gitg-commit-action-cherry-pick.c" +#line 1172 "gitg-commit-action-cherry-pick.c" } __finally66: #line 124 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" @@ -1205,18 +1185,18 @@ g_clear_error (&_data_->_inner_error_); #line 124 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 1209 "gitg-commit-action-cherry-pick.c" +#line 1189 "gitg-commit-action-cherry-pick.c" } #line 136 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp29_ = NULL; + _data_->_tmp27_ = NULL; #line 136 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp29_ = _data_->_data39_->index; + _data_->_tmp27_ = _data_->_data39_->index; #line 136 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp30_ = NULL; + _data_->_tmp28_ = NULL; #line 136 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp30_ = _g_object_ref0 (_data_->_tmp29_); + _data_->_tmp28_ = _g_object_ref0 (_data_->_tmp27_); #line 136 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->result = _data_->_tmp30_; + _data_->result = _data_->_tmp28_; #line 136 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _g_free0 (_data_->theirs_name); #line 136 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" @@ -1227,11 +1207,11 @@ if (_data_->_state_ == 0) { #line 136 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1231 "gitg-commit-action-cherry-pick.c" +#line 1211 "gitg-commit-action-cherry-pick.c" } else { #line 136 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1235 "gitg-commit-action-cherry-pick.c" +#line 1215 "gitg-commit-action-cherry-pick.c" } #line 136 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (_data_->_async_result); @@ -1247,17 +1227,17 @@ if (_data_->_state_ == 0) { #line 106 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1251 "gitg-commit-action-cherry-pick.c" +#line 1231 "gitg-commit-action-cherry-pick.c" } else { #line 106 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1255 "gitg-commit-action-cherry-pick.c" +#line 1235 "gitg-commit-action-cherry-pick.c" } #line 106 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (_data_->_async_result); #line 106 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 1261 "gitg-commit-action-cherry-pick.c" +#line 1241 "gitg-commit-action-cherry-pick.c" } @@ -1274,7 +1254,7 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_slice_free (GitgCommitActionCherryPickCheckoutConflictsData, _data_); -#line 1278 "gitg-commit-action-cherry-pick.c" +#line 1258 "gitg-commit-action-cherry-pick.c" } @@ -1323,7 +1303,7 @@ _data_->destination = _tmp6_; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_checkout_conflicts_co (_data_); -#line 1327 "gitg-commit-action-cherry-pick.c" +#line 1307 "gitg-commit-action-cherry-pick.c" } @@ -1336,7 +1316,7 @@ result = _data_->result; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return result; -#line 1340 "gitg-commit-action-cherry-pick.c" +#line 1320 "gitg-commit-action-cherry-pick.c" } @@ -1357,105 +1337,105 @@ glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1347 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { -#line 1373 "gitg-commit-action-cherry-pick.c" +#line 1353 "gitg-commit-action-cherry-pick.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; -#line 1382 "gitg-commit-action-cherry-pick.c" +#line 1362 "gitg-commit-action-cherry-pick.c" } -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { -#line 1388 "gitg-commit-action-cherry-pick.c" +#line 1368 "gitg-commit-action-cherry-pick.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; -#line 1397 "gitg-commit-action-cherry-pick.c" +#line 1377 "gitg-commit-action-cherry-pick.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { -#line 1403 "gitg-commit-action-cherry-pick.c" +#line 1383 "gitg-commit-action-cherry-pick.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; -#line 1412 "gitg-commit-action-cherry-pick.c" +#line 1392 "gitg-commit-action-cherry-pick.c" } else { -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = FALSE; -#line 1416 "gitg-commit-action-cherry-pick.c" +#line 1396 "gitg-commit-action-cherry-pick.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { -#line 1424 "gitg-commit-action-cherry-pick.c" +#line 1404 "gitg-commit-action-cherry-pick.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; -#line 1433 "gitg-commit-action-cherry-pick.c" +#line 1413 "gitg-commit-action-cherry-pick.c" } else { -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 1437 "gitg-commit-action-cherry-pick.c" +#line 1417 "gitg-commit-action-cherry-pick.c" } -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1459 "gitg-commit-action-cherry-pick.c" +#line 1439 "gitg-commit-action-cherry-pick.c" } @@ -1469,7 +1449,7 @@ _data_->_res_ = _res_; #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_checkout_conflicts_co (_data_); -#line 1473 "gitg-commit-action-cherry-pick.c" +#line 1453 "gitg-commit-action-cherry-pick.c" } @@ -1478,20 +1458,20 @@ switch (_data_->_state_) { #line 139 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" case 0: -#line 1482 "gitg-commit-action-cherry-pick.c" +#line 1462 "gitg-commit-action-cherry-pick.c" goto _state_0; #line 139 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" case 1: -#line 1486 "gitg-commit-action-cherry-pick.c" +#line 1466 "gitg-commit-action-cherry-pick.c" goto _state_1; #line 139 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" case 2: -#line 1490 "gitg-commit-action-cherry-pick.c" +#line 1470 "gitg-commit-action-cherry-pick.c" goto _state_2; default: #line 139 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_assert_not_reached (); -#line 1495 "gitg-commit-action-cherry-pick.c" +#line 1475 "gitg-commit-action-cherry-pick.c" } _state_0: #line 141 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" @@ -1569,223 +1549,195 @@ #line 144 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp15_ = _data_->notification; #line 144 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp16_ = NULL; -#line 144 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp16_ = _ ("Cherry pick has conflicts"); -#line 144 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - gitg_simple_notification_set_message (_data_->_tmp15_, _data_->_tmp16_); + gitg_simple_notification_set_message (_data_->_tmp15_, _ ("Cherry pick has conflicts")); #line 146 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->head = NULL; #line 147 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp17_ = NULL; + _data_->_tmp16_ = NULL; #line 147 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp17_ = _data_->self->priv->d_support; + _data_->_tmp16_ = _data_->self->priv->d_support; #line 147 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp18_ = NULL; + _data_->_tmp17_ = NULL; #line 147 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp18_ = _data_->destination; + _data_->_tmp17_ = _data_->destination; #line 147 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp19_ = FALSE; + _data_->_tmp18_ = FALSE; #line 147 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp19_ = gitg_action_support_reference_is_head (_data_->_tmp17_, _data_->_tmp18_, &_data_->head); + _data_->_tmp18_ = gitg_action_support_reference_is_head (_data_->_tmp16_, _data_->_tmp17_, &_data_->head); #line 147 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->ishead = _data_->_tmp19_; + _data_->ishead = _data_->_tmp18_; #line 151 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp20_ = FALSE; + _data_->_tmp19_ = FALSE; #line 151 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp20_ = _data_->ishead; + _data_->_tmp19_ = _data_->ishead; #line 151 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - if (_data_->_tmp20_) { + if (_data_->_tmp19_) { +#line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp20_ = NULL; +#line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp20_ = _data_->ours_name; #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp21_ = NULL; #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp21_ = _ ("The cherry pick of %s onto %s has caused conflicts, would you like to " \ -"checkout branch %s with the cherry pick to your working directory to r" \ -"esolve the conflicts?"); + _data_->_tmp21_ = string_to_string (_data_->_tmp20_); #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp22_ = NULL; #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp22_ = _data_->ours_name; + _data_->_tmp22_ = g_strconcat ("'", _data_->_tmp21_, "'", NULL); #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp23_ = NULL; #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp23_ = string_to_string (_data_->_tmp22_); + _data_->_tmp23_ = _data_->_tmp22_; #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp24_ = NULL; #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp24_ = g_strconcat ("'", _data_->_tmp23_, "'", NULL); + _data_->_tmp24_ = _data_->theirs_name; #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp25_ = NULL; #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp25_ = _data_->_tmp24_; + _data_->_tmp25_ = string_to_string (_data_->_tmp24_); #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp26_ = NULL; #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp26_ = _data_->theirs_name; + _data_->_tmp26_ = g_strconcat ("'", _data_->_tmp25_, "'", NULL); #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp27_ = NULL; #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp27_ = string_to_string (_data_->_tmp26_); + _data_->_tmp27_ = _data_->_tmp26_; #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp28_ = NULL; #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp28_ = g_strconcat ("'", _data_->_tmp27_, "'", NULL); + _data_->_tmp28_ = _data_->theirs_name; #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp29_ = NULL; #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp29_ = _data_->_tmp28_; + _data_->_tmp29_ = string_to_string (_data_->_tmp28_); #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp30_ = NULL; #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp30_ = _data_->theirs_name; + _data_->_tmp30_ = g_strconcat ("'", _data_->_tmp29_, "'", NULL); #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp31_ = NULL; #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp31_ = string_to_string (_data_->_tmp30_); + _data_->_tmp31_ = _data_->_tmp30_; #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp32_ = NULL; #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp32_ = g_strconcat ("'", _data_->_tmp31_, "'", NULL); -#line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp33_ = NULL; -#line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp33_ = _data_->_tmp32_; -#line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp34_ = NULL; -#line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp34_ = g_strdup_printf (_data_->_tmp21_, _data_->_tmp25_, _data_->_tmp29_, _data_->_tmp33_); + _data_->_tmp32_ = g_strdup_printf (_ ("The cherry pick of %s onto %s has caused conflicts, would you like to " \ +"checkout branch %s with the cherry pick to your working directory to r" \ +"esolve the conflicts?"), _data_->_tmp23_, _data_->_tmp27_, _data_->_tmp31_); #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _g_free0 (_data_->message); #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->message = _data_->_tmp34_; + _data_->message = _data_->_tmp32_; #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_data_->_tmp33_); + _g_free0 (_data_->_tmp31_); #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_data_->_tmp29_); + _g_free0 (_data_->_tmp27_); #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_data_->_tmp25_); -#line 1666 "gitg-commit-action-cherry-pick.c" + _g_free0 (_data_->_tmp23_); +#line 1638 "gitg-commit-action-cherry-pick.c" } else { #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp33_ = NULL; +#line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp33_ = _data_->ours_name; +#line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp34_ = NULL; +#line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp34_ = string_to_string (_data_->_tmp33_); +#line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp35_ = NULL; #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp35_ = _ ("The cherry-pick of %s onto %s has caused conflicts, would you like to " \ -"checkout the cherry pick to your working directory to resolve the conf" \ -"licts?"); + _data_->_tmp35_ = g_strconcat ("'", _data_->_tmp34_, "'", NULL); #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp36_ = NULL; #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp36_ = _data_->ours_name; + _data_->_tmp36_ = _data_->_tmp35_; #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp37_ = NULL; #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp37_ = string_to_string (_data_->_tmp36_); + _data_->_tmp37_ = _data_->theirs_name; #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp38_ = NULL; #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp38_ = g_strconcat ("'", _data_->_tmp37_, "'", NULL); + _data_->_tmp38_ = string_to_string (_data_->_tmp37_); #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp39_ = NULL; #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp39_ = _data_->_tmp38_; + _data_->_tmp39_ = g_strconcat ("'", _data_->_tmp38_, "'", NULL); #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp40_ = NULL; #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp40_ = _data_->theirs_name; + _data_->_tmp40_ = _data_->_tmp39_; #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp41_ = NULL; #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp41_ = string_to_string (_data_->_tmp40_); -#line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp42_ = NULL; -#line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp42_ = g_strconcat ("'", _data_->_tmp41_, "'", NULL); -#line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp43_ = NULL; -#line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp43_ = _data_->_tmp42_; -#line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp44_ = NULL; -#line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp44_ = g_strdup_printf (_data_->_tmp35_, _data_->_tmp39_, _data_->_tmp43_); + _data_->_tmp41_ = g_strdup_printf (_ ("The cherry-pick of %s onto %s has caused conflicts, would you like to " \ +"checkout the cherry pick to your working directory to resolve the conf" \ +"licts?"), _data_->_tmp36_, _data_->_tmp40_); #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _g_free0 (_data_->message); #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->message = _data_->_tmp44_; + _data_->message = _data_->_tmp41_; #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_data_->_tmp43_); + _g_free0 (_data_->_tmp40_); #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_data_->_tmp39_); -#line 1716 "gitg-commit-action-cherry-pick.c" + _g_free0 (_data_->_tmp36_); +#line 1684 "gitg-commit-action-cherry-pick.c" } #line 160 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp45_ = NULL; -#line 160 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp45_ = _ ("Cherry pick has conflicts"); -#line 160 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp46_ = NULL; -#line 160 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp46_ = _data_->message; -#line 160 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp47_ = NULL; -#line 160 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp47_ = _ ("Cancel"); -#line 160 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp48_ = NULL; + _data_->_tmp42_ = NULL; #line 160 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp48_ = _ ("Checkout"); + _data_->_tmp42_ = _data_->message; #line 160 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp49_ = NULL; + _data_->_tmp43_ = NULL; #line 160 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp49_ = gitg_ext_user_query_new_full (_data_->_tmp45_, _data_->_tmp46_, GTK_MESSAGE_QUESTION, _data_->_tmp47_, GTK_RESPONSE_CANCEL, _data_->_tmp48_, GTK_RESPONSE_OK, NULL); + _data_->_tmp43_ = gitg_ext_user_query_new_full (_ ("Cherry pick has conflicts"), _data_->_tmp42_, GTK_MESSAGE_QUESTION, _ ("Cancel"), GTK_RESPONSE_CANCEL, _ ("Checkout"), GTK_RESPONSE_OK, NULL); #line 160 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->q = _data_->_tmp49_; + _data_->q = _data_->_tmp43_; #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp50_ = NULL; + _data_->_tmp44_ = NULL; #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp50_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); + _data_->_tmp44_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp51_ = NULL; + _data_->_tmp45_ = NULL; #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp51_ = _data_->_tmp50_; + _data_->_tmp45_ = _data_->_tmp44_; #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp52_ = NULL; + _data_->_tmp46_ = NULL; #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp52_ = _data_->_tmp51_; + _data_->_tmp46_ = _data_->_tmp45_; #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp53_ = NULL; + _data_->_tmp47_ = NULL; #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp53_ = _data_->q; + _data_->_tmp47_ = _data_->q; #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_state_ = 1; #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - gitg_ext_application_user_query_async (_data_->_tmp52_, _data_->_tmp53_, gitg_commit_action_cherry_pick_checkout_conflicts_ready, _data_); + gitg_ext_application_user_query_async (_data_->_tmp46_, _data_->_tmp47_, gitg_commit_action_cherry_pick_checkout_conflicts_ready, _data_); #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 1762 "gitg-commit-action-cherry-pick.c" +#line 1718 "gitg-commit-action-cherry-pick.c" _state_1: #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp54_ = 0; + _data_->_tmp48_ = 0; #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp54_ = gitg_ext_application_user_query_finish (_data_->_tmp52_, _data_->_res_); + _data_->_tmp48_ = gitg_ext_application_user_query_finish (_data_->_tmp46_, _data_->_res_); #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp55_ = FALSE; + _data_->_tmp49_ = FALSE; #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp55_ = _data_->_tmp54_ != GTK_RESPONSE_OK; + _data_->_tmp49_ = _data_->_tmp48_ != GTK_RESPONSE_OK; #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _g_object_unref0 (_data_->_tmp52_); + _g_object_unref0 (_data_->_tmp46_); #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - if (_data_->_tmp55_) { -#line 168 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp56_ = NULL; -#line 168 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp56_ = _data_->notification; + if (_data_->_tmp49_) { #line 168 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp57_ = NULL; + _data_->_tmp50_ = NULL; #line 168 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp57_ = _ ("Cherry pick failed with conflicts"); + _data_->_tmp50_ = _data_->notification; #line 168 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - gitg_simple_notification_error (_data_->_tmp56_, _data_->_tmp57_); + gitg_simple_notification_error (_data_->_tmp50_, _ ("Cherry pick failed with conflicts")); #line 169 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->result = FALSE; #line 169 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" @@ -1802,52 +1754,52 @@ if (_data_->_state_ == 0) { #line 169 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1802 "gitg-commit-action-cherry-pick.c" +#line 1754 "gitg-commit-action-cherry-pick.c" } else { #line 169 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1806 "gitg-commit-action-cherry-pick.c" +#line 1758 "gitg-commit-action-cherry-pick.c" } #line 169 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (_data_->_async_result); #line 169 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 1812 "gitg-commit-action-cherry-pick.c" +#line 1764 "gitg-commit-action-cherry-pick.c" } #line 172 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp58_ = NULL; + _data_->_tmp51_ = NULL; #line 172 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp58_ = _data_->self->priv->d_support; + _data_->_tmp51_ = _data_->self->priv->d_support; #line 172 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp59_ = NULL; + _data_->_tmp52_ = NULL; #line 172 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp59_ = _data_->notification; + _data_->_tmp52_ = _data_->notification; #line 172 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp60_ = NULL; + _data_->_tmp53_ = NULL; #line 172 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp60_ = _data_->destination; + _data_->_tmp53_ = _data_->destination; #line 172 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp61_ = NULL; + _data_->_tmp54_ = NULL; #line 172 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp61_ = _data_->index; + _data_->_tmp54_ = _data_->index; #line 172 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp62_ = NULL; + _data_->_tmp55_ = NULL; #line 172 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp62_ = _data_->head; + _data_->_tmp55_ = _data_->head; #line 172 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_state_ = 2; #line 172 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - gitg_action_support_checkout_conflicts (_data_->_tmp58_, _data_->_tmp59_, _data_->_tmp60_, _data_->_tmp61_, _data_->_tmp62_, gitg_commit_action_cherry_pick_checkout_conflicts_ready, _data_); + gitg_action_support_checkout_conflicts (_data_->_tmp51_, _data_->_tmp52_, _data_->_tmp53_, _data_->_tmp54_, _data_->_tmp55_, gitg_commit_action_cherry_pick_checkout_conflicts_ready, _data_); #line 172 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 1840 "gitg-commit-action-cherry-pick.c" +#line 1792 "gitg-commit-action-cherry-pick.c" _state_2: #line 172 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp63_ = FALSE; + _data_->_tmp56_ = FALSE; #line 172 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp63_ = gitg_action_support_checkout_conflicts_finish (_data_->_tmp58_, _data_->_res_); + _data_->_tmp56_ = gitg_action_support_checkout_conflicts_finish (_data_->_tmp51_, _data_->_res_); #line 172 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - if (!_data_->_tmp63_) { + if (!_data_->_tmp56_) { #line 174 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->result = FALSE; #line 174 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" @@ -1864,30 +1816,26 @@ if (_data_->_state_ == 0) { #line 174 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1864 "gitg-commit-action-cherry-pick.c" +#line 1816 "gitg-commit-action-cherry-pick.c" } else { #line 174 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1868 "gitg-commit-action-cherry-pick.c" +#line 1820 "gitg-commit-action-cherry-pick.c" } #line 174 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (_data_->_async_result); #line 174 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 1874 "gitg-commit-action-cherry-pick.c" +#line 1826 "gitg-commit-action-cherry-pick.c" } #line 177 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_write_cherry_pick_state_files (_data_->self); #line 179 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp64_ = NULL; -#line 179 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp64_ = _data_->notification; -#line 179 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp65_ = NULL; + _data_->_tmp57_ = NULL; #line 179 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp65_ = _ ("Cherry pick finished with conflicts in working directory"); + _data_->_tmp57_ = _data_->notification; #line 179 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - gitg_simple_notification_success (_data_->_tmp64_, _data_->_tmp65_); + gitg_simple_notification_success (_data_->_tmp57_, _ ("Cherry pick finished with conflicts in working directory")); #line 180 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->result = TRUE; #line 180 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" @@ -1904,11 +1852,11 @@ if (_data_->_state_ == 0) { #line 180 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1904 "gitg-commit-action-cherry-pick.c" +#line 1852 "gitg-commit-action-cherry-pick.c" } else { #line 180 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1908 "gitg-commit-action-cherry-pick.c" +#line 1856 "gitg-commit-action-cherry-pick.c" } #line 180 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (_data_->_async_result); @@ -1928,17 +1876,17 @@ if (_data_->_state_ == 0) { #line 139 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1928 "gitg-commit-action-cherry-pick.c" +#line 1876 "gitg-commit-action-cherry-pick.c" } else { #line 139 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1932 "gitg-commit-action-cherry-pick.c" +#line 1880 "gitg-commit-action-cherry-pick.c" } #line 139 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (_data_->_async_result); #line 139 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 1938 "gitg-commit-action-cherry-pick.c" +#line 1886 "gitg-commit-action-cherry-pick.c" } @@ -1985,7 +1933,7 @@ _g_object_unref0 (_tmp2_); #line 185 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" wd = _tmp9_; -#line 1985 "gitg-commit-action-cherry-pick.c" +#line 1933 "gitg-commit-action-cherry-pick.c" { gchar* _tmp10_ = NULL; gchar* _tmp11_ = NULL; @@ -2029,7 +1977,7 @@ _g_free0 (_tmp11_); #line 189 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2029 "gitg-commit-action-cherry-pick.c" +#line 1977 "gitg-commit-action-cherry-pick.c" goto __catch67_g_error; } } @@ -2040,7 +1988,7 @@ g_clear_error (&_inner_error_); #line 187 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _inner_error_ = NULL; -#line 2040 "gitg-commit-action-cherry-pick.c" +#line 1988 "gitg-commit-action-cherry-pick.c" } __finally67: #line 187 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" @@ -2053,11 +2001,11 @@ g_clear_error (&_inner_error_); #line 187 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return; -#line 2053 "gitg-commit-action-cherry-pick.c" +#line 2001 "gitg-commit-action-cherry-pick.c" } #line 183 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _g_free0 (wd); -#line 2057 "gitg-commit-action-cherry-pick.c" +#line 2005 "gitg-commit-action-cherry-pick.c" } @@ -2070,7 +2018,7 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_slice_free (GitgCommitActionCherryPickCherryPickData, _data_); -#line 2070 "gitg-commit-action-cherry-pick.c" +#line 2018 "gitg-commit-action-cherry-pick.c" } @@ -2099,7 +2047,7 @@ _data_->destination = _tmp2_; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_cherry_pick_co (_data_); -#line 2099 "gitg-commit-action-cherry-pick.c" +#line 2047 "gitg-commit-action-cherry-pick.c" } @@ -2107,7 +2055,7 @@ GitgCommitActionCherryPickCherryPickData* _data_; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 2107 "gitg-commit-action-cherry-pick.c" +#line 2055 "gitg-commit-action-cherry-pick.c" } @@ -2121,7 +2069,7 @@ _data_->_res_ = _res_; #line 203 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_cherry_pick_co (_data_); -#line 2121 "gitg-commit-action-cherry-pick.c" +#line 2069 "gitg-commit-action-cherry-pick.c" } @@ -2130,24 +2078,24 @@ switch (_data_->_state_) { #line 193 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" case 0: -#line 2130 "gitg-commit-action-cherry-pick.c" +#line 2078 "gitg-commit-action-cherry-pick.c" goto _state_0; #line 193 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" case 1: -#line 2134 "gitg-commit-action-cherry-pick.c" +#line 2082 "gitg-commit-action-cherry-pick.c" goto _state_1; #line 193 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" case 2: -#line 2138 "gitg-commit-action-cherry-pick.c" +#line 2086 "gitg-commit-action-cherry-pick.c" goto _state_2; #line 193 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" case 3: -#line 2142 "gitg-commit-action-cherry-pick.c" +#line 2090 "gitg-commit-action-cherry-pick.c" goto _state_3; default: #line 193 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_assert_not_reached (); -#line 2147 "gitg-commit-action-cherry-pick.c" +#line 2095 "gitg-commit-action-cherry-pick.c" } _state_0: #line 195 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" @@ -2223,69 +2171,69 @@ #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp15_ = NULL; #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp15_ = _ ("Cherry pick %s onto %s"); + _data_->_tmp15_ = _data_->shortid; #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp16_ = NULL; #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp16_ = _data_->shortid; + _data_->_tmp16_ = string_to_string (_data_->_tmp15_); #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp17_ = NULL; #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp17_ = string_to_string (_data_->_tmp16_); + _data_->_tmp17_ = g_strconcat ("'", _data_->_tmp16_, "'", NULL); #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp18_ = NULL; #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp18_ = g_strconcat ("'", _data_->_tmp17_, "'", NULL); + _data_->_tmp18_ = _data_->_tmp17_; #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp19_ = NULL; #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp19_ = _data_->_tmp18_; + _data_->_tmp19_ = _data_->name; #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp20_ = NULL; #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp20_ = _data_->name; + _data_->_tmp20_ = string_to_string (_data_->_tmp19_); #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp21_ = NULL; #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp21_ = string_to_string (_data_->_tmp20_); + _data_->_tmp21_ = g_strconcat ("'", _data_->_tmp20_, "'", NULL); #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp22_ = NULL; #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp22_ = g_strconcat ("'", _data_->_tmp21_, "'", NULL); + _data_->_tmp22_ = _data_->_tmp21_; #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp23_ = NULL; #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp23_ = _data_->_tmp22_; + _data_->_tmp23_ = g_strdup_printf (_ ("Cherry pick %s onto %s"), _data_->_tmp18_, _data_->_tmp22_); #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp24_ = NULL; #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp24_ = g_strdup_printf (_data_->_tmp15_, _data_->_tmp19_, _data_->_tmp23_); + _data_->_tmp24_ = _data_->_tmp23_; #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp25_ = NULL; #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp25_ = _data_->_tmp24_; + _data_->_tmp25_ = gitg_simple_notification_new (_data_->_tmp24_, NULL); #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp26_ = NULL; -#line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp26_ = gitg_simple_notification_new (_data_->_tmp25_, NULL); -#line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - g_object_ref_sink (_data_->_tmp26_); + g_object_ref_sink (_data_->_tmp25_); #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp27_ = NULL; + _data_->_tmp26_ = NULL; #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp27_ = _data_->_tmp26_; + _data_->_tmp26_ = _data_->_tmp25_; #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_data_->_tmp25_); + _g_free0 (_data_->_tmp24_); #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_data_->_tmp23_); + _g_free0 (_data_->_tmp22_); #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_data_->_tmp19_); + _g_free0 (_data_->_tmp18_); #line 199 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->notification = _data_->_tmp27_; + _data_->notification = _data_->_tmp26_; +#line 201 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp27_ = NULL; +#line 201 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp27_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); #line 201 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp28_ = NULL; #line 201 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp28_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); + _data_->_tmp28_ = _data_->_tmp27_; #line 201 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp29_ = NULL; #line 201 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" @@ -2293,11 +2241,11 @@ #line 201 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp30_ = NULL; #line 201 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp30_ = _data_->_tmp29_; + _data_->_tmp30_ = gitg_ext_application_get_notifications (_data_->_tmp29_); #line 201 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp31_ = NULL; #line 201 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp31_ = gitg_ext_application_get_notifications (_data_->_tmp30_); + _data_->_tmp31_ = _data_->_tmp30_; #line 201 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp32_ = NULL; #line 201 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" @@ -2305,45 +2253,41 @@ #line 201 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp33_ = NULL; #line 201 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp33_ = _data_->_tmp32_; -#line 201 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp34_ = NULL; -#line 201 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp34_ = _data_->notification; + _data_->_tmp33_ = _data_->notification; #line 201 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - gitg_ext_notifications_add (_data_->_tmp33_, (GitgExtNotification*) _data_->_tmp34_); + gitg_ext_notifications_add (_data_->_tmp32_, (GitgExtNotification*) _data_->_tmp33_); #line 201 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _g_object_unref0 (_data_->_tmp33_); + _g_object_unref0 (_data_->_tmp32_); #line 201 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _g_object_unref0 (_data_->_tmp30_); + _g_object_unref0 (_data_->_tmp29_); #line 203 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp35_ = NULL; + _data_->_tmp34_ = NULL; #line 203 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp35_ = _data_->notification; + _data_->_tmp34_ = _data_->notification; #line 203 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp36_ = NULL; + _data_->_tmp35_ = NULL; #line 203 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp36_ = _data_->destination; + _data_->_tmp35_ = _data_->destination; #line 203 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_state_ = 1; #line 203 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - gitg_commit_action_cherry_pick_create_index (_data_->self, _data_->_tmp35_, _data_->_tmp36_, gitg_commit_action_cherry_pick_cherry_pick_ready, _data_); + gitg_commit_action_cherry_pick_create_index (_data_->self, _data_->_tmp34_, _data_->_tmp35_, gitg_commit_action_cherry_pick_cherry_pick_ready, _data_); #line 203 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 2330 "gitg-commit-action-cherry-pick.c" +#line 2274 "gitg-commit-action-cherry-pick.c" _state_1: #line 203 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp37_ = NULL; + _data_->_tmp36_ = NULL; #line 203 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp37_ = gitg_commit_action_cherry_pick_create_index_finish (_data_->self, _data_->_res_); + _data_->_tmp36_ = gitg_commit_action_cherry_pick_create_index_finish (_data_->self, _data_->_res_); #line 203 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->index = _data_->_tmp37_; + _data_->index = _data_->_tmp36_; #line 205 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp38_ = NULL; + _data_->_tmp37_ = NULL; #line 205 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp38_ = _data_->index; + _data_->_tmp37_ = _data_->index; #line 205 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - if (_data_->_tmp38_ == NULL) { + if (_data_->_tmp37_ == NULL) { #line 207 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (_data_->index); #line 207 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" @@ -2358,47 +2302,47 @@ if (_data_->_state_ == 0) { #line 207 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2358 "gitg-commit-action-cherry-pick.c" +#line 2302 "gitg-commit-action-cherry-pick.c" } else { #line 207 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2362 "gitg-commit-action-cherry-pick.c" +#line 2306 "gitg-commit-action-cherry-pick.c" } #line 207 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (_data_->_async_result); #line 207 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 2368 "gitg-commit-action-cherry-pick.c" +#line 2312 "gitg-commit-action-cherry-pick.c" } #line 210 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp39_ = NULL; + _data_->_tmp38_ = NULL; #line 210 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp39_ = _data_->index; + _data_->_tmp38_ = _data_->index; #line 210 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp40_ = FALSE; + _data_->_tmp39_ = FALSE; #line 210 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp40_ = ggit_index_has_conflicts (_data_->_tmp39_); + _data_->_tmp39_ = ggit_index_has_conflicts (_data_->_tmp38_); #line 210 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - if (_data_->_tmp40_) { + if (_data_->_tmp39_) { #line 212 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp41_ = NULL; + _data_->_tmp40_ = NULL; #line 212 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp41_ = _data_->notification; + _data_->_tmp40_ = _data_->notification; #line 212 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp42_ = NULL; + _data_->_tmp41_ = NULL; #line 212 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp42_ = _data_->index; + _data_->_tmp41_ = _data_->index; #line 212 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp43_ = NULL; + _data_->_tmp42_ = NULL; #line 212 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp43_ = _data_->destination; + _data_->_tmp42_ = _data_->destination; #line 212 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_state_ = 2; #line 212 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - gitg_commit_action_cherry_pick_checkout_conflicts (_data_->self, _data_->_tmp41_, _data_->_tmp42_, _data_->_tmp43_, gitg_commit_action_cherry_pick_cherry_pick_ready, _data_); + gitg_commit_action_cherry_pick_checkout_conflicts (_data_->self, _data_->_tmp40_, _data_->_tmp41_, _data_->_tmp42_, gitg_commit_action_cherry_pick_cherry_pick_ready, _data_); #line 212 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 2398 "gitg-commit-action-cherry-pick.c" +#line 2342 "gitg-commit-action-cherry-pick.c" _state_2: #line 212 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_checkout_conflicts_finish (_data_->self, _data_->_res_); @@ -2416,99 +2360,95 @@ if (_data_->_state_ == 0) { #line 213 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2416 "gitg-commit-action-cherry-pick.c" +#line 2360 "gitg-commit-action-cherry-pick.c" } else { #line 213 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2420 "gitg-commit-action-cherry-pick.c" +#line 2364 "gitg-commit-action-cherry-pick.c" } #line 213 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (_data_->_async_result); #line 213 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 2426 "gitg-commit-action-cherry-pick.c" +#line 2370 "gitg-commit-action-cherry-pick.c" } #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp43_ = NULL; +#line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp43_ = _data_->self->priv->d_support; +#line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp44_ = NULL; #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp44_ = _data_->self->priv->d_support; + _data_->_tmp44_ = _data_->notification; #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp45_ = NULL; #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp45_ = _data_->notification; + _data_->_tmp45_ = _data_->destination; #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp46_ = NULL; #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp46_ = _data_->destination; + _data_->_tmp46_ = _data_->index; #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp47_ = NULL; #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp47_ = _data_->index; + _data_->_tmp47_ = gitg_ext_commit_action_get_commit ((GitgExtCommitAction*) _data_->self); #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp48_ = NULL; #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp48_ = gitg_ext_commit_action_get_commit ((GitgExtCommitAction*) _data_->self); + _data_->_tmp48_ = _data_->_tmp47_; #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp49_ = NULL; #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp49_ = _data_->_tmp48_; + _data_->_tmp49_ = ggit_commit_get_author ((GgitCommit*) _data_->_tmp48_); #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp50_ = NULL; #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp50_ = ggit_commit_get_author ((GgitCommit*) _data_->_tmp49_); + _data_->_tmp50_ = _data_->_tmp49_; #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp51_ = NULL; #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp51_ = _data_->_tmp50_; + _data_->_tmp51_ = gitg_ext_commit_action_get_commit ((GitgExtCommitAction*) _data_->self); #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp52_ = NULL; #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp52_ = gitg_ext_commit_action_get_commit ((GitgExtCommitAction*) _data_->self); + _data_->_tmp52_ = _data_->_tmp51_; #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp53_ = NULL; #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp53_ = _data_->_tmp52_; -#line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp54_ = NULL; -#line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp54_ = ggit_commit_get_message ((GgitCommit*) _data_->_tmp53_); + _data_->_tmp53_ = ggit_commit_get_message ((GgitCommit*) _data_->_tmp52_); #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data_->_state_ = 3; #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - gitg_action_support_commit_index (_data_->_tmp44_, _data_->_tmp45_, _data_->_tmp46_, _data_->_tmp47_, NULL, 0, _data_->_tmp51_, _data_->_tmp54_, gitg_commit_action_cherry_pick_cherry_pick_ready, _data_); + gitg_action_support_commit_index (_data_->_tmp43_, _data_->_tmp44_, _data_->_tmp45_, _data_->_tmp46_, NULL, 0, _data_->_tmp50_, _data_->_tmp53_, gitg_commit_action_cherry_pick_cherry_pick_ready, _data_); #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 2478 "gitg-commit-action-cherry-pick.c" +#line 2422 "gitg-commit-action-cherry-pick.c" _state_3: #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp55_ = NULL; + _data_->_tmp54_ = NULL; #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp55_ = gitg_action_support_commit_index_finish (_data_->_tmp44_, _data_->_res_); + _data_->_tmp54_ = gitg_action_support_commit_index_finish (_data_->_tmp43_, _data_->_res_); #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp56_ = NULL; + _data_->_tmp55_ = NULL; #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp56_ = _data_->_tmp55_; + _data_->_tmp55_ = _data_->_tmp54_; #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _g_object_unref0 (_data_->_tmp51_); + _g_object_unref0 (_data_->_tmp50_); #line 216 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->oid = _data_->_tmp56_; + _data_->oid = _data_->_tmp55_; #line 223 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp57_ = NULL; + _data_->_tmp56_ = NULL; #line 223 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp57_ = _data_->oid; + _data_->_tmp56_ = _data_->oid; #line 223 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - if (_data_->_tmp57_ != NULL) { -#line 224 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp58_ = NULL; -#line 224 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp58_ = _data_->notification; + if (_data_->_tmp56_ != NULL) { #line 224 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp59_ = NULL; + _data_->_tmp57_ = NULL; #line 224 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp59_ = _ ("Successfully cherry picked"); + _data_->_tmp57_ = _data_->notification; #line 224 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - gitg_simple_notification_success (_data_->_tmp58_, _data_->_tmp59_); -#line 2508 "gitg-commit-action-cherry-pick.c" + gitg_simple_notification_success (_data_->_tmp57_, _ ("Successfully cherry picked")); +#line 2448 "gitg-commit-action-cherry-pick.c" } #line 193 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" __vala_GgitOId_free0 (_data_->oid); @@ -2526,17 +2466,17 @@ if (_data_->_state_ == 0) { #line 193 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2526 "gitg-commit-action-cherry-pick.c" +#line 2466 "gitg-commit-action-cherry-pick.c" } else { #line 193 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2530 "gitg-commit-action-cherry-pick.c" +#line 2470 "gitg-commit-action-cherry-pick.c" } #line 193 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (_data_->_async_result); #line 193 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 2536 "gitg-commit-action-cherry-pick.c" +#line 2476 "gitg-commit-action-cherry-pick.c" } @@ -2548,7 +2488,7 @@ _tmp0_ = res; #line 231 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_cherry_pick_finish (self, _tmp0_); -#line 2548 "gitg-commit-action-cherry-pick.c" +#line 2488 "gitg-commit-action-cherry-pick.c" } @@ -2557,7 +2497,7 @@ __lambda156_ ((GitgCommitActionCherryPick*) self, source_object, res); #line 230 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (self); -#line 2557 "gitg-commit-action-cherry-pick.c" +#line 2497 "gitg-commit-action-cherry-pick.c" } @@ -2571,7 +2511,7 @@ _tmp0_ = destination; #line 230 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_cherry_pick (self, _tmp0_, ___lambda156__gasync_ready_callback, g_object_ref (self)); -#line 2571 "gitg-commit-action-cherry-pick.c" +#line 2511 "gitg-commit-action-cherry-pick.c" } @@ -2580,7 +2520,7 @@ g_atomic_int_inc (&_data40_->_ref_count_); #line 256 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return _data40_; -#line 2580 "gitg-commit-action-cherry-pick.c" +#line 2520 "gitg-commit-action-cherry-pick.c" } @@ -2589,7 +2529,7 @@ _data40_ = (Block40Data*) _userdata_; #line 256 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" if (g_atomic_int_dec_and_test (&_data40_->_ref_count_)) { -#line 2589 "gitg-commit-action-cherry-pick.c" +#line 2529 "gitg-commit-action-cherry-pick.c" GitgCommitActionCherryPick* self; #line 256 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" self = _data40_->self; @@ -2599,7 +2539,7 @@ _g_object_unref0 (self); #line 256 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_slice_free (Block40Data, _data40_); -#line 2599 "gitg-commit-action-cherry-pick.c" +#line 2539 "gitg-commit-action-cherry-pick.c" } } @@ -2613,14 +2553,14 @@ _tmp0_ = _data40_->dest; #line 265 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_activate_destination (self, _tmp0_); -#line 2613 "gitg-commit-action-cherry-pick.c" +#line 2553 "gitg-commit-action-cherry-pick.c" } static void _____lambda157__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 264 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" ____lambda157_ (self); -#line 2620 "gitg-commit-action-cherry-pick.c" +#line 2560 "gitg-commit-action-cherry-pick.c" } @@ -2646,10 +2586,10 @@ GtkMenu* _tmp15_ = NULL; GitgRef** _tmp16_ = NULL; gint _tmp16__length1 = 0; - GtkMenuItem* _tmp39_ = NULL; + GtkMenuItem* _tmp38_ = NULL; + GtkMenu* _tmp39_ = NULL; GtkMenu* _tmp40_ = NULL; - GtkMenu* _tmp41_ = NULL; - GtkMenuItem* _tmp42_ = NULL; + GtkMenuItem* _tmp41_ = NULL; #line 235 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" self = (GitgCommitActionCherryPick*) base; #line 235 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" @@ -2662,7 +2602,7 @@ if (!_tmp1_) { #line 239 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return; -#line 2662 "gitg-commit-action-cherry-pick.c" +#line 2602 "gitg-commit-action-cherry-pick.c" } #line 242 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_ensure_destinations (self); @@ -2674,7 +2614,7 @@ if (!_tmp3_) { #line 246 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return; -#line 2674 "gitg-commit-action-cherry-pick.c" +#line 2614 "gitg-commit-action-cherry-pick.c" } #line 249 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _tmp4_ = gitg_ext_ui_element_get_display_name ((GitgExtUIElement*) self); @@ -2722,7 +2662,7 @@ _tmp16_ = self->priv->d_destinations; #line 256 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _tmp16__length1 = self->priv->d_destinations_length1; -#line 2722 "gitg-commit-action-cherry-pick.c" +#line 2662 "gitg-commit-action-cherry-pick.c" { GitgRef** dest_collection = NULL; gint dest_collection_length1 = 0; @@ -2734,14 +2674,14 @@ dest_collection_length1 = _tmp16__length1; #line 256 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" for (dest_it = 0; dest_it < _tmp16__length1; dest_it = dest_it + 1) { -#line 2734 "gitg-commit-action-cherry-pick.c" +#line 2674 "gitg-commit-action-cherry-pick.c" GitgRef* _tmp17_ = NULL; GitgRef* dest = NULL; #line 256 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _tmp17_ = _g_object_ref0 (dest_collection[dest_it]); #line 256 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" dest = _tmp17_; -#line 2741 "gitg-commit-action-cherry-pick.c" +#line 2681 "gitg-commit-action-cherry-pick.c" { Block40Data* _data40_; gchar* name = NULL; @@ -2758,15 +2698,14 @@ GtkMenuItem* _tmp27_ = NULL; const gchar* _tmp28_ = NULL; const gchar* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; + gchar* _tmp30_ = NULL; gchar* _tmp31_ = NULL; gchar* _tmp32_ = NULL; gchar* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; + GtkMenuItem* _tmp34_ = NULL; GtkMenuItem* _tmp35_ = NULL; - GtkMenuItem* _tmp36_ = NULL; - GtkMenu* _tmp37_ = NULL; - GtkMenuItem* _tmp38_ = NULL; + GtkMenu* _tmp36_ = NULL; + GtkMenuItem* _tmp37_ = NULL; #line 256 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data40_ = g_slice_new0 (Block40Data); #line 256 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" @@ -2804,39 +2743,37 @@ #line 261 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _tmp27_ = subitem; #line 261 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp28_ = _ ("Cherry pick onto %s"); -#line 261 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp29_ = name; + _tmp28_ = name; #line 261 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp30_ = string_to_string (_tmp29_); + _tmp29_ = string_to_string (_tmp28_); #line 261 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp31_ = g_strconcat ("'", _tmp30_, "'", NULL); + _tmp30_ = g_strconcat ("'", _tmp29_, "'", NULL); #line 261 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp32_ = _tmp31_; + _tmp31_ = _tmp30_; #line 261 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp33_ = g_strdup_printf (_tmp28_, _tmp32_); + _tmp32_ = g_strdup_printf (_ ("Cherry pick onto %s"), _tmp31_); #line 261 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp34_ = _tmp33_; + _tmp33_ = _tmp32_; #line 261 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - gtk_widget_set_tooltip_text ((GtkWidget*) _tmp27_, _tmp34_); + gtk_widget_set_tooltip_text ((GtkWidget*) _tmp27_, _tmp33_); #line 261 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_tmp34_); + _g_free0 (_tmp33_); #line 261 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_tmp32_); + _g_free0 (_tmp31_); #line 262 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp35_ = subitem; + _tmp34_ = subitem; #line 262 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - gtk_widget_show ((GtkWidget*) _tmp35_); + gtk_widget_show ((GtkWidget*) _tmp34_); #line 264 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp36_ = subitem; + _tmp35_ = subitem; #line 264 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - g_signal_connect_data (_tmp36_, "activate", (GCallback) _____lambda157__gtk_menu_item_activate, block40_data_ref (_data40_), (GClosureNotify) block40_data_unref, 0); + g_signal_connect_data (_tmp35_, "activate", (GCallback) _____lambda157__gtk_menu_item_activate, block40_data_ref (_data40_), (GClosureNotify) block40_data_unref, 0); #line 268 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp37_ = submenu; + _tmp36_ = submenu; #line 268 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp38_ = subitem; + _tmp37_ = subitem; #line 268 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - gtk_menu_shell_append ((GtkMenuShell*) _tmp37_, (GtkWidget*) _tmp38_); + gtk_menu_shell_append ((GtkMenuShell*) _tmp36_, (GtkWidget*) _tmp37_); #line 256 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (subitem); #line 256 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" @@ -2845,27 +2782,27 @@ block40_data_unref (_data40_); #line 256 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _data40_ = NULL; -#line 2845 "gitg-commit-action-cherry-pick.c" +#line 2782 "gitg-commit-action-cherry-pick.c" } } } #line 271 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp39_ = item; + _tmp38_ = item; #line 271 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp40_ = submenu; + _tmp39_ = submenu; #line 271 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - gtk_menu_item_set_submenu (_tmp39_, _tmp40_); + gtk_menu_item_set_submenu (_tmp38_, _tmp39_); #line 272 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp41_ = menu; + _tmp40_ = menu; #line 272 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp42_ = item; + _tmp41_ = item; #line 272 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - gtk_menu_shell_append ((GtkMenuShell*) _tmp41_, (GtkWidget*) _tmp42_); + gtk_menu_shell_append ((GtkMenuShell*) _tmp40_, (GtkWidget*) _tmp41_); #line 235 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (submenu); #line 235 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (item); -#line 2865 "gitg-commit-action-cherry-pick.c" +#line 2802 "gitg-commit-action-cherry-pick.c" } @@ -2873,7 +2810,7 @@ GitgCommitActionCherryPick * self; #line 275 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" self = (GitgCommitActionCherryPick*) base; -#line 2873 "gitg-commit-action-cherry-pick.c" +#line 2810 "gitg-commit-action-cherry-pick.c" } @@ -2892,27 +2829,31 @@ result = _tmp1_; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return result; -#line 2892 "gitg-commit-action-cherry-pick.c" +#line 2829 "gitg-commit-action-cherry-pick.c" } static void gitg_commit_action_cherry_pick_real_set_application (GitgExtUIElement* base, GitgExtApplication* value) { GitgCommitActionCherryPick* self; - GitgExtApplication* _tmp0_ = NULL; - GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" self = (GitgCommitActionCherryPick*) base; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp0_ = value; + if (gitg_commit_action_cherry_pick_real_get_application (self) != value) { +#line 2839 "gitg-commit-action-cherry-pick.c" + GitgExtApplication* _tmp0_ = NULL; + GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _g_object_unref0 (self->priv->_application); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" + _g_object_unref0 (self->priv->_application); #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - self->priv->_application = _tmp1_; + self->priv->_application = _tmp1_; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - g_object_notify ((GObject *) self, "application"); -#line 2912 "gitg-commit-action-cherry-pick.c" + g_object_notify ((GObject *) self, "application"); +#line 2852 "gitg-commit-action-cherry-pick.c" + } } @@ -2928,27 +2869,31 @@ result = _tmp0_; #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return result; -#line 2928 "gitg-commit-action-cherry-pick.c" +#line 2869 "gitg-commit-action-cherry-pick.c" } static void gitg_commit_action_cherry_pick_real_set_action_interface (GitgExtCommitAction* base, GitgExtRefActionInterface* value) { GitgCommitActionCherryPick* self; - GitgExtRefActionInterface* _tmp0_ = NULL; - GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" self = (GitgCommitActionCherryPick*) base; #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp0_ = value; + if (gitg_commit_action_cherry_pick_real_get_action_interface (self) != value) { +#line 2879 "gitg-commit-action-cherry-pick.c" + GitgExtRefActionInterface* _tmp0_ = NULL; + GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _g_object_unref0 (self->priv->_action_interface); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" + _g_object_unref0 (self->priv->_action_interface); #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - self->priv->_action_interface = _tmp1_; + self->priv->_action_interface = _tmp1_; #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - g_object_notify ((GObject *) self, "action-interface"); -#line 2948 "gitg-commit-action-cherry-pick.c" + g_object_notify ((GObject *) self, "action-interface"); +#line 2892 "gitg-commit-action-cherry-pick.c" + } } @@ -2964,27 +2909,31 @@ result = _tmp0_; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return result; -#line 2964 "gitg-commit-action-cherry-pick.c" +#line 2909 "gitg-commit-action-cherry-pick.c" } static void gitg_commit_action_cherry_pick_real_set_commit (GitgExtCommitAction* base, GitgCommit* value) { GitgCommitActionCherryPick* self; - GitgCommit* _tmp0_ = NULL; - GitgCommit* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" self = (GitgCommitActionCherryPick*) base; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp0_ = value; + if (gitg_commit_action_cherry_pick_real_get_commit (self) != value) { +#line 2919 "gitg-commit-action-cherry-pick.c" + GitgCommit* _tmp0_ = NULL; + GitgCommit* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _g_object_unref0 (self->priv->_commit); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" + _g_object_unref0 (self->priv->_commit); #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - self->priv->_commit = _tmp1_; + self->priv->_commit = _tmp1_; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - g_object_notify ((GObject *) self, "commit"); -#line 2984 "gitg-commit-action-cherry-pick.c" + g_object_notify ((GObject *) self, "commit"); +#line 2932 "gitg-commit-action-cherry-pick.c" + } } @@ -3000,45 +2949,39 @@ result = _tmp0_; #line 48 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return result; -#line 3000 "gitg-commit-action-cherry-pick.c" +#line 2949 "gitg-commit-action-cherry-pick.c" } static gchar* gitg_commit_action_cherry_pick_real_get_display_name (GitgExtUIElement* base) { gchar* result; GitgCommitActionCherryPick* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 53 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" self = (GitgCommitActionCherryPick*) base; #line 53 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp0_ = _ ("Cherry pick onto"); -#line 53 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (_ ("Cherry pick onto")); #line 53 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - result = _tmp1_; + result = _tmp0_; #line 53 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return result; -#line 3019 "gitg-commit-action-cherry-pick.c" +#line 2965 "gitg-commit-action-cherry-pick.c" } static gchar* gitg_commit_action_cherry_pick_real_get_description (GitgExtUIElement* base) { gchar* result; GitgCommitActionCherryPick* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 58 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" self = (GitgCommitActionCherryPick*) base; #line 58 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp0_ = _ ("Cherry pick this commit onto a branch"); + _tmp0_ = g_strdup (_ ("Cherry pick this commit onto a branch")); #line 58 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 58 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - result = _tmp1_; + result = _tmp0_; #line 58 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return result; -#line 3038 "gitg-commit-action-cherry-pick.c" +#line 2981 "gitg-commit-action-cherry-pick.c" } @@ -3051,7 +2994,7 @@ result = TRUE; #line 63 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return result; -#line 3051 "gitg-commit-action-cherry-pick.c" +#line 2994 "gitg-commit-action-cherry-pick.c" } @@ -3088,7 +3031,7 @@ result = FALSE; #line 72 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return result; -#line 3088 "gitg-commit-action-cherry-pick.c" +#line 3031 "gitg-commit-action-cherry-pick.c" } #line 75 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_ensure_destinations (self); @@ -3100,7 +3043,7 @@ result = _tmp6__length1 != 0; #line 76 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" return result; -#line 3100 "gitg-commit-action-cherry-pick.c" +#line 3043 "gitg-commit-action-cherry-pick.c" } @@ -3131,7 +3074,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_COMMIT_ACTION_CHERRY_PICK_AVAILABLE, g_param_spec_boolean ("available", "available", "available", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_COMMIT_ACTION_CHERRY_PICK_ENABLED, g_param_spec_boolean ("enabled", "enabled", "enabled", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 3131 "gitg-commit-action-cherry-pick.c" +#line 3074 "gitg-commit-action-cherry-pick.c" } @@ -3139,7 +3082,7 @@ #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_gitg_ext_ui_element_parent_iface = g_type_interface_peek_parent (iface); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - iface->activate = (void (*)(GitgExtUIElement*)) gitg_commit_action_cherry_pick_real_activate; + iface->activate = (void (*) (GitgExtUIElement *)) gitg_commit_action_cherry_pick_real_activate; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" iface->get_application = gitg_commit_action_cherry_pick_real_get_application; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" @@ -3154,7 +3097,7 @@ iface->get_available = gitg_commit_action_cherry_pick_real_get_available; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" iface->get_enabled = gitg_commit_action_cherry_pick_real_get_enabled; -#line 3154 "gitg-commit-action-cherry-pick.c" +#line 3097 "gitg-commit-action-cherry-pick.c" } @@ -3162,8 +3105,8 @@ #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_gitg_ext_action_parent_iface = g_type_interface_peek_parent (iface); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" - iface->populate_menu = (void (*)(GitgExtAction*, GtkMenu*)) gitg_commit_action_cherry_pick_real_populate_menu; -#line 3163 "gitg-commit-action-cherry-pick.c" + iface->populate_menu = (void (*) (GitgExtAction *, GtkMenu*)) gitg_commit_action_cherry_pick_real_populate_menu; +#line 3106 "gitg-commit-action-cherry-pick.c" } @@ -3178,18 +3121,18 @@ iface->get_commit = gitg_commit_action_cherry_pick_real_get_commit; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" iface->set_commit = gitg_commit_action_cherry_pick_real_set_commit; -#line 3178 "gitg-commit-action-cherry-pick.c" +#line 3121 "gitg-commit-action-cherry-pick.c" } static void gitg_commit_action_cherry_pick_instance_init (GitgCommitActionCherryPick * self) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" self->priv = GITG_COMMIT_ACTION_CHERRY_PICK_GET_PRIVATE (self); -#line 3185 "gitg-commit-action-cherry-pick.c" +#line 3128 "gitg-commit-action-cherry-pick.c" } -static void gitg_commit_action_cherry_pick_finalize (GObject* obj) { +static void gitg_commit_action_cherry_pick_finalize (GObject * obj) { GitgCommitActionCherryPick * self; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_COMMIT_ACTION_CHERRY_PICK, GitgCommitActionCherryPick); @@ -3205,7 +3148,7 @@ _g_object_unref0 (self->priv->d_support); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" G_OBJECT_CLASS (gitg_commit_action_cherry_pick_parent_class)->finalize (obj); -#line 3205 "gitg-commit-action-cherry-pick.c" +#line 3148 "gitg-commit-action-cherry-pick.c" } @@ -3280,13 +3223,13 @@ g_value_set_boolean (value, gitg_ext_ui_element_get_enabled ((GitgExtUIElement*) self)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" break; -#line 3280 "gitg-commit-action-cherry-pick.c" +#line 3223 "gitg-commit-action-cherry-pick.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" break; -#line 3286 "gitg-commit-action-cherry-pick.c" +#line 3229 "gitg-commit-action-cherry-pick.c" } } @@ -3314,13 +3257,13 @@ gitg_ext_commit_action_set_commit ((GitgExtCommitAction*) self, g_value_get_object (value)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" break; -#line 3314 "gitg-commit-action-cherry-pick.c" +#line 3257 "gitg-commit-action-cherry-pick.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-cherry-pick.vala" break; -#line 3320 "gitg-commit-action-cherry-pick.c" +#line 3263 "gitg-commit-action-cherry-pick.c" } } diff -Nru gitg-3.22.0/gitg/gitg-commit-action-create-branch.c gitg-3.23.0/gitg/gitg-commit-action-create-branch.c --- gitg-3.22.0/gitg/gitg-commit-action-create-branch.c 2016-08-17 18:00:36.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-commit-action-create-branch.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-commit-action-create-branch.c generated by valac 0.32.1, the Vala compiler +/* gitg-commit-action-create-branch.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-commit-action-create-branch.vala, do not modify */ /* @@ -80,9 +80,9 @@ static gpointer gitg_commit_action_create_branch_parent_class = NULL; -static GitgExtUIElementIface* gitg_commit_action_create_branch_gitg_ext_ui_element_parent_iface = NULL; -static GitgExtActionIface* gitg_commit_action_create_branch_gitg_ext_action_parent_iface = NULL; -static GitgExtCommitActionIface* gitg_commit_action_create_branch_gitg_ext_commit_action_parent_iface = NULL; +static GitgExtUIElementIface * gitg_commit_action_create_branch_gitg_ext_ui_element_parent_iface = NULL; +static GitgExtActionIface * gitg_commit_action_create_branch_gitg_ext_action_parent_iface = NULL; +static GitgExtCommitActionIface * gitg_commit_action_create_branch_gitg_ext_commit_action_parent_iface = NULL; GType gitg_commit_action_create_branch_get_type (void) G_GNUC_CONST; #define GITG_COMMIT_ACTION_CREATE_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_COMMIT_ACTION_CREATE_BRANCH, GitgCommitActionCreateBranchPrivate)) @@ -107,7 +107,7 @@ static void __lambda147_ (Block36Data* _data36_, GtkDialog* d, gint resp); gchar* gitg_create_branch_dialog_get_new_branch_name (GitgCreateBranchDialog* self); static void ___lambda147__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self); -static void gitg_commit_action_create_branch_finalize (GObject* obj); +static void gitg_commit_action_create_branch_finalize (GObject * obj); static void _vala_gitg_commit_action_create_branch_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_commit_action_create_branch_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -194,7 +194,7 @@ GitgRepository* _tmp4_ = NULL; GitgRepository* _tmp5_ = NULL; GitgRepository* _tmp6_ = NULL; - GgitBranch* _tmp23_ = NULL; + GgitBranch* _tmp22_ = NULL; #line 63 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" branch = NULL; #line 65 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" @@ -269,9 +269,8 @@ GitgExtApplication* _tmp17_ = NULL; GitgExtApplication* _tmp18_ = NULL; GitgExtApplication* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - GError* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; + GError* _tmp20_ = NULL; + const gchar* _tmp21_ = NULL; #line 67 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" e = _inner_error_; #line 67 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" @@ -283,18 +282,16 @@ #line 75 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" _tmp19_ = _tmp18_; #line 75 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - _tmp20_ = _ ("Failed to create branch"); + _tmp20_ = e; #line 75 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - _tmp21_ = e; + _tmp21_ = _tmp20_->message; #line 75 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - _tmp22_ = _tmp21_->message; -#line 75 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - gitg_ext_application_show_infobar (_tmp19_, _tmp20_, _tmp22_, GTK_MESSAGE_ERROR); + gitg_ext_application_show_infobar (_tmp19_, _ ("Failed to create branch"), _tmp21_, GTK_MESSAGE_ERROR); #line 75 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" _g_object_unref0 (_tmp19_); #line 67 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" _g_error_free0 (e); -#line 298 "gitg-commit-action-create-branch.c" +#line 295 "gitg-commit-action-create-branch.c" } __finally55: #line 67 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" @@ -309,44 +306,44 @@ g_clear_error (&_inner_error_); #line 67 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" return; -#line 313 "gitg-commit-action-create-branch.c" +#line 310 "gitg-commit-action-create-branch.c" } #line 80 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - _tmp23_ = branch; + _tmp22_ = branch; #line 80 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - if (_tmp23_ != NULL) { -#line 319 "gitg-commit-action-create-branch.c" + if (_tmp22_ != NULL) { +#line 316 "gitg-commit-action-create-branch.c" + GitgExtRefActionInterface* _tmp23_ = NULL; GitgExtRefActionInterface* _tmp24_ = NULL; - GitgExtRefActionInterface* _tmp25_ = NULL; - GgitBranch* _tmp26_ = NULL; + GgitBranch* _tmp25_ = NULL; #line 82 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - _tmp24_ = gitg_ext_commit_action_get_action_interface ((GitgExtCommitAction*) self); + _tmp23_ = gitg_ext_commit_action_get_action_interface ((GitgExtCommitAction*) self); #line 82 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - _tmp25_ = _tmp24_; + _tmp24_ = _tmp23_; #line 82 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - _tmp26_ = branch; + _tmp25_ = branch; #line 82 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - gitg_ext_ref_action_interface_add_ref (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GITG_TYPE_REF, GitgRef)); -#line 331 "gitg-commit-action-create-branch.c" + gitg_ext_ref_action_interface_add_ref (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GITG_TYPE_REF, GitgRef)); +#line 328 "gitg-commit-action-create-branch.c" } #line 61 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" _g_object_unref0 (repo); #line 61 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" _g_object_unref0 (branch); -#line 337 "gitg-commit-action-create-branch.c" +#line 334 "gitg-commit-action-create-branch.c" } #line 86 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" gtk_widget_destroy ((GtkWidget*) _data36_->dlg); #line 87 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" g_signal_emit_by_name ((GitgExtCommitAction*) self, "finished"); -#line 343 "gitg-commit-action-create-branch.c" +#line 340 "gitg-commit-action-create-branch.c" } static void ___lambda147__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { #line 60 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" __lambda147_ (self, _sender, response_id); -#line 350 "gitg-commit-action-create-branch.c" +#line 347 "gitg-commit-action-create-branch.c" } @@ -390,14 +387,14 @@ block36_data_unref (_data36_); #line 56 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" _data36_ = NULL; -#line 394 "gitg-commit-action-create-branch.c" +#line 391 "gitg-commit-action-create-branch.c" } static gpointer _g_object_ref0 (gpointer self) { #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" return self ? g_object_ref (self) : NULL; -#line 401 "gitg-commit-action-create-branch.c" +#line 398 "gitg-commit-action-create-branch.c" } @@ -416,27 +413,31 @@ result = _tmp1_; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" return result; -#line 420 "gitg-commit-action-create-branch.c" +#line 417 "gitg-commit-action-create-branch.c" } static void gitg_commit_action_create_branch_real_set_application (GitgExtUIElement* base, GitgExtApplication* value) { GitgCommitActionCreateBranch* self; - GitgExtApplication* _tmp0_ = NULL; - GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" self = (GitgCommitActionCreateBranch*) base; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - _tmp0_ = value; + if (gitg_commit_action_create_branch_real_get_application (self) != value) { +#line 427 "gitg-commit-action-create-branch.c" + GitgExtApplication* _tmp0_ = NULL; + GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - _g_object_unref0 (self->priv->_application); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" + _g_object_unref0 (self->priv->_application); #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - self->priv->_application = _tmp1_; + self->priv->_application = _tmp1_; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - g_object_notify ((GObject *) self, "application"); + g_object_notify ((GObject *) self, "application"); #line 440 "gitg-commit-action-create-branch.c" + } } @@ -452,27 +453,31 @@ result = _tmp0_; #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" return result; -#line 456 "gitg-commit-action-create-branch.c" +#line 457 "gitg-commit-action-create-branch.c" } static void gitg_commit_action_create_branch_real_set_action_interface (GitgExtCommitAction* base, GitgExtRefActionInterface* value) { GitgCommitActionCreateBranch* self; - GitgExtRefActionInterface* _tmp0_ = NULL; - GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" self = (GitgCommitActionCreateBranch*) base; #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - _tmp0_ = value; + if (gitg_commit_action_create_branch_real_get_action_interface (self) != value) { +#line 467 "gitg-commit-action-create-branch.c" + GitgExtRefActionInterface* _tmp0_ = NULL; + GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - _g_object_unref0 (self->priv->_action_interface); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" + _g_object_unref0 (self->priv->_action_interface); #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - self->priv->_action_interface = _tmp1_; + self->priv->_action_interface = _tmp1_; #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - g_object_notify ((GObject *) self, "action-interface"); -#line 476 "gitg-commit-action-create-branch.c" + g_object_notify ((GObject *) self, "action-interface"); +#line 480 "gitg-commit-action-create-branch.c" + } } @@ -488,27 +493,31 @@ result = _tmp0_; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" return result; -#line 492 "gitg-commit-action-create-branch.c" +#line 497 "gitg-commit-action-create-branch.c" } static void gitg_commit_action_create_branch_real_set_commit (GitgExtCommitAction* base, GitgCommit* value) { GitgCommitActionCreateBranch* self; - GitgCommit* _tmp0_ = NULL; - GitgCommit* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" self = (GitgCommitActionCreateBranch*) base; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - _tmp0_ = value; + if (gitg_commit_action_create_branch_real_get_commit (self) != value) { +#line 507 "gitg-commit-action-create-branch.c" + GitgCommit* _tmp0_ = NULL; + GitgCommit* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - _g_object_unref0 (self->priv->_commit); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" + _g_object_unref0 (self->priv->_commit); #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - self->priv->_commit = _tmp1_; + self->priv->_commit = _tmp1_; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - g_object_notify ((GObject *) self, "commit"); -#line 512 "gitg-commit-action-create-branch.c" + g_object_notify ((GObject *) self, "commit"); +#line 520 "gitg-commit-action-create-branch.c" + } } @@ -524,45 +533,39 @@ result = _tmp0_; #line 43 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" return result; -#line 528 "gitg-commit-action-create-branch.c" +#line 537 "gitg-commit-action-create-branch.c" } static gchar* gitg_commit_action_create_branch_real_get_display_name (GitgExtUIElement* base) { gchar* result; GitgCommitActionCreateBranch* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 48 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" self = (GitgCommitActionCreateBranch*) base; #line 48 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - _tmp0_ = _ ("Create branch"); -#line 48 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (_ ("Create branch")); #line 48 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - result = _tmp1_; + result = _tmp0_; #line 48 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" return result; -#line 547 "gitg-commit-action-create-branch.c" +#line 553 "gitg-commit-action-create-branch.c" } static gchar* gitg_commit_action_create_branch_real_get_description (GitgExtUIElement* base) { gchar* result; GitgCommitActionCreateBranch* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 53 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" self = (GitgCommitActionCreateBranch*) base; #line 53 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - _tmp0_ = _ ("Create a new branch at the selected commit"); + _tmp0_ = g_strdup (_ ("Create a new branch at the selected commit")); #line 53 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 53 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - result = _tmp1_; + result = _tmp0_; #line 53 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" return result; -#line 566 "gitg-commit-action-create-branch.c" +#line 569 "gitg-commit-action-create-branch.c" } @@ -589,7 +592,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_COMMIT_ACTION_CREATE_BRANCH_DISPLAY_NAME, g_param_spec_string ("display-name", "display-name", "display-name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_COMMIT_ACTION_CREATE_BRANCH_DESCRIPTION, g_param_spec_string ("description", "description", "description", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 593 "gitg-commit-action-create-branch.c" +#line 596 "gitg-commit-action-create-branch.c" } @@ -597,7 +600,7 @@ #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" gitg_commit_action_create_branch_gitg_ext_ui_element_parent_iface = g_type_interface_peek_parent (iface); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" - iface->activate = (void (*)(GitgExtUIElement*)) gitg_commit_action_create_branch_real_activate; + iface->activate = (void (*) (GitgExtUIElement *)) gitg_commit_action_create_branch_real_activate; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" iface->get_application = gitg_commit_action_create_branch_real_get_application; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" @@ -608,14 +611,14 @@ iface->get_display_name = gitg_commit_action_create_branch_real_get_display_name; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" iface->get_description = gitg_commit_action_create_branch_real_get_description; -#line 612 "gitg-commit-action-create-branch.c" +#line 615 "gitg-commit-action-create-branch.c" } static void gitg_commit_action_create_branch_gitg_ext_action_interface_init (GitgExtActionIface * iface) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" gitg_commit_action_create_branch_gitg_ext_action_parent_iface = g_type_interface_peek_parent (iface); -#line 619 "gitg-commit-action-create-branch.c" +#line 622 "gitg-commit-action-create-branch.c" } @@ -630,18 +633,18 @@ iface->get_commit = gitg_commit_action_create_branch_real_get_commit; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" iface->set_commit = gitg_commit_action_create_branch_real_set_commit; -#line 634 "gitg-commit-action-create-branch.c" +#line 637 "gitg-commit-action-create-branch.c" } static void gitg_commit_action_create_branch_instance_init (GitgCommitActionCreateBranch * self) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" self->priv = GITG_COMMIT_ACTION_CREATE_BRANCH_GET_PRIVATE (self); -#line 641 "gitg-commit-action-create-branch.c" +#line 644 "gitg-commit-action-create-branch.c" } -static void gitg_commit_action_create_branch_finalize (GObject* obj) { +static void gitg_commit_action_create_branch_finalize (GObject * obj) { GitgCommitActionCreateBranch * self; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_COMMIT_ACTION_CREATE_BRANCH, GitgCommitActionCreateBranch); @@ -653,7 +656,7 @@ _g_object_unref0 (self->priv->_commit); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" G_OBJECT_CLASS (gitg_commit_action_create_branch_parent_class)->finalize (obj); -#line 657 "gitg-commit-action-create-branch.c" +#line 660 "gitg-commit-action-create-branch.c" } @@ -716,13 +719,13 @@ g_value_take_string (value, gitg_ext_ui_element_get_description ((GitgExtUIElement*) self)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" break; -#line 720 "gitg-commit-action-create-branch.c" +#line 723 "gitg-commit-action-create-branch.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" break; -#line 726 "gitg-commit-action-create-branch.c" +#line 729 "gitg-commit-action-create-branch.c" } } @@ -750,13 +753,13 @@ gitg_ext_commit_action_set_commit ((GitgExtCommitAction*) self, g_value_get_object (value)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" break; -#line 754 "gitg-commit-action-create-branch.c" +#line 757 "gitg-commit-action-create-branch.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-branch.vala" break; -#line 760 "gitg-commit-action-create-branch.c" +#line 763 "gitg-commit-action-create-branch.c" } } diff -Nru gitg-3.22.0/gitg/gitg-commit-action-create-patch.c gitg-3.23.0/gitg/gitg-commit-action-create-patch.c --- gitg-3.22.0/gitg/gitg-commit-action-create-patch.c 2016-08-17 18:00:36.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-commit-action-create-patch.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-commit-action-create-patch.c generated by valac 0.32.1, the Vala compiler +/* gitg-commit-action-create-patch.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-commit-action-create-patch.vala, do not modify */ /* @@ -77,9 +77,9 @@ static gpointer gitg_commit_action_create_patch_parent_class = NULL; static GRegex* gitg_commit_action_create_patch_s_subject_regex; static GRegex* gitg_commit_action_create_patch_s_subject_regex = NULL; -static GitgExtUIElementIface* gitg_commit_action_create_patch_gitg_ext_ui_element_parent_iface = NULL; -static GitgExtActionIface* gitg_commit_action_create_patch_gitg_ext_action_parent_iface = NULL; -static GitgExtCommitActionIface* gitg_commit_action_create_patch_gitg_ext_commit_action_parent_iface = NULL; +static GitgExtUIElementIface * gitg_commit_action_create_patch_gitg_ext_ui_element_parent_iface = NULL; +static GitgExtActionIface * gitg_commit_action_create_patch_gitg_ext_action_parent_iface = NULL; +static GitgExtCommitActionIface * gitg_commit_action_create_patch_gitg_ext_commit_action_parent_iface = NULL; GType gitg_commit_action_create_patch_get_type (void) G_GNUC_CONST; #define GITG_COMMIT_ACTION_CREATE_PATCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_COMMIT_ACTION_CREATE_PATCH, GitgCommitActionCreatePatchPrivate)) @@ -107,7 +107,7 @@ static void block37_data_unref (void * _userdata_); static void __lambda154_ (Block37Data* _data37_, GtkDialog* dialog, gint id); static void ___lambda154__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self); -static void gitg_commit_action_create_patch_finalize (GObject* obj); +static void gitg_commit_action_create_patch_finalize (GObject * obj); static void _vala_gitg_commit_action_create_patch_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_commit_action_create_patch_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -146,120 +146,162 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1399 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1399 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1399 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 157 "gitg-commit-action-create-patch.c" +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + if ((*((gchar*) self)) == '\0') { +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = TRUE; +#line 163 "gitg-commit-action-create-patch.c" + } else { + const gchar* _tmp2_ = NULL; +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp2_ = old; +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; +#line 170 "gitg-commit-action-create-patch.c" + } +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + if (_tmp1_) { +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp0_ = TRUE; +#line 176 "gitg-commit-action-create-patch.c" + } else { + const gchar* _tmp3_ = NULL; + const gchar* _tmp4_ = NULL; +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp3_ = old; +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp4_ = replacement; +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; +#line 186 "gitg-commit-action-create-patch.c" + } +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + if (_tmp0_) { +#line 190 "gitg-commit-action-create-patch.c" + gchar* _tmp5_ = NULL; +#line 1401 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp5_ = g_strdup (self); +#line 1401 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp5_; +#line 1401 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + return result; +#line 198 "gitg-commit-action-create-patch.c" + } { GRegex* regex = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - GRegex* _tmp3_ = NULL; - GRegex* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - GRegex* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; + const gchar* _tmp6_ = NULL; + gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp0_ = old; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp2_ = _tmp1_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - regex = _tmp4_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" + GRegex* _tmp9_ = NULL; + GRegex* _tmp10_ = NULL; + gchar* _tmp11_ = NULL; + GRegex* _tmp12_ = NULL; + const gchar* _tmp13_ = NULL; + gchar* _tmp14_ = NULL; + gchar* _tmp15_ = NULL; +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp6_ = old; +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp7_ = g_regex_escape_string (_tmp6_, -1); +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp8_ = _tmp7_; +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp10_ = _tmp9_; +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp8_); +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + regex = _tmp10_; +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 188 "gitg-commit-action-create-patch.c" +#line 230 "gitg-commit-action-create-patch.c" goto __catch57_g_regex_error; } -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1404 "/home/jesse/.local/share/vala-0.36/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 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 197 "gitg-commit-action-create-patch.c" +#line 239 "gitg-commit-action-create-patch.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp7_ = replacement; -#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 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp12_ = regex; +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp13_ = replacement; +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = _tmp14_; +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 213 "gitg-commit-action-create-patch.c" +#line 255 "gitg-commit-action-create-patch.c" goto __catch57_g_regex_error; } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/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 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 224 "gitg-commit-action-create-patch.c" +#line 266 "gitg-commit-action-create-patch.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - result = _tmp9_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp15_ = _tmp11_; +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = NULL; +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp15_; +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp11_); +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 238 "gitg-commit-action-create-patch.c" +#line 280 "gitg-commit-action-create-patch.c" } goto __finally57; __catch57_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1403 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1403 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1407 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1403 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 252 "gitg-commit-action-create-patch.c" +#line 294 "gitg-commit-action-create-patch.c" } __finally57: -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1403 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1403 "/home/jesse/.local/share/vala-0.36/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 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1403 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1403 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 263 "gitg-commit-action-create-patch.c" +#line 305 "gitg-commit-action-create-patch.c" } } @@ -286,7 +328,7 @@ _tmp3_ = g_strdup (_tmp2_); #line 73 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" subject = _tmp3_; -#line 290 "gitg-commit-action-create-patch.c" +#line 332 "gitg-commit-action-create-patch.c" { gchar* _tmp4_ = NULL; GRegex* _tmp5_ = NULL; @@ -317,7 +359,7 @@ _tmp4_ = _tmp10_; #line 81 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 321 "gitg-commit-action-create-patch.c" +#line 363 "gitg-commit-action-create-patch.c" goto __catch56_g_error; } #line 81 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" @@ -348,7 +390,7 @@ subject = _tmp16_; #line 79 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" _g_free0 (_tmp4_); -#line 352 "gitg-commit-action-create-patch.c" +#line 394 "gitg-commit-action-create-patch.c" } goto __finally56; __catch56_g_error: @@ -366,7 +408,7 @@ _g_free0 (subject); #line 88 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" return result; -#line 370 "gitg-commit-action-create-patch.c" +#line 412 "gitg-commit-action-create-patch.c" } __finally56: #line 79 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" @@ -379,7 +421,7 @@ g_clear_error (&_inner_error_); #line 79 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" return NULL; -#line 383 "gitg-commit-action-create-patch.c" +#line 425 "gitg-commit-action-create-patch.c" } #line 91 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" _tmp18_ = subject; @@ -391,7 +433,7 @@ _g_free0 (subject); #line 91 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" return result; -#line 395 "gitg-commit-action-create-patch.c" +#line 437 "gitg-commit-action-create-patch.c" } @@ -432,7 +474,7 @@ _tmp3_ = g_settings_get_boolean (_tmp2_, "ignore-whitespace"); #line 100 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" if (_tmp3_) { -#line 436 "gitg-commit-action-create-patch.c" +#line 478 "gitg-commit-action-create-patch.c" GgitDiffOptions* _tmp4_ = NULL; GgitDiffOptions* _tmp5_ = NULL; GgitDiffOption _tmp6_ = 0; @@ -447,7 +489,7 @@ _tmp7_ = _tmp6_; #line 102 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" ggit_diff_options_set_flags (_tmp5_, _tmp7_ | GGIT_DIFF_IGNORE_WHITESPACE); -#line 451 "gitg-commit-action-create-patch.c" +#line 493 "gitg-commit-action-create-patch.c" } #line 105 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" _tmp8_ = settings; @@ -489,14 +531,14 @@ _g_object_unref0 (settings); #line 112 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" return result; -#line 493 "gitg-commit-action-create-patch.c" +#line 535 "gitg-commit-action-create-patch.c" } static void _vala_GgitOId_free (GgitOId* self) { #line 128 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" g_boxed_free (ggit_oid_get_type (), self); -#line 500 "gitg-commit-action-create-patch.c" +#line 542 "gitg-commit-action-create-patch.c" } @@ -512,41 +554,41 @@ gint _tmp3__length1 = 0; guint8* _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 1398 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1420 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1421 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" res = (guint8*) self; -#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1421 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" res_length1 = -1; -#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1421 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _res_size_ = res_length1; -#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1422 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1422 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1422 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" res_length1 = (gint) _tmp1_; -#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1422 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = res_length1; -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = res; -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = res_length1; -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = _tmp3__length1; -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (result_length1) { -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" *result_length1 = _tmp4__length1; -#line 544 "gitg-commit-action-create-patch.c" +#line 586 "gitg-commit-action-create-patch.c" } -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 550 "gitg-commit-action-create-patch.c" +#line 592 "gitg-commit-action-create-patch.c" } @@ -592,7 +634,7 @@ _tmp0_ = self->priv->_diff; #line 118 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" if (_tmp0_ == NULL) { -#line 596 "gitg-commit-action-create-patch.c" +#line 638 "gitg-commit-action-create-patch.c" GgitDiff* _tmp1_ = NULL; GgitDiff* _tmp2_ = NULL; #line 120 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" @@ -605,13 +647,13 @@ g_propagate_error (error, _inner_error_); #line 120 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" return; -#line 609 "gitg-commit-action-create-patch.c" +#line 651 "gitg-commit-action-create-patch.c" } #line 120 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" gitg_commit_action_create_patch_set_diff (self, _tmp1_); #line 118 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" _g_object_unref0 (_tmp1_); -#line 615 "gitg-commit-action-create-patch.c" +#line 657 "gitg-commit-action-create-patch.c" } #line 123 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" _tmp3_ = ggit_diff_format_email_options_new (); @@ -679,7 +721,7 @@ _g_object_unref0 (opts); #line 131 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" return; -#line 683 "gitg-commit-action-create-patch.c" +#line 725 "gitg-commit-action-create-patch.c" } #line 133 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" _tmp23_ = file; @@ -709,13 +751,13 @@ _g_object_unref0 (opts); #line 133 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" return; -#line 713 "gitg-commit-action-create-patch.c" +#line 755 "gitg-commit-action-create-patch.c" } #line 115 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" _g_free0 (content); #line 115 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" _g_object_unref0 (opts); -#line 719 "gitg-commit-action-create-patch.c" +#line 761 "gitg-commit-action-create-patch.c" } @@ -724,7 +766,7 @@ g_atomic_int_inc (&_data37_->_ref_count_); #line 141 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" return _data37_; -#line 728 "gitg-commit-action-create-patch.c" +#line 770 "gitg-commit-action-create-patch.c" } @@ -733,7 +775,7 @@ _data37_ = (Block37Data*) _userdata_; #line 141 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" if (g_atomic_int_dec_and_test (&_data37_->_ref_count_)) { -#line 737 "gitg-commit-action-create-patch.c" +#line 779 "gitg-commit-action-create-patch.c" GitgCommitActionCreatePatch* self; #line 141 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" self = _data37_->self; @@ -743,7 +785,7 @@ _g_object_unref0 (self); #line 141 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" g_slice_free (Block37Data, _data37_); -#line 747 "gitg-commit-action-create-patch.c" +#line 789 "gitg-commit-action-create-patch.c" } } @@ -760,7 +802,7 @@ _tmp0_ = id; #line 164 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) { -#line 764 "gitg-commit-action-create-patch.c" +#line 806 "gitg-commit-action-create-patch.c" { GFile* _tmp1_ = NULL; GFile* _tmp2_ = NULL; @@ -774,7 +816,7 @@ _g_object_unref0 (_tmp2_); #line 168 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 778 "gitg-commit-action-create-patch.c" +#line 820 "gitg-commit-action-create-patch.c" goto __catch59_g_error; } } @@ -785,9 +827,8 @@ GitgExtApplication* _tmp3_ = NULL; GitgExtApplication* _tmp4_ = NULL; GitgExtApplication* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - GError* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; + GError* _tmp6_ = NULL; + const gchar* _tmp7_ = NULL; #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" e = _inner_error_; #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" @@ -799,18 +840,16 @@ #line 172 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" _tmp5_ = _tmp4_; #line 172 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp6_ = _ ("Failed to create patch"); + _tmp6_ = e; #line 172 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp7_ = e; + _tmp7_ = _tmp6_->message; #line 172 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp8_ = _tmp7_->message; -#line 172 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - gitg_ext_application_show_infobar (_tmp5_, _tmp6_, _tmp8_, GTK_MESSAGE_ERROR); + gitg_ext_application_show_infobar (_tmp5_, _ ("Failed to create patch"), _tmp7_, GTK_MESSAGE_ERROR); #line 172 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" _g_object_unref0 (_tmp5_); #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" _g_error_free0 (e); -#line 814 "gitg-commit-action-create-patch.c" +#line 853 "gitg-commit-action-create-patch.c" } __finally59: #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" @@ -821,36 +860,33 @@ g_clear_error (&_inner_error_); #line 166 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" return; -#line 825 "gitg-commit-action-create-patch.c" +#line 864 "gitg-commit-action-create-patch.c" } } #line 178 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" gtk_widget_destroy ((GtkWidget*) _data37_->chooser); #line 179 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" g_signal_emit_by_name ((GitgExtCommitAction*) self, "finished"); -#line 832 "gitg-commit-action-create-patch.c" +#line 871 "gitg-commit-action-create-patch.c" } static void ___lambda154__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { #line 163 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" __lambda154_ (self, _sender, response_id); -#line 839 "gitg-commit-action-create-patch.c" +#line 878 "gitg-commit-action-create-patch.c" } static void gitg_commit_action_create_patch_real_activate (GitgExtUIElement* base) { GitgCommitActionCreatePatch * self; Block37Data* _data37_; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - GtkFileChooserDialog* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - GitgExtApplication* _tmp14_ = NULL; - GitgExtApplication* _tmp15_ = NULL; - GtkWindow* _tmp16_ = NULL; + GtkFileChooserDialog* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; + gchar* _tmp2_ = NULL; + GitgExtApplication* _tmp11_ = NULL; + GitgExtApplication* _tmp12_ = NULL; + GtkWindow* _tmp13_ = NULL; GError * _inner_error_ = NULL; #line 141 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" self = (GitgCommitActionCreatePatch*) base; @@ -861,66 +897,60 @@ #line 141 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" _data37_->self = g_object_ref (self); #line 143 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp0_ = _ ("Save Patch File"); -#line 143 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp1_ = _ ("_Cancel"); + _tmp0_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_ ("Save Patch File"), NULL, GTK_FILE_CHOOSER_ACTION_SAVE, _ ("_Cancel"), GTK_RESPONSE_CANCEL, _ ("_Save Patch"), GTK_RESPONSE_OK, NULL); #line 143 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp2_ = _ ("_Save Patch"); + g_object_ref_sink (_tmp0_); #line 143 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp3_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp0_, NULL, GTK_FILE_CHOOSER_ACTION_SAVE, _tmp1_, GTK_RESPONSE_CANCEL, _tmp2_, GTK_RESPONSE_OK, NULL); -#line 143 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - g_object_ref_sink (_tmp3_); -#line 143 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _data37_->chooser = _tmp3_; + _data37_->chooser = _tmp0_; #line 150 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" gtk_dialog_set_default_response ((GtkDialog*) _data37_->chooser, (gint) GTK_RESPONSE_OK); #line 152 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" gtk_file_chooser_set_do_overwrite_confirmation ((GtkFileChooser*) _data37_->chooser, TRUE); #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp4_ = gitg_commit_action_create_patch_patch_filename (self, 1); + _tmp1_ = gitg_commit_action_create_patch_patch_filename (self, 1); #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp5_ = _tmp4_; + _tmp2_ = _tmp1_; #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - gtk_file_chooser_set_current_name ((GtkFileChooser*) _data37_->chooser, _tmp5_); + gtk_file_chooser_set_current_name ((GtkFileChooser*) _data37_->chooser, _tmp2_); #line 153 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _g_free0 (_tmp5_); -#line 888 "gitg-commit-action-create-patch.c" + _g_free0 (_tmp2_); +#line 918 "gitg-commit-action-create-patch.c" { - GitgExtApplication* _tmp6_ = NULL; - GitgExtApplication* _tmp7_ = NULL; - GitgExtApplication* _tmp8_ = NULL; - GitgRepository* _tmp9_ = NULL; - GitgRepository* _tmp10_ = NULL; - GitgRepository* _tmp11_ = NULL; - GFile* _tmp12_ = NULL; - GFile* _tmp13_ = NULL; + GitgExtApplication* _tmp3_ = NULL; + GitgExtApplication* _tmp4_ = NULL; + GitgExtApplication* _tmp5_ = NULL; + GitgRepository* _tmp6_ = NULL; + GitgRepository* _tmp7_ = NULL; + GitgRepository* _tmp8_ = NULL; + GFile* _tmp9_ = NULL; + GFile* _tmp10_ = NULL; #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp6_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); + _tmp3_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp7_ = _tmp6_; -#line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp8_ = _tmp7_; + _tmp4_ = _tmp3_; #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp9_ = gitg_ext_application_get_repository (_tmp8_); + _tmp5_ = _tmp4_; #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp10_ = _tmp9_; + _tmp6_ = gitg_ext_application_get_repository (_tmp5_); #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp11_ = _tmp10_; + _tmp7_ = _tmp6_; #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp12_ = ggit_repository_get_workdir ((GgitRepository*) _tmp11_); + _tmp8_ = _tmp7_; #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp13_ = _tmp12_; + _tmp9_ = ggit_repository_get_workdir ((GgitRepository*) _tmp8_); #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - gtk_file_chooser_set_current_folder_file ((GtkFileChooser*) _data37_->chooser, _tmp13_, &_inner_error_); + _tmp10_ = _tmp9_; #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _g_object_unref0 (_tmp13_); + gtk_file_chooser_set_current_folder_file ((GtkFileChooser*) _data37_->chooser, _tmp10_, &_inner_error_); #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _g_object_unref0 (_tmp11_); + _g_object_unref0 (_tmp10_); #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" _g_object_unref0 (_tmp8_); #line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" + _g_object_unref0 (_tmp5_); +#line 157 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 924 "gitg-commit-action-create-patch.c" +#line 954 "gitg-commit-action-create-patch.c" goto __catch58_g_error; } } @@ -931,7 +961,7 @@ g_clear_error (&_inner_error_); #line 155 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" _inner_error_ = NULL; -#line 935 "gitg-commit-action-create-patch.c" +#line 965 "gitg-commit-action-create-patch.c" } __finally58: #line 155 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" @@ -946,18 +976,18 @@ g_clear_error (&_inner_error_); #line 155 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" return; -#line 950 "gitg-commit-action-create-patch.c" +#line 980 "gitg-commit-action-create-patch.c" } #line 160 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp14_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); + _tmp11_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); #line 160 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp15_ = _tmp14_; + _tmp12_ = _tmp11_; #line 160 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_window_get_type (), GtkWindow); + _tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow); #line 160 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - gtk_window_set_transient_for ((GtkWindow*) _data37_->chooser, _tmp16_); + gtk_window_set_transient_for ((GtkWindow*) _data37_->chooser, _tmp13_); #line 160 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp13_); #line 162 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" gtk_widget_show ((GtkWidget*) _data37_->chooser); #line 163 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" @@ -966,14 +996,14 @@ block37_data_unref (_data37_); #line 141 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" _data37_ = NULL; -#line 970 "gitg-commit-action-create-patch.c" +#line 1000 "gitg-commit-action-create-patch.c" } static gpointer _g_object_ref0 (gpointer self) { #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" return self ? g_object_ref (self) : NULL; -#line 977 "gitg-commit-action-create-patch.c" +#line 1007 "gitg-commit-action-create-patch.c" } @@ -992,27 +1022,31 @@ result = _tmp1_; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" return result; -#line 996 "gitg-commit-action-create-patch.c" +#line 1026 "gitg-commit-action-create-patch.c" } static void gitg_commit_action_create_patch_real_set_application (GitgExtUIElement* base, GitgExtApplication* value) { GitgCommitActionCreatePatch* self; - GitgExtApplication* _tmp0_ = NULL; - GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" self = (GitgCommitActionCreatePatch*) base; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp0_ = value; + if (gitg_commit_action_create_patch_real_get_application (self) != value) { +#line 1036 "gitg-commit-action-create-patch.c" + GitgExtApplication* _tmp0_ = NULL; + GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _g_object_unref0 (self->priv->_application); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" + _g_object_unref0 (self->priv->_application); #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - self->priv->_application = _tmp1_; + self->priv->_application = _tmp1_; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - g_object_notify ((GObject *) self, "application"); -#line 1016 "gitg-commit-action-create-patch.c" + g_object_notify ((GObject *) self, "application"); +#line 1049 "gitg-commit-action-create-patch.c" + } } @@ -1028,27 +1062,31 @@ result = _tmp0_; #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" return result; -#line 1032 "gitg-commit-action-create-patch.c" +#line 1066 "gitg-commit-action-create-patch.c" } static void gitg_commit_action_create_patch_real_set_action_interface (GitgExtCommitAction* base, GitgExtRefActionInterface* value) { GitgCommitActionCreatePatch* self; - GitgExtRefActionInterface* _tmp0_ = NULL; - GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" self = (GitgCommitActionCreatePatch*) base; #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp0_ = value; + if (gitg_commit_action_create_patch_real_get_action_interface (self) != value) { +#line 1076 "gitg-commit-action-create-patch.c" + GitgExtRefActionInterface* _tmp0_ = NULL; + GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _g_object_unref0 (self->priv->_action_interface); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - self->priv->_action_interface = _tmp1_; + _g_object_unref0 (self->priv->_action_interface); #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - g_object_notify ((GObject *) self, "action-interface"); -#line 1052 "gitg-commit-action-create-patch.c" + self->priv->_action_interface = _tmp1_; +#line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" + g_object_notify ((GObject *) self, "action-interface"); +#line 1089 "gitg-commit-action-create-patch.c" + } } @@ -1064,27 +1102,31 @@ result = _tmp0_; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" return result; -#line 1068 "gitg-commit-action-create-patch.c" +#line 1106 "gitg-commit-action-create-patch.c" } static void gitg_commit_action_create_patch_real_set_commit (GitgExtCommitAction* base, GitgCommit* value) { GitgCommitActionCreatePatch* self; - GitgCommit* _tmp0_ = NULL; - GitgCommit* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" self = (GitgCommitActionCreatePatch*) base; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp0_ = value; + if (gitg_commit_action_create_patch_real_get_commit (self) != value) { +#line 1116 "gitg-commit-action-create-patch.c" + GitgCommit* _tmp0_ = NULL; + GitgCommit* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _g_object_unref0 (self->priv->_commit); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" + _g_object_unref0 (self->priv->_commit); #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - self->priv->_commit = _tmp1_; + self->priv->_commit = _tmp1_; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - g_object_notify ((GObject *) self, "commit"); -#line 1088 "gitg-commit-action-create-patch.c" + g_object_notify ((GObject *) self, "commit"); +#line 1129 "gitg-commit-action-create-patch.c" + } } @@ -1099,26 +1141,30 @@ result = _tmp0_; #line 31 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" return result; -#line 1103 "gitg-commit-action-create-patch.c" +#line 1145 "gitg-commit-action-create-patch.c" } void gitg_commit_action_create_patch_set_diff (GitgCommitActionCreatePatch* self, GgitDiff* value) { - GgitDiff* _tmp0_ = NULL; - GgitDiff* _tmp1_ = NULL; #line 31 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" g_return_if_fail (self != NULL); #line 31 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp0_ = value; + if (gitg_commit_action_create_patch_get_diff (self) != value) { +#line 1154 "gitg-commit-action-create-patch.c" + GgitDiff* _tmp0_ = NULL; + GgitDiff* _tmp1_ = NULL; #line 31 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 31 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _g_object_unref0 (self->priv->_diff); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 31 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" + _g_object_unref0 (self->priv->_diff); #line 31 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - self->priv->_diff = _tmp1_; + self->priv->_diff = _tmp1_; #line 31 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - g_object_notify ((GObject *) self, "diff"); -#line 1122 "gitg-commit-action-create-patch.c" + g_object_notify ((GObject *) self, "diff"); +#line 1167 "gitg-commit-action-create-patch.c" + } } @@ -1134,57 +1180,51 @@ result = _tmp0_; #line 58 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" return result; -#line 1138 "gitg-commit-action-create-patch.c" +#line 1184 "gitg-commit-action-create-patch.c" } static gchar* gitg_commit_action_create_patch_real_get_display_name (GitgExtUIElement* base) { gchar* result; GitgCommitActionCreatePatch* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 63 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" self = (GitgCommitActionCreatePatch*) base; #line 63 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp0_ = _ ("Create patch"); + _tmp0_ = g_strdup (_ ("Create patch")); #line 63 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 63 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - result = _tmp1_; + result = _tmp0_; #line 63 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" return result; -#line 1157 "gitg-commit-action-create-patch.c" +#line 1200 "gitg-commit-action-create-patch.c" } static gchar* gitg_commit_action_create_patch_real_get_description (GitgExtUIElement* base) { gchar* result; GitgCommitActionCreatePatch* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 68 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" self = (GitgCommitActionCreatePatch*) base; #line 68 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp0_ = _ ("Create a patch from the selected commit"); -#line 68 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (_ ("Create a patch from the selected commit")); #line 68 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - result = _tmp1_; + result = _tmp0_; #line 68 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" return result; -#line 1176 "gitg-commit-action-create-patch.c" +#line 1216 "gitg-commit-action-create-patch.c" } static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1188 "gitg-commit-action-create-patch.c" +#line 1228 "gitg-commit-action-create-patch.c" } @@ -1214,7 +1254,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_COMMIT_ACTION_CREATE_PATCH_DISPLAY_NAME, g_param_spec_string ("display-name", "display-name", "display-name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_COMMIT_ACTION_CREATE_PATCH_DESCRIPTION, g_param_spec_string ("description", "description", "description", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1218 "gitg-commit-action-create-patch.c" +#line 1258 "gitg-commit-action-create-patch.c" { GRegex* _tmp0_ = NULL; GRegex* _tmp1_ = NULL; @@ -1225,7 +1265,7 @@ _tmp0_ = _tmp1_; #line 39 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1229 "gitg-commit-action-create-patch.c" +#line 1269 "gitg-commit-action-create-patch.c" goto __catch60_g_error; } #line 39 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" @@ -1238,7 +1278,7 @@ gitg_commit_action_create_patch_s_subject_regex = _tmp2_; #line 37 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" _g_regex_unref0 (_tmp0_); -#line 1242 "gitg-commit-action-create-patch.c" +#line 1282 "gitg-commit-action-create-patch.c" } goto __finally60; __catch60_g_error: @@ -1272,7 +1312,7 @@ _g_free0 (_tmp8_); #line 37 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" _g_error_free0 (e); -#line 1276 "gitg-commit-action-create-patch.c" +#line 1316 "gitg-commit-action-create-patch.c" } __finally60: #line 37 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" @@ -1281,7 +1321,7 @@ 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 37 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" g_clear_error (&_inner_error_); -#line 1285 "gitg-commit-action-create-patch.c" +#line 1325 "gitg-commit-action-create-patch.c" } } @@ -1290,7 +1330,7 @@ #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" gitg_commit_action_create_patch_gitg_ext_ui_element_parent_iface = g_type_interface_peek_parent (iface); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" - iface->activate = (void (*)(GitgExtUIElement*)) gitg_commit_action_create_patch_real_activate; + iface->activate = (void (*) (GitgExtUIElement *)) gitg_commit_action_create_patch_real_activate; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" iface->get_application = gitg_commit_action_create_patch_real_get_application; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" @@ -1301,14 +1341,14 @@ iface->get_display_name = gitg_commit_action_create_patch_real_get_display_name; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" iface->get_description = gitg_commit_action_create_patch_real_get_description; -#line 1305 "gitg-commit-action-create-patch.c" +#line 1345 "gitg-commit-action-create-patch.c" } static void gitg_commit_action_create_patch_gitg_ext_action_interface_init (GitgExtActionIface * iface) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" gitg_commit_action_create_patch_gitg_ext_action_parent_iface = g_type_interface_peek_parent (iface); -#line 1312 "gitg-commit-action-create-patch.c" +#line 1352 "gitg-commit-action-create-patch.c" } @@ -1323,18 +1363,18 @@ iface->get_commit = gitg_commit_action_create_patch_real_get_commit; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" iface->set_commit = gitg_commit_action_create_patch_real_set_commit; -#line 1327 "gitg-commit-action-create-patch.c" +#line 1367 "gitg-commit-action-create-patch.c" } static void gitg_commit_action_create_patch_instance_init (GitgCommitActionCreatePatch * self) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" self->priv = GITG_COMMIT_ACTION_CREATE_PATCH_GET_PRIVATE (self); -#line 1334 "gitg-commit-action-create-patch.c" +#line 1374 "gitg-commit-action-create-patch.c" } -static void gitg_commit_action_create_patch_finalize (GObject* obj) { +static void gitg_commit_action_create_patch_finalize (GObject * obj) { GitgCommitActionCreatePatch * self; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_COMMIT_ACTION_CREATE_PATCH, GitgCommitActionCreatePatch); @@ -1348,7 +1388,7 @@ _g_object_unref0 (self->priv->_diff); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" G_OBJECT_CLASS (gitg_commit_action_create_patch_parent_class)->finalize (obj); -#line 1352 "gitg-commit-action-create-patch.c" +#line 1392 "gitg-commit-action-create-patch.c" } @@ -1417,13 +1457,13 @@ g_value_take_string (value, gitg_ext_ui_element_get_description ((GitgExtUIElement*) self)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" break; -#line 1421 "gitg-commit-action-create-patch.c" +#line 1461 "gitg-commit-action-create-patch.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" break; -#line 1427 "gitg-commit-action-create-patch.c" +#line 1467 "gitg-commit-action-create-patch.c" } } @@ -1457,13 +1497,13 @@ gitg_commit_action_create_patch_set_diff (self, g_value_get_object (value)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" break; -#line 1461 "gitg-commit-action-create-patch.c" +#line 1501 "gitg-commit-action-create-patch.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-patch.vala" break; -#line 1467 "gitg-commit-action-create-patch.c" +#line 1507 "gitg-commit-action-create-patch.c" } } diff -Nru gitg-3.22.0/gitg/gitg-commit-action-create-tag.c gitg-3.23.0/gitg/gitg-commit-action-create-tag.c --- gitg-3.22.0/gitg/gitg-commit-action-create-tag.c 2016-08-17 18:00:36.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-commit-action-create-tag.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-commit-action-create-tag.c generated by valac 0.32.1, the Vala compiler +/* gitg-commit-action-create-tag.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-commit-action-create-tag.vala, do not modify */ /* @@ -81,9 +81,9 @@ static gpointer gitg_commit_action_create_tag_parent_class = NULL; -static GitgExtUIElementIface* gitg_commit_action_create_tag_gitg_ext_ui_element_parent_iface = NULL; -static GitgExtActionIface* gitg_commit_action_create_tag_gitg_ext_action_parent_iface = NULL; -static GitgExtCommitActionIface* gitg_commit_action_create_tag_gitg_ext_commit_action_parent_iface = NULL; +static GitgExtUIElementIface * gitg_commit_action_create_tag_gitg_ext_ui_element_parent_iface = NULL; +static GitgExtActionIface * gitg_commit_action_create_tag_gitg_ext_action_parent_iface = NULL; +static GitgExtCommitActionIface * gitg_commit_action_create_tag_gitg_ext_commit_action_parent_iface = NULL; GType gitg_commit_action_create_tag_get_type (void) G_GNUC_CONST; #define GITG_COMMIT_ACTION_CREATE_TAG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_COMMIT_ACTION_CREATE_TAG, GitgCommitActionCreateTagPrivate)) @@ -110,7 +110,7 @@ gchar* gitg_create_tag_dialog_get_new_tag_name (GitgCreateTagDialog* self); static void _vala_GgitOId_free (GgitOId* self); static void ___lambda153__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self); -static void gitg_commit_action_create_tag_finalize (GObject* obj); +static void gitg_commit_action_create_tag_finalize (GObject * obj); static void _vala_gitg_commit_action_create_tag_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_commit_action_create_tag_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -185,11 +185,11 @@ static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 195 "gitg-commit-action-create-tag.c" } @@ -226,8 +226,8 @@ gchar* _tmp12_ = NULL; gchar* _tmp13_ = NULL; GgitRef* tag = NULL; - GgitOId* _tmp50_ = NULL; - GgitRef* _tmp66_ = NULL; + GgitOId* _tmp49_ = NULL; + GgitRef* _tmp64_ = NULL; #line 63 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" tagid = NULL; #line 65 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" @@ -444,9 +444,8 @@ GitgExtApplication* _tmp44_ = NULL; GitgExtApplication* _tmp45_ = NULL; GitgExtApplication* _tmp46_ = NULL; - const gchar* _tmp47_ = NULL; - GError* _tmp48_ = NULL; - const gchar* _tmp49_ = NULL; + GError* _tmp47_ = NULL; + const gchar* _tmp48_ = NULL; #line 70 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" e = _inner_error_; #line 70 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" @@ -458,13 +457,11 @@ #line 92 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" _tmp46_ = _tmp45_; #line 92 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp47_ = _ ("Failed to create tag"); + _tmp47_ = e; #line 92 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp48_ = e; + _tmp48_ = _tmp47_->message; #line 92 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp49_ = _tmp48_->message; -#line 92 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - gitg_ext_application_show_infobar (_tmp46_, _tmp47_, _tmp49_, GTK_MESSAGE_ERROR); + gitg_ext_application_show_infobar (_tmp46_, _ ("Failed to create tag"), _tmp48_, GTK_MESSAGE_ERROR); #line 92 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" _g_object_unref0 (_tmp46_); #line 96 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" @@ -473,7 +470,7 @@ tagid = NULL; #line 70 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" _g_error_free0 (e); -#line 477 "gitg-commit-action-create-tag.c" +#line 474 "gitg-commit-action-create-tag.c" } __finally61: #line 70 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" @@ -492,93 +489,90 @@ g_clear_error (&_inner_error_); #line 70 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" return; -#line 496 "gitg-commit-action-create-tag.c" +#line 493 "gitg-commit-action-create-tag.c" } #line 99 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" tag = NULL; #line 101 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp50_ = tagid; + _tmp49_ = tagid; #line 101 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - if (_tmp50_ != NULL) { -#line 504 "gitg-commit-action-create-tag.c" + if (_tmp49_ != NULL) { +#line 501 "gitg-commit-action-create-tag.c" { - GitgRef* _tmp51_ = NULL; - GitgRepository* _tmp52_ = NULL; + GitgRef* _tmp50_ = NULL; + GitgRepository* _tmp51_ = NULL; + const gchar* _tmp52_ = NULL; const gchar* _tmp53_ = NULL; - const gchar* _tmp54_ = NULL; + gchar* _tmp54_ = NULL; gchar* _tmp55_ = NULL; - gchar* _tmp56_ = NULL; + GitgRef* _tmp56_ = NULL; GitgRef* _tmp57_ = NULL; GitgRef* _tmp58_ = NULL; - GitgRef* _tmp59_ = NULL; #line 105 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp52_ = repo; + _tmp51_ = repo; #line 105 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp53_ = name; + _tmp52_ = name; #line 105 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp54_ = string_to_string (_tmp53_); + _tmp53_ = string_to_string (_tmp52_); #line 105 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp55_ = g_strconcat ("refs/tags/", _tmp54_, NULL); + _tmp54_ = g_strconcat ("refs/tags/", _tmp53_, NULL); #line 105 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp56_ = _tmp55_; + _tmp55_ = _tmp54_; #line 105 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp57_ = gitg_repository_lookup_reference (_tmp52_, _tmp56_, &_inner_error_); + _tmp56_ = gitg_repository_lookup_reference (_tmp51_, _tmp55_, &_inner_error_); #line 105 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp58_ = _tmp57_; + _tmp57_ = _tmp56_; #line 105 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _g_free0 (_tmp56_); + _g_free0 (_tmp55_); #line 105 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp51_ = _tmp58_; + _tmp50_ = _tmp57_; #line 105 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 535 "gitg-commit-action-create-tag.c" +#line 532 "gitg-commit-action-create-tag.c" goto __catch63_g_error; } #line 105 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp59_ = _tmp51_; + _tmp58_ = _tmp50_; #line 105 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp51_ = NULL; + _tmp50_ = NULL; #line 105 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" _g_object_unref0 (tag); #line 105 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - tag = (GgitRef*) _tmp59_; + tag = (GgitRef*) _tmp58_; #line 103 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _g_object_unref0 (_tmp51_); -#line 548 "gitg-commit-action-create-tag.c" + _g_object_unref0 (_tmp50_); +#line 545 "gitg-commit-action-create-tag.c" } goto __finally63; __catch63_g_error: { GError* e = NULL; + GitgExtApplication* _tmp59_ = NULL; GitgExtApplication* _tmp60_ = NULL; GitgExtApplication* _tmp61_ = NULL; - GitgExtApplication* _tmp62_ = NULL; + GError* _tmp62_ = NULL; const gchar* _tmp63_ = NULL; - GError* _tmp64_ = NULL; - const gchar* _tmp65_ = NULL; #line 103 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" e = _inner_error_; #line 103 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" _inner_error_ = NULL; #line 109 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp60_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); -#line 109 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp61_ = _tmp60_; + _tmp59_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); #line 109 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp62_ = _tmp61_; + _tmp60_ = _tmp59_; #line 109 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp63_ = _ ("Failed to lookup tag"); + _tmp61_ = _tmp60_; #line 109 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp64_ = e; + _tmp62_ = e; #line 109 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp65_ = _tmp64_->message; + _tmp63_ = _tmp62_->message; #line 109 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - gitg_ext_application_show_infobar (_tmp62_, _tmp63_, _tmp65_, GTK_MESSAGE_ERROR); + gitg_ext_application_show_infobar (_tmp61_, _ ("Failed to lookup tag"), _tmp63_, GTK_MESSAGE_ERROR); #line 109 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _g_object_unref0 (_tmp62_); + _g_object_unref0 (_tmp61_); #line 103 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" _g_error_free0 (e); -#line 582 "gitg-commit-action-create-tag.c" +#line 576 "gitg-commit-action-create-tag.c" } __finally63: #line 103 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" @@ -599,26 +593,26 @@ g_clear_error (&_inner_error_); #line 103 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" return; -#line 603 "gitg-commit-action-create-tag.c" +#line 597 "gitg-commit-action-create-tag.c" } } #line 115 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp66_ = tag; + _tmp64_ = tag; #line 115 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - if (_tmp66_ != NULL) { -#line 610 "gitg-commit-action-create-tag.c" - GitgExtRefActionInterface* _tmp67_ = NULL; - GitgExtRefActionInterface* _tmp68_ = NULL; - GgitRef* _tmp69_ = NULL; + if (_tmp64_ != NULL) { +#line 604 "gitg-commit-action-create-tag.c" + GitgExtRefActionInterface* _tmp65_ = NULL; + GitgExtRefActionInterface* _tmp66_ = NULL; + GgitRef* _tmp67_ = NULL; #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp67_ = gitg_ext_commit_action_get_action_interface ((GitgExtCommitAction*) self); + _tmp65_ = gitg_ext_commit_action_get_action_interface ((GitgExtCommitAction*) self); #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp68_ = _tmp67_; + _tmp66_ = _tmp65_; #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp69_ = tag; + _tmp67_ = tag; #line 117 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - gitg_ext_ref_action_interface_add_ref (_tmp68_, G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GITG_TYPE_REF, GitgRef)); -#line 622 "gitg-commit-action-create-tag.c" + gitg_ext_ref_action_interface_add_ref (_tmp66_, G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GITG_TYPE_REF, GitgRef)); +#line 616 "gitg-commit-action-create-tag.c" } #line 61 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" _g_object_unref0 (tag); @@ -630,20 +624,20 @@ _g_object_unref0 (repo); #line 61 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" __vala_GgitOId_free0 (tagid); -#line 634 "gitg-commit-action-create-tag.c" +#line 628 "gitg-commit-action-create-tag.c" } #line 121 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" gtk_widget_destroy ((GtkWidget*) _data38_->dlg); #line 122 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" g_signal_emit_by_name ((GitgExtCommitAction*) self, "finished"); -#line 640 "gitg-commit-action-create-tag.c" +#line 634 "gitg-commit-action-create-tag.c" } static void ___lambda153__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { #line 60 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" __lambda153_ (self, _sender, response_id); -#line 647 "gitg-commit-action-create-tag.c" +#line 641 "gitg-commit-action-create-tag.c" } @@ -687,14 +681,14 @@ block38_data_unref (_data38_); #line 56 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" _data38_ = NULL; -#line 691 "gitg-commit-action-create-tag.c" +#line 685 "gitg-commit-action-create-tag.c" } static gpointer _g_object_ref0 (gpointer self) { #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" return self ? g_object_ref (self) : NULL; -#line 698 "gitg-commit-action-create-tag.c" +#line 692 "gitg-commit-action-create-tag.c" } @@ -713,27 +707,31 @@ result = _tmp1_; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" return result; -#line 717 "gitg-commit-action-create-tag.c" +#line 711 "gitg-commit-action-create-tag.c" } static void gitg_commit_action_create_tag_real_set_application (GitgExtUIElement* base, GitgExtApplication* value) { GitgCommitActionCreateTag* self; - GitgExtApplication* _tmp0_ = NULL; - GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" self = (GitgCommitActionCreateTag*) base; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp0_ = value; + if (gitg_commit_action_create_tag_real_get_application (self) != value) { +#line 721 "gitg-commit-action-create-tag.c" + GitgExtApplication* _tmp0_ = NULL; + GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _g_object_unref0 (self->priv->_application); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - self->priv->_application = _tmp1_; + _g_object_unref0 (self->priv->_application); #line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - g_object_notify ((GObject *) self, "application"); -#line 737 "gitg-commit-action-create-tag.c" + self->priv->_application = _tmp1_; +#line 28 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" + g_object_notify ((GObject *) self, "application"); +#line 734 "gitg-commit-action-create-tag.c" + } } @@ -749,27 +747,31 @@ result = _tmp0_; #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" return result; -#line 753 "gitg-commit-action-create-tag.c" +#line 751 "gitg-commit-action-create-tag.c" } static void gitg_commit_action_create_tag_real_set_action_interface (GitgExtCommitAction* base, GitgExtRefActionInterface* value) { GitgCommitActionCreateTag* self; - GitgExtRefActionInterface* _tmp0_ = NULL; - GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" self = (GitgCommitActionCreateTag*) base; #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp0_ = value; + if (gitg_commit_action_create_tag_real_get_action_interface (self) != value) { +#line 761 "gitg-commit-action-create-tag.c" + GitgExtRefActionInterface* _tmp0_ = NULL; + GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _g_object_unref0 (self->priv->_action_interface); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - self->priv->_action_interface = _tmp1_; + _g_object_unref0 (self->priv->_action_interface); #line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - g_object_notify ((GObject *) self, "action-interface"); -#line 773 "gitg-commit-action-create-tag.c" + self->priv->_action_interface = _tmp1_; +#line 29 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" + g_object_notify ((GObject *) self, "action-interface"); +#line 774 "gitg-commit-action-create-tag.c" + } } @@ -785,27 +787,31 @@ result = _tmp0_; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" return result; -#line 789 "gitg-commit-action-create-tag.c" +#line 791 "gitg-commit-action-create-tag.c" } static void gitg_commit_action_create_tag_real_set_commit (GitgExtCommitAction* base, GitgCommit* value) { GitgCommitActionCreateTag* self; - GitgCommit* _tmp0_ = NULL; - GitgCommit* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" self = (GitgCommitActionCreateTag*) base; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp0_ = value; + if (gitg_commit_action_create_tag_real_get_commit (self) != value) { +#line 801 "gitg-commit-action-create-tag.c" + GitgCommit* _tmp0_ = NULL; + GitgCommit* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _g_object_unref0 (self->priv->_commit); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - self->priv->_commit = _tmp1_; + _g_object_unref0 (self->priv->_commit); #line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - g_object_notify ((GObject *) self, "commit"); -#line 809 "gitg-commit-action-create-tag.c" + self->priv->_commit = _tmp1_; +#line 30 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" + g_object_notify ((GObject *) self, "commit"); +#line 814 "gitg-commit-action-create-tag.c" + } } @@ -821,42 +827,36 @@ result = _tmp0_; #line 43 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" return result; -#line 825 "gitg-commit-action-create-tag.c" +#line 831 "gitg-commit-action-create-tag.c" } static gchar* gitg_commit_action_create_tag_real_get_display_name (GitgExtUIElement* base) { gchar* result; GitgCommitActionCreateTag* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 48 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" self = (GitgCommitActionCreateTag*) base; #line 48 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp0_ = _ ("Create tag"); + _tmp0_ = g_strdup (_ ("Create tag")); #line 48 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 48 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - result = _tmp1_; + result = _tmp0_; #line 48 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" return result; -#line 844 "gitg-commit-action-create-tag.c" +#line 847 "gitg-commit-action-create-tag.c" } static gchar* gitg_commit_action_create_tag_real_get_description (GitgExtUIElement* base) { gchar* result; GitgCommitActionCreateTag* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 53 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" self = (GitgCommitActionCreateTag*) base; #line 53 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp0_ = _ ("Create a new tag at the selected commit"); + _tmp0_ = g_strdup (_ ("Create a new tag at the selected commit")); #line 53 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 53 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - result = _tmp1_; + result = _tmp0_; #line 53 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" return result; #line 863 "gitg-commit-action-create-tag.c" @@ -894,7 +894,7 @@ #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" gitg_commit_action_create_tag_gitg_ext_ui_element_parent_iface = g_type_interface_peek_parent (iface); #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" - iface->activate = (void (*)(GitgExtUIElement*)) gitg_commit_action_create_tag_real_activate; + iface->activate = (void (*) (GitgExtUIElement *)) gitg_commit_action_create_tag_real_activate; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" iface->get_application = gitg_commit_action_create_tag_real_get_application; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" @@ -938,7 +938,7 @@ } -static void gitg_commit_action_create_tag_finalize (GObject* obj) { +static void gitg_commit_action_create_tag_finalize (GObject * obj) { GitgCommitActionCreateTag * self; #line 23 "/home/jesse/dev/gitg/gitg/gitg-commit-action-create-tag.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_COMMIT_ACTION_CREATE_TAG, GitgCommitActionCreateTag); diff -Nru gitg-3.22.0/gitg/gitg-convert.c gitg-3.23.0/gitg/gitg-convert.c --- gitg-3.22.0/gitg/gitg-convert.c 2016-08-17 18:00:36.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-convert.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-convert.c generated by valac 0.32.1, the Vala compiler +/* gitg-convert.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-convert.vala, do not modify */ /* @@ -30,13 +30,13 @@ -void gitg_convert_utf8_validate_fallback (gchar** text, gssize size); +void gitg_convert_utf8_validate_fallback (gchar* * text, gssize size); gchar* gitg_convert_convert_fallback (const gchar* text, gssize size, const gchar* fallback); -gboolean gitg_convert_convert_and_check (const gchar* text, gssize size, const gchar* from_charset, gchar** ret); +gboolean gitg_convert_convert_and_check (const gchar* text, gssize size, const gchar* from_charset, gchar* * ret); gchar* gitg_convert_utf8 (const gchar* str, gssize size, const gchar* from_charset); -void gitg_convert_utf8_validate_fallback (gchar** text, gssize size) { +void gitg_convert_utf8_validate_fallback (gchar* * text, gssize size) { gchar* end = NULL; #line 22 "/home/jesse/dev/gitg/gitg/gitg-convert.vala" g_return_if_fail (*text != NULL); @@ -277,7 +277,7 @@ } -gboolean gitg_convert_convert_and_check (const gchar* text, gssize size, const gchar* from_charset, gchar** ret) { +gboolean gitg_convert_convert_and_check (const gchar* text, gssize size, const gchar* from_charset, gchar* * ret) { gchar* _vala_ret = NULL; gboolean result = FALSE; gsize read = 0UL; @@ -419,103 +419,103 @@ glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1347 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { #line 435 "gitg-convert.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; #line 444 "gitg-convert.c" } -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { #line 450 "gitg-convert.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; #line 459 "gitg-convert.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { #line 465 "gitg-convert.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; #line 474 "gitg-convert.c" } else { -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = FALSE; #line 478 "gitg-convert.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { #line 486 "gitg-convert.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; #line 495 "gitg-convert.c" } else { -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 499 "gitg-convert.c" } -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 521 "gitg-convert.c" } diff -Nru gitg-3.22.0/gitg/gitg-create-branch-dialog.c gitg-3.23.0/gitg/gitg-create-branch-dialog.c --- gitg-3.22.0/gitg/gitg-create-branch-dialog.c 2016-08-09 09:50:54.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-create-branch-dialog.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-create-branch-dialog.c generated by valac 0.32.1, the Vala compiler +/* gitg-create-branch-dialog.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-create-branch-dialog.vala, do not modify */ /* @@ -69,7 +69,7 @@ static GObject * gitg_create_branch_dialog_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); static void _gitg_create_branch_dialog___lambda146_ (GitgCreateBranchDialog* self); static void __gitg_create_branch_dialog___lambda146__gtk_editable_changed (GtkEditable* _sender, gpointer self); -static void gitg_create_branch_dialog_finalize (GObject* obj); +static void gitg_create_branch_dialog_finalize (GObject * obj); static void _vala_gitg_create_branch_dialog_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); @@ -108,19 +108,19 @@ gchar* _result_ = NULL; gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; -#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1226 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1227 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1227 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1228 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1228 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1229 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _result_; -#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1229 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 126 "gitg-create-branch-dialog.c" } @@ -247,7 +247,7 @@ } -static void gitg_create_branch_dialog_finalize (GObject* obj) { +static void gitg_create_branch_dialog_finalize (GObject * obj) { GitgCreateBranchDialog * self; #line 24 "/home/jesse/dev/gitg/gitg/gitg-create-branch-dialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_CREATE_BRANCH_DIALOG, GitgCreateBranchDialog); diff -Nru gitg-3.22.0/gitg/gitg-create-tag-dialog.c gitg-3.23.0/gitg/gitg-create-tag-dialog.c --- gitg-3.22.0/gitg/gitg-create-tag-dialog.c 2016-08-09 09:50:54.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-create-tag-dialog.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-create-tag-dialog.c generated by valac 0.32.1, the Vala compiler +/* gitg-create-tag-dialog.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-create-tag-dialog.vala, do not modify */ /* @@ -103,7 +103,7 @@ static gboolean __gitg_create_tag_dialog___lambda151__gtk_widget_focus_in_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self); static gboolean _gitg_create_tag_dialog___lambda152_ (GitgCreateTagDialog* self); static gboolean __gitg_create_tag_dialog___lambda152__gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self); -static void gitg_create_tag_dialog_finalize (GObject* obj); +static void gitg_create_tag_dialog_finalize (GObject * obj); static void _vala_gitg_create_tag_dialog_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); @@ -214,27 +214,24 @@ if (_tmp7_) { #line 216 "gitg-create-tag-dialog.c" GtkTextBuffer* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - GtkTextTag* _tmp15_ = NULL; + GtkTextTag* _tmp14_ = NULL; #line 106 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" _tmp13_ = buf; #line 106 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" - _tmp14_ = _ ("Provide a message to create an annotated tag"); + _tmp14_ = self->priv->d_info_tag; #line 106 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" - _tmp15_ = self->priv->d_info_tag; -#line 106 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" - gtk_text_buffer_insert_with_tags (_tmp13_, &start, _tmp14_, -1, _tmp15_, NULL); + gtk_text_buffer_insert_with_tags (_tmp13_, &start, _ ("Provide a message to create an annotated tag"), -1, _tmp14_, NULL); #line 114 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" self->priv->d_is_showing_user_info = TRUE; -#line 230 "gitg-create-tag-dialog.c" +#line 227 "gitg-create-tag-dialog.c" } else { #line 118 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" self->priv->d_is_showing_user_info = FALSE; -#line 234 "gitg-create-tag-dialog.c" +#line 231 "gitg-create-tag-dialog.c" } #line 96 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" _g_object_unref0 (buf); -#line 238 "gitg-create-tag-dialog.c" +#line 235 "gitg-create-tag-dialog.c" } @@ -263,7 +260,7 @@ g_object_set (_tmp3_, "foreground-rgba", &_tmp4_, NULL); #line 122 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" _g_object_unref0 (ctx); -#line 267 "gitg-create-tag-dialog.c" +#line 264 "gitg-create-tag-dialog.c" } @@ -276,24 +273,24 @@ _tmp0_ = parent; #line 132 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" if (_tmp0_ != NULL) { -#line 280 "gitg-create-tag-dialog.c" +#line 277 "gitg-create-tag-dialog.c" GtkWindow* _tmp1_ = NULL; #line 134 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" _tmp1_ = parent; #line 134 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" gtk_window_set_transient_for ((GtkWindow*) self, _tmp1_); -#line 286 "gitg-create-tag-dialog.c" +#line 283 "gitg-create-tag-dialog.c" } #line 128 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" return self; -#line 290 "gitg-create-tag-dialog.c" +#line 287 "gitg-create-tag-dialog.c" } GitgCreateTagDialog* gitg_create_tag_dialog_new (GtkWindow* parent) { #line 128 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" return gitg_create_tag_dialog_construct (GITG_TYPE_CREATE_TAG_DIALOG, parent); -#line 297 "gitg-create-tag-dialog.c" +#line 294 "gitg-create-tag-dialog.c" } @@ -302,21 +299,21 @@ gchar* _result_ = NULL; gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; -#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1226 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1227 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1227 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1228 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1228 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1229 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _result_; -#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1229 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 320 "gitg-create-tag-dialog.c" +#line 317 "gitg-create-tag-dialog.c" } @@ -340,7 +337,7 @@ result = _tmp3_; #line 142 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" return result; -#line 344 "gitg-create-tag-dialog.c" +#line 341 "gitg-create-tag-dialog.c" } @@ -367,7 +364,7 @@ _tmp0_ = self->priv->d_is_showing_user_info; #line 150 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" if (_tmp0_) { -#line 371 "gitg-create-tag-dialog.c" +#line 368 "gitg-create-tag-dialog.c" gchar* _tmp1_ = NULL; #line 152 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" _tmp1_ = g_strdup (""); @@ -375,7 +372,7 @@ result = _tmp1_; #line 152 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" return result; -#line 379 "gitg-create-tag-dialog.c" +#line 376 "gitg-create-tag-dialog.c" } #line 155 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" _tmp2_ = self->priv->d_text_view_message; @@ -409,7 +406,7 @@ _g_object_unref0 (buf); #line 160 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" return result; -#line 413 "gitg-create-tag-dialog.c" +#line 410 "gitg-create-tag-dialog.c" } @@ -418,7 +415,7 @@ g_atomic_int_inc (&_data41_->_ref_count_); #line 42 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" return _data41_; -#line 422 "gitg-create-tag-dialog.c" +#line 419 "gitg-create-tag-dialog.c" } @@ -427,7 +424,7 @@ _data41_ = (Block41Data*) _userdata_; #line 42 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" if (g_atomic_int_dec_and_test (&_data41_->_ref_count_)) { -#line 431 "gitg-create-tag-dialog.c" +#line 428 "gitg-create-tag-dialog.c" GitgCreateTagDialog* self; #line 42 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" self = _data41_->self; @@ -437,7 +434,7 @@ _g_object_unref0 (self); #line 42 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" g_slice_free (Block41Data, _data41_); -#line 441 "gitg-create-tag-dialog.c" +#line 438 "gitg-create-tag-dialog.c" } } @@ -449,14 +446,14 @@ g_return_if_fail (k != NULL); #line 49 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" gitg_create_tag_dialog_update_font_settings (self); -#line 453 "gitg-create-tag-dialog.c" +#line 450 "gitg-create-tag-dialog.c" } static void __gitg_create_tag_dialog___lambda148__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) { #line 48 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" _gitg_create_tag_dialog___lambda148_ ((GitgCreateTagDialog*) self, _sender, key); -#line 460 "gitg-create-tag-dialog.c" +#line 457 "gitg-create-tag-dialog.c" } @@ -483,28 +480,28 @@ gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp5_ != 0); #line 53 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" _g_free0 (_tmp3_); -#line 487 "gitg-create-tag-dialog.c" +#line 484 "gitg-create-tag-dialog.c" } static void __gitg_create_tag_dialog___lambda149__gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 52 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" _gitg_create_tag_dialog___lambda149_ ((GitgCreateTagDialog*) self); -#line 494 "gitg-create-tag-dialog.c" +#line 491 "gitg-create-tag-dialog.c" } static void _gitg_create_tag_dialog___lambda150_ (GitgCreateTagDialog* self) { #line 62 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" gitg_create_tag_dialog_update_info_tag (self); -#line 501 "gitg-create-tag-dialog.c" +#line 498 "gitg-create-tag-dialog.c" } static void __gitg_create_tag_dialog___lambda150__gtk_widget_style_updated (GtkWidget* _sender, gpointer self) { #line 61 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" _gitg_create_tag_dialog___lambda150_ ((GitgCreateTagDialog*) self); -#line 508 "gitg-create-tag-dialog.c" +#line 505 "gitg-create-tag-dialog.c" } @@ -518,7 +515,7 @@ _tmp0_ = self->priv->d_is_showing_user_info; #line 66 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" if (_tmp0_) { -#line 522 "gitg-create-tag-dialog.c" +#line 519 "gitg-create-tag-dialog.c" GtkTextIter start = {0}; GtkTextIter end = {0}; GtkTextBuffer* _tmp1_ = NULL; @@ -537,13 +534,13 @@ _tmp4_ = _data41_->buf; #line 71 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" gtk_text_buffer_delete (_tmp4_, &start, &end); -#line 541 "gitg-create-tag-dialog.c" +#line 538 "gitg-create-tag-dialog.c" } #line 74 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" result = FALSE; #line 74 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" return result; -#line 547 "gitg-create-tag-dialog.c" +#line 544 "gitg-create-tag-dialog.c" } @@ -552,7 +549,7 @@ result = _gitg_create_tag_dialog___lambda151_ (self); #line 65 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" return result; -#line 556 "gitg-create-tag-dialog.c" +#line 553 "gitg-create-tag-dialog.c" } @@ -564,7 +561,7 @@ result = FALSE; #line 79 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" return result; -#line 568 "gitg-create-tag-dialog.c" +#line 565 "gitg-create-tag-dialog.c" } @@ -573,7 +570,7 @@ result = _gitg_create_tag_dialog___lambda152_ ((GitgCreateTagDialog*) self); #line 77 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" return result; -#line 577 "gitg-create-tag-dialog.c" +#line 574 "gitg-create-tag-dialog.c" } @@ -672,7 +669,7 @@ _data41_ = NULL; #line 42 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" return obj; -#line 676 "gitg-create-tag-dialog.c" +#line 673 "gitg-create-tag-dialog.c" } @@ -702,7 +699,7 @@ gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "d_entry_tag_name", FALSE, GitgCreateTagDialog_private_offset + G_STRUCT_OFFSET (GitgCreateTagDialogPrivate, d_entry_tag_name)); #line 24 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "d_text_view_message", FALSE, GitgCreateTagDialog_private_offset + G_STRUCT_OFFSET (GitgCreateTagDialogPrivate, d_text_view_message)); -#line 706 "gitg-create-tag-dialog.c" +#line 703 "gitg-create-tag-dialog.c" } @@ -711,11 +708,11 @@ self->priv = GITG_CREATE_TAG_DIALOG_GET_PRIVATE (self); #line 24 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 715 "gitg-create-tag-dialog.c" +#line 712 "gitg-create-tag-dialog.c" } -static void gitg_create_tag_dialog_finalize (GObject* obj) { +static void gitg_create_tag_dialog_finalize (GObject * obj) { GitgCreateTagDialog * self; #line 24 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_CREATE_TAG_DIALOG, GitgCreateTagDialog); @@ -731,7 +728,7 @@ _g_object_unref0 (self->priv->d_font_settings); #line 24 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" G_OBJECT_CLASS (gitg_create_tag_dialog_parent_class)->finalize (obj); -#line 735 "gitg-create-tag-dialog.c" +#line 732 "gitg-create-tag-dialog.c" } @@ -764,13 +761,13 @@ g_value_take_string (value, gitg_create_tag_dialog_get_new_tag_message (self)); #line 24 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" break; -#line 768 "gitg-create-tag-dialog.c" +#line 765 "gitg-create-tag-dialog.c" default: #line 24 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 24 "/home/jesse/dev/gitg/gitg/gitg-create-tag-dialog.vala" break; -#line 774 "gitg-create-tag-dialog.c" +#line 771 "gitg-create-tag-dialog.c" } } diff -Nru gitg-3.22.0/gitg/gitg-dash-view.c gitg-3.23.0/gitg/gitg-dash-view.c --- gitg-3.22.0/gitg/gitg-dash-view.c 2016-09-18 12:01:48.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-dash-view.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-dash-view.c generated by valac 0.32.1, the Vala compiler +/* gitg-dash-view.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-dash-view.vala, do not modify */ /* @@ -275,11 +275,11 @@ static gpointer gitg_dash_view_parent_class = NULL; static gpointer gitg_dash_view_clone_callbacks_parent_class = NULL; -static GitgExtUIElementIface* gitg_dash_view_gitg_ext_ui_element_parent_iface = NULL; -static GitgExtActivityIface* gitg_dash_view_gitg_ext_activity_parent_iface = NULL; -static GitgExtSelectableIface* gitg_dash_view_gitg_ext_selectable_parent_iface = NULL; -static GitgExtSearchableIface* gitg_dash_view_gitg_ext_searchable_parent_iface = NULL; -static GitgRecursiveScannerIface* gitg_dash_view_gitg_recursive_scanner_parent_iface = NULL; +static GitgExtUIElementIface * gitg_dash_view_gitg_ext_ui_element_parent_iface = NULL; +static GitgExtActivityIface * gitg_dash_view_gitg_ext_activity_parent_iface = NULL; +static GitgExtSelectableIface * gitg_dash_view_gitg_ext_selectable_parent_iface = NULL; +static GitgExtSearchableIface * gitg_dash_view_gitg_ext_searchable_parent_iface = NULL; +static GitgRecursiveScannerIface * gitg_dash_view_gitg_recursive_scanner_parent_iface = NULL; GType gitg_recursive_scanner_get_type (void) G_GNUC_CONST; GType gitg_dash_view_get_type (void) G_GNUC_CONST; @@ -391,8 +391,8 @@ static gboolean __lambda100_ (Block47Data* _data47_); static gboolean ___lambda100__gsource_func (gpointer self); static GgitCred* gitg_dash_view_clone_callbacks_real_credentials (GgitRemoteCallbacks* base, const gchar* url, const gchar* username_from_url, GgitCredtype allowed_types, GError** error); -static void gitg_dash_view_clone_callbacks_finalize (GObject* obj); -static void gitg_dash_view_finalize (GObject* obj); +static void gitg_dash_view_clone_callbacks_finalize (GObject * obj); +static void gitg_dash_view_finalize (GObject * obj); static void _vala_gitg_dash_view_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_dash_view_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -1221,33 +1221,33 @@ gunichar _tmp1_ = 0U; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1017 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1033 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1034 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1034 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = c; -#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1034 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_); -#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1034 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1036 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1036 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { #line 1239 "gitg-dash-view.c" gchar* _tmp4_ = NULL; -#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1037 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1037 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1037 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 1247 "gitg-dash-view.c" } else { -#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1039 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = -1; -#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1039 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 1253 "gitg-dash-view.c" } @@ -1261,37 +1261,37 @@ glong _tmp1_ = 0L; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1315 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1315 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { #line 1277 "gitg-dash-view.c" glong _tmp4_ = 0L; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = maxlen; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 1285 "gitg-dash-view.c" } else { gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = (glong) (_tmp5_ - _tmp6_); -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 1297 "gitg-dash-view.c" } @@ -1311,112 +1311,112 @@ glong _tmp20_ = 0L; glong _tmp21_ = 0L; gchar* _tmp22_ = NULL; -#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1325 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = offset; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { #line 1321 "gitg-dash-view.c" glong _tmp2_ = 0L; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = len; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); #line 1327 "gitg-dash-view.c" } else { -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = FALSE; #line 1331 "gitg-dash-view.c" } -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_) { #line 1335 "gitg-dash-view.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; glong _tmp5_ = 0L; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = offset; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = len; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = _tmp5_; #line 1347 "gitg-dash-view.c" } else { gint _tmp6_ = 0; gint _tmp7_ = 0; -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = strlen (self); -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = _tmp6_; -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; #line 1357 "gitg-dash-view.c" } -#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = offset; -#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { #line 1363 "gitg-dash-view.c" glong _tmp9_ = 0L; glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1335 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = string_length; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1335 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = offset; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1335 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" offset = _tmp9_ + _tmp10_; -#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = offset; -#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); #line 1377 "gitg-dash-view.c" } else { glong _tmp12_ = 0L; glong _tmp13_ = 0L; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = offset; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = string_length; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); #line 1387 "gitg-dash-view.c" } -#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1340 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = len; -#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1340 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { #line 1393 "gitg-dash-view.c" glong _tmp15_ = 0L; glong _tmp16_ = 0L; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1341 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1341 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = offset; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1341 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; #line 1402 "gitg-dash-view.c" } -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = offset; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = len; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = string_length; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = offset; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = len; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp22_; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 1422 "gitg-dash-view.c" } @@ -1439,103 +1439,103 @@ glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1347 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { #line 1455 "gitg-dash-view.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; #line 1464 "gitg-dash-view.c" } -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { #line 1470 "gitg-dash-view.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; #line 1479 "gitg-dash-view.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { #line 1485 "gitg-dash-view.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; #line 1494 "gitg-dash-view.c" } else { -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = FALSE; #line 1498 "gitg-dash-view.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { #line 1506 "gitg-dash-view.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; #line 1515 "gitg-dash-view.c" } else { -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 1519 "gitg-dash-view.c" } -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 1541 "gitg-dash-view.c" } @@ -1544,8 +1544,8 @@ static void __lambda101_ (Block43Data* _data43_, GObject* obj, GAsyncResult* res) { GitgDashView* self; GitgRepository* repository = NULL; - GitgRepositoryListBox* _tmp10_ = NULL; - GitgRepository* _tmp11_ = NULL; + GitgRepositoryListBox* _tmp9_ = NULL; + GitgRepository* _tmp10_ = NULL; GError * _inner_error_ = NULL; #line 380 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" self = _data43_->self; @@ -1589,9 +1589,8 @@ GitgExtApplication* _tmp4_ = NULL; GitgExtApplication* _tmp5_ = NULL; GitgExtApplication* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - GError* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; + GError* _tmp7_ = NULL; + const gchar* _tmp8_ = NULL; #line 383 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" e = _inner_error_; #line 383 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" @@ -1603,18 +1602,16 @@ #line 389 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _tmp6_ = _tmp5_; #line 389 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp7_ = _ ("Failed to clone repository"); -#line 389 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp8_ = e; + _tmp7_ = e; #line 389 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp9_ = _tmp8_->message; + _tmp8_ = _tmp7_->message; #line 389 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - gitg_ext_application_show_infobar (_tmp6_, _tmp7_, _tmp9_, GTK_MESSAGE_ERROR); + gitg_ext_application_show_infobar (_tmp6_, _ ("Failed to clone repository"), _tmp8_, GTK_MESSAGE_ERROR); #line 389 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _g_object_unref0 (_tmp6_); #line 383 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _g_error_free0 (e); -#line 1618 "gitg-dash-view.c" +#line 1615 "gitg-dash-view.c" } __finally73: #line 383 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" @@ -1627,17 +1624,17 @@ g_clear_error (&_inner_error_); #line 383 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return; -#line 1631 "gitg-dash-view.c" +#line 1628 "gitg-dash-view.c" } #line 392 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp10_ = self->priv->d_repository_list_box; + _tmp9_ = self->priv->d_repository_list_box; #line 392 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp11_ = repository; + _tmp10_ = repository; #line 392 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - gitg_repository_list_box_end_cloning (_tmp10_, _data43_->row, _tmp11_); + gitg_repository_list_box_end_cloning (_tmp9_, _data43_->row, _tmp10_); #line 380 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _g_object_unref0 (repository); -#line 1641 "gitg-dash-view.c" +#line 1638 "gitg-dash-view.c" } @@ -1646,7 +1643,7 @@ __lambda101_ (self, source_object, res); #line 380 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" block43_data_unref (self); -#line 1650 "gitg-dash-view.c" +#line 1647 "gitg-dash-view.c" } @@ -1698,7 +1695,7 @@ _tmp2_ = pos; #line 357 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" if (_tmp2_ == -1) { -#line 1702 "gitg-dash-view.c" +#line 1699 "gitg-dash-view.c" const gchar* _tmp3_ = NULL; gint _tmp4_ = 0; #line 359 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" @@ -1707,7 +1704,7 @@ _tmp4_ = string_last_index_of_char (_tmp3_, (gunichar) ':', 0); #line 359 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" pos = _tmp4_; -#line 1711 "gitg-dash-view.c" +#line 1708 "gitg-dash-view.c" } #line 362 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _tmp5_ = g_strdup (".git"); @@ -1733,21 +1730,21 @@ _tmp13_ = has_dot_git; #line 366 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" if (_tmp13_) { -#line 1737 "gitg-dash-view.c" +#line 1734 "gitg-dash-view.c" gboolean _tmp14_ = FALSE; #line 366 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _tmp14_ = is_bare; #line 366 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _tmp12_ = !_tmp14_; -#line 1743 "gitg-dash-view.c" +#line 1740 "gitg-dash-view.c" } else { #line 366 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _tmp12_ = FALSE; -#line 1747 "gitg-dash-view.c" +#line 1744 "gitg-dash-view.c" } #line 366 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" if (_tmp12_) { -#line 1751 "gitg-dash-view.c" +#line 1748 "gitg-dash-view.c" const gchar* _tmp15_ = NULL; const gchar* _tmp16_ = NULL; gint _tmp17_ = 0; @@ -1767,7 +1764,7 @@ _g_free0 (subfolder_name); #line 368 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" subfolder_name = _tmp19_; -#line 1771 "gitg-dash-view.c" +#line 1768 "gitg-dash-view.c" } else { gboolean _tmp20_ = FALSE; gboolean _tmp21_ = FALSE; @@ -1775,21 +1772,21 @@ _tmp21_ = has_dot_git; #line 370 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" if (!_tmp21_) { -#line 1779 "gitg-dash-view.c" +#line 1776 "gitg-dash-view.c" gboolean _tmp22_ = FALSE; #line 370 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _tmp22_ = is_bare; #line 370 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _tmp20_ = _tmp22_; -#line 1785 "gitg-dash-view.c" +#line 1782 "gitg-dash-view.c" } else { #line 370 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _tmp20_ = FALSE; -#line 1789 "gitg-dash-view.c" +#line 1786 "gitg-dash-view.c" } #line 370 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" if (_tmp20_) { -#line 1793 "gitg-dash-view.c" +#line 1790 "gitg-dash-view.c" const gchar* _tmp23_ = NULL; const gchar* _tmp24_ = NULL; gchar* _tmp25_ = NULL; @@ -1803,7 +1800,7 @@ _g_free0 (subfolder_name); #line 372 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" subfolder_name = _tmp25_; -#line 1807 "gitg-dash-view.c" +#line 1804 "gitg-dash-view.c" } } #line 375 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" @@ -1836,7 +1833,7 @@ block43_data_unref (_data43_); #line 352 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _data43_ = NULL; -#line 1840 "gitg-dash-view.c" +#line 1837 "gitg-dash-view.c" } @@ -1859,7 +1856,7 @@ _tmp2_ = row; #line 400 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" if (_tmp2_ != NULL) { -#line 1863 "gitg-dash-view.c" +#line 1860 "gitg-dash-view.c" GitgRepositoryListBoxRow* _tmp3_ = NULL; GitgRepositoryListBox* _tmp4_ = NULL; GitgRepositoryListBoxRow* _tmp5_ = NULL; @@ -1875,23 +1872,23 @@ _tmp5_ = row; #line 404 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gtk_widget_grab_focus ((GtkWidget*) _tmp5_); -#line 1879 "gitg-dash-view.c" +#line 1876 "gitg-dash-view.c" } #line 396 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _g_object_unref0 (row); -#line 1883 "gitg-dash-view.c" +#line 1880 "gitg-dash-view.c" } static void gitg_dash_view_do_add_repository (GitgDashView* self, GFile* location, gboolean report_errors) { GitgRepository* repo = NULL; - GitgRepository* _tmp11_ = NULL; + GitgRepository* _tmp10_ = NULL; GError * _inner_error_ = NULL; #line 408 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_return_if_fail (self != NULL); #line 408 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_return_if_fail (location != NULL); -#line 1895 "gitg-dash-view.c" +#line 1892 "gitg-dash-view.c" { GitgRepository* _tmp0_ = NULL; GFile* _tmp1_ = NULL; @@ -1905,7 +1902,7 @@ _tmp0_ = _tmp2_; #line 414 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1909 "gitg-dash-view.c" +#line 1906 "gitg-dash-view.c" goto __catch74_g_error; } #line 414 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" @@ -1918,7 +1915,7 @@ repo = _tmp3_; #line 412 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _g_object_unref0 (_tmp0_); -#line 1922 "gitg-dash-view.c" +#line 1919 "gitg-dash-view.c" } goto __finally74; __catch74_g_error: @@ -1933,13 +1930,12 @@ _tmp4_ = report_errors; #line 418 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" if (_tmp4_) { -#line 1937 "gitg-dash-view.c" +#line 1934 "gitg-dash-view.c" GitgExtApplication* _tmp5_ = NULL; GitgExtApplication* _tmp6_ = NULL; GitgExtApplication* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - GError* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; + GError* _tmp8_ = NULL; + const gchar* _tmp9_ = NULL; #line 420 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _tmp5_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); #line 420 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" @@ -1947,16 +1943,14 @@ #line 420 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _tmp7_ = _tmp6_; #line 420 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp8_ = _ ("Failed to add repository"); + _tmp8_ = err; #line 420 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp9_ = err; + _tmp9_ = _tmp8_->message; #line 420 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp10_ = _tmp9_->message; -#line 420 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - gitg_ext_application_show_infobar (_tmp7_, _tmp8_, _tmp10_, GTK_MESSAGE_ERROR); + gitg_ext_application_show_infobar (_tmp7_, _ ("Failed to add repository"), _tmp9_, GTK_MESSAGE_ERROR); #line 420 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _g_object_unref0 (_tmp7_); -#line 1960 "gitg-dash-view.c" +#line 1954 "gitg-dash-view.c" } #line 423 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _g_error_free0 (err); @@ -1964,7 +1958,7 @@ _g_object_unref0 (repo); #line 423 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return; -#line 1968 "gitg-dash-view.c" +#line 1962 "gitg-dash-view.c" } __finally74: #line 412 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" @@ -1977,15 +1971,15 @@ g_clear_error (&_inner_error_); #line 412 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return; -#line 1981 "gitg-dash-view.c" +#line 1975 "gitg-dash-view.c" } #line 426 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp11_ = repo; + _tmp10_ = repo; #line 426 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - gitg_dash_view_finish_add_repository (self, _tmp11_); + gitg_dash_view_finish_add_repository (self, _tmp10_); #line 408 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _g_object_unref0 (repo); -#line 1989 "gitg-dash-view.c" +#line 1983 "gitg-dash-view.c" } @@ -1994,7 +1988,7 @@ g_atomic_int_inc (&_data44_->_ref_count_); #line 429 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return _data44_; -#line 1998 "gitg-dash-view.c" +#line 1992 "gitg-dash-view.c" } @@ -2003,7 +1997,7 @@ _data44_ = (Block44Data*) _userdata_; #line 429 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" if (g_atomic_int_dec_and_test (&_data44_->_ref_count_)) { -#line 2007 "gitg-dash-view.c" +#line 2001 "gitg-dash-view.c" GitgDashView* self; #line 429 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" self = _data44_->self; @@ -2013,7 +2007,7 @@ _g_object_unref0 (self); #line 429 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_slice_free (Block44Data, _data44_); -#line 2017 "gitg-dash-view.c" +#line 2011 "gitg-dash-view.c" } } @@ -2031,9 +2025,9 @@ _tmp0_ = r; #line 451 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" if (_tmp0_ == GTK_RESPONSE_OK) { -#line 2035 "gitg-dash-view.c" +#line 2029 "gitg-dash-view.c" GitgRepository* repo = NULL; - GitgRepository* _tmp11_ = NULL; + GitgRepository* _tmp10_ = NULL; { GitgRepository* _tmp1_ = NULL; GFile* _tmp2_ = NULL; @@ -2047,7 +2041,7 @@ _tmp1_ = _tmp3_; #line 457 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2051 "gitg-dash-view.c" +#line 2045 "gitg-dash-view.c" goto __catch75_g_error; } #line 457 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" @@ -2060,7 +2054,7 @@ repo = _tmp4_; #line 455 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _g_object_unref0 (_tmp1_); -#line 2064 "gitg-dash-view.c" +#line 2058 "gitg-dash-view.c" } goto __finally75; __catch75_g_error: @@ -2069,9 +2063,8 @@ GitgExtApplication* _tmp5_ = NULL; GitgExtApplication* _tmp6_ = NULL; GitgExtApplication* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - GError* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; + GError* _tmp8_ = NULL; + const gchar* _tmp9_ = NULL; #line 455 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" err = _inner_error_; #line 455 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" @@ -2083,13 +2076,11 @@ #line 461 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _tmp7_ = _tmp6_; #line 461 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp8_ = _ ("Failed to create repository"); -#line 461 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp9_ = err; + _tmp8_ = err; #line 461 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp10_ = _tmp9_->message; + _tmp9_ = _tmp8_->message; #line 461 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - gitg_ext_application_show_infobar (_tmp7_, _tmp8_, _tmp10_, GTK_MESSAGE_ERROR); + gitg_ext_application_show_infobar (_tmp7_, _ ("Failed to create repository"), _tmp9_, GTK_MESSAGE_ERROR); #line 461 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _g_object_unref0 (_tmp7_); #line 462 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" @@ -2100,7 +2091,7 @@ _g_object_unref0 (repo); #line 462 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 2104 "gitg-dash-view.c" +#line 2095 "gitg-dash-view.c" } __finally75: #line 455 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" @@ -2113,21 +2104,21 @@ g_clear_error (&_inner_error_); #line 455 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return FALSE; -#line 2117 "gitg-dash-view.c" +#line 2108 "gitg-dash-view.c" } #line 465 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp11_ = repo; + _tmp10_ = repo; #line 465 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - gitg_dash_view_finish_add_repository (self, _tmp11_); + gitg_dash_view_finish_add_repository (self, _tmp10_); #line 451 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _g_object_unref0 (repo); -#line 2125 "gitg-dash-view.c" +#line 2116 "gitg-dash-view.c" } #line 468 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" result = TRUE; #line 468 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 2131 "gitg-dash-view.c" +#line 2122 "gitg-dash-view.c" } @@ -2136,7 +2127,7 @@ result = __lambda102_ (self, _sender, response_type); #line 450 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 2140 "gitg-dash-view.c" +#line 2131 "gitg-dash-view.c" } @@ -2152,20 +2143,16 @@ const gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - GitgExtUserQueryResponse* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - GitgExtUserQueryResponse* _tmp15_ = NULL; - GitgExtUserQueryResponse** _tmp16_ = NULL; - GitgExtUserQueryResponse** _tmp17_ = NULL; - gint _tmp17__length1 = 0; - GitgExtApplication* _tmp18_ = NULL; - GitgExtApplication* _tmp19_ = NULL; - GitgExtApplication* _tmp20_ = NULL; + gchar* _tmp8_ = NULL; + gchar* _tmp9_ = NULL; + GitgExtUserQueryResponse* _tmp10_ = NULL; + GitgExtUserQueryResponse* _tmp11_ = NULL; + GitgExtUserQueryResponse** _tmp12_ = NULL; + GitgExtUserQueryResponse** _tmp13_ = NULL; + gint _tmp13__length1 = 0; + GitgExtApplication* _tmp14_ = NULL; + GitgExtApplication* _tmp15_ = NULL; + GitgExtApplication* _tmp16_ = NULL; #line 429 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_return_if_fail (self != NULL); #line 429 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" @@ -2203,62 +2190,54 @@ #line 434 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" name = _tmp6_; #line 436 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp7_ = _ ("Create new repository"); -#line 436 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - gitg_ext_user_query_set_title (q, _tmp7_); + gitg_ext_user_query_set_title (q, _ ("Create new repository")); #line 439 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp8_ = _ ("The location %s does not appear to be a valid git repository. W" \ -"ould you like to initialize a new git repository at this location?"); + _tmp7_ = name; #line 439 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp9_ = name; + _tmp8_ = g_strdup_printf (_ ("The location %s does not appear to be a valid git repository. W" \ +"ould you like to initialize a new git repository at this location?"), _tmp7_); #line 439 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp10_ = g_strdup_printf (_tmp8_, _tmp9_); -#line 439 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp11_ = _tmp10_; + _tmp9_ = _tmp8_; #line 439 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - gitg_ext_user_query_set_message (q, _tmp11_); + gitg_ext_user_query_set_message (q, _tmp9_); #line 439 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp9_); #line 440 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gitg_ext_user_query_set_message_type (q, GTK_MESSAGE_QUESTION); #line 441 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gitg_ext_user_query_set_message_use_markup (q, TRUE); #line 443 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp12_ = _ ("_Cancel"); + _tmp10_ = gitg_ext_user_query_response_new (_ ("_Cancel"), GTK_RESPONSE_CANCEL); #line 443 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp13_ = gitg_ext_user_query_response_new (_tmp12_, GTK_RESPONSE_CANCEL); + _tmp11_ = gitg_ext_user_query_response_new (_ ("Create repository"), GTK_RESPONSE_OK); #line 443 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp14_ = _ ("Create repository"); + _tmp12_ = g_new0 (GitgExtUserQueryResponse*, 2 + 1); #line 443 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp15_ = gitg_ext_user_query_response_new (_tmp14_, GTK_RESPONSE_OK); + _tmp12_[0] = _tmp10_; #line 443 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp16_ = g_new0 (GitgExtUserQueryResponse*, 2 + 1); + _tmp12_[1] = _tmp11_; #line 443 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp16_[0] = _tmp13_; + _tmp13_ = _tmp12_; #line 443 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp16_[1] = _tmp15_; + _tmp13__length1 = 2; #line 443 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp17_ = _tmp16_; + gitg_ext_user_query_set_responses (q, _tmp13_, 2); #line 443 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp17__length1 = 2; -#line 443 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - gitg_ext_user_query_set_responses (q, _tmp17_, 2); -#line 443 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp17_ = (_vala_array_free (_tmp17_, _tmp17__length1, (GDestroyNotify) g_object_unref), NULL); + _tmp13_ = (_vala_array_free (_tmp13_, _tmp13__length1, (GDestroyNotify) g_object_unref), NULL); #line 448 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gitg_ext_user_query_set_default_response (q, GTK_RESPONSE_OK); #line 450 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_signal_connect_data (q, "response", (GCallback) ___lambda102__gitg_ext_user_query_response, block44_data_ref (_data44_), (GClosureNotify) block44_data_unref, 0); #line 471 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp18_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); + _tmp14_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) self); #line 471 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp19_ = _tmp18_; + _tmp15_ = _tmp14_; #line 471 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp20_ = _tmp19_; + _tmp16_ = _tmp15_; #line 471 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - gitg_ext_application_user_query (_tmp20_, q); + gitg_ext_application_user_query (_tmp16_, q); #line 471 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp16_); #line 429 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _g_free0 (name); #line 429 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" @@ -2267,7 +2246,7 @@ block44_data_unref (_data44_); #line 429 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _data44_ = NULL; -#line 2270 "gitg-dash-view.c" +#line 2249 "gitg-dash-view.c" } @@ -2307,7 +2286,7 @@ result = TRUE; #line 478 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 2310 "gitg-dash-view.c" +#line 2289 "gitg-dash-view.c" } #line 482 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _tmp7_ = location; @@ -2323,7 +2302,7 @@ _g_object_unref0 (_tmp9_); #line 482 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" if (_tmp11_) { -#line 2326 "gitg-dash-view.c" +#line 2305 "gitg-dash-view.c" GFile* _tmp12_ = NULL; GFile* _tmp13_ = NULL; GFile* _tmp14_ = NULL; @@ -2340,15 +2319,15 @@ _tmp6_ = _tmp15_; #line 483 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _g_object_unref0 (_tmp14_); -#line 2343 "gitg-dash-view.c" +#line 2322 "gitg-dash-view.c" } else { #line 482 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _tmp6_ = FALSE; -#line 2347 "gitg-dash-view.c" +#line 2326 "gitg-dash-view.c" } #line 482 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" if (_tmp6_) { -#line 2351 "gitg-dash-view.c" +#line 2330 "gitg-dash-view.c" GFile* _tmp16_ = NULL; GFile* _tmp17_ = NULL; GFile* _tmp18_ = NULL; @@ -2365,17 +2344,17 @@ _tmp5_ = _tmp19_; #line 484 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _g_object_unref0 (_tmp18_); -#line 2368 "gitg-dash-view.c" +#line 2347 "gitg-dash-view.c" } else { #line 482 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _tmp5_ = FALSE; -#line 2372 "gitg-dash-view.c" +#line 2351 "gitg-dash-view.c" } #line 482 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" result = _tmp5_; #line 482 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 2378 "gitg-dash-view.c" +#line 2357 "gitg-dash-view.c" } @@ -2390,7 +2369,7 @@ _g_object_unref0 (_data_->self); #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_slice_free (GitgDashViewFileExistsAsyncData, _data_); -#line 2393 "gitg-dash-view.c" +#line 2372 "gitg-dash-view.c" } @@ -2429,7 +2408,7 @@ _data_->cancellable = _tmp4_; #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gitg_dash_view_file_exists_async_co (_data_); -#line 2432 "gitg-dash-view.c" +#line 2411 "gitg-dash-view.c" } @@ -2442,7 +2421,7 @@ result = _data_->result; #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 2445 "gitg-dash-view.c" +#line 2424 "gitg-dash-view.c" } @@ -2456,7 +2435,7 @@ _data_->_res_ = _res_; #line 491 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gitg_dash_view_file_exists_async_co (_data_); -#line 2459 "gitg-dash-view.c" +#line 2438 "gitg-dash-view.c" } @@ -2465,16 +2444,16 @@ switch (_data_->_state_) { #line 487 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" case 0: -#line 2468 "gitg-dash-view.c" +#line 2447 "gitg-dash-view.c" goto _state_0; #line 487 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" case 1: -#line 2472 "gitg-dash-view.c" +#line 2451 "gitg-dash-view.c" goto _state_1; default: #line 487 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_assert_not_reached (); -#line 2477 "gitg-dash-view.c" +#line 2456 "gitg-dash-view.c" } _state_0: { @@ -2492,7 +2471,7 @@ g_file_query_info_async (_data_->_tmp1_, G_FILE_ATTRIBUTE_STANDARD_TYPE, G_FILE_QUERY_INFO_NONE, G_PRIORITY_DEFAULT, _data_->_tmp2_, gitg_dash_view_file_exists_async_ready, _data_); #line 491 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return FALSE; -#line 2495 "gitg-dash-view.c" +#line 2474 "gitg-dash-view.c" _state_1: #line 491 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _data_->_tmp3_ = NULL; @@ -2502,7 +2481,7 @@ _data_->_tmp0_ = _data_->_tmp3_; #line 491 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 2505 "gitg-dash-view.c" +#line 2484 "gitg-dash-view.c" goto __catch76_g_error; } #line 491 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" @@ -2529,17 +2508,17 @@ if (_data_->_state_ == 0) { #line 491 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2532 "gitg-dash-view.c" +#line 2511 "gitg-dash-view.c" } else { #line 491 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2536 "gitg-dash-view.c" +#line 2515 "gitg-dash-view.c" } #line 491 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_object_unref (_data_->_async_result); #line 491 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return FALSE; -#line 2542 "gitg-dash-view.c" +#line 2521 "gitg-dash-view.c" } goto __finally76; __catch76_g_error: @@ -2554,17 +2533,17 @@ if (_data_->_state_ == 0) { #line 495 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2557 "gitg-dash-view.c" +#line 2536 "gitg-dash-view.c" } else { #line 495 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2561 "gitg-dash-view.c" +#line 2540 "gitg-dash-view.c" } #line 495 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_object_unref (_data_->_async_result); #line 495 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return FALSE; -#line 2567 "gitg-dash-view.c" +#line 2546 "gitg-dash-view.c" } __finally76: #line 489 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" @@ -2577,17 +2556,17 @@ if (_data_->_state_ == 0) { #line 487 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2580 "gitg-dash-view.c" +#line 2559 "gitg-dash-view.c" } else { #line 487 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2584 "gitg-dash-view.c" +#line 2563 "gitg-dash-view.c" } #line 487 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_object_unref (_data_->_async_result); #line 487 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return FALSE; -#line 2590 "gitg-dash-view.c" +#line 2569 "gitg-dash-view.c" } @@ -2602,7 +2581,7 @@ _g_object_unref0 (_data_->self); #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_slice_free (GitgDashViewScanVisitDirectoryData, _data_); -#line 2605 "gitg-dash-view.c" +#line 2584 "gitg-dash-view.c" } @@ -2644,7 +2623,7 @@ _data_->cancellable = _tmp4_; #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gitg_dash_view_real_scan_visit_directory_co (_data_); -#line 2647 "gitg-dash-view.c" +#line 2626 "gitg-dash-view.c" } @@ -2657,7 +2636,7 @@ result = _data_->result; #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 2660 "gitg-dash-view.c" +#line 2639 "gitg-dash-view.c" } @@ -2671,7 +2650,7 @@ _data_->_res_ = _res_; #line 507 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gitg_dash_view_real_scan_visit_directory_co (_data_); -#line 2674 "gitg-dash-view.c" +#line 2653 "gitg-dash-view.c" } @@ -2680,28 +2659,28 @@ switch (_data_->_state_) { #line 499 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" case 0: -#line 2683 "gitg-dash-view.c" +#line 2662 "gitg-dash-view.c" goto _state_0; #line 499 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" case 1: -#line 2687 "gitg-dash-view.c" +#line 2666 "gitg-dash-view.c" goto _state_1; #line 499 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" case 2: -#line 2691 "gitg-dash-view.c" +#line 2670 "gitg-dash-view.c" goto _state_2; #line 499 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" case 3: -#line 2695 "gitg-dash-view.c" +#line 2674 "gitg-dash-view.c" goto _state_3; #line 499 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" case 4: -#line 2699 "gitg-dash-view.c" +#line 2678 "gitg-dash-view.c" goto _state_4; default: #line 499 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_assert_not_reached (); -#line 2704 "gitg-dash-view.c" +#line 2683 "gitg-dash-view.c" } _state_0: #line 501 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" @@ -2720,11 +2699,11 @@ _data_->_tmp3_ = g_cancellable_is_cancelled (_data_->_tmp2_); #line 501 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _data_->_tmp0_ = _data_->_tmp3_; -#line 2723 "gitg-dash-view.c" +#line 2702 "gitg-dash-view.c" } else { #line 501 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _data_->_tmp0_ = FALSE; -#line 2727 "gitg-dash-view.c" +#line 2706 "gitg-dash-view.c" } #line 501 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" if (_data_->_tmp0_) { @@ -2734,17 +2713,17 @@ if (_data_->_state_ == 0) { #line 503 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2737 "gitg-dash-view.c" +#line 2716 "gitg-dash-view.c" } else { #line 503 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2741 "gitg-dash-view.c" +#line 2720 "gitg-dash-view.c" } #line 503 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_object_unref (_data_->_async_result); #line 503 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return FALSE; -#line 2747 "gitg-dash-view.c" +#line 2726 "gitg-dash-view.c" } #line 507 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _data_->_tmp4_ = NULL; @@ -2768,7 +2747,7 @@ gitg_dash_view_file_exists_async (_data_->self, _data_->_tmp6_, _data_->_tmp7_, gitg_dash_view_scan_visit_directory_ready, _data_); #line 507 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return FALSE; -#line 2771 "gitg-dash-view.c" +#line 2750 "gitg-dash-view.c" _state_1: #line 507 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _data_->_tmp8_ = FALSE; @@ -2794,17 +2773,17 @@ if (_data_->_state_ == 0) { #line 510 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2797 "gitg-dash-view.c" +#line 2776 "gitg-dash-view.c" } else { #line 510 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2801 "gitg-dash-view.c" +#line 2780 "gitg-dash-view.c" } #line 510 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_object_unref (_data_->_async_result); #line 510 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return FALSE; -#line 2807 "gitg-dash-view.c" +#line 2786 "gitg-dash-view.c" } #line 514 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _data_->_tmp13_ = NULL; @@ -2828,7 +2807,7 @@ gitg_dash_view_file_exists_async (_data_->self, _data_->_tmp15_, _data_->_tmp16_, gitg_dash_view_scan_visit_directory_ready, _data_); #line 514 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return FALSE; -#line 2831 "gitg-dash-view.c" +#line 2810 "gitg-dash-view.c" _state_2: #line 514 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _data_->_tmp17_ = FALSE; @@ -2864,7 +2843,7 @@ gitg_dash_view_file_exists_async (_data_->self, _data_->_tmp21_, _data_->_tmp22_, gitg_dash_view_scan_visit_directory_ready, _data_); #line 515 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return FALSE; -#line 2867 "gitg-dash-view.c" +#line 2846 "gitg-dash-view.c" _state_3: #line 515 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _data_->_tmp23_ = FALSE; @@ -2874,11 +2853,11 @@ _data_->_tmp12_ = _data_->_tmp23_; #line 515 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _g_object_unref0 (_data_->_tmp21_); -#line 2877 "gitg-dash-view.c" +#line 2856 "gitg-dash-view.c" } else { #line 514 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _data_->_tmp12_ = FALSE; -#line 2881 "gitg-dash-view.c" +#line 2860 "gitg-dash-view.c" } #line 514 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" if (_data_->_tmp12_) { @@ -2904,7 +2883,7 @@ gitg_dash_view_file_exists_async (_data_->self, _data_->_tmp26_, _data_->_tmp27_, gitg_dash_view_scan_visit_directory_ready, _data_); #line 516 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return FALSE; -#line 2907 "gitg-dash-view.c" +#line 2886 "gitg-dash-view.c" _state_4: #line 516 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _data_->_tmp28_ = FALSE; @@ -2914,11 +2893,11 @@ _data_->_tmp11_ = _data_->_tmp28_; #line 516 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _g_object_unref0 (_data_->_tmp26_); -#line 2917 "gitg-dash-view.c" +#line 2896 "gitg-dash-view.c" } else { #line 514 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _data_->_tmp11_ = FALSE; -#line 2921 "gitg-dash-view.c" +#line 2900 "gitg-dash-view.c" } #line 514 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" if (_data_->_tmp11_) { @@ -2934,17 +2913,17 @@ if (_data_->_state_ == 0) { #line 519 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2937 "gitg-dash-view.c" +#line 2916 "gitg-dash-view.c" } else { #line 519 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2941 "gitg-dash-view.c" +#line 2920 "gitg-dash-view.c" } #line 519 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_object_unref (_data_->_async_result); #line 519 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return FALSE; -#line 2947 "gitg-dash-view.c" +#line 2926 "gitg-dash-view.c" } #line 522 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _data_->_tmp30_ = NULL; @@ -2960,11 +2939,11 @@ if (_data_->_state_ == 0) { #line 522 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2963 "gitg-dash-view.c" +#line 2942 "gitg-dash-view.c" } else { #line 522 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2967 "gitg-dash-view.c" +#line 2946 "gitg-dash-view.c" } #line 522 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_object_unref (_data_->_async_result); @@ -2974,17 +2953,17 @@ if (_data_->_state_ == 0) { #line 499 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2977 "gitg-dash-view.c" +#line 2956 "gitg-dash-view.c" } else { #line 499 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2981 "gitg-dash-view.c" +#line 2960 "gitg-dash-view.c" } #line 499 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_object_unref (_data_->_async_result); #line 499 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return FALSE; -#line 2987 "gitg-dash-view.c" +#line 2966 "gitg-dash-view.c" } @@ -2993,7 +2972,7 @@ g_atomic_int_inc (&_data45_->_ref_count_); #line 525 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return _data45_; -#line 2996 "gitg-dash-view.c" +#line 2975 "gitg-dash-view.c" } @@ -3002,7 +2981,7 @@ _data45_ = (Block45Data*) _userdata_; #line 525 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" if (g_atomic_int_dec_and_test (&_data45_->_ref_count_)) { -#line 3005 "gitg-dash-view.c" +#line 2984 "gitg-dash-view.c" GitgDashView* self; #line 525 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" self = _data45_->self; @@ -3014,7 +2993,7 @@ _g_object_unref0 (self); #line 525 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_slice_free (Block45Data, _data45_); -#line 3017 "gitg-dash-view.c" +#line 2996 "gitg-dash-view.c" } } @@ -3025,14 +3004,14 @@ self = _data45_->self; #line 539 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_cancellable_cancel (_data45_->cancellable); -#line 3028 "gitg-dash-view.c" +#line 3007 "gitg-dash-view.c" } static void ___lambda95__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { #line 538 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" __lambda95_ (self); -#line 3035 "gitg-dash-view.c" +#line 3014 "gitg-dash-view.c" } @@ -3048,7 +3027,7 @@ if (_tmp0_ == ((guint) 0)) { #line 547 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gtk_widget_destroy ((GtkWidget*) _data45_->dlg); -#line 3051 "gitg-dash-view.c" +#line 3030 "gitg-dash-view.c" } #line 550 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _data45_->timeout_id = (guint) 0; @@ -3056,7 +3035,7 @@ result = FALSE; #line 551 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 3059 "gitg-dash-view.c" +#line 3038 "gitg-dash-view.c" } @@ -3065,7 +3044,7 @@ result = __lambda96_ (self); #line 544 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 3068 "gitg-dash-view.c" +#line 3047 "gitg-dash-view.c" } @@ -3080,11 +3059,11 @@ if (_tmp0_ != ((guint) 0)) { #line 557 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _data45_->timeout_id = (guint) 0; -#line 3083 "gitg-dash-view.c" +#line 3062 "gitg-dash-view.c" } else { #line 561 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gtk_widget_destroy ((GtkWidget*) _data45_->dlg); -#line 3087 "gitg-dash-view.c" +#line 3066 "gitg-dash-view.c" } } @@ -3094,7 +3073,7 @@ __lambda97_ (self); #line 554 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" block45_data_unref (self); -#line 3097 "gitg-dash-view.c" +#line 3076 "gitg-dash-view.c" } @@ -3104,19 +3083,18 @@ GitgExtApplication* _tmp1_ = NULL; GtkWindow* _tmp2_ = NULL; GtkWindow* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; + GFile* _tmp4_ = NULL; + gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; + GtkMessageDialog* _tmp7_ = NULL; GtkMessageDialog* _tmp8_ = NULL; - GtkMessageDialog* _tmp9_ = NULL; - GCancellable* _tmp10_ = NULL; - guint _tmp11_ = 0U; - GFile* _tmp12_ = NULL; - GdkWindow* _tmp13_ = NULL; - GdkDisplay* _tmp14_ = NULL; + GCancellable* _tmp9_ = NULL; + guint _tmp10_ = 0U; + GFile* _tmp11_ = NULL; + GdkWindow* _tmp12_ = NULL; + GdkDisplay* _tmp13_ = NULL; + GdkCursor* _tmp14_ = NULL; GdkCursor* _tmp15_ = NULL; - GdkCursor* _tmp16_ = NULL; #line 525 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_return_if_fail (self != NULL); #line 525 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" @@ -3137,67 +3115,65 @@ if (_tmp2_ == NULL) { #line 527 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _g_object_unref0 (_tmp1_); -#line 3140 "gitg-dash-view.c" +#line 3118 "gitg-dash-view.c" } #line 527 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _tmp3_ = _tmp2_; #line 527 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp4_ = _ ("Scanning for repositories in %s"); + _tmp4_ = location; #line 527 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp5_ = location; + _tmp5_ = gitg_utils_replace_home_dir_with_tilde (_tmp4_); #line 527 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp6_ = gitg_utils_replace_home_dir_with_tilde (_tmp5_); + _tmp6_ = _tmp5_; #line 527 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp7_ = _tmp6_; + _tmp7_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp3_, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_CANCEL, _ ("Scanning for repositories in %s"), _tmp6_); #line 527 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp8_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp3_, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_CANCEL, _tmp4_, _tmp7_); + g_object_ref_sink (_tmp7_); #line 527 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - g_object_ref_sink (_tmp8_); + _tmp8_ = _tmp7_; #line 527 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp9_ = _tmp8_; -#line 527 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 527 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _g_object_unref0 (_tmp3_); #line 527 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _data45_->dlg = _tmp9_; + _data45_->dlg = _tmp8_; #line 534 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gtk_dialog_set_default_response ((GtkDialog*) _data45_->dlg, (gint) GTK_RESPONSE_CANCEL); #line 536 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp10_ = g_cancellable_new (); + _tmp9_ = g_cancellable_new (); #line 536 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _data45_->cancellable = _tmp10_; + _data45_->cancellable = _tmp9_; #line 538 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_signal_connect_data ((GtkDialog*) _data45_->dlg, "response", (GCallback) ___lambda95__gtk_dialog_response, block45_data_ref (_data45_), (GClosureNotify) block45_data_unref, 0); #line 542 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _data45_->timeout_id = (guint) 0; #line 544 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp11_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda96__gsource_func, block45_data_ref (_data45_), block45_data_unref); + _tmp10_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda96__gsource_func, block45_data_ref (_data45_), block45_data_unref); #line 544 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _data45_->timeout_id = _tmp11_; + _data45_->timeout_id = _tmp10_; #line 554 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp12_ = location; + _tmp11_ = location; #line 554 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - gitg_recursive_scanner_scan ((GitgRecursiveScanner*) self, _tmp12_, _data45_->cancellable, ___lambda97__gasync_ready_callback, block45_data_ref (_data45_)); + gitg_recursive_scanner_scan ((GitgRecursiveScanner*) self, _tmp11_, _data45_->cancellable, ___lambda97__gasync_ready_callback, block45_data_ref (_data45_)); #line 565 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gtk_widget_show ((GtkWidget*) _data45_->dlg); #line 566 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp13_ = gtk_widget_get_window ((GtkWidget*) _data45_->dlg); + _tmp12_ = gtk_widget_get_window ((GtkWidget*) _data45_->dlg); #line 566 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp14_ = gtk_widget_get_display ((GtkWidget*) self); + _tmp13_ = gtk_widget_get_display ((GtkWidget*) self); #line 566 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp15_ = gdk_cursor_new_for_display (_tmp14_, GDK_WATCH); + _tmp14_ = gdk_cursor_new_for_display (_tmp13_, GDK_WATCH); #line 566 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 566 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - gdk_window_set_cursor (_tmp13_, _tmp16_); + gdk_window_set_cursor (_tmp12_, _tmp15_); #line 566 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp15_); #line 525 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" block45_data_unref (_data45_); #line 525 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _data45_ = NULL; -#line 3200 "gitg-dash-view.c" +#line 3176 "gitg-dash-view.c" } @@ -3211,13 +3187,13 @@ _tmp0_ = scan_all; #line 571 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" if (_tmp0_) { -#line 3214 "gitg-dash-view.c" +#line 3190 "gitg-dash-view.c" GFile* _tmp1_ = NULL; #line 573 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _tmp1_ = location; #line 573 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gitg_dash_view_add_repositories_scan (self, _tmp1_); -#line 3220 "gitg-dash-view.c" +#line 3196 "gitg-dash-view.c" } else { GFile* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; @@ -3227,20 +3203,20 @@ _tmp3_ = gitg_dash_view_looks_like_git (self, _tmp2_); #line 575 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" if (!_tmp3_) { -#line 3230 "gitg-dash-view.c" +#line 3206 "gitg-dash-view.c" GFile* _tmp4_ = NULL; #line 577 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _tmp4_ = location; #line 577 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gitg_dash_view_query_create_repository (self, _tmp4_); -#line 3236 "gitg-dash-view.c" +#line 3212 "gitg-dash-view.c" } else { GFile* _tmp5_ = NULL; #line 581 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _tmp5_ = location; #line 581 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gitg_dash_view_do_add_repository (self, _tmp5_, TRUE); -#line 3243 "gitg-dash-view.c" +#line 3219 "gitg-dash-view.c" } } } @@ -3252,14 +3228,14 @@ self = (GitgDashView*) g_object_new (object_type, NULL); #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return self; -#line 3255 "gitg-dash-view.c" +#line 3231 "gitg-dash-view.c" } GitgDashView* gitg_dash_view_new (void) { #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return gitg_dash_view_construct (GITG_TYPE_DASH_VIEW); -#line 3262 "gitg-dash-view.c" +#line 3238 "gitg-dash-view.c" } @@ -3278,27 +3254,31 @@ result = _tmp1_; #line 28 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 3281 "gitg-dash-view.c" +#line 3257 "gitg-dash-view.c" } static void gitg_dash_view_real_set_application (GitgExtUIElement* base, GitgExtApplication* value) { GitgDashView* self; - GitgExtApplication* _tmp0_ = NULL; - GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" self = (GitgDashView*) base; #line 28 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp0_ = value; + if (gitg_dash_view_real_get_application (self) != value) { +#line 3267 "gitg-dash-view.c" + GitgExtApplication* _tmp0_ = NULL; + GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _g_object_unref0 (self->priv->_application); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 28 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - self->priv->_application = _tmp1_; + _g_object_unref0 (self->priv->_application); #line 28 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - g_object_notify ((GObject *) self, "application"); -#line 3301 "gitg-dash-view.c" + self->priv->_application = _tmp1_; +#line 28 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" + g_object_notify ((GObject *) self, "application"); +#line 3280 "gitg-dash-view.c" + } } @@ -3320,118 +3300,119 @@ switch (_tmp2_) { #line 51 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" case GITG_SELECTION_MODE_NORMAL: -#line 3323 "gitg-dash-view.c" +#line 3303 "gitg-dash-view.c" { #line 54 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" result = GITG_EXT_SELECTION_MODE_NORMAL; #line 54 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 3329 "gitg-dash-view.c" +#line 3309 "gitg-dash-view.c" } #line 51 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" case GITG_SELECTION_MODE_SELECTION: -#line 3333 "gitg-dash-view.c" +#line 3313 "gitg-dash-view.c" { #line 56 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" result = GITG_EXT_SELECTION_MODE_SELECTION; #line 56 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 3339 "gitg-dash-view.c" +#line 3319 "gitg-dash-view.c" } default: #line 51 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" break; -#line 3344 "gitg-dash-view.c" +#line 3324 "gitg-dash-view.c" } #line 59 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" result = GITG_EXT_SELECTION_MODE_NORMAL; #line 59 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 3350 "gitg-dash-view.c" +#line 3330 "gitg-dash-view.c" } static void gitg_dash_view_real_set_selectable_mode (GitgExtSelectable* base, GitgExtSelectionMode value) { GitgDashView* self; - GitgExtSelectionMode _tmp0_ = 0; - GitgExtSelectionMode _tmp1_ = 0; - GitgExtSelectionMode _tmp2_ = 0; - GitgExtSelectionMode _tmp3_ = 0; #line 62 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" self = (GitgDashView*) base; +#line 62 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" + if (gitg_dash_view_real_get_selectable_mode (self) != value) { +#line 3340 "gitg-dash-view.c" + GitgExtSelectionMode _tmp0_ = 0; + GitgExtSelectionMode _tmp1_ = 0; + GitgExtSelectionMode _tmp2_ = 0; + GitgExtSelectionMode _tmp3_ = 0; #line 64 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp0_ = gitg_ext_selectable_get_selectable_mode ((GitgExtSelectable*) self); + _tmp0_ = gitg_ext_selectable_get_selectable_mode ((GitgExtSelectable*) self); #line 64 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp1_ = _tmp0_; + _tmp1_ = _tmp0_; #line 64 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp2_ = value; + _tmp2_ = value; #line 64 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - if (_tmp1_ == _tmp2_) { + if (_tmp1_ == _tmp2_) { #line 66 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - return; -#line 3372 "gitg-dash-view.c" - } + return; +#line 3355 "gitg-dash-view.c" + } #line 69 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - self->priv->d_setting_mode = TRUE; + self->priv->d_setting_mode = TRUE; #line 71 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp3_ = value; + _tmp3_ = value; #line 71 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - switch (_tmp3_) { + switch (_tmp3_) { #line 71 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - case GITG_EXT_SELECTION_MODE_NORMAL: -#line 3382 "gitg-dash-view.c" - { - GitgRepositoryListBox* _tmp4_ = NULL; + case GITG_EXT_SELECTION_MODE_NORMAL: +#line 3365 "gitg-dash-view.c" + { + GitgRepositoryListBox* _tmp4_ = NULL; #line 74 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp4_ = self->priv->d_repository_list_box; + _tmp4_ = self->priv->d_repository_list_box; #line 74 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - gitg_repository_list_box_set_mode (_tmp4_, GITG_SELECTION_MODE_NORMAL); + gitg_repository_list_box_set_mode (_tmp4_, GITG_SELECTION_MODE_NORMAL); #line 75 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - break; -#line 3391 "gitg-dash-view.c" - } + break; +#line 3374 "gitg-dash-view.c" + } #line 71 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - case GITG_EXT_SELECTION_MODE_SELECTION: -#line 3395 "gitg-dash-view.c" - { - GitgRepositoryListBox* _tmp5_ = NULL; + case GITG_EXT_SELECTION_MODE_SELECTION: +#line 3378 "gitg-dash-view.c" + { + GitgRepositoryListBox* _tmp5_ = NULL; #line 77 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp5_ = self->priv->d_repository_list_box; + _tmp5_ = self->priv->d_repository_list_box; #line 77 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - gitg_repository_list_box_set_mode (_tmp5_, GITG_SELECTION_MODE_SELECTION); + gitg_repository_list_box_set_mode (_tmp5_, GITG_SELECTION_MODE_SELECTION); #line 78 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" + break; +#line 3387 "gitg-dash-view.c" + } + default: +#line 71 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" break; -#line 3404 "gitg-dash-view.c" +#line 3392 "gitg-dash-view.c" } - default: -#line 71 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - break; -#line 3409 "gitg-dash-view.c" - } #line 81 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - self->priv->d_setting_mode = FALSE; + self->priv->d_setting_mode = FALSE; #line 62 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - g_object_notify ((GObject *) self, "selectable-mode"); -#line 3415 "gitg-dash-view.c" + g_object_notify ((GObject *) self, "selectable-mode"); +#line 3398 "gitg-dash-view.c" + } } static gchar* gitg_dash_view_real_get_selectable_mode_tooltip (GitgExtSelectable* base) { gchar* result; GitgDashView* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 87 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" self = (GitgDashView*) base; #line 87 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp0_ = _ ("Select and manage projects"); + _tmp0_ = g_strdup (_ ("Select and manage projects")); #line 87 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 87 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - result = _tmp1_; + result = _tmp0_; #line 87 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 3434 "gitg-dash-view.c" +#line 3415 "gitg-dash-view.c" } @@ -3460,7 +3441,7 @@ result = _tmp4_; #line 92 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 3463 "gitg-dash-view.c" +#line 3444 "gitg-dash-view.c" } @@ -3479,7 +3460,7 @@ result = _tmp1_; #line 97 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 3482 "gitg-dash-view.c" +#line 3463 "gitg-dash-view.c" } @@ -3498,7 +3479,7 @@ result = _tmp1_; #line 102 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 3501 "gitg-dash-view.c" +#line 3482 "gitg-dash-view.c" } @@ -3514,7 +3495,7 @@ result = _tmp0_; #line 107 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 3517 "gitg-dash-view.c" +#line 3498 "gitg-dash-view.c" } @@ -3530,7 +3511,7 @@ result = _tmp0_; #line 112 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 3533 "gitg-dash-view.c" +#line 3514 "gitg-dash-view.c" } @@ -3546,7 +3527,7 @@ result = _tmp0_; #line 117 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 3549 "gitg-dash-view.c" +#line 3530 "gitg-dash-view.c" } @@ -3562,7 +3543,7 @@ result = _tmp0_; #line 122 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 3565 "gitg-dash-view.c" +#line 3546 "gitg-dash-view.c" } @@ -3575,7 +3556,7 @@ result = NULL; #line 127 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 3578 "gitg-dash-view.c" +#line 3559 "gitg-dash-view.c" } @@ -3594,40 +3575,44 @@ result = _tmp1_; #line 134 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 3597 "gitg-dash-view.c" +#line 3578 "gitg-dash-view.c" } static void gitg_dash_view_real_set_search_text (GitgExtSearchable* base, const gchar* value) { GitgDashView* self; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; #line 136 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" self = (GitgDashView*) base; +#line 136 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" + if (g_strcmp0 (value, gitg_dash_view_real_get_search_text (self)) != 0) { +#line 3588 "gitg-dash-view.c" + const gchar* _tmp0_ = NULL; + const gchar* _tmp1_ = NULL; #line 138 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp0_ = self->priv->d_search_text; + _tmp0_ = self->priv->d_search_text; #line 138 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp1_ = value; + _tmp1_ = value; #line 138 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - if (g_strcmp0 (_tmp0_, _tmp1_) != 0) { -#line 3613 "gitg-dash-view.c" - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + if (g_strcmp0 (_tmp0_, _tmp1_) != 0) { +#line 3597 "gitg-dash-view.c" + const gchar* _tmp2_ = NULL; + gchar* _tmp3_ = NULL; #line 140 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp2_ = value; + _tmp2_ = value; #line 140 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp3_ = g_strdup (_tmp2_); #line 140 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _g_free0 (self->priv->d_search_text); + _g_free0 (self->priv->d_search_text); #line 140 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - self->priv->d_search_text = _tmp3_; + self->priv->d_search_text = _tmp3_; #line 141 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - gitg_dash_view_update_search_text (self); -#line 3626 "gitg-dash-view.c" - } + gitg_dash_view_update_search_text (self); +#line 3610 "gitg-dash-view.c" + } #line 136 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - g_object_notify ((GObject *) self, "search-text"); -#line 3630 "gitg-dash-view.c" + g_object_notify ((GObject *) self, "search-text"); +#line 3614 "gitg-dash-view.c" + } } @@ -3637,7 +3622,7 @@ self = (GitgDashView*) base; #line 150 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_object_notify ((GObject *) self, "search-entry"); -#line 3640 "gitg-dash-view.c" +#line 3625 "gitg-dash-view.c" } @@ -3653,22 +3638,26 @@ result = _tmp0_; #line 153 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 3656 "gitg-dash-view.c" +#line 3641 "gitg-dash-view.c" } static void gitg_dash_view_real_set_search_visible (GitgExtSearchable* base, gboolean value) { GitgDashView* self; - gboolean _tmp0_ = FALSE; #line 153 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" self = (GitgDashView*) base; #line 153 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp0_ = value; + if (gitg_dash_view_real_get_search_visible (self) != value) { +#line 3651 "gitg-dash-view.c" + gboolean _tmp0_ = FALSE; #line 153 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - self->priv->_search_visible = _tmp0_; + _tmp0_ = value; #line 153 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - g_object_notify ((GObject *) self, "search-visible"); -#line 3671 "gitg-dash-view.c" + self->priv->_search_visible = _tmp0_; +#line 153 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" + g_object_notify ((GObject *) self, "search-visible"); +#line 3659 "gitg-dash-view.c" + } } @@ -3686,7 +3675,7 @@ _tmp2_ = _tmp1_; #line 183 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _tmp2__length1 = _tmp1__length1; -#line 3689 "gitg-dash-view.c" +#line 3678 "gitg-dash-view.c" { GitgRepositoryListBoxRow** sel_collection = NULL; gint sel_collection_length1 = 0; @@ -3698,14 +3687,14 @@ sel_collection_length1 = _tmp2__length1; #line 183 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" for (sel_it = 0; sel_it < _tmp2__length1; sel_it = sel_it + 1) { -#line 3701 "gitg-dash-view.c" +#line 3690 "gitg-dash-view.c" GitgRepositoryListBoxRow* _tmp3_ = NULL; GitgRepositoryListBoxRow* sel = NULL; #line 183 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _tmp3_ = _g_object_ref0 (sel_collection[sel_it]); #line 183 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" sel = _tmp3_; -#line 3708 "gitg-dash-view.c" +#line 3697 "gitg-dash-view.c" { GitgRepositoryListBoxRow* _tmp4_ = NULL; #line 185 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" @@ -3714,23 +3703,23 @@ g_signal_emit_by_name (_tmp4_, "request-remove"); #line 183 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _g_object_unref0 (sel); -#line 3717 "gitg-dash-view.c" +#line 3706 "gitg-dash-view.c" } } #line 183 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" sel_collection = (_vala_array_free (sel_collection, sel_collection_length1, (GDestroyNotify) g_object_unref), NULL); -#line 3722 "gitg-dash-view.c" +#line 3711 "gitg-dash-view.c" } #line 188 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gitg_ext_selectable_set_selectable_mode ((GitgExtSelectable*) self, GITG_EXT_SELECTION_MODE_NORMAL); -#line 3726 "gitg-dash-view.c" +#line 3715 "gitg-dash-view.c" } static void __gitg_dash_view_action_widget___lambda103__gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 182 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _gitg_dash_view_action_widget___lambda103_ ((GitgDashView*) self); -#line 3733 "gitg-dash-view.c" +#line 3722 "gitg-dash-view.c" } @@ -3740,10 +3729,9 @@ GtkActionBar* ab = NULL; GtkActionBar* _tmp0_ = NULL; GtkButton* remove_button = NULL; - const gchar* _tmp1_ = NULL; - GtkButton* _tmp2_ = NULL; - GtkStyleContext* _tmp3_ = NULL; - GitgRepositoryListBox* _tmp4_ = NULL; + GtkButton* _tmp1_ = NULL; + GtkStyleContext* _tmp2_ = NULL; + GitgRepositoryListBox* _tmp3_ = NULL; #line 172 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" self = (GitgDashView*) base; #line 174 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" @@ -3753,17 +3741,15 @@ #line 174 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" ab = _tmp0_; #line 176 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp1_ = _ ("_Remove"); + _tmp1_ = (GtkButton*) gtk_button_new_with_mnemonic (_ ("_Remove")); #line 176 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp2_ = (GtkButton*) gtk_button_new_with_mnemonic (_tmp1_); + g_object_ref_sink (_tmp1_); #line 176 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - g_object_ref_sink (_tmp2_); -#line 176 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - remove_button = _tmp2_; + remove_button = _tmp1_; #line 177 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp3_ = gtk_widget_get_style_context ((GtkWidget*) remove_button); + _tmp2_ = gtk_widget_get_style_context ((GtkWidget*) remove_button); #line 177 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - gtk_style_context_add_class (_tmp3_, GTK_STYLE_CLASS_DESTRUCTIVE_ACTION); + gtk_style_context_add_class (_tmp2_, GTK_STYLE_CLASS_DESTRUCTIVE_ACTION); #line 179 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gtk_widget_set_sensitive ((GtkWidget*) remove_button, FALSE); #line 180 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" @@ -3771,9 +3757,9 @@ #line 182 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_signal_connect_object (remove_button, "clicked", (GCallback) __gitg_dash_view_action_widget___lambda103__gtk_button_clicked, self, 0); #line 191 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp4_ = self->priv->d_repository_list_box; + _tmp3_ = self->priv->d_repository_list_box; #line 191 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - g_object_bind_property_with_closures ((GObject*) _tmp4_, "has-selection", (GObject*) remove_button, "sensitive", G_BINDING_DEFAULT, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); + g_object_bind_property_with_closures ((GObject*) _tmp3_, "has-selection", (GObject*) remove_button, "sensitive", G_BINDING_DEFAULT, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); #line 193 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gtk_action_bar_pack_end (ab, (GtkWidget*) remove_button); #line 195 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" @@ -3782,7 +3768,7 @@ _g_object_unref0 (remove_button); #line 195 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 3785 "gitg-dash-view.c" +#line 3771 "gitg-dash-view.c" } @@ -3791,7 +3777,7 @@ g_atomic_int_inc (&_data46_->_ref_count_); #line 200 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return _data46_; -#line 3794 "gitg-dash-view.c" +#line 3780 "gitg-dash-view.c" } @@ -3800,7 +3786,7 @@ _data46_ = (Block46Data*) _userdata_; #line 200 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" if (g_atomic_int_dec_and_test (&_data46_->_ref_count_)) { -#line 3803 "gitg-dash-view.c" +#line 3789 "gitg-dash-view.c" GitgDashView* self; #line 200 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" self = _data46_->self; @@ -3810,7 +3796,7 @@ _g_object_unref0 (self); #line 200 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_slice_free (Block46Data, _data46_); -#line 3813 "gitg-dash-view.c" +#line 3799 "gitg-dash-view.c" } } @@ -3823,7 +3809,7 @@ if (!_tmp0_) { #line 205 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_object_notify ((GObject*) self, "selectable-mode"); -#line 3826 "gitg-dash-view.c" +#line 3812 "gitg-dash-view.c" } } @@ -3831,7 +3817,7 @@ static void __gitg_dash_view___lambda104__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 202 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _gitg_dash_view___lambda104_ ((GitgDashView*) self); -#line 3834 "gitg-dash-view.c" +#line 3820 "gitg-dash-view.c" } @@ -3854,14 +3840,14 @@ gitg_ext_application_set_repository (_tmp2_, _tmp3_); #line 210 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _g_object_unref0 (_tmp2_); -#line 3857 "gitg-dash-view.c" +#line 3843 "gitg-dash-view.c" } static void __gitg_dash_view___lambda105__gitg_repository_list_box_repository_activated (GitgRepositoryListBox* _sender, GitgRepository* repository, gpointer self) { #line 209 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _gitg_dash_view___lambda105_ ((GitgDashView*) self, repository); -#line 3864 "gitg-dash-view.c" +#line 3850 "gitg-dash-view.c" } @@ -3889,28 +3875,28 @@ gitg_ext_application_show_infobar (_tmp2_, _tmp3_, _tmp4_, GTK_MESSAGE_ERROR); #line 214 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _g_object_unref0 (_tmp2_); -#line 3892 "gitg-dash-view.c" +#line 3878 "gitg-dash-view.c" } static void __gitg_dash_view___lambda106__gitg_repository_list_box_show_error (GitgRepositoryListBox* _sender, const gchar* primary_message, const gchar* secondary_message, gpointer self) { #line 213 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _gitg_dash_view___lambda106_ ((GitgDashView*) self, primary_message, secondary_message); -#line 3899 "gitg-dash-view.c" +#line 3885 "gitg-dash-view.c" } static void _gitg_dash_view_update_availability_gtk_container_add (GtkContainer* _sender, GtkWidget* widget, gpointer self) { #line 228 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gitg_dash_view_update_availability ((GitgDashView*) self); -#line 3906 "gitg-dash-view.c" +#line 3892 "gitg-dash-view.c" } static void _gitg_dash_view_update_availability_gtk_container_remove (GtkContainer* _sender, GtkWidget* widget, gpointer self) { #line 229 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gitg_dash_view_update_availability ((GitgDashView*) self); -#line 3913 "gitg-dash-view.c" +#line 3899 "gitg-dash-view.c" } @@ -3959,14 +3945,14 @@ _gitg_when_mapped_unref0 (_data46_->whenMapped); #line 244 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _data46_->whenMapped = NULL; -#line 3962 "gitg-dash-view.c" +#line 3948 "gitg-dash-view.c" } static void __gitg_dash_view___lambda107__gitg_when_mapped_on_mapped (gpointer self) { #line 240 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _gitg_dash_view___lambda107_ (self); -#line 3969 "gitg-dash-view.c" +#line 3955 "gitg-dash-view.c" } @@ -3983,15 +3969,13 @@ GitgRepositoryListBox* _tmp5_ = NULL; GitgRepositoryListBox* _tmp6_ = NULL; GtkLabel* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; + gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - GtkLabel* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - GitgWhenMapped* _tmp15_ = NULL; - GitgWhenMapped* _tmp16_ = NULL; + GtkLabel* _tmp10_ = NULL; + gchar* _tmp11_ = NULL; + gchar* _tmp12_ = NULL; + GitgWhenMapped* _tmp13_ = NULL; + GitgWhenMapped* _tmp14_ = NULL; #line 200 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" parent_class = G_OBJECT_CLASS (gitg_dash_view_parent_class); #line 200 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" @@ -4035,44 +4019,40 @@ #line 232 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _tmp7_ = self->priv->d_label_scan; #line 232 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp8_ = _ ("We can also %sscan your home directory%s for git repositories."); + _tmp8_ = g_strdup_printf (_ ("We can also %sscan your home directory%s for git repositories."), "", ""); #line 232 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp9_ = g_strdup_printf (_tmp8_, "", ""); -#line 232 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 232 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - gtk_label_set_label (_tmp7_, _tmp10_); + gtk_label_set_label (_tmp7_, _tmp9_); #line 232 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _g_free0 (_tmp10_); -#line 235 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp11_ = self->priv->d_label_profile; + _g_free0 (_tmp9_); #line 235 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp12_ = _ ("In the mean time, you may want to %sset up your git profile%s."); + _tmp10_ = self->priv->d_label_profile; #line 235 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp13_ = g_strdup_printf (_tmp12_, "", ""); + _tmp11_ = g_strdup_printf (_ ("In the mean time, you may want to %sset up your git profile%s."), "", ""); #line 235 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 235 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - gtk_label_set_label (_tmp11_, _tmp14_); + gtk_label_set_label (_tmp10_, _tmp12_); #line 235 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _g_free0 (_tmp14_); + _g_free0 (_tmp12_); #line 236 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gitg_dash_view_update_setup_profile_visibility (self); #line 238 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp15_ = gitg_when_mapped_new ((GtkWidget*) self); + _tmp13_ = gitg_when_mapped_new ((GtkWidget*) self); #line 238 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _data46_->whenMapped = _tmp15_; + _data46_->whenMapped = _tmp13_; #line 240 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - _tmp16_ = _data46_->whenMapped; + _tmp14_ = _data46_->whenMapped; #line 240 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - gitg_when_mapped_update (_tmp16_, __gitg_dash_view___lambda107__gitg_when_mapped_on_mapped, block46_data_ref (_data46_), block46_data_unref, NULL); + gitg_when_mapped_update (_tmp14_, __gitg_dash_view___lambda107__gitg_when_mapped_on_mapped, block46_data_ref (_data46_), block46_data_unref, NULL); #line 200 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" block46_data_unref (_data46_); #line 200 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _data46_ = NULL; #line 200 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return obj; -#line 4075 "gitg-dash-view.c" +#line 4055 "gitg-dash-view.c" } @@ -4109,14 +4089,14 @@ self->priv->d_credentials = _tmp4_; #line 303 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return self; -#line 4112 "gitg-dash-view.c" +#line 4092 "gitg-dash-view.c" } static GitgDashViewCloneCallbacks* gitg_dash_view_clone_callbacks_new (GitgExtApplication* application, GgitConfig* config, GitgRepositoryListBoxRow* row) { #line 303 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return gitg_dash_view_clone_callbacks_construct (GITG_DASH_VIEW_TYPE_CLONE_CALLBACKS, application, config, row); -#line 4119 "gitg-dash-view.c" +#line 4099 "gitg-dash-view.c" } @@ -4125,7 +4105,7 @@ g_atomic_int_inc (&_data47_->_ref_count_); #line 309 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return _data47_; -#line 4128 "gitg-dash-view.c" +#line 4108 "gitg-dash-view.c" } @@ -4134,7 +4114,7 @@ _data47_ = (Block47Data*) _userdata_; #line 309 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" if (g_atomic_int_dec_and_test (&_data47_->_ref_count_)) { -#line 4137 "gitg-dash-view.c" +#line 4117 "gitg-dash-view.c" GitgDashViewCloneCallbacks* self; #line 309 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" self = _data47_->self; @@ -4142,7 +4122,7 @@ _g_object_unref0 (self); #line 309 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" g_slice_free (Block47Data, _data47_); -#line 4145 "gitg-dash-view.c" +#line 4125 "gitg-dash-view.c" } } @@ -4161,7 +4141,7 @@ result = FALSE; #line 317 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 4164 "gitg-dash-view.c" +#line 4144 "gitg-dash-view.c" } @@ -4170,7 +4150,7 @@ result = __lambda100_ (self); #line 315 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 4173 "gitg-dash-view.c" +#line 4153 "gitg-dash-view.c" } @@ -4217,7 +4197,7 @@ block47_data_unref (_data47_); #line 309 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _data47_ = NULL; -#line 4220 "gitg-dash-view.c" +#line 4200 "gitg-dash-view.c" } @@ -4254,7 +4234,7 @@ g_propagate_error (error, _inner_error_); #line 323 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return NULL; -#line 4257 "gitg-dash-view.c" +#line 4237 "gitg-dash-view.c" } #line 323 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" _tmp6_ = _tmp0_; @@ -4266,7 +4246,7 @@ _g_object_unref0 (_tmp0_); #line 323 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" return result; -#line 4269 "gitg-dash-view.c" +#line 4249 "gitg-dash-view.c" } @@ -4281,18 +4261,18 @@ ((GgitRemoteCallbacksClass *) klass)->credentials = gitg_dash_view_clone_callbacks_real_credentials; #line 298 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" G_OBJECT_CLASS (klass)->finalize = gitg_dash_view_clone_callbacks_finalize; -#line 4284 "gitg-dash-view.c" +#line 4264 "gitg-dash-view.c" } static void gitg_dash_view_clone_callbacks_instance_init (GitgDashViewCloneCallbacks * self) { #line 298 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" self->priv = GITG_DASH_VIEW_CLONE_CALLBACKS_GET_PRIVATE (self); -#line 4291 "gitg-dash-view.c" +#line 4271 "gitg-dash-view.c" } -static void gitg_dash_view_clone_callbacks_finalize (GObject* obj) { +static void gitg_dash_view_clone_callbacks_finalize (GObject * obj) { GitgDashViewCloneCallbacks * self; #line 298 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_DASH_VIEW_TYPE_CLONE_CALLBACKS, GitgDashViewCloneCallbacks); @@ -4302,7 +4282,7 @@ _gitg_credentials_manager_unref0 (self->priv->d_credentials); #line 298 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" G_OBJECT_CLASS (gitg_dash_view_clone_callbacks_parent_class)->finalize (obj); -#line 4305 "gitg-dash-view.c" +#line 4285 "gitg-dash-view.c" } @@ -4380,7 +4360,7 @@ gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "scan_home_activated", G_CALLBACK(_gitg_dash_view_scan_home_activated_gtk_label_activate_link)); #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "setup_profile_activated", G_CALLBACK(_gitg_dash_view_setup_profile_activated_gtk_label_activate_link)); -#line 4383 "gitg-dash-view.c" +#line 4363 "gitg-dash-view.c" } @@ -4401,14 +4381,14 @@ iface->get_widget = gitg_dash_view_real_get_widget; #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" iface->get_icon = gitg_dash_view_real_get_icon; -#line 4404 "gitg-dash-view.c" +#line 4384 "gitg-dash-view.c" } static void gitg_dash_view_gitg_ext_activity_interface_init (GitgExtActivityIface * iface) { #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gitg_dash_view_gitg_ext_activity_parent_iface = g_type_interface_peek_parent (iface); -#line 4411 "gitg-dash-view.c" +#line 4391 "gitg-dash-view.c" } @@ -4425,7 +4405,7 @@ iface->get_selectable_available = gitg_dash_view_real_get_selectable_available; #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" iface->get_action_widget = gitg_dash_view_real_get_action_widget; -#line 4428 "gitg-dash-view.c" +#line 4408 "gitg-dash-view.c" } @@ -4444,7 +4424,7 @@ iface->get_search_visible = gitg_dash_view_real_get_search_visible; #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" iface->set_search_visible = gitg_dash_view_real_set_search_visible; -#line 4447 "gitg-dash-view.c" +#line 4427 "gitg-dash-view.c" } @@ -4452,10 +4432,10 @@ #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gitg_dash_view_gitg_recursive_scanner_parent_iface = g_type_interface_peek_parent (iface); #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" - iface->scan_visit_directory = (gboolean (*)(GitgRecursiveScanner*, GFile*, GCancellable*)) gitg_dash_view_real_scan_visit_directory; + iface->scan_visit_directory = (gboolean (*) (GitgRecursiveScanner *, GFile*, GCancellable*)) gitg_dash_view_real_scan_visit_directory; #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" iface->scan_visit_directory_finish = gitg_dash_view_real_scan_visit_directory_finish; -#line 4458 "gitg-dash-view.c" +#line 4438 "gitg-dash-view.c" } @@ -4466,11 +4446,11 @@ gitg_ext_searchable_set_search_text (self, ""); #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 4469 "gitg-dash-view.c" +#line 4449 "gitg-dash-view.c" } -static void gitg_dash_view_finalize (GObject* obj) { +static void gitg_dash_view_finalize (GObject * obj) { GitgDashView * self; #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_DASH_VIEW, GitgDashView); @@ -4490,7 +4470,7 @@ _g_free0 (self->priv->d_search_text); #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" G_OBJECT_CLASS (gitg_dash_view_parent_class)->finalize (obj); -#line 4493 "gitg-dash-view.c" +#line 4473 "gitg-dash-view.c" } @@ -4605,13 +4585,13 @@ g_value_take_object (value, gitg_ext_selectable_get_action_widget ((GitgExtSelectable*) self)); #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" break; -#line 4608 "gitg-dash-view.c" +#line 4588 "gitg-dash-view.c" default: #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" break; -#line 4614 "gitg-dash-view.c" +#line 4594 "gitg-dash-view.c" } } @@ -4651,13 +4631,13 @@ gitg_ext_searchable_set_search_visible ((GitgExtSearchable*) self, g_value_get_boolean (value)); #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" break; -#line 4654 "gitg-dash-view.c" +#line 4634 "gitg-dash-view.c" default: #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 24 "/home/jesse/dev/gitg/gitg/gitg-dash-view.vala" break; -#line 4660 "gitg-dash-view.c" +#line 4640 "gitg-dash-view.c" } } diff -Nru gitg-3.22.0/gitg/gitg-dirs.c gitg-3.23.0/gitg/gitg-dirs.c --- gitg-3.22.0/gitg/gitg-dirs.c 2016-08-25 21:16:29.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-dirs.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-dirs.c generated by valac 0.32.1, the Vala compiler +/* gitg-dirs.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-dirs.vala, do not modify */ /* @@ -81,7 +81,7 @@ gchar* gitg_dirs_get_user_plugins_dir (void); gchar* gitg_dirs_get_user_data_dir (void); gchar* gitg_dirs_get_user_plugins_data_dir (void); -static void gitg_dirs_finalize (GitgDirs* obj); +static void gitg_dirs_finalize (GitgDirs * obj); gchar* gitg_dirs_build_data_file (const gchar* part, ...) { @@ -375,7 +375,7 @@ #line 23 "/home/jesse/dev/gitg/gitg/gitg-dirs.vala" if (collect_values[0].v_pointer) { #line 378 "gitg-dirs.c" - GitgDirs* object; + GitgDirs * object; object = collect_values[0].v_pointer; #line 23 "/home/jesse/dev/gitg/gitg/gitg-dirs.vala" if (object->parent_instance.g_class == NULL) { @@ -402,7 +402,7 @@ static gchar* gitg_value_dirs_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GitgDirs** object_p; + GitgDirs ** object_p; object_p = collect_values[0].v_pointer; #line 23 "/home/jesse/dev/gitg/gitg/gitg-dirs.vala" if (!object_p) { @@ -454,7 +454,7 @@ void gitg_value_set_dirs (GValue* value, gpointer v_object) { - GitgDirs* old; + GitgDirs * old; #line 23 "/home/jesse/dev/gitg/gitg/gitg-dirs.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_DIRS)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-dirs.vala" @@ -485,7 +485,7 @@ void gitg_value_take_dirs (GValue* value, gpointer v_object) { - GitgDirs* old; + GitgDirs * old; #line 23 "/home/jesse/dev/gitg/gitg/gitg-dirs.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_DIRS)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-dirs.vala" @@ -529,7 +529,7 @@ } -static void gitg_dirs_finalize (GitgDirs* obj) { +static void gitg_dirs_finalize (GitgDirs * obj) { GitgDirs * self; #line 23 "/home/jesse/dev/gitg/gitg/gitg-dirs.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_DIRS, GitgDirs); @@ -554,7 +554,7 @@ gpointer gitg_dirs_ref (gpointer instance) { - GitgDirs* self; + GitgDirs * self; self = instance; #line 23 "/home/jesse/dev/gitg/gitg/gitg-dirs.vala" g_atomic_int_inc (&self->ref_count); @@ -565,7 +565,7 @@ void gitg_dirs_unref (gpointer instance) { - GitgDirs* self; + GitgDirs * self; self = instance; #line 23 "/home/jesse/dev/gitg/gitg/gitg-dirs.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { diff -Nru gitg-3.22.0/gitg/gitg-notifications.c gitg-3.23.0/gitg/gitg-notifications.c --- gitg-3.22.0/gitg/gitg-notifications.c 2016-08-09 09:50:55.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-notifications.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-notifications.c generated by valac 0.32.1, the Vala compiler +/* gitg-notifications.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-notifications.vala, do not modify */ /* @@ -79,7 +79,7 @@ static gpointer gitg_notifications_parent_class = NULL; -static GitgExtNotificationsIface* gitg_notifications_gitg_ext_notifications_parent_iface = NULL; +static GitgExtNotificationsIface * gitg_notifications_gitg_ext_notifications_parent_iface = NULL; GType gitg_notifications_get_type (void) G_GNUC_CONST; #define GITG_NOTIFICATIONS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_NOTIFICATIONS, GitgNotificationsPrivate)) @@ -104,7 +104,7 @@ static void block50_data_unref (void * _userdata_); static gboolean __lambda112_ (Block50Data* _data50_); static gboolean ___lambda112__gsource_func (gpointer self); -static void gitg_notifications_finalize (GObject* obj); +static void gitg_notifications_finalize (GObject * obj); static gpointer _g_object_ref0 (gpointer self) { @@ -785,9 +785,9 @@ #line 23 "/home/jesse/dev/gitg/gitg/gitg-notifications.vala" gitg_notifications_gitg_ext_notifications_parent_iface = g_type_interface_peek_parent (iface); #line 23 "/home/jesse/dev/gitg/gitg/gitg-notifications.vala" - iface->add = (void (*)(GitgExtNotifications*, GitgExtNotification*)) gitg_notifications_real_add; + iface->add = (void (*) (GitgExtNotifications *, GitgExtNotification*)) gitg_notifications_real_add; #line 23 "/home/jesse/dev/gitg/gitg/gitg-notifications.vala" - iface->remove = (void (*)(GitgExtNotifications*, GitgExtNotification*, guint)) gitg_notifications_real_remove; + iface->remove = (void (*) (GitgExtNotifications *, GitgExtNotification*, guint)) gitg_notifications_real_remove; #line 792 "gitg-notifications.c" } @@ -799,7 +799,7 @@ } -static void gitg_notifications_finalize (GObject* obj) { +static void gitg_notifications_finalize (GObject * obj) { GitgNotifications * self; #line 23 "/home/jesse/dev/gitg/gitg/gitg-notifications.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_NOTIFICATIONS, GitgNotifications); diff -Nru gitg-3.22.0/gitg/gitg-plugins-engine.c gitg-3.23.0/gitg/gitg-plugins-engine.c --- gitg-3.22.0/gitg/gitg-plugins-engine.c 2016-08-17 18:00:36.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-plugins-engine.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-plugins-engine.c generated by valac 0.32.1, the Vala compiler +/* gitg-plugins-engine.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-plugins-engine.vala, do not modify */ /* @@ -71,9 +71,9 @@ gchar* gitg_dirs_get_plugins_dir (void); gchar* gitg_dirs_get_plugins_data_dir (void); static PeasPluginInfo* _vala_PeasPluginInfo_copy (PeasPluginInfo* self); -static void _vala_array_add12 (PeasPluginInfo*** array, int* length, int* size, PeasPluginInfo* value); +static void _vala_array_add12 (PeasPluginInfo** * array, int* length, int* size, PeasPluginInfo* value); static void _vala_PeasPluginInfo_free (PeasPluginInfo* self); -static void gitg_plugins_engine_finalize (GObject* obj); +static void gitg_plugins_engine_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -165,7 +165,7 @@ } -static void _vala_array_add12 (PeasPluginInfo*** array, int* length, int* size, PeasPluginInfo* value) { +static void _vala_array_add12 (PeasPluginInfo** * array, int* length, int* size, PeasPluginInfo* value) { #line 57 "/home/jesse/dev/gitg/gitg/gitg-plugins-engine.vala" if ((*length) == (*size)) { #line 57 "/home/jesse/dev/gitg/gitg/gitg-plugins-engine.vala" @@ -439,7 +439,7 @@ } -static void gitg_plugins_engine_finalize (GObject* obj) { +static void gitg_plugins_engine_finalize (GObject * obj) { GitgPluginsEngine * self; #line 23 "/home/jesse/dev/gitg/gitg/gitg-plugins-engine.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_PLUGINS_ENGINE, GitgPluginsEngine); diff -Nru gitg-3.22.0/gitg/gitg-popup-menu.c gitg-3.23.0/gitg/gitg-popup-menu.c --- gitg-3.22.0/gitg/gitg-popup-menu.c 2016-08-09 09:50:55.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-popup-menu.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-popup-menu.c generated by valac 0.32.1, the Vala compiler +/* gitg-popup-menu.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-popup-menu.vala, do not modify */ /* @@ -37,6 +37,11 @@ typedef struct _GitgPopupMenuClass GitgPopupMenuClass; typedef struct _GitgPopupMenuPrivate GitgPopupMenuPrivate; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) +enum { + GITG_POPUP_MENU_POPULATE_MENU_SIGNAL, + GITG_POPUP_MENU_LAST_SIGNAL +}; +static guint gitg_popup_menu_signals[GITG_POPUP_MENU_LAST_SIGNAL] = {0}; struct _GitgPopupMenu { GObject parent_instance; @@ -68,7 +73,7 @@ static void gitg_popup_menu_real_dispose (GObject* base); static gboolean gitg_popup_menu_popup_menu (GitgPopupMenu* self, GtkWidget* widget, GdkEventButton* event); static void g_cclosure_user_marshal_OBJECT__BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void gitg_popup_menu_finalize (GObject* obj); +static void gitg_popup_menu_finalize (GObject * obj); static gboolean _gitg_popup_menu_on_button_press_event_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { @@ -76,7 +81,7 @@ result = gitg_popup_menu_on_button_press_event ((GitgPopupMenu*) self, _sender, event); #line 31 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" return result; -#line 80 "gitg-popup-menu.c" +#line 85 "gitg-popup-menu.c" } @@ -85,14 +90,14 @@ result = gitg_popup_menu_on_popup_menu ((GitgPopupMenu*) self, _sender); #line 32 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" return result; -#line 89 "gitg-popup-menu.c" +#line 94 "gitg-popup-menu.c" } static gpointer _g_object_ref0 (gpointer self) { #line 34 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" return self ? g_object_ref (self) : NULL; -#line 96 "gitg-popup-menu.c" +#line 101 "gitg-popup-menu.c" } @@ -124,14 +129,14 @@ self->priv->d_widget = _tmp3_; #line 29 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" return self; -#line 128 "gitg-popup-menu.c" +#line 133 "gitg-popup-menu.c" } GitgPopupMenu* gitg_popup_menu_new (GtkWidget* widget) { #line 29 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" return gitg_popup_menu_construct (GITG_TYPE_POPUP_MENU, widget); -#line 135 "gitg-popup-menu.c" +#line 140 "gitg-popup-menu.c" } @@ -144,7 +149,7 @@ _tmp0_ = self->priv->d_widget; #line 39 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" if (_tmp0_ != NULL) { -#line 148 "gitg-popup-menu.c" +#line 153 "gitg-popup-menu.c" GtkWidget* _tmp1_ = NULL; guint _tmp2_ = 0U; GtkWidget* _tmp3_ = NULL; @@ -165,7 +170,7 @@ _g_object_unref0 (self->priv->d_widget); #line 44 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" self->priv->d_widget = NULL; -#line 169 "gitg-popup-menu.c" +#line 174 "gitg-popup-menu.c" } } @@ -194,7 +199,7 @@ #line 50 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" _tmp0_ = event; #line 50 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" - g_signal_emit_by_name (self, "populate-menu", _tmp0_, &_tmp1_); + g_signal_emit (self, gitg_popup_menu_signals[GITG_POPUP_MENU_POPULATE_MENU_SIGNAL], 0, _tmp0_, &_tmp1_); #line 50 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" menu = _tmp1_; #line 52 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" @@ -207,19 +212,19 @@ _g_object_unref0 (menu); #line 54 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" return result; -#line 211 "gitg-popup-menu.c" +#line 216 "gitg-popup-menu.c" } #line 57 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" _tmp4_ = event; #line 57 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" if (_tmp4_ == NULL) { -#line 217 "gitg-popup-menu.c" +#line 222 "gitg-popup-menu.c" guint32 _tmp5_ = 0U; #line 57 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" _tmp5_ = gtk_get_current_event_time (); #line 57 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" _tmp3_ = _tmp5_; -#line 223 "gitg-popup-menu.c" +#line 228 "gitg-popup-menu.c" } else { GdkEventButton* _tmp6_ = NULL; guint32 _tmp7_ = 0U; @@ -229,7 +234,7 @@ _tmp7_ = _tmp6_->time; #line 57 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" _tmp3_ = _tmp7_; -#line 233 "gitg-popup-menu.c" +#line 238 "gitg-popup-menu.c" } #line 57 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" time = _tmp3_; @@ -239,7 +244,7 @@ if (_tmp9_ == NULL) { #line 58 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" _tmp8_ = (guint) 0; -#line 243 "gitg-popup-menu.c" +#line 248 "gitg-popup-menu.c" } else { GdkEventButton* _tmp10_ = NULL; guint _tmp11_ = 0U; @@ -249,7 +254,7 @@ _tmp11_ = _tmp10_->button; #line 58 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" _tmp8_ = _tmp11_; -#line 253 "gitg-popup-menu.c" +#line 258 "gitg-popup-menu.c" } #line 58 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" button = _tmp8_; @@ -273,7 +278,7 @@ _g_object_unref0 (menu); #line 63 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" return result; -#line 277 "gitg-popup-menu.c" +#line 282 "gitg-popup-menu.c" } @@ -293,7 +298,7 @@ result = _tmp1_; #line 68 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" return result; -#line 297 "gitg-popup-menu.c" +#line 302 "gitg-popup-menu.c" } @@ -326,7 +331,7 @@ result = FALSE; #line 77 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" return result; -#line 330 "gitg-popup-menu.c" +#line 335 "gitg-popup-menu.c" } #line 80 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" _tmp3_ = widget; @@ -338,7 +343,7 @@ result = _tmp5_; #line 80 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" return result; -#line 342 "gitg-popup-menu.c" +#line 347 "gitg-popup-menu.c" } @@ -360,13 +365,13 @@ data1 = closure->data; #line 23 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" data2 = param_values->data[0].v_pointer; -#line 364 "gitg-popup-menu.c" +#line 369 "gitg-popup-menu.c" } else { #line 23 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" data1 = param_values->data[0].v_pointer; #line 23 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" data2 = closure->data; -#line 370 "gitg-popup-menu.c" +#line 375 "gitg-popup-menu.c" } #line 23 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" callback = (GMarshalFunc_OBJECT__BOXED) (marshal_data ? marshal_data : cc->callback); @@ -374,7 +379,7 @@ v_return = callback (data1, g_value_get_boxed (param_values + 1), data2); #line 23 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" g_value_take_object (return_value, v_return); -#line 378 "gitg-popup-menu.c" +#line 383 "gitg-popup-menu.c" } @@ -388,19 +393,19 @@ #line 23 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" G_OBJECT_CLASS (klass)->finalize = gitg_popup_menu_finalize; #line 23 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" - g_signal_new ("populate_menu", GITG_TYPE_POPUP_MENU, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_OBJECT__BOXED, gtk_menu_get_type (), 1, gdk_event_get_type ()); -#line 393 "gitg-popup-menu.c" + gitg_popup_menu_signals[GITG_POPUP_MENU_POPULATE_MENU_SIGNAL] = g_signal_new ("populate_menu", GITG_TYPE_POPUP_MENU, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_OBJECT__BOXED, gtk_menu_get_type (), 1, gdk_event_get_type ()); +#line 398 "gitg-popup-menu.c" } static void gitg_popup_menu_instance_init (GitgPopupMenu * self) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" self->priv = GITG_POPUP_MENU_GET_PRIVATE (self); -#line 400 "gitg-popup-menu.c" +#line 405 "gitg-popup-menu.c" } -static void gitg_popup_menu_finalize (GObject* obj) { +static void gitg_popup_menu_finalize (GObject * obj) { GitgPopupMenu * self; #line 23 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_POPUP_MENU, GitgPopupMenu); @@ -408,7 +413,7 @@ _g_object_unref0 (self->priv->d_widget); #line 23 "/home/jesse/dev/gitg/gitg/gitg-popup-menu.vala" G_OBJECT_CLASS (gitg_popup_menu_parent_class)->finalize (obj); -#line 412 "gitg-popup-menu.c" +#line 417 "gitg-popup-menu.c" } diff -Nru gitg-3.22.0/gitg/gitg-recursive-monitor.c gitg-3.23.0/gitg/gitg-recursive-monitor.c --- gitg-3.22.0/gitg/gitg-recursive-monitor.c 2016-08-17 18:00:36.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-recursive-monitor.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-recursive-monitor.c generated by valac 0.32.1, the Vala compiler +/* gitg-recursive-monitor.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-recursive-monitor.vala, do not modify */ /* @@ -49,6 +49,11 @@ #define __g_list_free__g_object_unref0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free__g_object_unref0_ (var), NULL))) typedef struct _GitgRecursiveMonitorEnumerateData GitgRecursiveMonitorEnumerateData; typedef struct _GitgRecursiveMonitorMonitorPrivate GitgRecursiveMonitorMonitorPrivate; +enum { + GITG_RECURSIVE_MONITOR_CHANGED_SIGNAL, + GITG_RECURSIVE_MONITOR_LAST_SIGNAL +}; +static guint gitg_recursive_monitor_signals[GITG_RECURSIVE_MONITOR_LAST_SIGNAL] = {0}; struct _GitgRecursiveMonitor { GObject parent_instance; @@ -153,7 +158,7 @@ static void gitg_recursive_monitor_enumerate_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); static void _g_object_unref0_ (gpointer var); static void _g_list_free__g_object_unref0_ (GList* self); -static void _vala_array_add13 (GFile*** array, int* length, int* size, GFile* value); +static void _vala_array_add13 (GFile** * array, int* length, int* size, GFile* value); static void gitg_recursive_monitor_add_submonitor (GitgRecursiveMonitor* self, GFile* location); static gboolean __lambda88_ (GitgRecursiveMonitor* self, GFile* l); static gboolean ___lambda88__gitg_recursive_monitor_filter_func (GFile* file, gpointer self); @@ -166,15 +171,15 @@ static void gitg_recursive_monitor_real_dispose (GObject* base); void gitg_recursive_monitor_cancel (GitgRecursiveMonitor* self); static void gitg_recursive_monitor_remove_submonitor (GitgRecursiveMonitor* self, GFile* location); -static void _vala_array_add14 (GFile*** array, int* length, int* size, GFile* value); +static void _vala_array_add14 (GFile** * array, int* length, int* size, GFile* value); static gboolean ___lambda90_ (GitgRecursiveMonitor* self); static gboolean ____lambda90__gsource_func (gpointer self); static void g_cclosure_user_marshal_VOID__POINTER_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); enum { GITG_RECURSIVE_MONITOR_MONITOR_DUMMY_PROPERTY }; -static void gitg_recursive_monitor_monitor_finalize (GObject* obj); -static void gitg_recursive_monitor_finalize (GObject* obj); +static void gitg_recursive_monitor_monitor_finalize (GObject * obj); +static void gitg_recursive_monitor_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -182,7 +187,7 @@ static void _gitg_recursive_monitor_monitor_changed_timeout_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self) { #line 60 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" gitg_recursive_monitor_monitor_changed_timeout ((GitgRecursiveMonitor*) self, file, other_file, event_type); -#line 186 "gitg-recursive-monitor.c" +#line 191 "gitg-recursive-monitor.c" } @@ -190,7 +195,7 @@ GError * _inner_error_ = NULL; #line 65 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" g_return_if_fail (res != NULL); -#line 194 "gitg-recursive-monitor.c" +#line 199 "gitg-recursive-monitor.c" { GAsyncResult* _tmp0_ = NULL; #line 68 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" @@ -199,7 +204,7 @@ gitg_recursive_monitor_enumerate_finish (self, _tmp0_, &_inner_error_); #line 68 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 203 "gitg-recursive-monitor.c" +#line 208 "gitg-recursive-monitor.c" goto __catch79_g_error; } } @@ -210,7 +215,7 @@ g_clear_error (&_inner_error_); #line 66 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _inner_error_ = NULL; -#line 214 "gitg-recursive-monitor.c" +#line 219 "gitg-recursive-monitor.c" } __finally79: #line 66 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" @@ -221,7 +226,7 @@ g_clear_error (&_inner_error_); #line 66 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return; -#line 225 "gitg-recursive-monitor.c" +#line 230 "gitg-recursive-monitor.c" } } @@ -231,7 +236,7 @@ __lambda91_ ((GitgRecursiveMonitor*) self, source_object, res); #line 65 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" g_object_unref (self); -#line 235 "gitg-recursive-monitor.c" +#line 240 "gitg-recursive-monitor.c" } @@ -277,7 +282,7 @@ _g_object_unref0 (self->priv->d_sub_monitors); #line 50 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" self->priv->d_sub_monitors = (GeeList*) _tmp1_; -#line 281 "gitg-recursive-monitor.c" +#line 286 "gitg-recursive-monitor.c" { GFileMonitor* _tmp2_ = NULL; GFile* _tmp3_ = NULL; @@ -291,7 +296,7 @@ _tmp2_ = _tmp4_; #line 54 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 295 "gitg-recursive-monitor.c" +#line 300 "gitg-recursive-monitor.c" goto __catch78_g_error; } #line 54 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" @@ -304,7 +309,7 @@ self->priv->d_monitor = _tmp5_; #line 52 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _g_object_unref0 (_tmp2_); -#line 308 "gitg-recursive-monitor.c" +#line 313 "gitg-recursive-monitor.c" } goto __finally78; __catch78_g_error: @@ -313,7 +318,7 @@ g_clear_error (&_inner_error_); #line 52 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _inner_error_ = NULL; -#line 317 "gitg-recursive-monitor.c" +#line 322 "gitg-recursive-monitor.c" } __finally78: #line 52 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" @@ -332,19 +337,19 @@ g_clear_error (&_inner_error_); #line 52 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return NULL; -#line 336 "gitg-recursive-monitor.c" +#line 341 "gitg-recursive-monitor.c" } #line 58 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp6_ = self->priv->d_monitor; #line 58 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" if (_tmp6_ != NULL) { -#line 342 "gitg-recursive-monitor.c" +#line 347 "gitg-recursive-monitor.c" GFileMonitor* _tmp7_ = NULL; #line 60 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp7_ = self->priv->d_monitor; #line 60 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" g_signal_connect_object (_tmp7_, "changed", (GCallback) _gitg_recursive_monitor_monitor_changed_timeout_g_file_monitor_changed, self, 0); -#line 348 "gitg-recursive-monitor.c" +#line 353 "gitg-recursive-monitor.c" } #line 63 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp8_ = g_cancellable_new (); @@ -366,14 +371,14 @@ filter_func_target_destroy_notify = NULL; #line 47 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return self; -#line 370 "gitg-recursive-monitor.c" +#line 375 "gitg-recursive-monitor.c" } GitgRecursiveMonitor* gitg_recursive_monitor_new (GFile* location, GitgRecursiveMonitorFilterFunc filter_func, void* filter_func_target, GDestroyNotify filter_func_target_destroy_notify) { #line 47 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return gitg_recursive_monitor_construct (GITG_TYPE_RECURSIVE_MONITOR, location, filter_func, filter_func_target, filter_func_target_destroy_notify); -#line 377 "gitg-recursive-monitor.c" +#line 382 "gitg-recursive-monitor.c" } @@ -386,14 +391,14 @@ _g_object_unref0 (_data_->self); #line 22 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" g_slice_free (GitgRecursiveMonitorEnumerateData, _data_); -#line 390 "gitg-recursive-monitor.c" +#line 395 "gitg-recursive-monitor.c" } static gpointer _g_object_ref0 (gpointer self) { #line 22 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return self ? g_object_ref (self) : NULL; -#line 397 "gitg-recursive-monitor.c" +#line 402 "gitg-recursive-monitor.c" } @@ -422,7 +427,7 @@ _data_->location = _tmp2_; #line 22 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" gitg_recursive_monitor_enumerate_co (_data_); -#line 426 "gitg-recursive-monitor.c" +#line 431 "gitg-recursive-monitor.c" } @@ -432,11 +437,11 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 22 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return; -#line 436 "gitg-recursive-monitor.c" +#line 441 "gitg-recursive-monitor.c" } #line 22 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 440 "gitg-recursive-monitor.c" +#line 445 "gitg-recursive-monitor.c" } @@ -450,14 +455,14 @@ _data_->_res_ = _res_; #line 75 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" gitg_recursive_monitor_enumerate_co (_data_); -#line 454 "gitg-recursive-monitor.c" +#line 459 "gitg-recursive-monitor.c" } static void _g_object_unref0_ (gpointer var) { #line 84 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" (var == NULL) ? NULL : (var = (g_object_unref (var), NULL)); -#line 461 "gitg-recursive-monitor.c" +#line 466 "gitg-recursive-monitor.c" } @@ -466,24 +471,24 @@ g_list_foreach (self, (GFunc) _g_object_unref0_, NULL); #line 84 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" g_list_free (self); -#line 470 "gitg-recursive-monitor.c" +#line 475 "gitg-recursive-monitor.c" } -static void _vala_array_add13 (GFile*** array, int* length, int* size, GFile* value) { +static void _vala_array_add13 (GFile** * array, int* length, int* size, GFile* value) { #line 91 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" if ((*length) == (*size)) { #line 91 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" *size = (*size) ? (2 * (*size)) : 4; #line 91 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" *array = g_renew (GFile*, *array, (*size) + 1); -#line 481 "gitg-recursive-monitor.c" +#line 486 "gitg-recursive-monitor.c" } #line 91 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" (*array)[(*length)++] = value; #line 91 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" (*array)[*length] = NULL; -#line 487 "gitg-recursive-monitor.c" +#line 492 "gitg-recursive-monitor.c" } @@ -492,24 +497,24 @@ switch (_data_->_state_) { #line 73 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" case 0: -#line 496 "gitg-recursive-monitor.c" +#line 501 "gitg-recursive-monitor.c" goto _state_0; #line 73 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" case 1: -#line 500 "gitg-recursive-monitor.c" +#line 505 "gitg-recursive-monitor.c" goto _state_1; #line 73 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" case 2: -#line 504 "gitg-recursive-monitor.c" +#line 509 "gitg-recursive-monitor.c" goto _state_2; #line 73 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" case 3: -#line 508 "gitg-recursive-monitor.c" +#line 513 "gitg-recursive-monitor.c" goto _state_3; default: #line 73 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" g_assert_not_reached (); -#line 513 "gitg-recursive-monitor.c" +#line 518 "gitg-recursive-monitor.c" } _state_0: #line 75 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" @@ -526,7 +531,7 @@ g_file_enumerate_children_async (_data_->_tmp0_, G_FILE_ATTRIBUTE_STANDARD_NAME "," G_FILE_ATTRIBUTE_STANDARD_TYPE, G_FILE_QUERY_INFO_NONE, G_PRIORITY_DEFAULT, _data_->_tmp1_, gitg_recursive_monitor_enumerate_ready, _data_); #line 75 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return FALSE; -#line 530 "gitg-recursive-monitor.c" +#line 535 "gitg-recursive-monitor.c" _state_1: #line 75 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _data_->_tmp2_ = NULL; @@ -544,17 +549,17 @@ if (_data_->_state_ == 0) { #line 75 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 548 "gitg-recursive-monitor.c" +#line 553 "gitg-recursive-monitor.c" } else { #line 75 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" g_simple_async_result_complete (_data_->_async_result); -#line 552 "gitg-recursive-monitor.c" +#line 557 "gitg-recursive-monitor.c" } #line 75 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" g_object_unref (_data_->_async_result); #line 75 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return FALSE; -#line 558 "gitg-recursive-monitor.c" +#line 563 "gitg-recursive-monitor.c" } #line 76 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _data_->_tmp3_ = NULL; @@ -582,7 +587,7 @@ g_file_enumerator_next_files_async (_data_->_tmp4_, 10, G_PRIORITY_DEFAULT, NULL, gitg_recursive_monitor_enumerate_ready, _data_); #line 80 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return FALSE; -#line 586 "gitg-recursive-monitor.c" +#line 591 "gitg-recursive-monitor.c" _state_2: #line 80 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _data_->_tmp5_ = NULL; @@ -604,17 +609,17 @@ if (_data_->_state_ == 0) { #line 80 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 608 "gitg-recursive-monitor.c" +#line 613 "gitg-recursive-monitor.c" } else { #line 80 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" g_simple_async_result_complete (_data_->_async_result); -#line 612 "gitg-recursive-monitor.c" +#line 617 "gitg-recursive-monitor.c" } #line 80 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" g_object_unref (_data_->_async_result); #line 80 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return FALSE; -#line 618 "gitg-recursive-monitor.c" +#line 623 "gitg-recursive-monitor.c" } #line 82 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _data_->_tmp6_ = NULL; @@ -626,13 +631,13 @@ __g_list_free__g_object_unref0_0 (_data_->files); #line 84 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" break; -#line 630 "gitg-recursive-monitor.c" +#line 635 "gitg-recursive-monitor.c" } #line 87 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _data_->_tmp7_ = NULL; #line 87 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _data_->_tmp7_ = _data_->files; -#line 636 "gitg-recursive-monitor.c" +#line 641 "gitg-recursive-monitor.c" { #line 87 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _data_->f_collection = _data_->_tmp7_; @@ -644,7 +649,7 @@ _data_->_tmp8_ = _g_object_ref0 ((GFileInfo*) _data_->f_it->data); #line 87 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _data_->f = _data_->_tmp8_; -#line 648 "gitg-recursive-monitor.c" +#line 653 "gitg-recursive-monitor.c" { #line 89 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _data_->_tmp9_ = NULL; @@ -682,17 +687,17 @@ _data_->_tmp15_ = g_file_get_child (_data_->_tmp12_, _data_->_tmp14_); #line 91 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _vala_array_add13 (&_data_->allfiles, &_data_->allfiles_length1, &_data_->_allfiles_size_, _data_->_tmp15_); -#line 686 "gitg-recursive-monitor.c" +#line 691 "gitg-recursive-monitor.c" } #line 87 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _g_object_unref0 (_data_->f); -#line 690 "gitg-recursive-monitor.c" +#line 695 "gitg-recursive-monitor.c" } } } #line 78 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" __g_list_free__g_object_unref0_0 (_data_->files); -#line 696 "gitg-recursive-monitor.c" +#line 701 "gitg-recursive-monitor.c" } #line 96 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _data_->_tmp16_ = NULL; @@ -708,7 +713,7 @@ g_file_enumerator_close_async (_data_->_tmp16_, G_PRIORITY_DEFAULT, _data_->_tmp17_, gitg_recursive_monitor_enumerate_ready, _data_); #line 96 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return FALSE; -#line 712 "gitg-recursive-monitor.c" +#line 717 "gitg-recursive-monitor.c" _state_3: #line 96 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" g_file_enumerator_close_finish (_data_->_tmp16_, _data_->_res_, &_data_->_inner_error_); @@ -726,17 +731,17 @@ if (_data_->_state_ == 0) { #line 96 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 730 "gitg-recursive-monitor.c" +#line 735 "gitg-recursive-monitor.c" } else { #line 96 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" g_simple_async_result_complete (_data_->_async_result); -#line 734 "gitg-recursive-monitor.c" +#line 739 "gitg-recursive-monitor.c" } #line 96 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" g_object_unref (_data_->_async_result); #line 96 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return FALSE; -#line 740 "gitg-recursive-monitor.c" +#line 745 "gitg-recursive-monitor.c" } #line 98 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _data_->_tmp18_ = NULL; @@ -746,7 +751,7 @@ _data_->_tmp18_ = _data_->allfiles; #line 98 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _data_->_tmp18__length1 = _data_->allfiles_length1; -#line 750 "gitg-recursive-monitor.c" +#line 755 "gitg-recursive-monitor.c" { #line 98 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _data_->_vala1_f_collection_length1 = 0; @@ -764,7 +769,7 @@ _data_->_tmp19_ = _g_object_ref0 (_data_->_vala1_f_collection[_data_->_vala1_f_it]); #line 98 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _data_->_vala1_f = _data_->_tmp19_; -#line 768 "gitg-recursive-monitor.c" +#line 773 "gitg-recursive-monitor.c" { #line 100 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _data_->_tmp20_ = NULL; @@ -774,7 +779,7 @@ gitg_recursive_monitor_add_submonitor (_data_->self, _data_->_tmp20_); #line 98 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _g_object_unref0 (_data_->_vala1_f); -#line 778 "gitg-recursive-monitor.c" +#line 783 "gitg-recursive-monitor.c" } } } @@ -786,17 +791,17 @@ if (_data_->_state_ == 0) { #line 73 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 790 "gitg-recursive-monitor.c" +#line 795 "gitg-recursive-monitor.c" } else { #line 73 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" g_simple_async_result_complete (_data_->_async_result); -#line 794 "gitg-recursive-monitor.c" +#line 799 "gitg-recursive-monitor.c" } #line 73 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" g_object_unref (_data_->_async_result); #line 73 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return FALSE; -#line 800 "gitg-recursive-monitor.c" +#line 805 "gitg-recursive-monitor.c" } @@ -820,7 +825,7 @@ result = _tmp2_; #line 112 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return result; -#line 824 "gitg-recursive-monitor.c" +#line 829 "gitg-recursive-monitor.c" } @@ -829,7 +834,7 @@ result = __lambda88_ ((GitgRecursiveMonitor*) self, file); #line 111 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return result; -#line 833 "gitg-recursive-monitor.c" +#line 838 "gitg-recursive-monitor.c" } @@ -842,14 +847,14 @@ _tmp0__length1 = files_length1; #line 116 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" gitg_recursive_monitor_changed_timeout (self, _tmp0_, _tmp0__length1); -#line 846 "gitg-recursive-monitor.c" +#line 851 "gitg-recursive-monitor.c" } static void ___lambda89__gitg_recursive_monitor_changed (GitgRecursiveMonitor* _sender, GFile** files, int files_length1, gpointer self) { #line 116 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" __lambda89_ ((GitgRecursiveMonitor*) self, files, files_length1); -#line 853 "gitg-recursive-monitor.c" +#line 858 "gitg-recursive-monitor.c" } @@ -876,7 +881,7 @@ _tmp1__target = self->priv->d_filter_func_target; #line 106 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" if (_tmp1_ != NULL) { -#line 880 "gitg-recursive-monitor.c" +#line 885 "gitg-recursive-monitor.c" GitgRecursiveMonitorFilterFunc _tmp2_ = NULL; void* _tmp2__target = NULL; GFile* _tmp3_ = NULL; @@ -891,17 +896,17 @@ _tmp4_ = _tmp2_ (_tmp3_, _tmp2__target); #line 106 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp0_ = !_tmp4_; -#line 895 "gitg-recursive-monitor.c" +#line 900 "gitg-recursive-monitor.c" } else { #line 106 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp0_ = FALSE; -#line 899 "gitg-recursive-monitor.c" +#line 904 "gitg-recursive-monitor.c" } #line 106 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" if (_tmp0_) { #line 108 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return; -#line 905 "gitg-recursive-monitor.c" +#line 910 "gitg-recursive-monitor.c" } #line 111 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp5_ = location; @@ -929,7 +934,7 @@ g_signal_connect_object (_tmp12_, "changed", (GCallback) ___lambda89__gitg_recursive_monitor_changed, self, 0); #line 104 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _g_object_unref0 (mon); -#line 933 "gitg-recursive-monitor.c" +#line 938 "gitg-recursive-monitor.c" } @@ -939,7 +944,7 @@ g_return_if_fail (self != NULL); #line 119 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" g_return_if_fail (location != NULL); -#line 943 "gitg-recursive-monitor.c" +#line 948 "gitg-recursive-monitor.c" { GFileInfo* info = NULL; GFile* _tmp0_ = NULL; @@ -953,24 +958,24 @@ info = _tmp1_; #line 123 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 957 "gitg-recursive-monitor.c" +#line 962 "gitg-recursive-monitor.c" goto __catch80_g_error; } #line 125 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp2_ = g_file_info_get_file_type (info); #line 125 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" if (_tmp2_ == G_FILE_TYPE_DIRECTORY) { -#line 964 "gitg-recursive-monitor.c" +#line 969 "gitg-recursive-monitor.c" GFile* _tmp3_ = NULL; #line 127 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp3_ = location; #line 127 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" gitg_recursive_monitor_add_submonitor (self, _tmp3_); -#line 970 "gitg-recursive-monitor.c" +#line 975 "gitg-recursive-monitor.c" } #line 121 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _g_object_unref0 (info); -#line 974 "gitg-recursive-monitor.c" +#line 979 "gitg-recursive-monitor.c" } goto __finally80; __catch80_g_error: @@ -979,7 +984,7 @@ g_clear_error (&_inner_error_); #line 121 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _inner_error_ = NULL; -#line 983 "gitg-recursive-monitor.c" +#line 988 "gitg-recursive-monitor.c" } __finally80: #line 121 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" @@ -990,7 +995,7 @@ g_clear_error (&_inner_error_); #line 121 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return; -#line 994 "gitg-recursive-monitor.c" +#line 999 "gitg-recursive-monitor.c" } } @@ -1003,7 +1008,7 @@ gitg_recursive_monitor_cancel (self); #line 136 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" G_OBJECT_CLASS (gitg_recursive_monitor_parent_class)->dispose (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject)); -#line 1007 "gitg-recursive-monitor.c" +#line 1012 "gitg-recursive-monitor.c" } @@ -1012,7 +1017,7 @@ g_return_if_fail (self != NULL); #line 139 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" g_return_if_fail (location != NULL); -#line 1016 "gitg-recursive-monitor.c" +#line 1021 "gitg-recursive-monitor.c" { GeeList* _monitor_list = NULL; GeeList* _tmp0_ = NULL; @@ -1040,7 +1045,7 @@ _monitor_index = -1; #line 141 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" while (TRUE) { -#line 1044 "gitg-recursive-monitor.c" +#line 1049 "gitg-recursive-monitor.c" gint _tmp5_ = 0; gint _tmp6_ = 0; gint _tmp7_ = 0; @@ -1064,7 +1069,7 @@ if (!(_tmp6_ < _tmp7_)) { #line 141 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" break; -#line 1068 "gitg-recursive-monitor.c" +#line 1073 "gitg-recursive-monitor.c" } #line 141 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp8_ = _monitor_list; @@ -1084,7 +1089,7 @@ _tmp14_ = g_file_equal (_tmp11_, _tmp13_); #line 143 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" if (_tmp14_) { -#line 1088 "gitg-recursive-monitor.c" +#line 1093 "gitg-recursive-monitor.c" GeeList* _tmp15_ = NULL; GitgRecursiveMonitorMonitor* _tmp16_ = NULL; #line 145 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" @@ -1099,15 +1104,15 @@ _g_object_unref0 (_monitor_list); #line 146 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return; -#line 1103 "gitg-recursive-monitor.c" +#line 1108 "gitg-recursive-monitor.c" } #line 141 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _g_object_unref0 (monitor); -#line 1107 "gitg-recursive-monitor.c" +#line 1112 "gitg-recursive-monitor.c" } #line 141 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _g_object_unref0 (_monitor_list); -#line 1111 "gitg-recursive-monitor.c" +#line 1116 "gitg-recursive-monitor.c" } } @@ -1129,33 +1134,33 @@ _tmp0_ = event; #line 153 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" if (_tmp0_ == G_FILE_MONITOR_EVENT_CREATED) { -#line 1133 "gitg-recursive-monitor.c" +#line 1138 "gitg-recursive-monitor.c" GFile* _tmp1_ = NULL; #line 155 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp1_ = file; #line 155 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" gitg_recursive_monitor_add_submonitor_if_directory (self, _tmp1_); -#line 1139 "gitg-recursive-monitor.c" +#line 1144 "gitg-recursive-monitor.c" } else { GFileMonitorEvent _tmp2_ = 0; #line 157 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp2_ = event; #line 157 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" if (_tmp2_ == G_FILE_MONITOR_EVENT_DELETED) { -#line 1146 "gitg-recursive-monitor.c" +#line 1151 "gitg-recursive-monitor.c" GFile* _tmp3_ = NULL; #line 159 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp3_ = file; #line 159 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" gitg_recursive_monitor_remove_submonitor (self, _tmp3_); -#line 1152 "gitg-recursive-monitor.c" +#line 1157 "gitg-recursive-monitor.c" } else { GFileMonitorEvent _tmp4_ = 0; #line 161 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp4_ = event; #line 161 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" if (_tmp4_ == G_FILE_MONITOR_EVENT_MOVED) { -#line 1159 "gitg-recursive-monitor.c" +#line 1164 "gitg-recursive-monitor.c" GFile* _tmp5_ = NULL; GFile* _tmp6_ = NULL; #line 163 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" @@ -1166,13 +1171,13 @@ _tmp6_ = other_file; #line 165 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" if (_tmp6_ != NULL) { -#line 1170 "gitg-recursive-monitor.c" +#line 1175 "gitg-recursive-monitor.c" GFile* _tmp7_ = NULL; #line 167 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp7_ = other_file; #line 167 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" gitg_recursive_monitor_add_submonitor_if_directory (self, _tmp7_); -#line 1176 "gitg-recursive-monitor.c" +#line 1181 "gitg-recursive-monitor.c" } } } @@ -1199,24 +1204,24 @@ gitg_recursive_monitor_changed_timeout (self, _tmp13_, 2); #line 171 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp13_ = (_vala_array_free (_tmp13_, _tmp13__length1, (GDestroyNotify) g_object_unref), NULL); -#line 1203 "gitg-recursive-monitor.c" +#line 1208 "gitg-recursive-monitor.c" } -static void _vala_array_add14 (GFile*** array, int* length, int* size, GFile* value) { +static void _vala_array_add14 (GFile** * array, int* length, int* size, GFile* value) { #line 180 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" if ((*length) == (*size)) { #line 180 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" *size = (*size) ? (2 * (*size)) : 4; #line 180 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" *array = g_renew (GFile*, *array, (*size) + 1); -#line 1214 "gitg-recursive-monitor.c" +#line 1219 "gitg-recursive-monitor.c" } #line 180 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" (*array)[(*length)++] = value; #line 180 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" (*array)[*length] = NULL; -#line 1220 "gitg-recursive-monitor.c" +#line 1225 "gitg-recursive-monitor.c" } @@ -1232,7 +1237,7 @@ #line 194 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp0__length1 = self->priv->d_changed_files_length1; #line 194 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" - g_signal_emit_by_name (self, "changed", _tmp0_, _tmp0__length1); + g_signal_emit (self, gitg_recursive_monitor_signals[GITG_RECURSIVE_MONITOR_CHANGED_SIGNAL], 0, _tmp0_, _tmp0__length1); #line 195 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp1_ = g_new0 (GFile*, 0 + 1); #line 195 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" @@ -1247,7 +1252,7 @@ result = FALSE; #line 197 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return result; -#line 1251 "gitg-recursive-monitor.c" +#line 1256 "gitg-recursive-monitor.c" } @@ -1256,7 +1261,7 @@ result = ___lambda90_ ((GitgRecursiveMonitor*) self); #line 191 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return result; -#line 1260 "gitg-recursive-monitor.c" +#line 1265 "gitg-recursive-monitor.c" } @@ -1272,7 +1277,7 @@ _tmp0_ = files; #line 176 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp0__length1 = files_length1; -#line 1276 "gitg-recursive-monitor.c" +#line 1281 "gitg-recursive-monitor.c" { GFile** f_collection = NULL; gint f_collection_length1 = 0; @@ -1284,14 +1289,14 @@ f_collection_length1 = _tmp0__length1; #line 176 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" for (f_it = 0; f_it < _tmp0__length1; f_it = f_it + 1) { -#line 1288 "gitg-recursive-monitor.c" +#line 1293 "gitg-recursive-monitor.c" GFile* _tmp1_ = NULL; GFile* f = NULL; #line 176 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp1_ = _g_object_ref0 (f_collection[f_it]); #line 176 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" f = _tmp1_; -#line 1295 "gitg-recursive-monitor.c" +#line 1300 "gitg-recursive-monitor.c" { gboolean _tmp2_ = FALSE; GFile* _tmp3_ = NULL; @@ -1299,7 +1304,7 @@ _tmp3_ = f; #line 178 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" if (_tmp3_ != NULL) { -#line 1303 "gitg-recursive-monitor.c" +#line 1308 "gitg-recursive-monitor.c" gboolean _tmp4_ = FALSE; GitgRecursiveMonitorFilterFunc _tmp5_ = NULL; void* _tmp5__target = NULL; @@ -1311,7 +1316,7 @@ if (_tmp5_ == NULL) { #line 178 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp4_ = TRUE; -#line 1315 "gitg-recursive-monitor.c" +#line 1320 "gitg-recursive-monitor.c" } else { GitgRecursiveMonitorFilterFunc _tmp6_ = NULL; void* _tmp6__target = NULL; @@ -1327,19 +1332,19 @@ _tmp8_ = _tmp6_ (_tmp7_, _tmp6__target); #line 178 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp4_ = _tmp8_; -#line 1331 "gitg-recursive-monitor.c" +#line 1336 "gitg-recursive-monitor.c" } #line 178 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp2_ = _tmp4_; -#line 1335 "gitg-recursive-monitor.c" +#line 1340 "gitg-recursive-monitor.c" } else { #line 178 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp2_ = FALSE; -#line 1339 "gitg-recursive-monitor.c" +#line 1344 "gitg-recursive-monitor.c" } #line 178 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" if (_tmp2_) { -#line 1343 "gitg-recursive-monitor.c" +#line 1348 "gitg-recursive-monitor.c" GFile** _tmp9_ = NULL; gint _tmp9__length1 = 0; GFile* _tmp10_ = NULL; @@ -1354,11 +1359,11 @@ _tmp11_ = _g_object_ref0 (_tmp10_); #line 180 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _vala_array_add14 (&self->priv->d_changed_files, &self->priv->d_changed_files_length1, &self->priv->_d_changed_files_size_, _tmp11_); -#line 1358 "gitg-recursive-monitor.c" +#line 1363 "gitg-recursive-monitor.c" } #line 176 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _g_object_unref0 (f); -#line 1362 "gitg-recursive-monitor.c" +#line 1367 "gitg-recursive-monitor.c" } } } @@ -1368,7 +1373,7 @@ if (_tmp12_ != ((guint) 0)) { #line 186 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return; -#line 1372 "gitg-recursive-monitor.c" +#line 1377 "gitg-recursive-monitor.c" } #line 189 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp13_ = self->priv->d_changed_files; @@ -1376,13 +1381,13 @@ _tmp13__length1 = self->priv->d_changed_files_length1; #line 189 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" if (_tmp13__length1 > 0) { -#line 1380 "gitg-recursive-monitor.c" +#line 1385 "gitg-recursive-monitor.c" guint _tmp14_ = 0U; #line 191 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp14_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda90__gsource_func, g_object_ref (self), g_object_unref); #line 191 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" self->priv->d_monitor_changed_timeout_id = _tmp14_; -#line 1386 "gitg-recursive-monitor.c" +#line 1391 "gitg-recursive-monitor.c" } } @@ -1402,7 +1407,7 @@ _tmp1_ = self->priv->d_monitor_changed_timeout_id; #line 206 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" if (_tmp1_ != ((guint) 0)) { -#line 1406 "gitg-recursive-monitor.c" +#line 1411 "gitg-recursive-monitor.c" guint _tmp2_ = 0U; #line 208 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp2_ = self->priv->d_monitor_changed_timeout_id; @@ -1410,7 +1415,7 @@ g_source_remove (_tmp2_); #line 209 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" self->priv->d_monitor_changed_timeout_id = (guint) 0; -#line 1414 "gitg-recursive-monitor.c" +#line 1419 "gitg-recursive-monitor.c" } { GeeList* _monitor_list = NULL; @@ -1439,7 +1444,7 @@ _monitor_index = -1; #line 212 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" while (TRUE) { -#line 1443 "gitg-recursive-monitor.c" +#line 1448 "gitg-recursive-monitor.c" gint _tmp8_ = 0; gint _tmp9_ = 0; gint _tmp10_ = 0; @@ -1461,7 +1466,7 @@ if (!(_tmp9_ < _tmp10_)) { #line 212 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" break; -#line 1465 "gitg-recursive-monitor.c" +#line 1470 "gitg-recursive-monitor.c" } #line 212 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp11_ = _monitor_list; @@ -1479,11 +1484,11 @@ gitg_recursive_monitor_cancel (_tmp15_); #line 212 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _g_object_unref0 (monitor); -#line 1483 "gitg-recursive-monitor.c" +#line 1488 "gitg-recursive-monitor.c" } #line 212 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _g_object_unref0 (_monitor_list); -#line 1487 "gitg-recursive-monitor.c" +#line 1492 "gitg-recursive-monitor.c" } #line 217 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp16_ = self->priv->d_sub_monitors; @@ -1493,7 +1498,7 @@ _tmp17_ = self->priv->d_monitor; #line 219 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" if (_tmp17_ != NULL) { -#line 1497 "gitg-recursive-monitor.c" +#line 1502 "gitg-recursive-monitor.c" GFileMonitor* _tmp18_ = NULL; #line 221 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" _tmp18_ = self->priv->d_monitor; @@ -1503,7 +1508,7 @@ _g_object_unref0 (self->priv->d_monitor); #line 222 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" self->priv->d_monitor = NULL; -#line 1507 "gitg-recursive-monitor.c" +#line 1512 "gitg-recursive-monitor.c" } } @@ -1523,19 +1528,19 @@ data1 = closure->data; #line 22 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" data2 = param_values->data[0].v_pointer; -#line 1527 "gitg-recursive-monitor.c" +#line 1532 "gitg-recursive-monitor.c" } else { #line 22 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" data1 = param_values->data[0].v_pointer; #line 22 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" data2 = closure->data; -#line 1533 "gitg-recursive-monitor.c" +#line 1538 "gitg-recursive-monitor.c" } #line 22 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" callback = (GMarshalFunc_VOID__POINTER_INT) (marshal_data ? marshal_data : cc->callback); #line 22 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" callback (data1, g_value_get_pointer (param_values + 1), g_value_get_int (param_values + 2), data2); -#line 1539 "gitg-recursive-monitor.c" +#line 1544 "gitg-recursive-monitor.c" } @@ -1569,14 +1574,14 @@ self->monitor = _tmp3_; #line 29 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return self; -#line 1573 "gitg-recursive-monitor.c" +#line 1578 "gitg-recursive-monitor.c" } static GitgRecursiveMonitorMonitor* gitg_recursive_monitor_monitor_new (GFile* location, GitgRecursiveMonitor* monitor) { #line 29 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" return gitg_recursive_monitor_monitor_construct (GITG_RECURSIVE_MONITOR_TYPE_MONITOR, location, monitor); -#line 1580 "gitg-recursive-monitor.c" +#line 1585 "gitg-recursive-monitor.c" } @@ -1585,7 +1590,7 @@ gitg_recursive_monitor_monitor_parent_class = g_type_class_peek_parent (klass); #line 24 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" G_OBJECT_CLASS (klass)->finalize = gitg_recursive_monitor_monitor_finalize; -#line 1589 "gitg-recursive-monitor.c" +#line 1594 "gitg-recursive-monitor.c" } @@ -1593,7 +1598,7 @@ } -static void gitg_recursive_monitor_monitor_finalize (GObject* obj) { +static void gitg_recursive_monitor_monitor_finalize (GObject * obj) { GitgRecursiveMonitorMonitor * self; #line 24 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_RECURSIVE_MONITOR_TYPE_MONITOR, GitgRecursiveMonitorMonitor); @@ -1603,7 +1608,7 @@ _g_object_unref0 (self->monitor); #line 24 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" G_OBJECT_CLASS (gitg_recursive_monitor_monitor_parent_class)->finalize (obj); -#line 1607 "gitg-recursive-monitor.c" +#line 1612 "gitg-recursive-monitor.c" } @@ -1629,19 +1634,19 @@ #line 22 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" G_OBJECT_CLASS (klass)->finalize = gitg_recursive_monitor_finalize; #line 22 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" - g_signal_new ("changed", GITG_TYPE_RECURSIVE_MONITOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__POINTER_INT, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_INT); -#line 1634 "gitg-recursive-monitor.c" + gitg_recursive_monitor_signals[GITG_RECURSIVE_MONITOR_CHANGED_SIGNAL] = g_signal_new ("changed", GITG_TYPE_RECURSIVE_MONITOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__POINTER_INT, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_INT); +#line 1639 "gitg-recursive-monitor.c" } static void gitg_recursive_monitor_instance_init (GitgRecursiveMonitor * self) { #line 22 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" self->priv = GITG_RECURSIVE_MONITOR_GET_PRIVATE (self); -#line 1641 "gitg-recursive-monitor.c" +#line 1646 "gitg-recursive-monitor.c" } -static void gitg_recursive_monitor_finalize (GObject* obj) { +static void gitg_recursive_monitor_finalize (GObject * obj) { GitgRecursiveMonitor * self; #line 22 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_RECURSIVE_MONITOR, GitgRecursiveMonitor); @@ -1663,7 +1668,7 @@ self->priv->d_changed_files = (_vala_array_free (self->priv->d_changed_files, self->priv->d_changed_files_length1, (GDestroyNotify) g_object_unref), NULL); #line 22 "/home/jesse/dev/gitg/gitg/gitg-recursive-monitor.vala" G_OBJECT_CLASS (gitg_recursive_monitor_parent_class)->finalize (obj); -#line 1667 "gitg-recursive-monitor.c" +#line 1672 "gitg-recursive-monitor.c" } diff -Nru gitg-3.22.0/gitg/gitg-recursive-scanner.c gitg-3.23.0/gitg/gitg-recursive-scanner.c --- gitg-3.22.0/gitg/gitg-recursive-scanner.c 2016-08-17 18:00:36.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-recursive-scanner.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-recursive-scanner.c generated by valac 0.32.1, the Vala compiler +/* gitg-recursive-scanner.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-recursive-scanner.vala, do not modify */ /* @@ -620,7 +620,7 @@ #line 40 "/home/jesse/dev/gitg/gitg/gitg-recursive-scanner.vala" _data_->_tmp2_ = NULL; #line 40 "/home/jesse/dev/gitg/gitg/gitg-recursive-scanner.vala" - _data_->_tmp2_ = gee_hash_set_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, ___lambda93__gee_hash_data_func, g_object_ref (_data_->self), g_object_unref, ___lambda94__gee_equal_data_func, g_object_ref (_data_->self), g_object_unref); + _data_->_tmp2_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, ___lambda93__gee_hash_data_func, g_object_ref (_data_->self), g_object_unref, ___lambda94__gee_equal_data_func, g_object_ref (_data_->self), g_object_unref); #line 40 "/home/jesse/dev/gitg/gitg/gitg-recursive-scanner.vala" _data_->_tmp3_ = NULL; #line 40 "/home/jesse/dev/gitg/gitg/gitg-recursive-scanner.vala" diff -Nru gitg-3.22.0/gitg/gitg-ref-action-checkout.c gitg-3.23.0/gitg/gitg-ref-action-checkout.c --- gitg-3.22.0/gitg/gitg-ref-action-checkout.c 2016-08-17 18:00:36.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-ref-action-checkout.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ref-action-checkout.c generated by valac 0.32.1, the Vala compiler +/* gitg-ref-action-checkout.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ref-action-checkout.vala, do not modify */ /* @@ -97,39 +97,37 @@ GitgRepository* _tmp3_; GitgRepository* _tmp4_; GitgRepository* _tmp5_; - const gchar* _tmp6_; + GitgRef* _tmp6_; GitgRef* _tmp7_; - GitgRef* _tmp8_; + GitgParsedRefName* _tmp8_; GitgParsedRefName* _tmp9_; GitgParsedRefName* _tmp10_; - GitgParsedRefName* _tmp11_; + gchar* _tmp11_; gchar* _tmp12_; gchar* _tmp13_; - gchar* _tmp14_; - const gchar* _tmp15_; + const gchar* _tmp14_; + gchar* _tmp15_; gchar* _tmp16_; gchar* _tmp17_; gchar* _tmp18_; - gchar* _tmp19_; + GitgSimpleNotification* _tmp19_; GitgSimpleNotification* _tmp20_; - GitgSimpleNotification* _tmp21_; + GitgExtApplication* _tmp21_; GitgExtApplication* _tmp22_; GitgExtApplication* _tmp23_; - GitgExtApplication* _tmp24_; + GitgExtNotifications* _tmp24_; GitgExtNotifications* _tmp25_; GitgExtNotifications* _tmp26_; - GitgExtNotifications* _tmp27_; - const gchar* _tmp28_; - GitgExtRefActionInterface* _tmp29_; - GitgExtRefActionInterface* _tmp30_; + GitgExtRefActionInterface* _tmp27_; + GitgExtRefActionInterface* _tmp28_; GError * _inner_error_; }; static gpointer gitg_ref_action_checkout_parent_class = NULL; -static GitgExtUIElementIface* gitg_ref_action_checkout_gitg_ext_ui_element_parent_iface = NULL; -static GitgExtActionIface* gitg_ref_action_checkout_gitg_ext_action_parent_iface = NULL; -static GitgExtRefActionIface* gitg_ref_action_checkout_gitg_ext_ref_action_parent_iface = NULL; +static GitgExtUIElementIface * gitg_ref_action_checkout_gitg_ext_ui_element_parent_iface = NULL; +static GitgExtActionIface * gitg_ref_action_checkout_gitg_ext_action_parent_iface = NULL; +static GitgExtRefActionIface * gitg_ref_action_checkout_gitg_ext_ref_action_parent_iface = NULL; GType gitg_ref_action_checkout_get_type (void) G_GNUC_CONST; #define GITG_REF_ACTION_CHECKOUT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_REF_ACTION_CHECKOUT, GitgRefActionCheckoutPrivate)) @@ -163,7 +161,7 @@ static void gitg_ref_action_checkout_real_activate (GitgExtUIElement* base); static void __lambda75_ (GitgRefActionCheckout* self, GObject* obj, GAsyncResult* res); static void ___lambda75__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); -static void gitg_ref_action_checkout_finalize (GObject* obj); +static void gitg_ref_action_checkout_finalize (GObject * obj); static void _vala_gitg_ref_action_checkout_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_ref_action_checkout_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -189,14 +187,14 @@ self = (GitgRefActionCheckout*) g_object_new (object_type, "application", _tmp0_, "action-interface", _tmp1_, "reference", _tmp2_, NULL); #line 32 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return self; -#line 193 "gitg-ref-action-checkout.c" +#line 191 "gitg-ref-action-checkout.c" } GitgRefActionCheckout* gitg_ref_action_checkout_new (GitgExtApplication* application, GitgExtRefActionInterface* action_interface, GitgRef* reference) { #line 32 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return gitg_ref_action_checkout_construct (GITG_TYPE_REF_ACTION_CHECKOUT, application, action_interface, reference); -#line 200 "gitg-ref-action-checkout.c" +#line 198 "gitg-ref-action-checkout.c" } @@ -207,14 +205,14 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" g_slice_free (GitgRefActionCheckoutCheckoutData, _data_); -#line 211 "gitg-ref-action-checkout.c" +#line 209 "gitg-ref-action-checkout.c" } static gpointer _g_object_ref0 (gpointer self) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return self ? g_object_ref (self) : NULL; -#line 218 "gitg-ref-action-checkout.c" +#line 216 "gitg-ref-action-checkout.c" } @@ -233,7 +231,7 @@ _data_->self = _tmp0_; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" gitg_ref_action_checkout_checkout_co (_data_); -#line 237 "gitg-ref-action-checkout.c" +#line 235 "gitg-ref-action-checkout.c" } @@ -246,7 +244,7 @@ result = _data_->result; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return result; -#line 250 "gitg-ref-action-checkout.c" +#line 248 "gitg-ref-action-checkout.c" } @@ -255,7 +253,7 @@ g_atomic_int_inc (&_data51_->_ref_count_); #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return _data51_; -#line 259 "gitg-ref-action-checkout.c" +#line 257 "gitg-ref-action-checkout.c" } @@ -264,7 +262,7 @@ _data51_ = (Block51Data*) _userdata_; #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" if (g_atomic_int_dec_and_test (&_data51_->_ref_count_)) { -#line 268 "gitg-ref-action-checkout.c" +#line 266 "gitg-ref-action-checkout.c" GitgRefActionCheckout* self; #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" self = _data51_->self; @@ -276,20 +274,20 @@ _g_object_unref0 (self); #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" g_slice_free (Block51Data, _data51_); -#line 280 "gitg-ref-action-checkout.c" +#line 278 "gitg-ref-action-checkout.c" } } static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 293 "gitg-ref-action-checkout.c" +#line 291 "gitg-ref-action-checkout.c" } @@ -299,7 +297,7 @@ GError * _inner_error_ = NULL; #line 79 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" self = _data51_->self; -#line 303 "gitg-ref-action-checkout.c" +#line 301 "gitg-ref-action-checkout.c" { GgitRef* _tmp0_ = NULL; GitgRef* _tmp1_ = NULL; @@ -322,7 +320,7 @@ _tmp0_ = _tmp3_; #line 84 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 326 "gitg-ref-action-checkout.c" +#line 324 "gitg-ref-action-checkout.c" goto __catch85_g_error; } #line 84 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" @@ -343,7 +341,7 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 84 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _g_object_unref0 (_tmp0_); -#line 347 "gitg-ref-action-checkout.c" +#line 345 "gitg-ref-action-checkout.c" goto __catch85_g_error; } #line 84 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" @@ -356,7 +354,7 @@ if (_tmp10_ == NULL) { #line 84 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _g_object_unref0 (_tmp9_); -#line 360 "gitg-ref-action-checkout.c" +#line 358 "gitg-ref-action-checkout.c" } #line 84 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _g_object_unref0 (commit); @@ -366,42 +364,39 @@ _g_object_unref0 (_tmp4_); #line 82 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _g_object_unref0 (_tmp0_); -#line 370 "gitg-ref-action-checkout.c" +#line 368 "gitg-ref-action-checkout.c" } goto __finally85; __catch85_g_error: { GError* e = NULL; - const gchar* _tmp11_ = NULL; - GError* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; + GError* _tmp11_ = NULL; + const gchar* _tmp12_ = NULL; + gchar* _tmp13_ = NULL; gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; #line 82 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" e = _inner_error_; #line 82 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _inner_error_ = NULL; #line 88 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp11_ = _ ("Failed to lookup commit: %s"); + _tmp11_ = e; #line 88 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp12_ = e; + _tmp12_ = _tmp11_->message; #line 88 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp13_ = _tmp12_->message; + _tmp13_ = g_strdup_printf (_ ("Failed to lookup commit: %s"), _tmp12_); #line 88 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp14_ = g_strdup_printf (_tmp11_, _tmp13_); + _tmp14_ = _tmp13_; #line 88 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp15_ = _tmp14_; + gitg_simple_notification_error (_data51_->notification, _tmp14_); #line 88 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - gitg_simple_notification_error (_data51_->notification, _tmp15_); -#line 88 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp14_); #line 89 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _g_error_free0 (e); #line 89 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _g_object_unref0 (commit); #line 89 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return; -#line 405 "gitg-ref-action-checkout.c" +#line 400 "gitg-ref-action-checkout.c" } __finally85: #line 82 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" @@ -412,81 +407,78 @@ _g_object_unref0 (commit); #line 82 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return; -#line 416 "gitg-ref-action-checkout.c" +#line 411 "gitg-ref-action-checkout.c" } { GgitCheckoutOptions* opts = NULL; + GgitCheckoutOptions* _tmp15_ = NULL; GgitCheckoutOptions* _tmp16_ = NULL; - GgitCheckoutOptions* _tmp17_ = NULL; - GitgCommit* _tmp18_ = NULL; + GitgCommit* _tmp17_ = NULL; + GgitTree* _tmp18_ = NULL; GgitTree* _tmp19_ = NULL; - GgitTree* _tmp20_ = NULL; - GgitCheckoutOptions* _tmp21_ = NULL; + GgitCheckoutOptions* _tmp20_ = NULL; #line 94 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp16_ = ggit_checkout_options_new (); + _tmp15_ = ggit_checkout_options_new (); #line 94 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - opts = _tmp16_; + opts = _tmp15_; #line 95 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp17_ = opts; + _tmp16_ = opts; #line 95 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - ggit_checkout_options_set_strategy (_tmp17_, GGIT_CHECKOUT_SAFE); + ggit_checkout_options_set_strategy (_tmp16_, GGIT_CHECKOUT_SAFE); #line 97 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp18_ = commit; + _tmp17_ = commit; #line 97 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp19_ = ggit_commit_get_tree ((GgitCommit*) _tmp18_); + _tmp18_ = ggit_commit_get_tree ((GgitCommit*) _tmp17_); #line 97 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 97 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp21_ = opts; + _tmp20_ = opts; #line 97 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - ggit_repository_checkout_tree ((GgitRepository*) _data51_->repo, (GgitObject*) _tmp20_, _tmp21_, &_inner_error_); + ggit_repository_checkout_tree ((GgitRepository*) _data51_->repo, (GgitObject*) _tmp19_, _tmp20_, &_inner_error_); #line 97 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp19_); #line 97 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 97 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _g_object_unref0 (opts); -#line 450 "gitg-ref-action-checkout.c" +#line 445 "gitg-ref-action-checkout.c" goto __catch86_g_error; } #line 92 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _g_object_unref0 (opts); -#line 455 "gitg-ref-action-checkout.c" +#line 450 "gitg-ref-action-checkout.c" } goto __finally86; __catch86_g_error: { GError* e = NULL; + GError* _tmp21_ = NULL; const gchar* _tmp22_ = NULL; - GError* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; + gchar* _tmp23_ = NULL; + gchar* _tmp24_ = NULL; #line 92 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" e = _inner_error_; #line 92 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _inner_error_ = NULL; #line 101 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp22_ = _ ("Failed to checkout branch: %s"); -#line 101 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp23_ = e; + _tmp21_ = e; #line 101 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp24_ = _tmp23_->message; + _tmp22_ = _tmp21_->message; #line 101 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp25_ = g_strdup_printf (_tmp22_, _tmp24_); + _tmp23_ = g_strdup_printf (_ ("Failed to checkout branch: %s"), _tmp22_); #line 101 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp26_ = _tmp25_; + _tmp24_ = _tmp23_; #line 101 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - gitg_simple_notification_error (_data51_->notification, _tmp26_); + gitg_simple_notification_error (_data51_->notification, _tmp24_); #line 101 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _g_free0 (_tmp26_); + _g_free0 (_tmp24_); #line 102 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _g_error_free0 (e); #line 102 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _g_object_unref0 (commit); #line 102 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return; -#line 490 "gitg-ref-action-checkout.c" +#line 482 "gitg-ref-action-checkout.c" } __finally86: #line 92 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" @@ -497,23 +489,23 @@ _g_object_unref0 (commit); #line 92 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return; -#line 501 "gitg-ref-action-checkout.c" +#line 493 "gitg-ref-action-checkout.c" } { - GitgRef* _tmp27_ = NULL; - GitgRef* _tmp28_ = NULL; - const gchar* _tmp29_ = NULL; + GitgRef* _tmp25_ = NULL; + GitgRef* _tmp26_ = NULL; + const gchar* _tmp27_ = NULL; #line 107 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp27_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); + _tmp25_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); #line 107 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp28_ = _tmp27_; + _tmp26_ = _tmp25_; #line 107 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp29_ = ggit_ref_get_name ((GgitRef*) _tmp28_); + _tmp27_ = ggit_ref_get_name ((GgitRef*) _tmp26_); #line 107 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - ggit_repository_set_head ((GgitRepository*) _data51_->repo, _tmp29_, &_inner_error_); + ggit_repository_set_head ((GgitRepository*) _data51_->repo, _tmp27_, &_inner_error_); #line 107 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 517 "gitg-ref-action-checkout.c" +#line 509 "gitg-ref-action-checkout.c" goto __catch87_g_error; } } @@ -521,36 +513,33 @@ __catch87_g_error: { GError* e = NULL; - const gchar* _tmp30_ = NULL; - GError* _tmp31_ = NULL; - const gchar* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; + GError* _tmp28_ = NULL; + const gchar* _tmp29_ = NULL; + gchar* _tmp30_ = NULL; + gchar* _tmp31_ = NULL; #line 105 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" e = _inner_error_; #line 105 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _inner_error_ = NULL; #line 111 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp30_ = _ ("Failed to update HEAD: %s"); + _tmp28_ = e; #line 111 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp31_ = e; + _tmp29_ = _tmp28_->message; #line 111 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp32_ = _tmp31_->message; + _tmp30_ = g_strdup_printf (_ ("Failed to update HEAD: %s"), _tmp29_); #line 111 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp33_ = g_strdup_printf (_tmp30_, _tmp32_); + _tmp31_ = _tmp30_; #line 111 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp34_ = _tmp33_; + gitg_simple_notification_error (_data51_->notification, _tmp31_); #line 111 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - gitg_simple_notification_error (_data51_->notification, _tmp34_); -#line 111 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _g_free0 (_tmp34_); + _g_free0 (_tmp31_); #line 112 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _g_error_free0 (e); #line 112 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _g_object_unref0 (commit); #line 112 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return; -#line 554 "gitg-ref-action-checkout.c" +#line 543 "gitg-ref-action-checkout.c" } __finally87: #line 105 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" @@ -561,20 +550,20 @@ _g_object_unref0 (commit); #line 105 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return; -#line 565 "gitg-ref-action-checkout.c" +#line 554 "gitg-ref-action-checkout.c" } #line 115 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data51_->retval = TRUE; #line 79 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _g_object_unref0 (commit); -#line 571 "gitg-ref-action-checkout.c" +#line 560 "gitg-ref-action-checkout.c" } static void ____lambda74__gitg_async_thread_func (gpointer self, GError** error) { #line 79 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" ___lambda74_ (self, error); -#line 578 "gitg-ref-action-checkout.c" +#line 567 "gitg-ref-action-checkout.c" } @@ -588,7 +577,7 @@ _data_->_res_ = _res_; #line 79 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" gitg_ref_action_checkout_checkout_co (_data_); -#line 592 "gitg-ref-action-checkout.c" +#line 581 "gitg-ref-action-checkout.c" } @@ -597,16 +586,16 @@ switch (_data_->_state_) { #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" case 0: -#line 601 "gitg-ref-action-checkout.c" +#line 590 "gitg-ref-action-checkout.c" goto _state_0; #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" case 1: -#line 605 "gitg-ref-action-checkout.c" +#line 594 "gitg-ref-action-checkout.c" goto _state_1; default: #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" g_assert_not_reached (); -#line 610 "gitg-ref-action-checkout.c" +#line 599 "gitg-ref-action-checkout.c" } _state_0: #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" @@ -648,19 +637,19 @@ #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_tmp6_ = NULL; #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp6_ = _ ("Checkout %s"); + _data_->_tmp6_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) _data_->self); #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_tmp7_ = NULL; #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp7_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) _data_->self); + _data_->_tmp7_ = _data_->_tmp6_; #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_tmp8_ = NULL; #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp8_ = _data_->_tmp7_; + _data_->_tmp8_ = gitg_ref_get_parsed_name (_data_->_tmp7_); #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_tmp9_ = NULL; #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp9_ = gitg_ref_get_parsed_name (_data_->_tmp8_); + _data_->_tmp9_ = _data_->_tmp8_; #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_tmp10_ = NULL; #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" @@ -668,11 +657,11 @@ #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_tmp11_ = NULL; #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp11_ = _data_->_tmp10_; + _data_->_tmp11_ = gitg_parsed_ref_name_get_shortname (_data_->_tmp10_); #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_tmp12_ = NULL; #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp12_ = gitg_parsed_ref_name_get_shortname (_data_->_tmp11_); + _data_->_tmp12_ = _data_->_tmp11_; #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_tmp13_ = NULL; #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" @@ -680,53 +669,53 @@ #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_tmp14_ = NULL; #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp14_ = _data_->_tmp13_; + _data_->_tmp14_ = string_to_string (_data_->_tmp13_); #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_tmp15_ = NULL; #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp15_ = string_to_string (_data_->_tmp14_); + _data_->_tmp15_ = g_strconcat ("'", _data_->_tmp14_, "'", NULL); #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_tmp16_ = NULL; #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp16_ = g_strconcat ("'", _data_->_tmp15_, "'", NULL); + _data_->_tmp16_ = _data_->_tmp15_; #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_tmp17_ = NULL; #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp17_ = _data_->_tmp16_; + _data_->_tmp17_ = g_strdup_printf (_ ("Checkout %s"), _data_->_tmp16_); #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_tmp18_ = NULL; #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp18_ = g_strdup_printf (_data_->_tmp6_, _data_->_tmp17_); + _data_->_tmp18_ = _data_->_tmp17_; #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_tmp19_ = NULL; #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp19_ = _data_->_tmp18_; + _data_->_tmp19_ = gitg_simple_notification_new (_data_->_tmp18_, NULL); #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp20_ = NULL; + g_object_ref_sink (_data_->_tmp19_); #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp20_ = gitg_simple_notification_new (_data_->_tmp19_, NULL); -#line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - g_object_ref_sink (_data_->_tmp20_); -#line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp21_ = NULL; + _data_->_tmp20_ = NULL; #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp21_ = _data_->_tmp20_; + _data_->_tmp20_ = _data_->_tmp19_; #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _g_free0 (_data_->_tmp19_); + _g_free0 (_data_->_tmp18_); #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _g_free0 (_data_->_tmp17_); + _g_free0 (_data_->_tmp16_); #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _g_free0 (_data_->_tmp14_); + _g_free0 (_data_->_tmp13_); #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _g_object_unref0 (_data_->_tmp11_); + _g_object_unref0 (_data_->_tmp10_); #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_data51_->notification = _data_->_tmp21_; + _data_->_data51_->notification = _data_->_tmp20_; #line 73 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_data51_->retval = FALSE; #line 75 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" + _data_->_tmp21_ = NULL; +#line 75 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" + _data_->_tmp21_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); +#line 75 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_tmp22_ = NULL; #line 75 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp22_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); + _data_->_tmp22_ = _data_->_tmp21_; #line 75 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_tmp23_ = NULL; #line 75 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" @@ -734,26 +723,22 @@ #line 75 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_tmp24_ = NULL; #line 75 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp24_ = _data_->_tmp23_; + _data_->_tmp24_ = gitg_ext_application_get_notifications (_data_->_tmp23_); #line 75 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_tmp25_ = NULL; #line 75 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp25_ = gitg_ext_application_get_notifications (_data_->_tmp24_); + _data_->_tmp25_ = _data_->_tmp24_; #line 75 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_tmp26_ = NULL; #line 75 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_tmp26_ = _data_->_tmp25_; #line 75 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp27_ = NULL; + gitg_ext_notifications_add (_data_->_tmp26_, (GitgExtNotification*) _data_->_data51_->notification); #line 75 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp27_ = _data_->_tmp26_; + _g_object_unref0 (_data_->_tmp26_); #line 75 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - gitg_ext_notifications_add (_data_->_tmp27_, (GitgExtNotification*) _data_->_data51_->notification); -#line 75 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _g_object_unref0 (_data_->_tmp27_); -#line 75 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _g_object_unref0 (_data_->_tmp24_); -#line 757 "gitg-ref-action-checkout.c" + _g_object_unref0 (_data_->_tmp23_); +#line 742 "gitg-ref-action-checkout.c" { #line 79 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_state_ = 1; @@ -761,13 +746,13 @@ gitg_async_thread (____lambda74__gitg_async_thread_func, _data_->_data51_, gitg_ref_action_checkout_checkout_ready, _data_); #line 79 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return FALSE; -#line 765 "gitg-ref-action-checkout.c" +#line 750 "gitg-ref-action-checkout.c" _state_1: #line 79 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" gitg_async_thread_finish (_data_->_res_, &_data_->_inner_error_); #line 79 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 771 "gitg-ref-action-checkout.c" +#line 756 "gitg-ref-action-checkout.c" goto __catch84_g_error; } } @@ -778,7 +763,7 @@ g_clear_error (&_data_->_inner_error_); #line 77 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->_inner_error_ = NULL; -#line 782 "gitg-ref-action-checkout.c" +#line 767 "gitg-ref-action-checkout.c" } __finally84: #line 77 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" @@ -793,27 +778,23 @@ g_clear_error (&_data_->_inner_error_); #line 77 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return FALSE; -#line 797 "gitg-ref-action-checkout.c" +#line 782 "gitg-ref-action-checkout.c" } #line 119 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" if (_data_->_data51_->retval) { #line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp28_ = NULL; -#line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp28_ = _ ("Successfully checked out branch to working directory"); -#line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - gitg_simple_notification_success (_data_->_data51_->notification, _data_->_tmp28_); + gitg_simple_notification_success (_data_->_data51_->notification, _ ("Successfully checked out branch to working directory")); #line 122 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp29_ = NULL; + _data_->_tmp27_ = NULL; #line 122 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp29_ = gitg_ext_ref_action_get_action_interface ((GitgExtRefAction*) _data_->self); + _data_->_tmp27_ = gitg_ext_ref_action_get_action_interface ((GitgExtRefAction*) _data_->self); #line 122 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp30_ = NULL; + _data_->_tmp28_ = NULL; #line 122 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp30_ = _data_->_tmp29_; + _data_->_tmp28_ = _data_->_tmp27_; #line 122 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - gitg_ext_ref_action_interface_refresh (_data_->_tmp30_); -#line 817 "gitg-ref-action-checkout.c" + gitg_ext_ref_action_interface_refresh (_data_->_tmp28_); +#line 798 "gitg-ref-action-checkout.c" } #line 125 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _data_->result = _data_->_data51_->retval; @@ -825,11 +806,11 @@ if (_data_->_state_ == 0) { #line 125 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 829 "gitg-ref-action-checkout.c" +#line 810 "gitg-ref-action-checkout.c" } else { #line 125 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" g_simple_async_result_complete (_data_->_async_result); -#line 833 "gitg-ref-action-checkout.c" +#line 814 "gitg-ref-action-checkout.c" } #line 125 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" g_object_unref (_data_->_async_result); @@ -843,17 +824,17 @@ if (_data_->_state_ == 0) { #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 847 "gitg-ref-action-checkout.c" +#line 828 "gitg-ref-action-checkout.c" } else { #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" g_simple_async_result_complete (_data_->_async_result); -#line 851 "gitg-ref-action-checkout.c" +#line 832 "gitg-ref-action-checkout.c" } #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" g_object_unref (_data_->_async_result); #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return FALSE; -#line 857 "gitg-ref-action-checkout.c" +#line 838 "gitg-ref-action-checkout.c" } @@ -865,7 +846,7 @@ _tmp0_ = res; #line 131 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" gitg_ref_action_checkout_checkout_finish (self, _tmp0_); -#line 869 "gitg-ref-action-checkout.c" +#line 850 "gitg-ref-action-checkout.c" } @@ -874,7 +855,7 @@ __lambda75_ ((GitgRefActionCheckout*) self, source_object, res); #line 130 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" g_object_unref (self); -#line 878 "gitg-ref-action-checkout.c" +#line 859 "gitg-ref-action-checkout.c" } @@ -884,7 +865,7 @@ self = (GitgRefActionCheckout*) base; #line 130 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" gitg_ref_action_checkout_checkout (self, ___lambda75__gasync_ready_callback, g_object_ref (self)); -#line 888 "gitg-ref-action-checkout.c" +#line 869 "gitg-ref-action-checkout.c" } @@ -903,27 +884,31 @@ result = _tmp1_; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return result; -#line 907 "gitg-ref-action-checkout.c" +#line 888 "gitg-ref-action-checkout.c" } static void gitg_ref_action_checkout_real_set_application (GitgExtUIElement* base, GitgExtApplication* value) { GitgRefActionCheckout* self; - GitgExtApplication* _tmp0_ = NULL; - GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" self = (GitgRefActionCheckout*) base; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp0_ = value; + if (gitg_ref_action_checkout_real_get_application (self) != value) { +#line 898 "gitg-ref-action-checkout.c" + GitgExtApplication* _tmp0_ = NULL; + GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _g_object_unref0 (self->priv->_application); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" + _g_object_unref0 (self->priv->_application); #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - self->priv->_application = _tmp1_; + self->priv->_application = _tmp1_; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - g_object_notify ((GObject *) self, "application"); -#line 927 "gitg-ref-action-checkout.c" + g_object_notify ((GObject *) self, "application"); +#line 911 "gitg-ref-action-checkout.c" + } } @@ -939,27 +924,31 @@ result = _tmp0_; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return result; -#line 943 "gitg-ref-action-checkout.c" +#line 928 "gitg-ref-action-checkout.c" } static void gitg_ref_action_checkout_real_set_action_interface (GitgExtRefAction* base, GitgExtRefActionInterface* value) { GitgRefActionCheckout* self; - GitgExtRefActionInterface* _tmp0_ = NULL; - GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" self = (GitgRefActionCheckout*) base; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp0_ = value; + if (gitg_ref_action_checkout_real_get_action_interface (self) != value) { +#line 938 "gitg-ref-action-checkout.c" + GitgExtRefActionInterface* _tmp0_ = NULL; + GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _g_object_unref0 (self->priv->_action_interface); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" + _g_object_unref0 (self->priv->_action_interface); #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - self->priv->_action_interface = _tmp1_; + self->priv->_action_interface = _tmp1_; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - g_object_notify ((GObject *) self, "action-interface"); -#line 963 "gitg-ref-action-checkout.c" + g_object_notify ((GObject *) self, "action-interface"); +#line 951 "gitg-ref-action-checkout.c" + } } @@ -975,27 +964,31 @@ result = _tmp0_; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return result; -#line 979 "gitg-ref-action-checkout.c" +#line 968 "gitg-ref-action-checkout.c" } static void gitg_ref_action_checkout_real_set_reference (GitgExtRefAction* base, GitgRef* value) { GitgRefActionCheckout* self; - GitgRef* _tmp0_ = NULL; - GitgRef* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" self = (GitgRefActionCheckout*) base; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp0_ = value; + if (gitg_ref_action_checkout_real_get_reference (self) != value) { +#line 978 "gitg-ref-action-checkout.c" + GitgRef* _tmp0_ = NULL; + GitgRef* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _g_object_unref0 (self->priv->_reference); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - self->priv->_reference = _tmp1_; + _g_object_unref0 (self->priv->_reference); #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - g_object_notify ((GObject *) self, "reference"); -#line 999 "gitg-ref-action-checkout.c" + self->priv->_reference = _tmp1_; +#line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" + g_object_notify ((GObject *) self, "reference"); +#line 991 "gitg-ref-action-checkout.c" + } } @@ -1011,45 +1004,39 @@ result = _tmp0_; #line 43 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return result; -#line 1015 "gitg-ref-action-checkout.c" +#line 1008 "gitg-ref-action-checkout.c" } static gchar* gitg_ref_action_checkout_real_get_display_name (GitgExtUIElement* base) { gchar* result; GitgRefActionCheckout* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 48 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" self = (GitgRefActionCheckout*) base; #line 48 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp0_ = _ ("Checkout"); + _tmp0_ = g_strdup (_ ("Checkout")); #line 48 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 48 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - result = _tmp1_; + result = _tmp0_; #line 48 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return result; -#line 1034 "gitg-ref-action-checkout.c" +#line 1024 "gitg-ref-action-checkout.c" } static gchar* gitg_ref_action_checkout_real_get_description (GitgExtUIElement* base) { gchar* result; GitgRefActionCheckout* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 53 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" self = (GitgRefActionCheckout*) base; #line 53 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp0_ = _ ("Checkout the selected reference"); + _tmp0_ = g_strdup (_ ("Checkout the selected reference")); #line 53 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 53 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - result = _tmp1_; + result = _tmp0_; #line 53 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return result; -#line 1053 "gitg-ref-action-checkout.c" +#line 1040 "gitg-ref-action-checkout.c" } @@ -1059,7 +1046,7 @@ GError * _inner_error_ = NULL; #line 58 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" self = (GitgRefActionCheckout*) base; -#line 1063 "gitg-ref-action-checkout.c" +#line 1050 "gitg-ref-action-checkout.c" { gboolean _tmp0_ = FALSE; GitgRef* _tmp1_ = NULL; @@ -1073,7 +1060,7 @@ _tmp3_ = ggit_ref_is_branch ((GgitRef*) _tmp2_); #line 62 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" if (_tmp3_) { -#line 1077 "gitg-ref-action-checkout.c" +#line 1064 "gitg-ref-action-checkout.c" gboolean _tmp4_ = FALSE; GitgRef* _tmp5_ = NULL; GitgRef* _tmp6_ = NULL; @@ -1088,22 +1075,22 @@ _tmp4_ = _tmp7_; #line 62 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1092 "gitg-ref-action-checkout.c" +#line 1079 "gitg-ref-action-checkout.c" goto __catch88_g_error; } #line 62 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _tmp0_ = !_tmp4_; -#line 1097 "gitg-ref-action-checkout.c" +#line 1084 "gitg-ref-action-checkout.c" } else { #line 62 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _tmp0_ = FALSE; -#line 1101 "gitg-ref-action-checkout.c" +#line 1088 "gitg-ref-action-checkout.c" } #line 62 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" result = _tmp0_; #line 62 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return result; -#line 1107 "gitg-ref-action-checkout.c" +#line 1094 "gitg-ref-action-checkout.c" } goto __finally88; __catch88_g_error: @@ -1112,7 +1099,7 @@ g_clear_error (&_inner_error_); #line 60 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" _inner_error_ = NULL; -#line 1116 "gitg-ref-action-checkout.c" +#line 1103 "gitg-ref-action-checkout.c" } __finally88: #line 60 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" @@ -1123,13 +1110,13 @@ g_clear_error (&_inner_error_); #line 60 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return FALSE; -#line 1127 "gitg-ref-action-checkout.c" +#line 1114 "gitg-ref-action-checkout.c" } #line 65 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" result = FALSE; #line 65 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" return result; -#line 1133 "gitg-ref-action-checkout.c" +#line 1120 "gitg-ref-action-checkout.c" } @@ -1158,7 +1145,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REF_ACTION_CHECKOUT_DESCRIPTION, g_param_spec_string ("description", "description", "description", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REF_ACTION_CHECKOUT_ENABLED, g_param_spec_boolean ("enabled", "enabled", "enabled", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1162 "gitg-ref-action-checkout.c" +#line 1149 "gitg-ref-action-checkout.c" } @@ -1166,7 +1153,7 @@ #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" gitg_ref_action_checkout_gitg_ext_ui_element_parent_iface = g_type_interface_peek_parent (iface); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" - iface->activate = (void (*)(GitgExtUIElement*)) gitg_ref_action_checkout_real_activate; + iface->activate = (void (*) (GitgExtUIElement *)) gitg_ref_action_checkout_real_activate; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" iface->get_application = gitg_ref_action_checkout_real_get_application; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" @@ -1179,14 +1166,14 @@ iface->get_description = gitg_ref_action_checkout_real_get_description; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" iface->get_enabled = gitg_ref_action_checkout_real_get_enabled; -#line 1183 "gitg-ref-action-checkout.c" +#line 1170 "gitg-ref-action-checkout.c" } static void gitg_ref_action_checkout_gitg_ext_action_interface_init (GitgExtActionIface * iface) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" gitg_ref_action_checkout_gitg_ext_action_parent_iface = g_type_interface_peek_parent (iface); -#line 1190 "gitg-ref-action-checkout.c" +#line 1177 "gitg-ref-action-checkout.c" } @@ -1201,18 +1188,18 @@ iface->get_reference = gitg_ref_action_checkout_real_get_reference; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" iface->set_reference = gitg_ref_action_checkout_real_set_reference; -#line 1205 "gitg-ref-action-checkout.c" +#line 1192 "gitg-ref-action-checkout.c" } static void gitg_ref_action_checkout_instance_init (GitgRefActionCheckout * self) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" self->priv = GITG_REF_ACTION_CHECKOUT_GET_PRIVATE (self); -#line 1212 "gitg-ref-action-checkout.c" +#line 1199 "gitg-ref-action-checkout.c" } -static void gitg_ref_action_checkout_finalize (GObject* obj) { +static void gitg_ref_action_checkout_finalize (GObject * obj) { GitgRefActionCheckout * self; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_REF_ACTION_CHECKOUT, GitgRefActionCheckout); @@ -1224,7 +1211,7 @@ _g_object_unref0 (self->priv->_reference); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" G_OBJECT_CLASS (gitg_ref_action_checkout_parent_class)->finalize (obj); -#line 1228 "gitg-ref-action-checkout.c" +#line 1215 "gitg-ref-action-checkout.c" } @@ -1293,13 +1280,13 @@ g_value_set_boolean (value, gitg_ext_ui_element_get_enabled ((GitgExtUIElement*) self)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" break; -#line 1297 "gitg-ref-action-checkout.c" +#line 1284 "gitg-ref-action-checkout.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" break; -#line 1303 "gitg-ref-action-checkout.c" +#line 1290 "gitg-ref-action-checkout.c" } } @@ -1327,13 +1314,13 @@ gitg_ext_ref_action_set_reference ((GitgExtRefAction*) self, g_value_get_object (value)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" break; -#line 1331 "gitg-ref-action-checkout.c" +#line 1318 "gitg-ref-action-checkout.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-checkout.vala" break; -#line 1337 "gitg-ref-action-checkout.c" +#line 1324 "gitg-ref-action-checkout.c" } } diff -Nru gitg-3.22.0/gitg/gitg-ref-action-copy-name.c gitg-3.23.0/gitg/gitg-ref-action-copy-name.c --- gitg-3.22.0/gitg/gitg-ref-action-copy-name.c 2016-08-09 09:50:55.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-ref-action-copy-name.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ref-action-copy-name.c generated by valac 0.32.1, the Vala compiler +/* gitg-ref-action-copy-name.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ref-action-copy-name.vala, do not modify */ /* @@ -62,9 +62,9 @@ static gpointer gitg_ref_action_copy_name_parent_class = NULL; -static GitgExtUIElementIface* gitg_ref_action_copy_name_gitg_ext_ui_element_parent_iface = NULL; -static GitgExtActionIface* gitg_ref_action_copy_name_gitg_ext_action_parent_iface = NULL; -static GitgExtRefActionIface* gitg_ref_action_copy_name_gitg_ext_ref_action_parent_iface = NULL; +static GitgExtUIElementIface * gitg_ref_action_copy_name_gitg_ext_ui_element_parent_iface = NULL; +static GitgExtActionIface * gitg_ref_action_copy_name_gitg_ext_action_parent_iface = NULL; +static GitgExtRefActionIface * gitg_ref_action_copy_name_gitg_ext_ref_action_parent_iface = NULL; GType gitg_ref_action_copy_name_get_type (void) G_GNUC_CONST; #define GITG_REF_ACTION_COPY_NAME_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_REF_ACTION_COPY_NAME, GitgRefActionCopyNamePrivate)) @@ -82,7 +82,7 @@ GitgRefActionCopyName* gitg_ref_action_copy_name_new (GitgExtApplication* application, GitgExtRefActionInterface* action_interface, GitgRef* reference); GitgRefActionCopyName* gitg_ref_action_copy_name_construct (GType object_type, GitgExtApplication* application, GitgExtRefActionInterface* action_interface, GitgRef* reference); static void gitg_ref_action_copy_name_real_activate (GitgExtUIElement* base); -static void gitg_ref_action_copy_name_finalize (GObject* obj); +static void gitg_ref_action_copy_name_finalize (GObject * obj); static void _vala_gitg_ref_action_copy_name_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_ref_action_copy_name_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -267,21 +267,25 @@ static void gitg_ref_action_copy_name_real_set_application (GitgExtUIElement* base, GitgExtApplication* value) { GitgRefActionCopyName* self; - GitgExtApplication* _tmp0_ = NULL; - GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" self = (GitgRefActionCopyName*) base; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" - _tmp0_ = value; + if (gitg_ref_action_copy_name_real_get_application (self) != value) { +#line 275 "gitg-ref-action-copy-name.c" + GitgExtApplication* _tmp0_ = NULL; + GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" - _g_object_unref0 (self->priv->_application); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" - self->priv->_application = _tmp1_; + _g_object_unref0 (self->priv->_application); #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" - g_object_notify ((GObject *) self, "application"); -#line 285 "gitg-ref-action-copy-name.c" + self->priv->_application = _tmp1_; +#line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" + g_object_notify ((GObject *) self, "application"); +#line 288 "gitg-ref-action-copy-name.c" + } } @@ -297,27 +301,31 @@ result = _tmp0_; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" return result; -#line 301 "gitg-ref-action-copy-name.c" +#line 305 "gitg-ref-action-copy-name.c" } static void gitg_ref_action_copy_name_real_set_action_interface (GitgExtRefAction* base, GitgExtRefActionInterface* value) { GitgRefActionCopyName* self; - GitgExtRefActionInterface* _tmp0_ = NULL; - GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" self = (GitgRefActionCopyName*) base; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" - _tmp0_ = value; + if (gitg_ref_action_copy_name_real_get_action_interface (self) != value) { +#line 315 "gitg-ref-action-copy-name.c" + GitgExtRefActionInterface* _tmp0_ = NULL; + GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" - _g_object_unref0 (self->priv->_action_interface); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" - self->priv->_action_interface = _tmp1_; + _g_object_unref0 (self->priv->_action_interface); #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" - g_object_notify ((GObject *) self, "action-interface"); -#line 321 "gitg-ref-action-copy-name.c" + self->priv->_action_interface = _tmp1_; +#line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" + g_object_notify ((GObject *) self, "action-interface"); +#line 328 "gitg-ref-action-copy-name.c" + } } @@ -333,27 +341,31 @@ result = _tmp0_; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" return result; -#line 337 "gitg-ref-action-copy-name.c" +#line 345 "gitg-ref-action-copy-name.c" } static void gitg_ref_action_copy_name_real_set_reference (GitgExtRefAction* base, GitgRef* value) { GitgRefActionCopyName* self; - GitgRef* _tmp0_ = NULL; - GitgRef* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" self = (GitgRefActionCopyName*) base; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" - _tmp0_ = value; + if (gitg_ref_action_copy_name_real_get_reference (self) != value) { +#line 355 "gitg-ref-action-copy-name.c" + GitgRef* _tmp0_ = NULL; + GitgRef* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" - _g_object_unref0 (self->priv->_reference); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" - self->priv->_reference = _tmp1_; + _g_object_unref0 (self->priv->_reference); #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" - g_object_notify ((GObject *) self, "reference"); -#line 357 "gitg-ref-action-copy-name.c" + self->priv->_reference = _tmp1_; +#line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" + g_object_notify ((GObject *) self, "reference"); +#line 368 "gitg-ref-action-copy-name.c" + } } @@ -369,45 +381,39 @@ result = _tmp0_; #line 43 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" return result; -#line 373 "gitg-ref-action-copy-name.c" +#line 385 "gitg-ref-action-copy-name.c" } static gchar* gitg_ref_action_copy_name_real_get_display_name (GitgExtUIElement* base) { gchar* result; GitgRefActionCopyName* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 48 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" self = (GitgRefActionCopyName*) base; #line 48 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" - _tmp0_ = _ ("Copy name"); -#line 48 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (_ ("Copy name")); #line 48 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" - result = _tmp1_; + result = _tmp0_; #line 48 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" return result; -#line 392 "gitg-ref-action-copy-name.c" +#line 401 "gitg-ref-action-copy-name.c" } static gchar* gitg_ref_action_copy_name_real_get_description (GitgExtUIElement* base) { gchar* result; GitgRefActionCopyName* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 53 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" self = (GitgRefActionCopyName*) base; #line 53 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" - _tmp0_ = _ ("Copy the name of the reference to the clipboard"); + _tmp0_ = g_strdup (_ ("Copy the name of the reference to the clipboard")); #line 53 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 53 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" - result = _tmp1_; + result = _tmp0_; #line 53 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" return result; -#line 411 "gitg-ref-action-copy-name.c" +#line 417 "gitg-ref-action-copy-name.c" } @@ -420,7 +426,7 @@ result = TRUE; #line 58 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" return result; -#line 424 "gitg-ref-action-copy-name.c" +#line 430 "gitg-ref-action-copy-name.c" } @@ -449,7 +455,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REF_ACTION_COPY_NAME_DESCRIPTION, g_param_spec_string ("description", "description", "description", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REF_ACTION_COPY_NAME_ENABLED, g_param_spec_boolean ("enabled", "enabled", "enabled", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 453 "gitg-ref-action-copy-name.c" +#line 459 "gitg-ref-action-copy-name.c" } @@ -457,7 +463,7 @@ #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" gitg_ref_action_copy_name_gitg_ext_ui_element_parent_iface = g_type_interface_peek_parent (iface); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" - iface->activate = (void (*)(GitgExtUIElement*)) gitg_ref_action_copy_name_real_activate; + iface->activate = (void (*) (GitgExtUIElement *)) gitg_ref_action_copy_name_real_activate; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" iface->get_application = gitg_ref_action_copy_name_real_get_application; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" @@ -470,14 +476,14 @@ iface->get_description = gitg_ref_action_copy_name_real_get_description; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" iface->get_enabled = gitg_ref_action_copy_name_real_get_enabled; -#line 474 "gitg-ref-action-copy-name.c" +#line 480 "gitg-ref-action-copy-name.c" } static void gitg_ref_action_copy_name_gitg_ext_action_interface_init (GitgExtActionIface * iface) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" gitg_ref_action_copy_name_gitg_ext_action_parent_iface = g_type_interface_peek_parent (iface); -#line 481 "gitg-ref-action-copy-name.c" +#line 487 "gitg-ref-action-copy-name.c" } @@ -492,18 +498,18 @@ iface->get_reference = gitg_ref_action_copy_name_real_get_reference; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" iface->set_reference = gitg_ref_action_copy_name_real_set_reference; -#line 496 "gitg-ref-action-copy-name.c" +#line 502 "gitg-ref-action-copy-name.c" } static void gitg_ref_action_copy_name_instance_init (GitgRefActionCopyName * self) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" self->priv = GITG_REF_ACTION_COPY_NAME_GET_PRIVATE (self); -#line 503 "gitg-ref-action-copy-name.c" +#line 509 "gitg-ref-action-copy-name.c" } -static void gitg_ref_action_copy_name_finalize (GObject* obj) { +static void gitg_ref_action_copy_name_finalize (GObject * obj) { GitgRefActionCopyName * self; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_REF_ACTION_COPY_NAME, GitgRefActionCopyName); @@ -515,7 +521,7 @@ _g_object_unref0 (self->priv->_reference); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" G_OBJECT_CLASS (gitg_ref_action_copy_name_parent_class)->finalize (obj); -#line 519 "gitg-ref-action-copy-name.c" +#line 525 "gitg-ref-action-copy-name.c" } @@ -584,13 +590,13 @@ g_value_set_boolean (value, gitg_ext_ui_element_get_enabled ((GitgExtUIElement*) self)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" break; -#line 588 "gitg-ref-action-copy-name.c" +#line 594 "gitg-ref-action-copy-name.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" break; -#line 594 "gitg-ref-action-copy-name.c" +#line 600 "gitg-ref-action-copy-name.c" } } @@ -618,13 +624,13 @@ gitg_ext_ref_action_set_reference ((GitgExtRefAction*) self, g_value_get_object (value)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" break; -#line 622 "gitg-ref-action-copy-name.c" +#line 628 "gitg-ref-action-copy-name.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-copy-name.vala" break; -#line 628 "gitg-ref-action-copy-name.c" +#line 634 "gitg-ref-action-copy-name.c" } } diff -Nru gitg-3.22.0/gitg/gitg-ref-action-delete.c gitg-3.23.0/gitg/gitg-ref-action-delete.c --- gitg-3.22.0/gitg/gitg-ref-action-delete.c 2016-08-17 18:00:36.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-ref-action-delete.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ref-action-delete.c generated by valac 0.32.1, the Vala compiler +/* gitg-ref-action-delete.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ref-action-delete.vala, do not modify */ /* @@ -63,9 +63,9 @@ static gpointer gitg_ref_action_delete_parent_class = NULL; -static GitgExtUIElementIface* gitg_ref_action_delete_gitg_ext_ui_element_parent_iface = NULL; -static GitgExtActionIface* gitg_ref_action_delete_gitg_ext_action_parent_iface = NULL; -static GitgExtRefActionIface* gitg_ref_action_delete_gitg_ext_ref_action_parent_iface = NULL; +static GitgExtUIElementIface * gitg_ref_action_delete_gitg_ext_ui_element_parent_iface = NULL; +static GitgExtActionIface * gitg_ref_action_delete_gitg_ext_action_parent_iface = NULL; +static GitgExtRefActionIface * gitg_ref_action_delete_gitg_ext_ref_action_parent_iface = NULL; GType gitg_ref_action_delete_get_type (void) G_GNUC_CONST; #define GITG_REF_ACTION_DELETE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_REF_ACTION_DELETE, GitgRefActionDeletePrivate)) @@ -85,7 +85,7 @@ static void gitg_ref_action_delete_real_activate (GitgExtUIElement* base); static gboolean gitg_ref_action_delete_on_response (GitgRefActionDelete* self, GtkResponseType response); static gboolean _gitg_ref_action_delete_on_response_gitg_ext_user_query_response (GitgExtUserQuery* _sender, GtkResponseType response_type, gpointer self); -static void gitg_ref_action_delete_finalize (GObject* obj); +static void gitg_ref_action_delete_finalize (GObject * obj); static void _vala_gitg_ref_action_delete_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_ref_action_delete_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -145,22 +145,20 @@ GitgRef* _tmp5_ = NULL; GitgRef* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; + GitgExtUserQuery* _tmp35_ = NULL; + GitgExtUserQueryResponse* _tmp36_ = NULL; + GitgExtUserQueryResponse* _tmp37_ = NULL; + GitgExtUserQueryResponse** _tmp38_ = NULL; + GitgExtUserQueryResponse** _tmp39_ = NULL; + gint _tmp39__length1 = 0; + GitgExtUserQuery* _tmp40_ = NULL; GitgExtUserQuery* _tmp41_ = NULL; - const gchar* _tmp42_ = NULL; - GitgExtUserQueryResponse* _tmp43_ = NULL; - const gchar* _tmp44_ = NULL; - GitgExtUserQueryResponse* _tmp45_ = NULL; - GitgExtUserQueryResponse** _tmp46_ = NULL; - GitgExtUserQueryResponse** _tmp47_ = NULL; - gint _tmp47__length1 = 0; - GitgExtUserQuery* _tmp48_ = NULL; - GitgExtUserQuery* _tmp49_ = NULL; - GitgExtRefActionInterface* _tmp50_ = NULL; - GitgExtRefActionInterface* _tmp51_ = NULL; - GitgExtApplication* _tmp52_ = NULL; - GitgExtApplication* _tmp53_ = NULL; - GitgExtApplication* _tmp54_ = NULL; - GitgExtUserQuery* _tmp55_ = NULL; + GitgExtRefActionInterface* _tmp42_ = NULL; + GitgExtRefActionInterface* _tmp43_ = NULL; + GitgExtApplication* _tmp44_ = NULL; + GitgExtApplication* _tmp45_ = NULL; + GitgExtApplication* _tmp46_ = NULL; + GitgExtUserQuery* _tmp47_ = NULL; #line 65 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" self = (GitgRefActionDelete*) base; #line 67 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" @@ -185,203 +183,181 @@ _tmp7_ = ggit_ref_is_branch ((GgitRef*) _tmp6_); #line 71 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" if (_tmp7_) { -#line 189 "gitg-ref-action-delete.c" +#line 187 "gitg-ref-action-delete.c" GitgExtUserQuery* _tmp8_ = NULL; const gchar* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; + gchar* _tmp10_ = NULL; gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - GitgExtUserQuery* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; + GitgExtUserQuery* _tmp12_ = NULL; + const gchar* _tmp13_ = NULL; + gchar* _tmp14_ = NULL; + gchar* _tmp15_ = NULL; #line 73 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" _tmp8_ = query; #line 73 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp9_ = _ ("Delete branch %s"); + _tmp9_ = name; #line 73 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp10_ = name; + _tmp10_ = g_strdup_printf (_ ("Delete branch %s"), _tmp9_); #line 73 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp11_ = g_strdup_printf (_tmp9_, _tmp10_); + _tmp11_ = _tmp10_; #line 73 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp12_ = _tmp11_; + gitg_ext_user_query_set_title (_tmp8_, _tmp11_); #line 73 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - gitg_ext_user_query_set_title (_tmp8_, _tmp12_); -#line 73 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _g_free0 (_tmp12_); -#line 74 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp13_ = query; + _g_free0 (_tmp11_); #line 74 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp14_ = _ ("Are you sure that you want to permanently delete the branch %s?"); + _tmp12_ = query; #line 74 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp15_ = name; + _tmp13_ = name; #line 74 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp16_ = g_strdup_printf (_tmp14_, _tmp15_); + _tmp14_ = g_strdup_printf (_ ("Are you sure that you want to permanently delete the branch %s?"), _tmp13_); #line 74 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp17_ = _tmp16_; + _tmp15_ = _tmp14_; #line 74 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - gitg_ext_user_query_set_message (_tmp13_, _tmp17_); + gitg_ext_user_query_set_message (_tmp12_, _tmp15_); #line 74 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _g_free0 (_tmp17_); -#line 228 "gitg-ref-action-delete.c" + _g_free0 (_tmp15_); +#line 220 "gitg-ref-action-delete.c" } else { - GitgRef* _tmp18_ = NULL; - GitgRef* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; + GitgRef* _tmp16_ = NULL; + GitgRef* _tmp17_ = NULL; + gboolean _tmp18_ = FALSE; #line 76 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp18_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); + _tmp16_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); #line 76 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp19_ = _tmp18_; + _tmp17_ = _tmp16_; #line 76 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp20_ = ggit_ref_is_tag ((GgitRef*) _tmp19_); + _tmp18_ = ggit_ref_is_tag ((GgitRef*) _tmp17_); #line 76 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - if (_tmp20_) { -#line 241 "gitg-ref-action-delete.c" - GitgExtUserQuery* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; + if (_tmp18_) { +#line 233 "gitg-ref-action-delete.c" + GitgExtUserQuery* _tmp19_ = NULL; + const gchar* _tmp20_ = NULL; + gchar* _tmp21_ = NULL; + gchar* _tmp22_ = NULL; + GitgExtUserQuery* _tmp23_ = NULL; + const gchar* _tmp24_ = NULL; gchar* _tmp25_ = NULL; - GitgExtUserQuery* _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; - const gchar* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; -#line 78 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp21_ = query; + gchar* _tmp26_ = NULL; #line 78 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp22_ = _ ("Delete tag %s"); + _tmp19_ = query; #line 78 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp23_ = name; + _tmp20_ = name; #line 78 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp24_ = g_strdup_printf (_tmp22_, _tmp23_); + _tmp21_ = g_strdup_printf (_ ("Delete tag %s"), _tmp20_); #line 78 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp25_ = _tmp24_; + _tmp22_ = _tmp21_; #line 78 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - gitg_ext_user_query_set_title (_tmp21_, _tmp25_); + gitg_ext_user_query_set_title (_tmp19_, _tmp22_); #line 78 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _g_free0 (_tmp25_); + _g_free0 (_tmp22_); #line 79 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp26_ = query; + _tmp23_ = query; #line 79 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp27_ = _ ("Are you sure that you want to permanently delete the tag %s?"); + _tmp24_ = name; #line 79 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp28_ = name; -#line 79 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp29_ = g_strdup_printf (_tmp27_, _tmp28_); + _tmp25_ = g_strdup_printf (_ ("Are you sure that you want to permanently delete the tag %s?"), _tmp24_); #line 79 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp30_ = _tmp29_; + _tmp26_ = _tmp25_; #line 79 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - gitg_ext_user_query_set_message (_tmp26_, _tmp30_); + gitg_ext_user_query_set_message (_tmp23_, _tmp26_); #line 79 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _g_free0 (_tmp30_); -#line 280 "gitg-ref-action-delete.c" + _g_free0 (_tmp26_); +#line 266 "gitg-ref-action-delete.c" } else { + GitgExtUserQuery* _tmp27_ = NULL; + const gchar* _tmp28_ = NULL; + gchar* _tmp29_ = NULL; + gchar* _tmp30_ = NULL; GitgExtUserQuery* _tmp31_ = NULL; const gchar* _tmp32_ = NULL; - const gchar* _tmp33_ = NULL; + gchar* _tmp33_ = NULL; gchar* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; - GitgExtUserQuery* _tmp36_ = NULL; - const gchar* _tmp37_ = NULL; - const gchar* _tmp38_ = NULL; - gchar* _tmp39_ = NULL; - gchar* _tmp40_ = NULL; #line 83 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp31_ = query; + _tmp27_ = query; #line 83 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp32_ = _ ("Delete remote branch %s"); -#line 83 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp33_ = name; + _tmp28_ = name; #line 83 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp34_ = g_strdup_printf (_tmp32_, _tmp33_); + _tmp29_ = g_strdup_printf (_ ("Delete remote branch %s"), _tmp28_); #line 83 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp35_ = _tmp34_; + _tmp30_ = _tmp29_; #line 83 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - gitg_ext_user_query_set_title (_tmp31_, _tmp35_); + gitg_ext_user_query_set_title (_tmp27_, _tmp30_); #line 83 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _g_free0 (_tmp35_); -#line 84 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp36_ = query; + _g_free0 (_tmp30_); #line 84 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp37_ = _ ("Are you sure that you want to permanently delete the remote branch %s?"); + _tmp31_ = query; #line 84 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp38_ = name; + _tmp32_ = name; #line 84 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp39_ = g_strdup_printf (_tmp37_, _tmp38_); + _tmp33_ = g_strdup_printf (_ ("Are you sure that you want to permanently delete the remote branch %s?"), _tmp32_); #line 84 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp40_ = _tmp39_; + _tmp34_ = _tmp33_; #line 84 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - gitg_ext_user_query_set_message (_tmp36_, _tmp40_); + gitg_ext_user_query_set_message (_tmp31_, _tmp34_); #line 84 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _g_free0 (_tmp40_); -#line 320 "gitg-ref-action-delete.c" + _g_free0 (_tmp34_); +#line 300 "gitg-ref-action-delete.c" } } #line 87 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp41_ = query; -#line 87 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp42_ = _ ("Cancel"); + _tmp35_ = query; #line 87 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp43_ = gitg_ext_user_query_response_new (_tmp42_, GTK_RESPONSE_CANCEL); + _tmp36_ = gitg_ext_user_query_response_new (_ ("Cancel"), GTK_RESPONSE_CANCEL); #line 87 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp44_ = _ ("Delete"); + _tmp37_ = gitg_ext_user_query_response_new (_ ("Delete"), GTK_RESPONSE_OK); #line 87 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp45_ = gitg_ext_user_query_response_new (_tmp44_, GTK_RESPONSE_OK); + _tmp38_ = g_new0 (GitgExtUserQueryResponse*, 2 + 1); #line 87 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp46_ = g_new0 (GitgExtUserQueryResponse*, 2 + 1); + _tmp38_[0] = _tmp36_; #line 87 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp46_[0] = _tmp43_; + _tmp38_[1] = _tmp37_; #line 87 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp46_[1] = _tmp45_; + _tmp39_ = _tmp38_; #line 87 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp47_ = _tmp46_; + _tmp39__length1 = 2; #line 87 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp47__length1 = 2; + gitg_ext_user_query_set_responses (_tmp35_, _tmp39_, 2); #line 87 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - gitg_ext_user_query_set_responses (_tmp41_, _tmp47_, 2); -#line 87 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp47_ = (_vala_array_free (_tmp47_, _tmp47__length1, (GDestroyNotify) g_object_unref), NULL); + _tmp39_ = (_vala_array_free (_tmp39_, _tmp39__length1, (GDestroyNotify) g_object_unref), NULL); #line 92 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp48_ = query; + _tmp40_ = query; #line 92 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - gitg_ext_user_query_set_default_response (_tmp48_, GTK_RESPONSE_OK); + gitg_ext_user_query_set_default_response (_tmp40_, GTK_RESPONSE_OK); #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp49_ = query; + _tmp41_ = query; #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - g_signal_connect_object (_tmp49_, "response", (GCallback) _gitg_ref_action_delete_on_response_gitg_ext_user_query_response, self, 0); + g_signal_connect_object (_tmp41_, "response", (GCallback) _gitg_ref_action_delete_on_response_gitg_ext_user_query_response, self, 0); #line 95 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp50_ = gitg_ext_ref_action_get_action_interface ((GitgExtRefAction*) self); + _tmp42_ = gitg_ext_ref_action_get_action_interface ((GitgExtRefAction*) self); #line 95 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp51_ = _tmp50_; + _tmp43_ = _tmp42_; #line 95 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp52_ = gitg_ext_ref_action_interface_get_application (_tmp51_); + _tmp44_ = gitg_ext_ref_action_interface_get_application (_tmp43_); #line 95 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp53_ = _tmp52_; + _tmp45_ = _tmp44_; #line 95 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp54_ = _tmp53_; + _tmp46_ = _tmp45_; #line 95 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp55_ = query; + _tmp47_ = query; #line 95 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - gitg_ext_application_user_query (_tmp54_, _tmp55_); + gitg_ext_application_user_query (_tmp46_, _tmp47_); #line 95 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _g_object_unref0 (_tmp54_); + _g_object_unref0 (_tmp46_); #line 65 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" _g_free0 (name); #line 65 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" _g_object_unref0 (query); -#line 375 "gitg-ref-action-delete.c" +#line 351 "gitg-ref-action-delete.c" } static gboolean gitg_ref_action_delete_on_response (GitgRefActionDelete* self, GtkResponseType response) { gboolean result = FALSE; GtkResponseType _tmp0_ = 0; - GitgExtRefActionInterface* _tmp33_ = NULL; - GitgExtRefActionInterface* _tmp34_ = NULL; - GitgRef* _tmp35_ = NULL; - GitgRef* _tmp36_ = NULL; + GitgExtRefActionInterface* _tmp29_ = NULL; + GitgExtRefActionInterface* _tmp30_ = NULL; + GitgRef* _tmp31_ = NULL; + GitgRef* _tmp32_ = NULL; GError * _inner_error_ = NULL; #line 98 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" g_return_val_if_fail (self != NULL, FALSE); @@ -393,7 +369,7 @@ result = TRUE; #line 102 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" return result; -#line 397 "gitg-ref-action-delete.c" +#line 373 "gitg-ref-action-delete.c" } { GitgRef* _tmp1_ = NULL; @@ -406,7 +382,7 @@ ggit_ref_delete ((GgitRef*) _tmp2_, &_inner_error_); #line 107 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 410 "gitg-ref-action-delete.c" +#line 386 "gitg-ref-action-delete.c" goto __catch89_g_error; } } @@ -424,13 +400,13 @@ GitgRef* _tmp7_ = NULL; GitgRef* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; - GitgExtRefActionInterface* _tmp26_ = NULL; - GitgExtRefActionInterface* _tmp27_ = NULL; - GitgExtApplication* _tmp28_ = NULL; - GitgExtApplication* _tmp29_ = NULL; - GitgExtApplication* _tmp30_ = NULL; - const gchar* _tmp31_ = NULL; - const gchar* _tmp32_ = NULL; + GitgExtRefActionInterface* _tmp22_ = NULL; + GitgExtRefActionInterface* _tmp23_ = NULL; + GitgExtApplication* _tmp24_ = NULL; + GitgExtApplication* _tmp25_ = NULL; + GitgExtApplication* _tmp26_ = NULL; + const gchar* _tmp27_ = NULL; + const gchar* _tmp28_ = NULL; #line 105 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" e = _inner_error_; #line 105 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" @@ -453,93 +429,81 @@ _tmp9_ = ggit_ref_is_tag ((GgitRef*) _tmp8_); #line 116 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" if (_tmp9_) { -#line 457 "gitg-ref-action-delete.c" +#line 433 "gitg-ref-action-delete.c" const gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; + gchar* _tmp11_ = NULL; + const gchar* _tmp12_ = NULL; + GError* _tmp13_ = NULL; const gchar* _tmp14_ = NULL; - GError* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; + gchar* _tmp15_ = NULL; #line 119 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp10_ = _ ("Failed to delete tag %s"); + _tmp10_ = name; #line 119 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp11_ = name; -#line 119 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp12_ = g_strdup_printf (_tmp10_, _tmp11_); + _tmp11_ = g_strdup_printf (_ ("Failed to delete tag %s"), _tmp10_); #line 119 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" _g_free0 (title); #line 119 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - title = _tmp12_; -#line 122 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp13_ = _ ("The tag %s could not be deleted: %s"); + title = _tmp11_; #line 122 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp14_ = name; + _tmp12_ = name; #line 122 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp15_ = e; + _tmp13_ = e; #line 122 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp16_ = _tmp15_->message; + _tmp14_ = _tmp13_->message; #line 122 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp17_ = g_strdup_printf (_tmp13_, _tmp14_, _tmp16_); + _tmp15_ = g_strdup_printf (_ ("The tag %s could not be deleted: %s"), _tmp12_, _tmp14_); #line 122 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" _g_free0 (message); #line 122 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - message = _tmp17_; -#line 490 "gitg-ref-action-delete.c" + message = _tmp15_; +#line 460 "gitg-ref-action-delete.c" } else { + const gchar* _tmp16_ = NULL; + gchar* _tmp17_ = NULL; const gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - GError* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; -#line 127 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp18_ = _ ("Failed to delete branch %s"); + GError* _tmp19_ = NULL; + const gchar* _tmp20_ = NULL; + gchar* _tmp21_ = NULL; #line 127 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp19_ = name; + _tmp16_ = name; #line 127 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp20_ = g_strdup_printf (_tmp18_, _tmp19_); + _tmp17_ = g_strdup_printf (_ ("Failed to delete branch %s"), _tmp16_); #line 127 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" _g_free0 (title); #line 127 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - title = _tmp20_; + title = _tmp17_; #line 130 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp21_ = _ ("The branch %s could not be deleted: %s"); + _tmp18_ = name; #line 130 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp22_ = name; + _tmp19_ = e; #line 130 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp23_ = e; + _tmp20_ = _tmp19_->message; #line 130 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp24_ = _tmp23_->message; -#line 130 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp25_ = g_strdup_printf (_tmp21_, _tmp22_, _tmp24_); + _tmp21_ = g_strdup_printf (_ ("The branch %s could not be deleted: %s"), _tmp18_, _tmp20_); #line 130 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" _g_free0 (message); #line 130 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - message = _tmp25_; -#line 524 "gitg-ref-action-delete.c" + message = _tmp21_; +#line 488 "gitg-ref-action-delete.c" } #line 133 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp26_ = gitg_ext_ref_action_get_action_interface ((GitgExtRefAction*) self); + _tmp22_ = gitg_ext_ref_action_get_action_interface ((GitgExtRefAction*) self); #line 133 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp27_ = _tmp26_; + _tmp23_ = _tmp22_; #line 133 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp28_ = gitg_ext_ref_action_interface_get_application (_tmp27_); + _tmp24_ = gitg_ext_ref_action_interface_get_application (_tmp23_); #line 133 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp29_ = _tmp28_; + _tmp25_ = _tmp24_; #line 133 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp30_ = _tmp29_; + _tmp26_ = _tmp25_; #line 133 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp31_ = title; + _tmp27_ = title; #line 133 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp32_ = message; + _tmp28_ = message; #line 133 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - gitg_ext_application_show_infobar (_tmp30_, _tmp31_, _tmp32_, GTK_MESSAGE_ERROR); + gitg_ext_application_show_infobar (_tmp26_, _tmp27_, _tmp28_, GTK_MESSAGE_ERROR); #line 133 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _g_object_unref0 (_tmp30_); + _g_object_unref0 (_tmp26_); #line 137 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" result = TRUE; #line 137 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" @@ -552,7 +516,7 @@ _g_error_free0 (e); #line 137 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" return result; -#line 556 "gitg-ref-action-delete.c" +#line 520 "gitg-ref-action-delete.c" } __finally89: #line 105 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" @@ -563,30 +527,30 @@ g_clear_error (&_inner_error_); #line 105 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" return FALSE; -#line 567 "gitg-ref-action-delete.c" +#line 531 "gitg-ref-action-delete.c" } #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp33_ = gitg_ext_ref_action_get_action_interface ((GitgExtRefAction*) self); + _tmp29_ = gitg_ext_ref_action_get_action_interface ((GitgExtRefAction*) self); #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp34_ = _tmp33_; + _tmp30_ = _tmp29_; #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp35_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); + _tmp31_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp36_ = _tmp35_; + _tmp32_ = _tmp31_; #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - gitg_ext_ref_action_interface_remove_ref (_tmp34_, _tmp36_); + gitg_ext_ref_action_interface_remove_ref (_tmp30_, _tmp32_); #line 141 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" result = TRUE; #line 141 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" return result; -#line 583 "gitg-ref-action-delete.c" +#line 547 "gitg-ref-action-delete.c" } static gpointer _g_object_ref0 (gpointer self) { #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" return self ? g_object_ref (self) : NULL; -#line 590 "gitg-ref-action-delete.c" +#line 554 "gitg-ref-action-delete.c" } @@ -605,27 +569,31 @@ result = _tmp1_; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" return result; -#line 609 "gitg-ref-action-delete.c" +#line 573 "gitg-ref-action-delete.c" } static void gitg_ref_action_delete_real_set_application (GitgExtUIElement* base, GitgExtApplication* value) { GitgRefActionDelete* self; - GitgExtApplication* _tmp0_ = NULL; - GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" self = (GitgRefActionDelete*) base; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp0_ = value; + if (gitg_ref_action_delete_real_get_application (self) != value) { +#line 583 "gitg-ref-action-delete.c" + GitgExtApplication* _tmp0_ = NULL; + GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _g_object_unref0 (self->priv->_application); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" + _g_object_unref0 (self->priv->_application); #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - self->priv->_application = _tmp1_; + self->priv->_application = _tmp1_; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - g_object_notify ((GObject *) self, "application"); -#line 629 "gitg-ref-action-delete.c" + g_object_notify ((GObject *) self, "application"); +#line 596 "gitg-ref-action-delete.c" + } } @@ -641,27 +609,31 @@ result = _tmp0_; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" return result; -#line 645 "gitg-ref-action-delete.c" +#line 613 "gitg-ref-action-delete.c" } static void gitg_ref_action_delete_real_set_action_interface (GitgExtRefAction* base, GitgExtRefActionInterface* value) { GitgRefActionDelete* self; - GitgExtRefActionInterface* _tmp0_ = NULL; - GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" self = (GitgRefActionDelete*) base; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp0_ = value; + if (gitg_ref_action_delete_real_get_action_interface (self) != value) { +#line 623 "gitg-ref-action-delete.c" + GitgExtRefActionInterface* _tmp0_ = NULL; + GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _g_object_unref0 (self->priv->_action_interface); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" + _g_object_unref0 (self->priv->_action_interface); #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - self->priv->_action_interface = _tmp1_; + self->priv->_action_interface = _tmp1_; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - g_object_notify ((GObject *) self, "action-interface"); -#line 665 "gitg-ref-action-delete.c" + g_object_notify ((GObject *) self, "action-interface"); +#line 636 "gitg-ref-action-delete.c" + } } @@ -677,27 +649,31 @@ result = _tmp0_; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" return result; -#line 681 "gitg-ref-action-delete.c" +#line 653 "gitg-ref-action-delete.c" } static void gitg_ref_action_delete_real_set_reference (GitgExtRefAction* base, GitgRef* value) { GitgRefActionDelete* self; - GitgRef* _tmp0_ = NULL; - GitgRef* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" self = (GitgRefActionDelete*) base; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp0_ = value; + if (gitg_ref_action_delete_real_get_reference (self) != value) { +#line 663 "gitg-ref-action-delete.c" + GitgRef* _tmp0_ = NULL; + GitgRef* _tmp1_ = NULL; +#line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" + _tmp0_ = value; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _g_object_unref0 (self->priv->_reference); + _g_object_unref0 (self->priv->_reference); #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - self->priv->_reference = _tmp1_; + self->priv->_reference = _tmp1_; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - g_object_notify ((GObject *) self, "reference"); -#line 701 "gitg-ref-action-delete.c" + g_object_notify ((GObject *) self, "reference"); +#line 676 "gitg-ref-action-delete.c" + } } @@ -713,45 +689,39 @@ result = _tmp0_; #line 43 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" return result; -#line 717 "gitg-ref-action-delete.c" +#line 693 "gitg-ref-action-delete.c" } static gchar* gitg_ref_action_delete_real_get_display_name (GitgExtUIElement* base) { gchar* result; GitgRefActionDelete* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 48 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" self = (GitgRefActionDelete*) base; #line 48 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp0_ = _ ("Delete"); -#line 48 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (_ ("Delete")); #line 48 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - result = _tmp1_; + result = _tmp0_; #line 48 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" return result; -#line 736 "gitg-ref-action-delete.c" +#line 709 "gitg-ref-action-delete.c" } static gchar* gitg_ref_action_delete_real_get_description (GitgExtUIElement* base) { gchar* result; GitgRefActionDelete* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 53 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" self = (GitgRefActionDelete*) base; #line 53 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp0_ = _ ("Delete the selected reference"); -#line 53 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (_ ("Delete the selected reference")); #line 53 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - result = _tmp1_; + result = _tmp0_; #line 53 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" return result; -#line 755 "gitg-ref-action-delete.c" +#line 725 "gitg-ref-action-delete.c" } @@ -774,7 +744,7 @@ if (_tmp3_) { #line 60 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" _tmp0_ = TRUE; -#line 778 "gitg-ref-action-delete.c" +#line 748 "gitg-ref-action-delete.c" } else { GitgRef* _tmp4_ = NULL; GitgRef* _tmp5_ = NULL; @@ -787,13 +757,13 @@ _tmp6_ = ggit_ref_is_tag ((GgitRef*) _tmp5_); #line 61 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" _tmp0_ = _tmp6_; -#line 791 "gitg-ref-action-delete.c" +#line 761 "gitg-ref-action-delete.c" } #line 60 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" result = _tmp0_; #line 60 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" return result; -#line 797 "gitg-ref-action-delete.c" +#line 767 "gitg-ref-action-delete.c" } @@ -822,7 +792,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REF_ACTION_DELETE_DESCRIPTION, g_param_spec_string ("description", "description", "description", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REF_ACTION_DELETE_ENABLED, g_param_spec_boolean ("enabled", "enabled", "enabled", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 826 "gitg-ref-action-delete.c" +#line 796 "gitg-ref-action-delete.c" } @@ -830,7 +800,7 @@ #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" gitg_ref_action_delete_gitg_ext_ui_element_parent_iface = g_type_interface_peek_parent (iface); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" - iface->activate = (void (*)(GitgExtUIElement*)) gitg_ref_action_delete_real_activate; + iface->activate = (void (*) (GitgExtUIElement *)) gitg_ref_action_delete_real_activate; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" iface->get_application = gitg_ref_action_delete_real_get_application; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" @@ -843,14 +813,14 @@ iface->get_description = gitg_ref_action_delete_real_get_description; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" iface->get_enabled = gitg_ref_action_delete_real_get_enabled; -#line 847 "gitg-ref-action-delete.c" +#line 817 "gitg-ref-action-delete.c" } static void gitg_ref_action_delete_gitg_ext_action_interface_init (GitgExtActionIface * iface) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" gitg_ref_action_delete_gitg_ext_action_parent_iface = g_type_interface_peek_parent (iface); -#line 854 "gitg-ref-action-delete.c" +#line 824 "gitg-ref-action-delete.c" } @@ -865,18 +835,18 @@ iface->get_reference = gitg_ref_action_delete_real_get_reference; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" iface->set_reference = gitg_ref_action_delete_real_set_reference; -#line 869 "gitg-ref-action-delete.c" +#line 839 "gitg-ref-action-delete.c" } static void gitg_ref_action_delete_instance_init (GitgRefActionDelete * self) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" self->priv = GITG_REF_ACTION_DELETE_GET_PRIVATE (self); -#line 876 "gitg-ref-action-delete.c" +#line 846 "gitg-ref-action-delete.c" } -static void gitg_ref_action_delete_finalize (GObject* obj) { +static void gitg_ref_action_delete_finalize (GObject * obj) { GitgRefActionDelete * self; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_REF_ACTION_DELETE, GitgRefActionDelete); @@ -888,7 +858,7 @@ _g_object_unref0 (self->priv->_reference); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" G_OBJECT_CLASS (gitg_ref_action_delete_parent_class)->finalize (obj); -#line 892 "gitg-ref-action-delete.c" +#line 862 "gitg-ref-action-delete.c" } @@ -957,13 +927,13 @@ g_value_set_boolean (value, gitg_ext_ui_element_get_enabled ((GitgExtUIElement*) self)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" break; -#line 961 "gitg-ref-action-delete.c" +#line 931 "gitg-ref-action-delete.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" break; -#line 967 "gitg-ref-action-delete.c" +#line 937 "gitg-ref-action-delete.c" } } @@ -991,13 +961,13 @@ gitg_ext_ref_action_set_reference ((GitgExtRefAction*) self, g_value_get_object (value)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" break; -#line 995 "gitg-ref-action-delete.c" +#line 965 "gitg-ref-action-delete.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-delete.vala" break; -#line 1001 "gitg-ref-action-delete.c" +#line 971 "gitg-ref-action-delete.c" } } diff -Nru gitg-3.22.0/gitg/gitg-ref-action-fetch.c gitg-3.23.0/gitg/gitg-ref-action-fetch.c --- gitg-3.22.0/gitg/gitg-ref-action-fetch.c 2016-08-17 18:00:36.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-ref-action-fetch.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ref-action-fetch.c generated by valac 0.32.1, the Vala compiler +/* gitg-ref-action-fetch.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ref-action-fetch.vala, do not modify */ /* @@ -101,55 +101,51 @@ GitgExtNotifications* _tmp5_; GitgExtNotifications* _tmp6_; GitgExtNotifications* _tmp7_; - const gchar* _tmp8_; - GitgRemote* _tmp9_; - const gchar* _tmp10_; + GitgRemote* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; - GeeArrayList* _tmp13_; + GeeArrayList* _tmp12_; gulong tip_updated_id; - GitgRemote* _tmp14_; - gulong _tmp15_; - GitgRemote* _tmp16_; + GitgRemote* _tmp13_; + gulong _tmp14_; + GitgRemote* _tmp15_; GError* e; + GitgRemote* _tmp16_; const gchar* _tmp17_; - GitgRemote* _tmp18_; + GError* _tmp18_; const gchar* _tmp19_; - GError* _tmp20_; - const gchar* _tmp21_; - gchar* _tmp22_; - gchar* _tmp23_; - FILE* _tmp24_; - GError* _tmp25_; - const gchar* _tmp26_; - GitgRemote* _tmp27_; - GitgRemote* _tmp28_; - gint _tmp29_; - gint _tmp30_; - const gchar* _tmp31_; - GitgRemote* _tmp32_; - const gchar* _tmp33_; - gchar* _tmp34_; - gchar* _tmp35_; - const gchar* _tmp36_; - GitgRemote* _tmp37_; - const gchar* _tmp38_; - gint _tmp39_; - gpointer* _tmp40_; - gchar** _tmp41_; - gint _tmp41__length1; - gchar* _tmp42_; - gchar* _tmp43_; - gchar* _tmp44_; - gchar* _tmp45_; + gchar* _tmp20_; + gchar* _tmp21_; + FILE* _tmp22_; + GError* _tmp23_; + const gchar* _tmp24_; + GitgRemote* _tmp25_; + GitgRemote* _tmp26_; + gint _tmp27_; + gint _tmp28_; + GitgRemote* _tmp29_; + const gchar* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; + GitgRemote* _tmp33_; + const gchar* _tmp34_; + gint _tmp35_; + gpointer* _tmp36_; + gchar** _tmp37_; + gint _tmp37__length1; + gchar* _tmp38_; + gchar* _tmp39_; + gchar* _tmp40_; + gchar* _tmp41_; GError * _inner_error_; }; static gpointer gitg_ref_action_fetch_parent_class = NULL; -static GitgExtUIElementIface* gitg_ref_action_fetch_gitg_ext_ui_element_parent_iface = NULL; -static GitgExtActionIface* gitg_ref_action_fetch_gitg_ext_action_parent_iface = NULL; -static GitgExtRefActionIface* gitg_ref_action_fetch_gitg_ext_ref_action_parent_iface = NULL; +static GitgExtUIElementIface * gitg_ref_action_fetch_gitg_ext_ui_element_parent_iface = NULL; +static GitgExtActionIface * gitg_ref_action_fetch_gitg_ext_action_parent_iface = NULL; +static GitgExtRefActionIface * gitg_ref_action_fetch_gitg_ext_ref_action_parent_iface = NULL; GType gitg_ref_action_fetch_get_type (void) G_GNUC_CONST; #define GITG_REF_ACTION_FETCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_REF_ACTION_FETCH, GitgRefActionFetchPrivate)) @@ -184,7 +180,7 @@ static void gitg_ref_action_fetch_real_activate (GitgExtUIElement* base); static void __lambda138_ (GitgRefActionFetch* self, GObject* obj, GAsyncResult* res); static void ___lambda138__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); -static void gitg_ref_action_fetch_finalize (GObject* obj); +static void gitg_ref_action_fetch_finalize (GObject * obj); static void _vala_gitg_ref_action_fetch_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_ref_action_fetch_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -194,7 +190,7 @@ static gpointer _g_object_ref0 (gpointer self) { #line 43 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" return self ? g_object_ref (self) : NULL; -#line 198 "gitg-ref-action-fetch.c" +#line 194 "gitg-ref-action-fetch.c" } @@ -233,7 +229,7 @@ _tmp5_ = branch; #line 45 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" if (_tmp5_ != NULL) { -#line 237 "gitg-ref-action-fetch.c" +#line 233 "gitg-ref-action-fetch.c" { GgitRef* _tmp6_ = NULL; GgitBranch* _tmp7_ = NULL; @@ -248,7 +244,7 @@ _tmp6_ = _tmp8_; #line 49 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 252 "gitg-ref-action-fetch.c" +#line 248 "gitg-ref-action-fetch.c" goto __catch90_g_error; } #line 49 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" @@ -261,7 +257,7 @@ if (_tmp10_ == NULL) { #line 49 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _g_object_unref0 (_tmp9_); -#line 265 "gitg-ref-action-fetch.c" +#line 261 "gitg-ref-action-fetch.c" } #line 49 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _g_object_unref0 (self->priv->d_remote_ref); @@ -269,7 +265,7 @@ self->priv->d_remote_ref = _tmp10_; #line 47 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _g_object_unref0 (_tmp6_); -#line 273 "gitg-ref-action-fetch.c" +#line 269 "gitg-ref-action-fetch.c" } goto __finally90; __catch90_g_error: @@ -278,7 +274,7 @@ g_clear_error (&_inner_error_); #line 47 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _inner_error_ = NULL; -#line 282 "gitg-ref-action-fetch.c" +#line 278 "gitg-ref-action-fetch.c" } __finally90: #line 47 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" @@ -291,7 +287,7 @@ g_clear_error (&_inner_error_); #line 47 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" return NULL; -#line 295 "gitg-ref-action-fetch.c" +#line 291 "gitg-ref-action-fetch.c" } } else { GitgRef* _tmp11_ = NULL; @@ -324,7 +320,7 @@ _g_object_unref0 (_tmp14_); #line 52 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" if (_tmp18_) { -#line 328 "gitg-ref-action-fetch.c" +#line 324 "gitg-ref-action-fetch.c" GitgRef* _tmp19_ = NULL; GitgRef* _tmp20_ = NULL; #line 54 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" @@ -335,14 +331,14 @@ _g_object_unref0 (self->priv->d_remote_ref); #line 54 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" self->priv->d_remote_ref = _tmp20_; -#line 339 "gitg-ref-action-fetch.c" +#line 335 "gitg-ref-action-fetch.c" } } #line 57 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _tmp21_ = self->priv->d_remote_ref; #line 57 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" if (_tmp21_ != NULL) { -#line 346 "gitg-ref-action-fetch.c" +#line 342 "gitg-ref-action-fetch.c" GitgExtApplication* _tmp22_ = NULL; GitgExtRemoteLookup* _tmp23_ = NULL; GitgExtRemoteLookup* _tmp24_ = NULL; @@ -389,20 +385,20 @@ _g_object_unref0 (_tmp29_); #line 59 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _g_object_unref0 (_tmp25_); -#line 393 "gitg-ref-action-fetch.c" +#line 389 "gitg-ref-action-fetch.c" } #line 35 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _g_object_unref0 (branch); #line 35 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" return self; -#line 399 "gitg-ref-action-fetch.c" +#line 395 "gitg-ref-action-fetch.c" } GitgRefActionFetch* gitg_ref_action_fetch_new (GitgExtApplication* application, GitgExtRefActionInterface* action_interface, GitgRef* reference) { #line 35 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" return gitg_ref_action_fetch_construct (GITG_TYPE_REF_ACTION_FETCH, application, action_interface, reference); -#line 406 "gitg-ref-action-fetch.c" +#line 402 "gitg-ref-action-fetch.c" } @@ -413,7 +409,7 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" g_slice_free (GitgRefActionFetchFetchData, _data_); -#line 417 "gitg-ref-action-fetch.c" +#line 413 "gitg-ref-action-fetch.c" } @@ -432,7 +428,7 @@ _data_->self = _tmp0_; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" gitg_ref_action_fetch_fetch_co (_data_); -#line 436 "gitg-ref-action-fetch.c" +#line 432 "gitg-ref-action-fetch.c" } @@ -445,7 +441,7 @@ result = _data_->result; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" return result; -#line 449 "gitg-ref-action-fetch.c" +#line 445 "gitg-ref-action-fetch.c" } @@ -454,7 +450,7 @@ g_atomic_int_inc (&_data52_->_ref_count_); #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" return _data52_; -#line 458 "gitg-ref-action-fetch.c" +#line 454 "gitg-ref-action-fetch.c" } @@ -463,7 +459,7 @@ _data52_ = (Block52Data*) _userdata_; #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" if (g_atomic_int_dec_and_test (&_data52_->_ref_count_)) { -#line 467 "gitg-ref-action-fetch.c" +#line 463 "gitg-ref-action-fetch.c" GitgRefActionFetch* self; #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" self = _data52_->self; @@ -473,20 +469,20 @@ _g_object_unref0 (self); #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" g_slice_free (Block52Data, _data52_); -#line 477 "gitg-ref-action-fetch.c" +#line 473 "gitg-ref-action-fetch.c" } } static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 490 "gitg-ref-action-fetch.c" +#line 486 "gitg-ref-action-fetch.c" } @@ -510,14 +506,13 @@ _tmp1_ = ggit_oid_is_zero (_tmp0_); #line 103 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" if (_tmp1_) { -#line 514 "gitg-ref-action-fetch.c" +#line 510 "gitg-ref-action-fetch.c" const gchar* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; + gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; #line 106 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _tmp2_ = name; #line 106 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" @@ -527,47 +522,42 @@ #line 106 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _tmp5_ = _tmp4_; #line 106 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp6_ = _ ("new"); + _tmp6_ = g_strdup_printf (_tmp5_, _ ("new")); #line 106 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp7_ = g_strdup_printf (_tmp5_, _tmp6_); -#line 106 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 106 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - gee_abstract_collection_add ((GeeAbstractCollection*) _data52_->updates, _tmp8_); + gee_abstract_collection_add ((GeeAbstractCollection*) _data52_->updates, _tmp7_); #line 106 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp7_); #line 106 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _g_free0 (_tmp5_); -#line 542 "gitg-ref-action-fetch.c" +#line 535 "gitg-ref-action-fetch.c" } else { + const gchar* _tmp8_ = NULL; const gchar* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; + gchar* _tmp10_ = NULL; gchar* _tmp11_ = NULL; gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; -#line 111 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp9_ = name; + gchar* _tmp13_ = NULL; #line 111 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp10_ = string_to_string (_tmp9_); + _tmp8_ = name; #line 111 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp11_ = g_strconcat (_tmp10_, " (%s)", NULL); + _tmp9_ = string_to_string (_tmp8_); #line 111 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp12_ = _tmp11_; + _tmp10_ = g_strconcat (_tmp9_, " (%s)", NULL); #line 111 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp13_ = _ ("updated"); + _tmp11_ = _tmp10_; #line 111 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp14_ = g_strdup_printf (_tmp12_, _tmp13_); + _tmp12_ = g_strdup_printf (_tmp11_, _ ("updated")); #line 111 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp15_ = _tmp14_; + _tmp13_ = _tmp12_; #line 111 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - gee_abstract_collection_add ((GeeAbstractCollection*) _data52_->updates, _tmp15_); + gee_abstract_collection_add ((GeeAbstractCollection*) _data52_->updates, _tmp13_); #line 111 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp13_); #line 111 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _g_free0 (_tmp12_); -#line 571 "gitg-ref-action-fetch.c" + _g_free0 (_tmp11_); +#line 561 "gitg-ref-action-fetch.c" } } @@ -575,7 +565,7 @@ static void ___lambda137__gitg_remote_tip_updated (GitgRemote* _sender, const gchar* refname, GgitOId* a, GgitOId* b, gpointer self) { #line 102 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" __lambda137_ (self, _sender, refname, a, b); -#line 579 "gitg-ref-action-fetch.c" +#line 569 "gitg-ref-action-fetch.c" } @@ -589,7 +579,7 @@ _data_->_res_ = _res_; #line 117 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" gitg_ref_action_fetch_fetch_co (_data_); -#line 593 "gitg-ref-action-fetch.c" +#line 583 "gitg-ref-action-fetch.c" } @@ -600,74 +590,74 @@ gboolean _tmp2_ = FALSE; gchar** _tmp3_ = NULL; gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" separator = ""; -#line 610 "gitg-ref-action-fetch.c" +#line 600 "gitg-ref-action-fetch.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = TRUE; -#line 620 "gitg-ref-action-fetch.c" +#line 610 "gitg-ref-action-fetch.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; -#line 630 "gitg-ref-action-fetch.c" +#line 620 "gitg-ref-action-fetch.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 636 "gitg-ref-action-fetch.c" +#line 626 "gitg-ref-action-fetch.c" } else { gboolean _tmp5_ = FALSE; gchar** _tmp6_ = NULL; gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { -#line 647 "gitg-ref-action-fetch.c" +#line 637 "gitg-ref-action-fetch.c" gchar** _tmp7_ = NULL; gint _tmp7__length1 = 0; const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; -#line 659 "gitg-ref-action-fetch.c" +#line 649 "gitg-ref-action-fetch.c" } else { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = FALSE; -#line 663 "gitg-ref-action-fetch.c" +#line 653 "gitg-ref-action-fetch.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; -#line 667 "gitg-ref-action-fetch.c" +#line 657 "gitg-ref-action-fetch.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 671 "gitg-ref-action-fetch.c" +#line 661 "gitg-ref-action-fetch.c" gint i = 0; gsize len = 0UL; gint _tmp31_ = 0; @@ -688,18 +678,18 @@ const gchar* _tmp44_ = NULL; void* _tmp45_ = NULL; const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1075 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" len = (gsize) 1; -#line 694 "gitg-ref-action-fetch.c" +#line 684 "gitg-ref-action-fetch.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { -#line 703 "gitg-ref-action-fetch.c" +#line 693 "gitg-ref-action-fetch.c" gboolean _tmp11_ = FALSE; gboolean _tmp12_ = FALSE; gchar** _tmp13_ = NULL; @@ -710,192 +700,192 @@ gint _tmp23_ = 0; const gchar* _tmp24_ = NULL; gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp9_) { -#line 716 "gitg-ref-action-fetch.c" +#line 706 "gitg-ref-action-fetch.c" gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp10_ + 1; -#line 722 "gitg-ref-action-fetch.c" +#line 712 "gitg-ref-action-fetch.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { -#line 732 "gitg-ref-action-fetch.c" +#line 722 "gitg-ref-action-fetch.c" gint _tmp14_ = 0; gchar** _tmp15_ = NULL; gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; -#line 744 "gitg-ref-action-fetch.c" +#line 734 "gitg-ref-action-fetch.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 748 "gitg-ref-action-fetch.c" +#line 738 "gitg-ref-action-fetch.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = TRUE; -#line 754 "gitg-ref-action-fetch.c" +#line 744 "gitg-ref-action-fetch.c" } else { gboolean _tmp16_ = FALSE; gchar** _tmp17_ = NULL; gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { -#line 765 "gitg-ref-action-fetch.c" +#line 755 "gitg-ref-action-fetch.c" gchar** _tmp18_ = NULL; gint _tmp18__length1 = 0; gint _tmp19_ = 0; const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; -#line 780 "gitg-ref-action-fetch.c" +#line 770 "gitg-ref-action-fetch.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = FALSE; -#line 784 "gitg-ref-action-fetch.c" +#line 774 "gitg-ref-action-fetch.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; -#line 788 "gitg-ref-action-fetch.c" +#line 778 "gitg-ref-action-fetch.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" break; -#line 794 "gitg-ref-action-fetch.c" +#line 784 "gitg-ref-action-fetch.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { -#line 806 "gitg-ref-action-fetch.c" +#line 796 "gitg-ref-action-fetch.c" gchar** _tmp25_ = NULL; gint _tmp25__length1 = 0; gint _tmp26_ = 0; const gchar* _tmp27_ = NULL; gint _tmp28_ = 0; gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; -#line 827 "gitg-ref-action-fetch.c" +#line 817 "gitg-ref-action-fetch.c" } else { -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = 0; -#line 831 "gitg-ref-action-fetch.c" +#line 821 "gitg-ref-action-fetch.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; -#line 837 "gitg-ref-action-fetch.c" +#line 827 "gitg-ref-action-fetch.c" } } -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1079 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1079 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { -#line 844 "gitg-ref-action-fetch.c" +#line 834 "gitg-ref-action-fetch.c" gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1080 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1080 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1080 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 852 "gitg-ref-action-fetch.c" +#line 842 "gitg-ref-action-fetch.c" } -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1082 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1082 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1082 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1085 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1085 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1085 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp45_; -#line 890 "gitg-ref-action-fetch.c" +#line 880 "gitg-ref-action-fetch.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { -#line 899 "gitg-ref-action-fetch.c" +#line 889 "gitg-ref-action-fetch.c" gint _tmp48_ = 0; gchar** _tmp49_ = NULL; gint _tmp49__length1 = 0; @@ -909,96 +899,96 @@ const gchar* _tmp56_ = NULL; void* _tmp60_ = NULL; void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp46_) { -#line 915 "gitg-ref-action-fetch.c" +#line 905 "gitg-ref-action-fetch.c" gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp47_ + 1; -#line 921 "gitg-ref-action-fetch.c" +#line 911 "gitg-ref-action-fetch.c" } -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" break; -#line 935 "gitg-ref-action-fetch.c" +#line 925 "gitg-ref-action-fetch.c" } -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1088 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1088 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1088 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1088 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { -#line 955 "gitg-ref-action-fetch.c" +#line 945 "gitg-ref-action-fetch.c" gchar** _tmp57_ = NULL; gint _tmp57__length1 = 0; gint _tmp58_ = 0; const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; -#line 970 "gitg-ref-action-fetch.c" +#line 960 "gitg-ref-action-fetch.c" } else { -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = ""; -#line 974 "gitg-ref-action-fetch.c" +#line 964 "gitg-ref-action-fetch.c" } -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp61_; -#line 982 "gitg-ref-action-fetch.c" +#line 972 "gitg-ref-action-fetch.c" } } -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1092 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1092 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1092 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1092 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 993 "gitg-ref-action-fetch.c" +#line 983 "gitg-ref-action-fetch.c" } else { gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1094 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1094 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1094 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1002 "gitg-ref-action-fetch.c" +#line 992 "gitg-ref-action-fetch.c" } } @@ -1008,16 +998,16 @@ switch (_data_->_state_) { #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" case 0: -#line 1012 "gitg-ref-action-fetch.c" +#line 1002 "gitg-ref-action-fetch.c" goto _state_0; #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" case 1: -#line 1016 "gitg-ref-action-fetch.c" +#line 1006 "gitg-ref-action-fetch.c" goto _state_1; default: #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" g_assert_not_reached (); -#line 1021 "gitg-ref-action-fetch.c" +#line 1011 "gitg-ref-action-fetch.c" } _state_0: #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" @@ -1073,62 +1063,58 @@ #line 98 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _data_->_tmp8_ = NULL; #line 98 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp8_ = _ ("Fetching from %s"); + _data_->_tmp8_ = _data_->self->priv->d_remote; #line 98 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _data_->_tmp9_ = NULL; #line 98 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp9_ = _data_->self->priv->d_remote; + _data_->_tmp9_ = ggit_remote_get_url ((GgitRemote*) _data_->_tmp8_); #line 98 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _data_->_tmp10_ = NULL; #line 98 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp10_ = ggit_remote_get_url ((GgitRemote*) _data_->_tmp9_); + _data_->_tmp10_ = g_strdup_printf (_ ("Fetching from %s"), _data_->_tmp9_); #line 98 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _data_->_tmp11_ = NULL; #line 98 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp11_ = g_strdup_printf (_data_->_tmp8_, _data_->_tmp10_); -#line 98 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp12_ = NULL; -#line 98 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp12_ = _data_->_tmp11_; + _data_->_tmp11_ = _data_->_tmp10_; #line 98 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - gitg_remote_notification_set_text (_data_->notification, _data_->_tmp12_); + gitg_remote_notification_set_text (_data_->notification, _data_->_tmp11_); #line 98 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _g_free0 (_data_->_tmp12_); + _g_free0 (_data_->_tmp11_); #line 100 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp13_ = NULL; + _data_->_tmp12_ = NULL; #line 100 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp13_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL); + _data_->_tmp12_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL); #line 100 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_data52_->updates = _data_->_tmp13_; + _data_->_data52_->updates = _data_->_tmp12_; #line 102 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp14_ = NULL; + _data_->_tmp13_ = NULL; #line 102 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp14_ = _data_->self->priv->d_remote; + _data_->_tmp13_ = _data_->self->priv->d_remote; #line 102 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp15_ = 0UL; + _data_->_tmp14_ = 0UL; #line 102 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp15_ = g_signal_connect_data (_data_->_tmp14_, "tip-updated", (GCallback) ___lambda137__gitg_remote_tip_updated, block52_data_ref (_data_->_data52_), (GClosureNotify) block52_data_unref, 0); + _data_->_tmp14_ = g_signal_connect_data (_data_->_tmp13_, "tip-updated", (GCallback) ___lambda137__gitg_remote_tip_updated, block52_data_ref (_data_->_data52_), (GClosureNotify) block52_data_unref, 0); #line 102 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->tip_updated_id = _data_->_tmp15_; -#line 1114 "gitg-ref-action-fetch.c" + _data_->tip_updated_id = _data_->_tmp14_; +#line 1100 "gitg-ref-action-fetch.c" { #line 117 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp16_ = NULL; + _data_->_tmp15_ = NULL; #line 117 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp16_ = _data_->self->priv->d_remote; + _data_->_tmp15_ = _data_->self->priv->d_remote; #line 117 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _data_->_state_ = 1; #line 117 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - gitg_remote_fetch (_data_->_tmp16_, NULL, NULL, gitg_ref_action_fetch_fetch_ready, _data_); + gitg_remote_fetch (_data_->_tmp15_, NULL, NULL, gitg_ref_action_fetch_fetch_ready, _data_); #line 117 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" return FALSE; -#line 1126 "gitg-ref-action-fetch.c" +#line 1112 "gitg-ref-action-fetch.c" _state_1: #line 117 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - gitg_remote_fetch_finish (_data_->_tmp16_, _data_->_res_, &_data_->_inner_error_); + gitg_remote_fetch_finish (_data_->_tmp15_, _data_->_res_, &_data_->_inner_error_); #line 117 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 1132 "gitg-ref-action-fetch.c" +#line 1118 "gitg-ref-action-fetch.c" goto __catch91_g_error; } } @@ -1140,64 +1126,60 @@ #line 115 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _data_->_inner_error_ = NULL; #line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" + _data_->_tmp16_ = NULL; +#line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" + _data_->_tmp16_ = _data_->self->priv->d_remote; +#line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _data_->_tmp17_ = NULL; #line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp17_ = _ ("Failed to fetch from %s: %s"); + _data_->_tmp17_ = ggit_remote_get_url ((GgitRemote*) _data_->_tmp16_); #line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _data_->_tmp18_ = NULL; #line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp18_ = _data_->self->priv->d_remote; + _data_->_tmp18_ = _data_->e; #line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _data_->_tmp19_ = NULL; #line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp19_ = ggit_remote_get_url ((GgitRemote*) _data_->_tmp18_); + _data_->_tmp19_ = _data_->_tmp18_->message; #line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _data_->_tmp20_ = NULL; #line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp20_ = _data_->e; + _data_->_tmp20_ = g_strdup_printf (_ ("Failed to fetch from %s: %s"), _data_->_tmp17_, _data_->_tmp19_); #line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _data_->_tmp21_ = NULL; #line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp21_ = _data_->_tmp20_->message; -#line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp22_ = NULL; -#line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp22_ = g_strdup_printf (_data_->_tmp17_, _data_->_tmp19_, _data_->_tmp21_); -#line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp23_ = NULL; -#line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp23_ = _data_->_tmp22_; + _data_->_tmp21_ = _data_->_tmp20_; #line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - gitg_remote_notification_error (_data_->notification, _data_->_tmp23_); + gitg_remote_notification_error (_data_->notification, _data_->_tmp21_); #line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _g_free0 (_data_->_tmp23_); + _g_free0 (_data_->_tmp21_); #line 122 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp24_ = NULL; + _data_->_tmp22_ = NULL; #line 122 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp24_ = stderr; + _data_->_tmp22_ = stderr; #line 122 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp25_ = NULL; + _data_->_tmp23_ = NULL; #line 122 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp25_ = _data_->e; + _data_->_tmp23_ = _data_->e; #line 122 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp26_ = NULL; + _data_->_tmp24_ = NULL; #line 122 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp26_ = _data_->_tmp25_->message; + _data_->_tmp24_ = _data_->_tmp23_->message; #line 122 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - fprintf (_data_->_tmp24_, "Failed to fetch: %s\n", _data_->_tmp26_); + fprintf (_data_->_tmp22_, "Failed to fetch: %s\n", _data_->_tmp24_); #line 124 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _data_->result = FALSE; #line 124 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _g_error_free0 (_data_->e); -#line 1193 "gitg-ref-action-fetch.c" +#line 1175 "gitg-ref-action-fetch.c" { #line 128 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp27_ = NULL; + _data_->_tmp25_ = NULL; #line 128 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp27_ = _data_->self->priv->d_remote; + _data_->_tmp25_ = _data_->self->priv->d_remote; #line 128 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp27_, G_TYPE_OBJECT, GObject), _data_->tip_updated_id); -#line 1201 "gitg-ref-action-fetch.c" + g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp25_, G_TYPE_OBJECT, GObject), _data_->tip_updated_id); +#line 1183 "gitg-ref-action-fetch.c" } #line 124 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _g_object_unref0 (_data_->notification); @@ -1209,27 +1191,27 @@ if (_data_->_state_ == 0) { #line 124 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1213 "gitg-ref-action-fetch.c" +#line 1195 "gitg-ref-action-fetch.c" } else { #line 124 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1217 "gitg-ref-action-fetch.c" +#line 1199 "gitg-ref-action-fetch.c" } #line 124 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" g_object_unref (_data_->_async_result); #line 124 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" return FALSE; -#line 1223 "gitg-ref-action-fetch.c" +#line 1205 "gitg-ref-action-fetch.c" } __finally91: { #line 128 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp28_ = NULL; + _data_->_tmp26_ = NULL; #line 128 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp28_ = _data_->self->priv->d_remote; + _data_->_tmp26_ = _data_->self->priv->d_remote; #line 128 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp28_, G_TYPE_OBJECT, GObject), _data_->tip_updated_id); -#line 1233 "gitg-ref-action-fetch.c" + g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp26_, G_TYPE_OBJECT, GObject), _data_->tip_updated_id); +#line 1215 "gitg-ref-action-fetch.c" } #line 115 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { @@ -1245,95 +1227,87 @@ g_clear_error (&_data_->_inner_error_); #line 115 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" return FALSE; -#line 1249 "gitg-ref-action-fetch.c" +#line 1231 "gitg-ref-action-fetch.c" } #line 131 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp29_ = 0; + _data_->_tmp27_ = 0; #line 131 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp29_ = gee_abstract_collection_get_size ((GeeCollection*) _data_->_data52_->updates); + _data_->_tmp27_ = gee_abstract_collection_get_size ((GeeCollection*) _data_->_data52_->updates); #line 131 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp30_ = 0; + _data_->_tmp28_ = 0; #line 131 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp30_ = _data_->_tmp29_; + _data_->_tmp28_ = _data_->_tmp27_; #line 131 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - if (_data_->_tmp30_ == 0) { -#line 134 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp31_ = NULL; + if (_data_->_tmp28_ == 0) { #line 134 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp31_ = _ ("Fetched from %s: everything is up to date"); + _data_->_tmp29_ = NULL; #line 134 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp32_ = NULL; -#line 134 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp32_ = _data_->self->priv->d_remote; + _data_->_tmp29_ = _data_->self->priv->d_remote; #line 134 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp33_ = NULL; + _data_->_tmp30_ = NULL; #line 134 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp33_ = ggit_remote_get_url ((GgitRemote*) _data_->_tmp32_); + _data_->_tmp30_ = ggit_remote_get_url ((GgitRemote*) _data_->_tmp29_); #line 134 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp34_ = NULL; + _data_->_tmp31_ = NULL; #line 134 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp34_ = g_strdup_printf (_data_->_tmp31_, _data_->_tmp33_); + _data_->_tmp31_ = g_strdup_printf (_ ("Fetched from %s: everything is up to date"), _data_->_tmp30_); #line 134 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp35_ = NULL; + _data_->_tmp32_ = NULL; #line 134 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp35_ = _data_->_tmp34_; + _data_->_tmp32_ = _data_->_tmp31_; #line 134 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - gitg_remote_notification_success (_data_->notification, _data_->_tmp35_); + gitg_remote_notification_success (_data_->notification, _data_->_tmp32_); #line 134 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _g_free0 (_data_->_tmp35_); -#line 1285 "gitg-ref-action-fetch.c" + _g_free0 (_data_->_tmp32_); +#line 1263 "gitg-ref-action-fetch.c" } else { #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp36_ = NULL; -#line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp36_ = _ ("Fetched from %s: %s"); + _data_->_tmp33_ = NULL; #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp37_ = NULL; + _data_->_tmp33_ = _data_->self->priv->d_remote; #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp37_ = _data_->self->priv->d_remote; + _data_->_tmp34_ = NULL; #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp38_ = NULL; + _data_->_tmp34_ = ggit_remote_get_url ((GgitRemote*) _data_->_tmp33_); #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp38_ = ggit_remote_get_url ((GgitRemote*) _data_->_tmp37_); + _data_->_tmp35_ = 0; #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp39_ = 0; + _data_->_tmp36_ = NULL; #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp40_ = NULL; + _data_->_tmp36_ = gee_collection_to_array ((GeeCollection*) _data_->_data52_->updates, &_data_->_tmp35_); #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp40_ = gee_collection_to_array ((GeeCollection*) _data_->_data52_->updates, &_data_->_tmp39_); + _data_->_tmp37_ = NULL; #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp41_ = NULL; + _data_->_tmp37__length1 = 0; #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp41__length1 = 0; + _data_->_tmp37_ = _data_->_tmp36_; #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp41_ = _data_->_tmp40_; + _data_->_tmp37__length1 = _data_->_tmp35_; #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp41__length1 = _data_->_tmp39_; -#line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp42_ = NULL; + _data_->_tmp38_ = NULL; #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp42_ = _vala_g_strjoinv (", ", _data_->_tmp41_, _data_->_tmp39_); + _data_->_tmp38_ = _vala_g_strjoinv (", ", _data_->_tmp37_, _data_->_tmp35_); #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp43_ = NULL; + _data_->_tmp39_ = NULL; #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp43_ = _data_->_tmp42_; + _data_->_tmp39_ = _data_->_tmp38_; #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp44_ = NULL; + _data_->_tmp40_ = NULL; #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp44_ = g_strdup_printf (_data_->_tmp36_, _data_->_tmp38_, _data_->_tmp43_); + _data_->_tmp40_ = g_strdup_printf (_ ("Fetched from %s: %s"), _data_->_tmp34_, _data_->_tmp39_); #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp45_ = NULL; + _data_->_tmp41_ = NULL; #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp45_ = _data_->_tmp44_; + _data_->_tmp41_ = _data_->_tmp40_; #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - gitg_remote_notification_success (_data_->notification, _data_->_tmp45_); + gitg_remote_notification_success (_data_->notification, _data_->_tmp41_); #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _g_free0 (_data_->_tmp45_); + _g_free0 (_data_->_tmp41_); #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _g_free0 (_data_->_tmp43_); + _g_free0 (_data_->_tmp39_); #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _data_->_tmp41_ = (_vala_array_free (_data_->_tmp41_, _data_->_tmp41__length1, (GDestroyNotify) g_free), NULL); -#line 1337 "gitg-ref-action-fetch.c" + _data_->_tmp37_ = (_vala_array_free (_data_->_tmp37_, _data_->_tmp37__length1, (GDestroyNotify) g_free), NULL); +#line 1311 "gitg-ref-action-fetch.c" } #line 143 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _data_->result = TRUE; @@ -1347,11 +1321,11 @@ if (_data_->_state_ == 0) { #line 143 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1351 "gitg-ref-action-fetch.c" +#line 1325 "gitg-ref-action-fetch.c" } else { #line 143 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1355 "gitg-ref-action-fetch.c" +#line 1329 "gitg-ref-action-fetch.c" } #line 143 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" g_object_unref (_data_->_async_result); @@ -1367,17 +1341,17 @@ if (_data_->_state_ == 0) { #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1371 "gitg-ref-action-fetch.c" +#line 1345 "gitg-ref-action-fetch.c" } else { #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1375 "gitg-ref-action-fetch.c" +#line 1349 "gitg-ref-action-fetch.c" } #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" g_object_unref (_data_->_async_result); #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" return FALSE; -#line 1381 "gitg-ref-action-fetch.c" +#line 1355 "gitg-ref-action-fetch.c" } @@ -1389,7 +1363,7 @@ _tmp0_ = res; #line 149 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" gitg_ref_action_fetch_fetch_finish (self, _tmp0_); -#line 1393 "gitg-ref-action-fetch.c" +#line 1367 "gitg-ref-action-fetch.c" } @@ -1398,7 +1372,7 @@ __lambda138_ ((GitgRefActionFetch*) self, source_object, res); #line 148 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" g_object_unref (self); -#line 1402 "gitg-ref-action-fetch.c" +#line 1376 "gitg-ref-action-fetch.c" } @@ -1408,7 +1382,7 @@ self = (GitgRefActionFetch*) base; #line 148 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" gitg_ref_action_fetch_fetch (self, ___lambda138__gasync_ready_callback, g_object_ref (self)); -#line 1412 "gitg-ref-action-fetch.c" +#line 1386 "gitg-ref-action-fetch.c" } @@ -1427,27 +1401,31 @@ result = _tmp1_; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" return result; -#line 1431 "gitg-ref-action-fetch.c" +#line 1405 "gitg-ref-action-fetch.c" } static void gitg_ref_action_fetch_real_set_application (GitgExtUIElement* base, GitgExtApplication* value) { GitgRefActionFetch* self; - GitgExtApplication* _tmp0_ = NULL; - GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" self = (GitgRefActionFetch*) base; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp0_ = value; + if (gitg_ref_action_fetch_real_get_application (self) != value) { +#line 1415 "gitg-ref-action-fetch.c" + GitgExtApplication* _tmp0_ = NULL; + GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _g_object_unref0 (self->priv->_application); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" + _g_object_unref0 (self->priv->_application); #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - self->priv->_application = _tmp1_; + self->priv->_application = _tmp1_; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - g_object_notify ((GObject *) self, "application"); -#line 1451 "gitg-ref-action-fetch.c" + g_object_notify ((GObject *) self, "application"); +#line 1428 "gitg-ref-action-fetch.c" + } } @@ -1463,27 +1441,31 @@ result = _tmp0_; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" return result; -#line 1467 "gitg-ref-action-fetch.c" +#line 1445 "gitg-ref-action-fetch.c" } static void gitg_ref_action_fetch_real_set_action_interface (GitgExtRefAction* base, GitgExtRefActionInterface* value) { GitgRefActionFetch* self; - GitgExtRefActionInterface* _tmp0_ = NULL; - GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" self = (GitgRefActionFetch*) base; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp0_ = value; + if (gitg_ref_action_fetch_real_get_action_interface (self) != value) { +#line 1455 "gitg-ref-action-fetch.c" + GitgExtRefActionInterface* _tmp0_ = NULL; + GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _g_object_unref0 (self->priv->_action_interface); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - self->priv->_action_interface = _tmp1_; + _g_object_unref0 (self->priv->_action_interface); #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - g_object_notify ((GObject *) self, "action-interface"); -#line 1487 "gitg-ref-action-fetch.c" + self->priv->_action_interface = _tmp1_; +#line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" + g_object_notify ((GObject *) self, "action-interface"); +#line 1468 "gitg-ref-action-fetch.c" + } } @@ -1499,27 +1481,31 @@ result = _tmp0_; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" return result; -#line 1503 "gitg-ref-action-fetch.c" +#line 1485 "gitg-ref-action-fetch.c" } static void gitg_ref_action_fetch_real_set_reference (GitgExtRefAction* base, GitgRef* value) { GitgRefActionFetch* self; - GitgRef* _tmp0_ = NULL; - GitgRef* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" self = (GitgRefActionFetch*) base; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp0_ = value; + if (gitg_ref_action_fetch_real_get_reference (self) != value) { +#line 1495 "gitg-ref-action-fetch.c" + GitgRef* _tmp0_ = NULL; + GitgRef* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _g_object_unref0 (self->priv->_reference); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" + _g_object_unref0 (self->priv->_reference); #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - self->priv->_reference = _tmp1_; + self->priv->_reference = _tmp1_; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - g_object_notify ((GObject *) self, "reference"); -#line 1523 "gitg-ref-action-fetch.c" + g_object_notify ((GObject *) self, "reference"); +#line 1508 "gitg-ref-action-fetch.c" + } } @@ -1535,7 +1521,7 @@ result = _tmp0_; #line 65 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" return result; -#line 1539 "gitg-ref-action-fetch.c" +#line 1525 "gitg-ref-action-fetch.c" } @@ -1549,55 +1535,52 @@ _tmp0_ = self->priv->d_remote; #line 72 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" if (_tmp0_ != NULL) { -#line 1553 "gitg-ref-action-fetch.c" - const gchar* _tmp1_ = NULL; - GitgRef* _tmp2_ = NULL; +#line 1539 "gitg-ref-action-fetch.c" + GitgRef* _tmp1_ = NULL; + GitgParsedRefName* _tmp2_ = NULL; GitgParsedRefName* _tmp3_ = NULL; GitgParsedRefName* _tmp4_ = NULL; - GitgParsedRefName* _tmp5_ = NULL; + gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; #line 74 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp1_ = _ ("Fetch from %s"); + _tmp1_ = self->priv->d_remote_ref; #line 74 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp2_ = self->priv->d_remote_ref; + _tmp2_ = gitg_ref_get_parsed_name (_tmp1_); #line 74 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp3_ = gitg_ref_get_parsed_name (_tmp2_); + _tmp3_ = _tmp2_; #line 74 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _tmp4_ = _tmp3_; #line 74 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp5_ = _tmp4_; + _tmp5_ = gitg_parsed_ref_name_get_remote_name (_tmp4_); #line 74 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp6_ = gitg_parsed_ref_name_get_remote_name (_tmp5_); + _tmp6_ = _tmp5_; #line 74 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _tmp7_ = _tmp6_; #line 74 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp8_ = _tmp7_; + _tmp8_ = g_strdup_printf (_ ("Fetch from %s"), _tmp7_); #line 74 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp9_ = g_strdup_printf (_tmp1_, _tmp8_); + _tmp9_ = _tmp8_; #line 74 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp10_ = _tmp9_; + _g_free0 (_tmp7_); #line 74 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _g_free0 (_tmp8_); + _g_object_unref0 (_tmp4_); #line 74 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _g_object_unref0 (_tmp5_); -#line 74 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - result = _tmp10_; + result = _tmp9_; #line 74 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" return result; -#line 1592 "gitg-ref-action-fetch.c" +#line 1575 "gitg-ref-action-fetch.c" } else { - gchar* _tmp11_ = NULL; + gchar* _tmp10_ = NULL; #line 78 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp11_ = g_strdup (""); + _tmp10_ = g_strdup (""); #line 78 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - result = _tmp11_; + result = _tmp10_; #line 78 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" return result; -#line 1601 "gitg-ref-action-fetch.c" +#line 1584 "gitg-ref-action-fetch.c" } } @@ -1605,47 +1588,44 @@ static gchar* gitg_ref_action_fetch_real_get_description (GitgExtUIElement* base) { gchar* result; GitgRefActionFetch* self; - const gchar* _tmp0_ = NULL; - GitgRef* _tmp1_ = NULL; + GitgRef* _tmp0_ = NULL; + GitgParsedRefName* _tmp1_ = NULL; GitgParsedRefName* _tmp2_ = NULL; GitgParsedRefName* _tmp3_ = NULL; - GitgParsedRefName* _tmp4_ = NULL; + gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; #line 85 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" self = (GitgRefActionFetch*) base; #line 85 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp0_ = _ ("Fetch remote objects from %s"); + _tmp0_ = self->priv->d_remote_ref; #line 85 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp1_ = self->priv->d_remote_ref; + _tmp1_ = gitg_ref_get_parsed_name (_tmp0_); #line 85 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp2_ = gitg_ref_get_parsed_name (_tmp1_); + _tmp2_ = _tmp1_; #line 85 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _tmp3_ = _tmp2_; #line 85 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp4_ = _tmp3_; + _tmp4_ = gitg_parsed_ref_name_get_remote_name (_tmp3_); #line 85 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp5_ = gitg_parsed_ref_name_get_remote_name (_tmp4_); + _tmp5_ = _tmp4_; #line 85 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" _tmp6_ = _tmp5_; #line 85 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp7_ = _tmp6_; + _tmp7_ = g_strdup_printf (_ ("Fetch remote objects from %s"), _tmp6_); #line 85 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp8_ = g_strdup_printf (_tmp0_, _tmp7_); + _tmp8_ = _tmp7_; #line 85 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _tmp9_ = _tmp8_; + _g_free0 (_tmp6_); #line 85 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _g_free0 (_tmp7_); + _g_object_unref0 (_tmp3_); #line 85 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - _g_object_unref0 (_tmp4_); -#line 85 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - result = _tmp9_; + result = _tmp8_; #line 85 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" return result; -#line 1649 "gitg-ref-action-fetch.c" +#line 1629 "gitg-ref-action-fetch.c" } @@ -1661,7 +1641,7 @@ result = _tmp0_ != NULL; #line 90 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" return result; -#line 1665 "gitg-ref-action-fetch.c" +#line 1645 "gitg-ref-action-fetch.c" } @@ -1690,7 +1670,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REF_ACTION_FETCH_DESCRIPTION, g_param_spec_string ("description", "description", "description", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REF_ACTION_FETCH_AVAILABLE, g_param_spec_boolean ("available", "available", "available", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1694 "gitg-ref-action-fetch.c" +#line 1674 "gitg-ref-action-fetch.c" } @@ -1698,7 +1678,7 @@ #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" gitg_ref_action_fetch_gitg_ext_ui_element_parent_iface = g_type_interface_peek_parent (iface); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" - iface->activate = (void (*)(GitgExtUIElement*)) gitg_ref_action_fetch_real_activate; + iface->activate = (void (*) (GitgExtUIElement *)) gitg_ref_action_fetch_real_activate; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" iface->get_application = gitg_ref_action_fetch_real_get_application; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" @@ -1711,14 +1691,14 @@ iface->get_description = gitg_ref_action_fetch_real_get_description; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" iface->get_available = gitg_ref_action_fetch_real_get_available; -#line 1715 "gitg-ref-action-fetch.c" +#line 1695 "gitg-ref-action-fetch.c" } static void gitg_ref_action_fetch_gitg_ext_action_interface_init (GitgExtActionIface * iface) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" gitg_ref_action_fetch_gitg_ext_action_parent_iface = g_type_interface_peek_parent (iface); -#line 1722 "gitg-ref-action-fetch.c" +#line 1702 "gitg-ref-action-fetch.c" } @@ -1733,18 +1713,18 @@ iface->get_reference = gitg_ref_action_fetch_real_get_reference; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" iface->set_reference = gitg_ref_action_fetch_real_set_reference; -#line 1737 "gitg-ref-action-fetch.c" +#line 1717 "gitg-ref-action-fetch.c" } static void gitg_ref_action_fetch_instance_init (GitgRefActionFetch * self) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" self->priv = GITG_REF_ACTION_FETCH_GET_PRIVATE (self); -#line 1744 "gitg-ref-action-fetch.c" +#line 1724 "gitg-ref-action-fetch.c" } -static void gitg_ref_action_fetch_finalize (GObject* obj) { +static void gitg_ref_action_fetch_finalize (GObject * obj) { GitgRefActionFetch * self; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_REF_ACTION_FETCH, GitgRefActionFetch); @@ -1760,7 +1740,7 @@ _g_object_unref0 (self->priv->d_remote); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" G_OBJECT_CLASS (gitg_ref_action_fetch_parent_class)->finalize (obj); -#line 1764 "gitg-ref-action-fetch.c" +#line 1744 "gitg-ref-action-fetch.c" } @@ -1829,13 +1809,13 @@ g_value_set_boolean (value, gitg_ext_ui_element_get_available ((GitgExtUIElement*) self)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" break; -#line 1833 "gitg-ref-action-fetch.c" +#line 1813 "gitg-ref-action-fetch.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" break; -#line 1839 "gitg-ref-action-fetch.c" +#line 1819 "gitg-ref-action-fetch.c" } } @@ -1863,13 +1843,13 @@ gitg_ext_ref_action_set_reference ((GitgExtRefAction*) self, g_value_get_object (value)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" break; -#line 1867 "gitg-ref-action-fetch.c" +#line 1847 "gitg-ref-action-fetch.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-fetch.vala" break; -#line 1873 "gitg-ref-action-fetch.c" +#line 1853 "gitg-ref-action-fetch.c" } } diff -Nru gitg-3.22.0/gitg/gitg-ref-action-merge.c gitg-3.23.0/gitg/gitg-ref-action-merge.c --- gitg-3.22.0/gitg/gitg-ref-action-merge.c 2016-08-17 18:00:36.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-ref-action-merge.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ref-action-merge.c generated by valac 0.32.1, the Vala compiler +/* gitg-ref-action-merge.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ref-action-merge.vala, do not modify */ /* @@ -170,64 +170,56 @@ gchar* _tmp13_; gchar* _tmp14_; GitgSimpleNotification* _tmp15_; - const gchar* _tmp16_; GitgRef* head; gboolean ishead; - GitgActionSupport* _tmp17_; + GitgActionSupport* _tmp16_; + GitgRef* _tmp17_; GitgRef* _tmp18_; - GitgRef* _tmp19_; - gboolean _tmp20_; + gboolean _tmp19_; gchar* message; - gboolean _tmp21_; + gboolean _tmp20_; + const gchar* _tmp21_; const gchar* _tmp22_; - const gchar* _tmp23_; - const gchar* _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; - const gchar* _tmp27_; - const gchar* _tmp28_; - gchar* _tmp29_; - gchar* _tmp30_; - const gchar* _tmp31_; - const gchar* _tmp32_; + gchar* _tmp23_; + gchar* _tmp24_; + const gchar* _tmp25_; + const gchar* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + const gchar* _tmp29_; + const gchar* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; gchar* _tmp33_; - gchar* _tmp34_; - gchar* _tmp35_; - const gchar* _tmp36_; - const gchar* _tmp37_; + const gchar* _tmp34_; + const gchar* _tmp35_; + gchar* _tmp36_; + gchar* _tmp37_; const gchar* _tmp38_; - gchar* _tmp39_; + const gchar* _tmp39_; gchar* _tmp40_; - const gchar* _tmp41_; - const gchar* _tmp42_; - gchar* _tmp43_; - gchar* _tmp44_; - gchar* _tmp45_; + gchar* _tmp41_; + gchar* _tmp42_; GitgExtUserQuery* q; - const gchar* _tmp46_; - const gchar* _tmp47_; - const gchar* _tmp48_; - const gchar* _tmp49_; - GitgExtUserQuery* _tmp50_; - GitgExtApplication* _tmp51_; - GitgExtApplication* _tmp52_; - GitgExtApplication* _tmp53_; - GitgExtUserQuery* _tmp54_; - GtkResponseType _tmp55_; - gboolean _tmp56_; - GitgSimpleNotification* _tmp57_; - const gchar* _tmp58_; - GitgActionSupport* _tmp59_; - GitgSimpleNotification* _tmp60_; - GitgRef* _tmp61_; - GitgRef* _tmp62_; - GgitIndex* _tmp63_; - GitgRef* _tmp64_; - gboolean _tmp65_; - GgitIndex* _tmp66_; - GitgRef* _tmp67_; - GitgSimpleNotification* _tmp68_; - const gchar* _tmp69_; + const gchar* _tmp43_; + GitgExtUserQuery* _tmp44_; + GitgExtApplication* _tmp45_; + GitgExtApplication* _tmp46_; + GitgExtApplication* _tmp47_; + GitgExtUserQuery* _tmp48_; + GtkResponseType _tmp49_; + gboolean _tmp50_; + GitgSimpleNotification* _tmp51_; + GitgActionSupport* _tmp52_; + GitgSimpleNotification* _tmp53_; + GitgRef* _tmp54_; + GitgRef* _tmp55_; + GgitIndex* _tmp56_; + GitgRef* _tmp57_; + gboolean _tmp58_; + GgitIndex* _tmp59_; + GitgRef* _tmp60_; + GitgSimpleNotification* _tmp61_; }; struct _GitgRefActionMergeMergeData { @@ -260,110 +252,106 @@ GitgSimpleNotification* notification; const gchar* _tmp15_; const gchar* _tmp16_; - const gchar* _tmp17_; + gchar* _tmp17_; gchar* _tmp18_; - gchar* _tmp19_; + const gchar* _tmp19_; const gchar* _tmp20_; - const gchar* _tmp21_; + gchar* _tmp21_; gchar* _tmp22_; gchar* _tmp23_; gchar* _tmp24_; - gchar* _tmp25_; + GitgSimpleNotification* _tmp25_; GitgSimpleNotification* _tmp26_; - GitgSimpleNotification* _tmp27_; + GitgExtApplication* _tmp27_; GitgExtApplication* _tmp28_; GitgExtApplication* _tmp29_; - GitgExtApplication* _tmp30_; + GitgExtNotifications* _tmp30_; GitgExtNotifications* _tmp31_; GitgExtNotifications* _tmp32_; - GitgExtNotifications* _tmp33_; - GitgSimpleNotification* _tmp34_; - GgitRef* _tmp35_; + GitgSimpleNotification* _tmp33_; + GgitRef* _tmp34_; + GitgRef* _tmp35_; GitgRef* _tmp36_; - GitgRef* _tmp37_; - GgitRef* _tmp38_; - GgitObject* _tmp39_; + GgitRef* _tmp37_; + GgitObject* _tmp38_; + GgitRef* _tmp39_; GgitRef* _tmp40_; - GgitRef* _tmp41_; + GgitObject* _tmp41_; GgitObject* _tmp42_; GgitObject* _tmp43_; - GgitObject* _tmp44_; - GgitCommit* _tmp45_; + GgitCommit* _tmp44_; GError* e; - GitgSimpleNotification* _tmp46_; + GitgSimpleNotification* _tmp45_; + GError* _tmp46_; const gchar* _tmp47_; - GError* _tmp48_; - const gchar* _tmp49_; - gchar* _tmp50_; - gchar* _tmp51_; + gchar* _tmp48_; + gchar* _tmp49_; + GgitRef* _tmp50_; + GitgRef* _tmp51_; GgitRef* _tmp52_; - GitgRef* _tmp53_; + GgitObject* _tmp53_; GgitRef* _tmp54_; - GgitObject* _tmp55_; - GgitRef* _tmp56_; - GgitRef* _tmp57_; + GgitRef* _tmp55_; + GgitObject* _tmp56_; + GgitObject* _tmp57_; GgitObject* _tmp58_; - GgitObject* _tmp59_; - GgitObject* _tmp60_; - GgitCommit* _tmp61_; + GgitCommit* _tmp59_; GError* _vala1_e; - GitgSimpleNotification* _tmp62_; - const gchar* _tmp63_; - GError* _tmp64_; - const gchar* _tmp65_; - gchar* _tmp66_; - gchar* _tmp67_; + GitgSimpleNotification* _tmp60_; + GError* _tmp61_; + const gchar* _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; GgitIndex* index; - GitgSimpleNotification* _tmp68_; - GgitCommit* _tmp69_; - GgitCommit* _tmp70_; - GgitIndex* _tmp71_; - GgitIndex* _tmp72_; + GitgSimpleNotification* _tmp65_; + GgitCommit* _tmp66_; + GgitCommit* _tmp67_; + GgitIndex* _tmp68_; + GgitIndex* _tmp69_; + GgitIndex* _tmp70_; + gboolean _tmp71_; + GitgSimpleNotification* _tmp72_; GgitIndex* _tmp73_; - gboolean _tmp74_; - GitgSimpleNotification* _tmp75_; - GgitIndex* _tmp76_; - GitgRef* _tmp77_; + GitgRef* _tmp74_; gchar* msg; - GitgRef* _tmp78_; - GitgParsedRefName* _tmp79_; - GitgParsedRefName* _tmp80_; - GitgParsedRefName* _tmp81_; - GitgRefType _tmp82_; - GitgRefType _tmp83_; - gboolean _tmp84_; + GitgRef* _tmp75_; + GitgParsedRefName* _tmp76_; + GitgParsedRefName* _tmp77_; + GitgParsedRefName* _tmp78_; + GitgRefType _tmp79_; + GitgRefType _tmp80_; + gboolean _tmp81_; + const gchar* _tmp82_; + const gchar* _tmp83_; + gchar* _tmp84_; const gchar* _tmp85_; const gchar* _tmp86_; gchar* _tmp87_; - const gchar* _tmp88_; - const gchar* _tmp89_; - gchar* _tmp90_; GgitOId* oid; - GitgActionSupport* _tmp91_; - GitgSimpleNotification* _tmp92_; - GitgRef* _tmp93_; - GitgRef* _tmp94_; - GgitIndex* _tmp95_; - GgitCommit* _tmp96_; - GgitOId* _tmp97_; - GgitCommit* _tmp98_; + GitgActionSupport* _tmp88_; + GitgSimpleNotification* _tmp89_; + GitgRef* _tmp90_; + GitgRef* _tmp91_; + GgitIndex* _tmp92_; + GgitCommit* _tmp93_; + GgitOId* _tmp94_; + GgitCommit* _tmp95_; + GgitOId* _tmp96_; + GgitOId** _tmp97_; + const gchar* _tmp98_; GgitOId* _tmp99_; - GgitOId** _tmp100_; - const gchar* _tmp101_; - GgitOId* _tmp102_; - GgitOId* _tmp103_; - GitgSimpleNotification* _tmp104_; - const gchar* _tmp105_; + GgitOId* _tmp100_; + GitgSimpleNotification* _tmp101_; + const gchar* _tmp102_; + const gchar* _tmp103_; + gchar* _tmp104_; + gchar* _tmp105_; const gchar* _tmp106_; const gchar* _tmp107_; gchar* _tmp108_; gchar* _tmp109_; - const gchar* _tmp110_; - const gchar* _tmp111_; - gchar* _tmp112_; - gchar* _tmp113_; - gchar* _tmp114_; - gchar* _tmp115_; + gchar* _tmp110_; + gchar* _tmp111_; GError * _inner_error_; }; @@ -375,9 +363,9 @@ static gpointer gitg_ref_action_merge_parent_class = NULL; -static GitgExtUIElementIface* gitg_ref_action_merge_gitg_ext_ui_element_parent_iface = NULL; -static GitgExtActionIface* gitg_ref_action_merge_gitg_ext_action_parent_iface = NULL; -static GitgExtRefActionIface* gitg_ref_action_merge_gitg_ext_ref_action_parent_iface = NULL; +static GitgExtUIElementIface * gitg_ref_action_merge_gitg_ext_ui_element_parent_iface = NULL; +static GitgExtActionIface * gitg_ref_action_merge_gitg_ext_action_parent_iface = NULL; +static GitgExtRefActionIface * gitg_ref_action_merge_gitg_ext_ref_action_parent_iface = NULL; GType gitg_ref_action_merge_get_type (void) G_GNUC_CONST; static GType gitg_ref_action_merge_remote_source_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; @@ -398,7 +386,7 @@ GITG_REF_ACTION_MERGE_AVAILABLE, GITG_REF_ACTION_MERGE_ENABLED }; -static void _vala_GitgRefActionMergeRemoteSource_array_free (GitgRefActionMergeRemoteSource* array, gint array_length); +static void _vala_GitgRefActionMergeRemoteSource_array_free (GitgRefActionMergeRemoteSource * array, gint array_length); #define GITG_REF_ACTION_MERGE_version VERSION GitgRefActionMerge* gitg_ref_action_merge_new (GitgExtApplication* application, GitgExtRefActionInterface* action_interface, GitgRef* reference); GitgRefActionMerge* gitg_ref_action_merge_construct (GType object_type, GitgExtApplication* application, GitgExtRefActionInterface* action_interface, GitgRef* reference); @@ -423,7 +411,7 @@ static gboolean gitg_ref_action_merge_checkout_conflicts_finish (GitgRefActionMerge* self, GAsyncResult* _res_); static gboolean gitg_ref_action_merge_checkout_conflicts_co (GitgRefActionMergeCheckoutConflictsData* _data_); void gitg_simple_notification_set_message (GitgSimpleNotification* self, const gchar* value); -gboolean gitg_action_support_reference_is_head (GitgActionSupport* self, GitgRef* reference, GitgRef** head); +gboolean gitg_action_support_reference_is_head (GitgActionSupport* self, GitgRef* reference, GitgRef* * head); static void gitg_ref_action_merge_checkout_conflicts_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); void gitg_action_support_checkout_conflicts (GitgActionSupport* self, GitgSimpleNotification* notification, GitgRef* reference, GgitIndex* index, GitgRef* head, GAsyncReadyCallback _callback_, gpointer _user_data_); gboolean gitg_action_support_checkout_conflicts_finish (GitgActionSupport* self, GAsyncResult* _res_); @@ -447,34 +435,34 @@ static void __lambda141_ (Block54Data* _data54_); static void ___lambda141__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); static void gitg_ref_action_merge_ensure_sources (GitgRefActionMerge* self); -static void _vala_array_add15 (GitgRef*** array, int* length, int* size, GitgRef* value); -static void _vala_array_add16 (GitgRef*** array, int* length, int* size, GitgRef* value); -static void _vala_array_add17 (GitgRefActionMergeRemoteSource** array, int* length, int* size, const GitgRefActionMergeRemoteSource* value); -static void _vala_array_add18 (GitgRef*** array, int* length, int* size, GitgRef* value); +static void _vala_array_add15 (GitgRef** * array, int* length, int* size, GitgRef* value); +static void _vala_array_add16 (GitgRef** * array, int* length, int* size, GitgRef* value); +static void _vala_array_add17 (GitgRefActionMergeRemoteSource* * array, int* length, int* size, const GitgRefActionMergeRemoteSource* value); +static void _vala_array_add18 (GitgRef** * array, int* length, int* size, GitgRef* value); static void gitg_ref_action_merge_real_populate_menu (GitgExtAction* base, GtkMenu* menu); static GitgRef** _vala_array_dup18 (GitgRef** self, int length); -static void gitg_ref_action_merge_finalize (GObject* obj); +static void gitg_ref_action_merge_finalize (GObject * obj); static void _vala_gitg_ref_action_merge_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_ref_action_merge_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_GitgRefActionMergeRemoteSource_array_free (GitgRefActionMergeRemoteSource* array, gint array_length) { +static void _vala_GitgRefActionMergeRemoteSource_array_free (GitgRefActionMergeRemoteSource * array, gint array_length) { #line 41 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (array != NULL) { -#line 467 "gitg-ref-action-merge.c" +#line 455 "gitg-ref-action-merge.c" int i; #line 41 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" for (i = 0; i < array_length; i = i + 1) { #line 41 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_remote_source_destroy (&array[i]); -#line 473 "gitg-ref-action-merge.c" +#line 461 "gitg-ref-action-merge.c" } } #line 41 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_free (array); -#line 478 "gitg-ref-action-merge.c" +#line 466 "gitg-ref-action-merge.c" } @@ -512,14 +500,14 @@ self->priv->d_support = _tmp5_; #line 45 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return self; -#line 516 "gitg-ref-action-merge.c" +#line 504 "gitg-ref-action-merge.c" } GitgRefActionMerge* gitg_ref_action_merge_new (GitgExtApplication* application, GitgExtRefActionInterface* action_interface, GitgRef* reference) { #line 45 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return gitg_ref_action_merge_construct (GITG_TYPE_REF_ACTION_MERGE, application, action_interface, reference); -#line 523 "gitg-ref-action-merge.c" +#line 511 "gitg-ref-action-merge.c" } @@ -532,14 +520,14 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_slice_free (GitgRefActionMergeCreateMergeIndexData, _data_); -#line 536 "gitg-ref-action-merge.c" +#line 524 "gitg-ref-action-merge.c" } static gpointer _g_object_ref0 (gpointer self) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return self ? g_object_ref (self) : NULL; -#line 543 "gitg-ref-action-merge.c" +#line 531 "gitg-ref-action-merge.c" } @@ -588,7 +576,7 @@ _data_->theirs = _tmp6_; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_create_merge_index_co (_data_); -#line 592 "gitg-ref-action-merge.c" +#line 580 "gitg-ref-action-merge.c" } @@ -603,7 +591,7 @@ _data_->result = NULL; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return result; -#line 607 "gitg-ref-action-merge.c" +#line 595 "gitg-ref-action-merge.c" } @@ -612,7 +600,7 @@ g_atomic_int_inc (&_data53_->_ref_count_); #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return _data53_; -#line 616 "gitg-ref-action-merge.c" +#line 604 "gitg-ref-action-merge.c" } @@ -621,7 +609,7 @@ _data53_ = (Block53Data*) _userdata_; #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (g_atomic_int_dec_and_test (&_data53_->_ref_count_)) { -#line 625 "gitg-ref-action-merge.c" +#line 613 "gitg-ref-action-merge.c" GitgRefActionMerge* self; #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" self = _data53_->self; @@ -637,7 +625,7 @@ _g_object_unref0 (self); #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_slice_free (Block53Data, _data53_); -#line 641 "gitg-ref-action-merge.c" +#line 629 "gitg-ref-action-merge.c" } } @@ -645,7 +633,7 @@ static void _vala_GgitMergeOptions_free (GgitMergeOptions* self) { #line 107 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_boxed_free (ggit_merge_options_get_type (), self); -#line 649 "gitg-ref-action-merge.c" +#line 637 "gitg-ref-action-merge.c" } @@ -660,7 +648,7 @@ _tmp0_ = ggit_merge_options_new (); #line 98 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" options = _tmp0_; -#line 664 "gitg-ref-action-merge.c" +#line 652 "gitg-ref-action-merge.c" { GgitIndex* _tmp1_ = NULL; GitgExtApplication* _tmp2_ = NULL; @@ -705,7 +693,7 @@ _tmp1_ = _tmp12_; #line 102 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 709 "gitg-ref-action-merge.c" +#line 697 "gitg-ref-action-merge.c" goto __catch92_g_error; } #line 102 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -718,18 +706,17 @@ _data53_->index = _tmp13_; #line 100 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (_tmp1_); -#line 722 "gitg-ref-action-merge.c" +#line 710 "gitg-ref-action-merge.c" } goto __finally92; __catch92_g_error: { GError* e = NULL; GitgSimpleNotification* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - GError* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; + GError* _tmp15_ = NULL; + const gchar* _tmp16_ = NULL; + gchar* _tmp17_ = NULL; gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; #line 100 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" e = _inner_error_; #line 100 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -737,26 +724,24 @@ #line 106 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp14_ = _data53_->notification; #line 106 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp15_ = _ ("Failed to merge commits: %s"); + _tmp15_ = e; #line 106 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp16_ = e; + _tmp16_ = _tmp15_->message; #line 106 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp17_ = _tmp16_->message; + _tmp17_ = g_strdup_printf (_ ("Failed to merge commits: %s"), _tmp16_); #line 106 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp18_ = g_strdup_printf (_tmp15_, _tmp17_); + _tmp18_ = _tmp17_; #line 106 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp19_ = _tmp18_; -#line 106 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gitg_simple_notification_error (_tmp14_, _tmp19_); + gitg_simple_notification_error (_tmp14_, _tmp18_); #line 106 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_free0 (_tmp19_); + _g_free0 (_tmp18_); #line 107 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_error_free0 (e); #line 107 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" __vala_GgitMergeOptions_free0 (options); #line 107 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return; -#line 760 "gitg-ref-action-merge.c" +#line 745 "gitg-ref-action-merge.c" } __finally92: #line 100 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -767,18 +752,18 @@ __vala_GgitMergeOptions_free0 (options); #line 100 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return; -#line 771 "gitg-ref-action-merge.c" +#line 756 "gitg-ref-action-merge.c" } #line 97 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" __vala_GgitMergeOptions_free0 (options); -#line 775 "gitg-ref-action-merge.c" +#line 760 "gitg-ref-action-merge.c" } static void ___lambda139__gitg_async_thread_func (gpointer self, GError** error) { #line 97 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" __lambda139_ (self, error); -#line 782 "gitg-ref-action-merge.c" +#line 767 "gitg-ref-action-merge.c" } @@ -792,7 +777,7 @@ _data_->_res_ = _res_; #line 97 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_create_merge_index_co (_data_); -#line 796 "gitg-ref-action-merge.c" +#line 781 "gitg-ref-action-merge.c" } @@ -801,16 +786,16 @@ switch (_data_->_state_) { #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" case 0: -#line 805 "gitg-ref-action-merge.c" +#line 790 "gitg-ref-action-merge.c" goto _state_0; #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" case 1: -#line 809 "gitg-ref-action-merge.c" +#line 794 "gitg-ref-action-merge.c" goto _state_1; default: #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_assert_not_reached (); -#line 814 "gitg-ref-action-merge.c" +#line 799 "gitg-ref-action-merge.c" } _state_0: #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -853,7 +838,7 @@ gitg_async_thread_try (___lambda139__gitg_async_thread_func, _data_->_data53_, gitg_ref_action_merge_create_merge_index_ready, _data_); #line 97 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 857 "gitg-ref-action-merge.c" +#line 842 "gitg-ref-action-merge.c" _state_1: #line 97 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" gitg_async_thread_try_finish (_data_->_res_); @@ -871,11 +856,11 @@ if (_data_->_state_ == 0) { #line 111 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 875 "gitg-ref-action-merge.c" +#line 860 "gitg-ref-action-merge.c" } else { #line 111 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 879 "gitg-ref-action-merge.c" +#line 864 "gitg-ref-action-merge.c" } #line 111 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); @@ -889,36 +874,36 @@ if (_data_->_state_ == 0) { #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 893 "gitg-ref-action-merge.c" +#line 878 "gitg-ref-action-merge.c" } else { #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 897 "gitg-ref-action-merge.c" +#line 882 "gitg-ref-action-merge.c" } #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); #line 93 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 903 "gitg-ref-action-merge.c" +#line 888 "gitg-ref-action-merge.c" } static void _vala_GgitOId_free (GgitOId* self) { #line 122 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_boxed_free (ggit_oid_get_type (), self); -#line 910 "gitg-ref-action-merge.c" +#line 895 "gitg-ref-action-merge.c" } static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 922 "gitg-ref-action-merge.c" +#line 907 "gitg-ref-action-merge.c" } @@ -995,7 +980,7 @@ _g_object_unref0 (_tmp13_); #line 117 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" theirs_name = _tmp16_; -#line 999 "gitg-ref-action-merge.c" +#line 984 "gitg-ref-action-merge.c" { GgitRef* _tmp17_ = NULL; GitgRef* _tmp18_ = NULL; @@ -1024,7 +1009,7 @@ _tmp17_ = _tmp20_; #line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1028 "gitg-ref-action-merge.c" +#line 1013 "gitg-ref-action-merge.c" goto __catch93_g_error; } #line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -1071,14 +1056,14 @@ __vala_GgitOId_free0 (dest_oid); #line 122 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (_tmp17_); -#line 1075 "gitg-ref-action-merge.c" +#line 1060 "gitg-ref-action-merge.c" goto __catch93_g_error; } #line 119 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" __vala_GgitOId_free0 (dest_oid); #line 119 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (_tmp17_); -#line 1082 "gitg-ref-action-merge.c" +#line 1067 "gitg-ref-action-merge.c" } goto __finally93; __catch93_g_error: @@ -1087,7 +1072,7 @@ g_clear_error (&_inner_error_); #line 119 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _inner_error_ = NULL; -#line 1091 "gitg-ref-action-merge.c" +#line 1076 "gitg-ref-action-merge.c" } __finally93: #line 119 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -1102,7 +1087,7 @@ g_clear_error (&_inner_error_); #line 119 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return; -#line 1106 "gitg-ref-action-merge.c" +#line 1091 "gitg-ref-action-merge.c" } { GgitRef* _tmp33_ = NULL; @@ -1129,7 +1114,7 @@ _tmp33_ = _tmp35_; #line 127 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1133 "gitg-ref-action-merge.c" +#line 1118 "gitg-ref-action-merge.c" goto __catch94_g_error; } #line 127 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -1176,14 +1161,14 @@ __vala_GgitOId_free0 (source_oid); #line 128 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (_tmp33_); -#line 1180 "gitg-ref-action-merge.c" +#line 1165 "gitg-ref-action-merge.c" goto __catch94_g_error; } #line 125 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" __vala_GgitOId_free0 (source_oid); #line 125 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (_tmp33_); -#line 1187 "gitg-ref-action-merge.c" +#line 1172 "gitg-ref-action-merge.c" } goto __finally94; __catch94_g_error: @@ -1192,7 +1177,7 @@ g_clear_error (&_inner_error_); #line 125 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _inner_error_ = NULL; -#line 1196 "gitg-ref-action-merge.c" +#line 1181 "gitg-ref-action-merge.c" } __finally94: #line 125 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -1207,7 +1192,7 @@ g_clear_error (&_inner_error_); #line 125 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return; -#line 1211 "gitg-ref-action-merge.c" +#line 1196 "gitg-ref-action-merge.c" } { const gchar* _tmp48_ = NULL; @@ -1225,7 +1210,7 @@ _g_free0 (_tmp50_); #line 133 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1229 "gitg-ref-action-merge.c" +#line 1214 "gitg-ref-action-merge.c" goto __catch95_g_error; } } @@ -1236,7 +1221,7 @@ g_clear_error (&_inner_error_); #line 131 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _inner_error_ = NULL; -#line 1240 "gitg-ref-action-merge.c" +#line 1225 "gitg-ref-action-merge.c" } __finally95: #line 131 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -1251,7 +1236,7 @@ g_clear_error (&_inner_error_); #line 131 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return; -#line 1255 "gitg-ref-action-merge.c" +#line 1240 "gitg-ref-action-merge.c" } { gchar* msg = NULL; @@ -1291,7 +1276,7 @@ _g_object_unref0 (_tmp54_); #line 140 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp57_) { -#line 1295 "gitg-ref-action-merge.c" +#line 1280 "gitg-ref-action-merge.c" const gchar* _tmp58_ = NULL; const gchar* _tmp59_ = NULL; gchar* _tmp60_ = NULL; @@ -1305,7 +1290,7 @@ _g_free0 (msg); #line 142 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" msg = _tmp60_; -#line 1309 "gitg-ref-action-merge.c" +#line 1294 "gitg-ref-action-merge.c" } else { const gchar* _tmp61_ = NULL; const gchar* _tmp62_ = NULL; @@ -1320,7 +1305,7 @@ _g_free0 (msg); #line 146 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" msg = _tmp63_; -#line 1324 "gitg-ref-action-merge.c" +#line 1309 "gitg-ref-action-merge.c" } #line 149 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp64_ = msg; @@ -1340,19 +1325,19 @@ _tmp68_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 152 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" seen = _tmp68_; -#line 1344 "gitg-ref-action-merge.c" +#line 1329 "gitg-ref-action-merge.c" { gint i = 0; #line 154 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" i = 0; -#line 1349 "gitg-ref-action-merge.c" +#line 1334 "gitg-ref-action-merge.c" { gboolean _tmp69_ = FALSE; #line 154 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp69_ = TRUE; #line 154 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" while (TRUE) { -#line 1356 "gitg-ref-action-merge.c" +#line 1341 "gitg-ref-action-merge.c" gint _tmp71_ = 0; GgitIndexEntries* _tmp72_ = NULL; guint _tmp73_ = 0U; @@ -1369,13 +1354,13 @@ gboolean _tmp82_ = FALSE; #line 154 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (!_tmp69_) { -#line 1373 "gitg-ref-action-merge.c" +#line 1358 "gitg-ref-action-merge.c" gint _tmp70_ = 0; #line 154 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp70_ = i; #line 154 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" i = _tmp70_ + 1; -#line 1379 "gitg-ref-action-merge.c" +#line 1364 "gitg-ref-action-merge.c" } #line 154 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp69_ = FALSE; @@ -1389,7 +1374,7 @@ if (!(((guint) _tmp71_) < _tmp73_)) { #line 154 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" break; -#line 1393 "gitg-ref-action-merge.c" +#line 1378 "gitg-ref-action-merge.c" } #line 156 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp74_ = entries; @@ -1413,7 +1398,7 @@ _tmp82_ = ggit_index_entry_is_conflict (_tmp81_); #line 159 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp82_) { -#line 1417 "gitg-ref-action-merge.c" +#line 1402 "gitg-ref-action-merge.c" GeeHashSet* _tmp83_ = NULL; const gchar* _tmp84_ = NULL; gboolean _tmp85_ = FALSE; @@ -1425,15 +1410,15 @@ _tmp85_ = gee_abstract_collection_contains ((GeeAbstractCollection*) _tmp83_, _tmp84_); #line 159 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp80_ = !_tmp85_; -#line 1429 "gitg-ref-action-merge.c" +#line 1414 "gitg-ref-action-merge.c" } else { #line 159 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp80_ = FALSE; -#line 1433 "gitg-ref-action-merge.c" +#line 1418 "gitg-ref-action-merge.c" } #line 159 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp80_) { -#line 1437 "gitg-ref-action-merge.c" +#line 1422 "gitg-ref-action-merge.c" const gchar* _tmp86_ = NULL; const gchar* _tmp87_ = NULL; gchar* _tmp88_ = NULL; @@ -1463,13 +1448,13 @@ _tmp92_ = p; #line 162 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _tmp91_, _tmp92_); -#line 1467 "gitg-ref-action-merge.c" +#line 1452 "gitg-ref-action-merge.c" } #line 154 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_free0 (p); #line 154 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _ggit_index_entry_unref0 (entry); -#line 1473 "gitg-ref-action-merge.c" +#line 1458 "gitg-ref-action-merge.c" } } } @@ -1493,7 +1478,7 @@ _ggit_index_entries_unref0 (entries); #line 166 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_free0 (msg); -#line 1497 "gitg-ref-action-merge.c" +#line 1482 "gitg-ref-action-merge.c" goto __catch96_g_error; } #line 136 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -1502,7 +1487,7 @@ _ggit_index_entries_unref0 (entries); #line 136 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_free0 (msg); -#line 1506 "gitg-ref-action-merge.c" +#line 1491 "gitg-ref-action-merge.c" } goto __finally96; __catch96_g_error: @@ -1511,7 +1496,7 @@ g_clear_error (&_inner_error_); #line 136 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _inner_error_ = NULL; -#line 1515 "gitg-ref-action-merge.c" +#line 1500 "gitg-ref-action-merge.c" } __finally96: #line 136 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -1526,13 +1511,13 @@ g_clear_error (&_inner_error_); #line 136 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return; -#line 1530 "gitg-ref-action-merge.c" +#line 1515 "gitg-ref-action-merge.c" } #line 114 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_free0 (theirs_name); #line 114 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_free0 (wd); -#line 1536 "gitg-ref-action-merge.c" +#line 1521 "gitg-ref-action-merge.c" } @@ -1549,7 +1534,7 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_slice_free (GitgRefActionMergeCheckoutConflictsData, _data_); -#line 1553 "gitg-ref-action-merge.c" +#line 1538 "gitg-ref-action-merge.c" } @@ -1598,7 +1583,7 @@ _data_->source = _tmp6_; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_checkout_conflicts_co (_data_); -#line 1602 "gitg-ref-action-merge.c" +#line 1587 "gitg-ref-action-merge.c" } @@ -1611,7 +1596,7 @@ result = _data_->result; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return result; -#line 1615 "gitg-ref-action-merge.c" +#line 1600 "gitg-ref-action-merge.c" } @@ -1625,7 +1610,7 @@ _data_->_res_ = _res_; #line 197 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_checkout_conflicts_co (_data_); -#line 1629 "gitg-ref-action-merge.c" +#line 1614 "gitg-ref-action-merge.c" } @@ -1634,20 +1619,20 @@ switch (_data_->_state_) { #line 170 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" case 0: -#line 1638 "gitg-ref-action-merge.c" +#line 1623 "gitg-ref-action-merge.c" goto _state_0; #line 170 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" case 1: -#line 1642 "gitg-ref-action-merge.c" +#line 1627 "gitg-ref-action-merge.c" goto _state_1; #line 170 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" case 2: -#line 1646 "gitg-ref-action-merge.c" +#line 1631 "gitg-ref-action-merge.c" goto _state_2; default: #line 170 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_assert_not_reached (); -#line 1651 "gitg-ref-action-merge.c" +#line 1636 "gitg-ref-action-merge.c" } _state_0: #line 172 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -1723,226 +1708,198 @@ #line 175 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp15_ = _data_->notification; #line 175 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp16_ = NULL; -#line 175 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp16_ = _ ("Merge has conflicts"); -#line 175 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gitg_simple_notification_set_message (_data_->_tmp15_, _data_->_tmp16_); + gitg_simple_notification_set_message (_data_->_tmp15_, _ ("Merge has conflicts")); #line 177 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->head = NULL; #line 178 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp17_ = NULL; + _data_->_tmp16_ = NULL; #line 178 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp17_ = _data_->self->priv->d_support; + _data_->_tmp16_ = _data_->self->priv->d_support; #line 178 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp18_ = NULL; + _data_->_tmp17_ = NULL; #line 178 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp18_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) _data_->self); + _data_->_tmp17_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) _data_->self); #line 178 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp19_ = NULL; + _data_->_tmp18_ = NULL; #line 178 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp19_ = _data_->_tmp18_; + _data_->_tmp18_ = _data_->_tmp17_; #line 178 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp20_ = FALSE; + _data_->_tmp19_ = FALSE; #line 178 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp20_ = gitg_action_support_reference_is_head (_data_->_tmp17_, _data_->_tmp19_, &_data_->head); + _data_->_tmp19_ = gitg_action_support_reference_is_head (_data_->_tmp16_, _data_->_tmp18_, &_data_->head); #line 178 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->ishead = _data_->_tmp20_; + _data_->ishead = _data_->_tmp19_; #line 182 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp21_ = FALSE; + _data_->_tmp20_ = FALSE; #line 182 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp21_ = _data_->ishead; + _data_->_tmp20_ = _data_->ishead; #line 182 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - if (_data_->_tmp21_) { + if (_data_->_tmp20_) { +#line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _data_->_tmp21_ = NULL; +#line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _data_->_tmp21_ = _data_->theirs_name; #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp22_ = NULL; #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp22_ = _ ("The merge of %s into %s has caused conflicts, would you like to checko" \ -"ut branch %s with the merge to your working directory to resolve the c" \ -"onflicts?"); + _data_->_tmp22_ = string_to_string (_data_->_tmp21_); #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp23_ = NULL; #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp23_ = _data_->theirs_name; + _data_->_tmp23_ = g_strconcat ("'", _data_->_tmp22_, "'", NULL); #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp24_ = NULL; #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp24_ = string_to_string (_data_->_tmp23_); + _data_->_tmp24_ = _data_->_tmp23_; #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp25_ = NULL; #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp25_ = g_strconcat ("'", _data_->_tmp24_, "'", NULL); + _data_->_tmp25_ = _data_->ours_name; #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp26_ = NULL; #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp26_ = _data_->_tmp25_; + _data_->_tmp26_ = string_to_string (_data_->_tmp25_); #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp27_ = NULL; #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp27_ = _data_->ours_name; + _data_->_tmp27_ = g_strconcat ("'", _data_->_tmp26_, "'", NULL); #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp28_ = NULL; #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp28_ = string_to_string (_data_->_tmp27_); + _data_->_tmp28_ = _data_->_tmp27_; #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp29_ = NULL; #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp29_ = g_strconcat ("'", _data_->_tmp28_, "'", NULL); + _data_->_tmp29_ = _data_->ours_name; #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp30_ = NULL; #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp30_ = _data_->_tmp29_; + _data_->_tmp30_ = string_to_string (_data_->_tmp29_); #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp31_ = NULL; #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp31_ = _data_->ours_name; + _data_->_tmp31_ = g_strconcat ("'", _data_->_tmp30_, "'", NULL); #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp32_ = NULL; #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp32_ = string_to_string (_data_->_tmp31_); + _data_->_tmp32_ = _data_->_tmp31_; #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp33_ = NULL; #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp33_ = g_strconcat ("'", _data_->_tmp32_, "'", NULL); -#line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp34_ = NULL; -#line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp34_ = _data_->_tmp33_; -#line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp35_ = NULL; -#line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp35_ = g_strdup_printf (_data_->_tmp22_, _data_->_tmp26_, _data_->_tmp30_, _data_->_tmp34_); + _data_->_tmp33_ = g_strdup_printf (_ ("The merge of %s into %s has caused conflicts, would you like to checko" \ +"ut branch %s with the merge to your working directory to resolve the c" \ +"onflicts?"), _data_->_tmp24_, _data_->_tmp28_, _data_->_tmp32_); #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_free0 (_data_->message); #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->message = _data_->_tmp35_; + _data_->message = _data_->_tmp33_; #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp34_); + _g_free0 (_data_->_tmp32_); #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp30_); + _g_free0 (_data_->_tmp28_); #line 184 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp26_); -#line 1824 "gitg-ref-action-merge.c" + _g_free0 (_data_->_tmp24_); +#line 1801 "gitg-ref-action-merge.c" } else { #line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _data_->_tmp34_ = NULL; +#line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _data_->_tmp34_ = _data_->theirs_name; +#line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _data_->_tmp35_ = NULL; +#line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _data_->_tmp35_ = string_to_string (_data_->_tmp34_); +#line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp36_ = NULL; #line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp36_ = _ ("The merge of %s into %s has caused conflicts, would you like to checko" \ -"ut the merge to your working directory to resolve the conflicts?"); + _data_->_tmp36_ = g_strconcat ("'", _data_->_tmp35_, "'", NULL); #line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp37_ = NULL; #line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp37_ = _data_->theirs_name; + _data_->_tmp37_ = _data_->_tmp36_; #line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp38_ = NULL; #line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp38_ = string_to_string (_data_->_tmp37_); + _data_->_tmp38_ = _data_->ours_name; #line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp39_ = NULL; #line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp39_ = g_strconcat ("'", _data_->_tmp38_, "'", NULL); + _data_->_tmp39_ = string_to_string (_data_->_tmp38_); #line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp40_ = NULL; #line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp40_ = _data_->_tmp39_; + _data_->_tmp40_ = g_strconcat ("'", _data_->_tmp39_, "'", NULL); #line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp41_ = NULL; #line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp41_ = _data_->ours_name; + _data_->_tmp41_ = _data_->_tmp40_; #line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp42_ = NULL; #line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp42_ = string_to_string (_data_->_tmp41_); -#line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp43_ = NULL; -#line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp43_ = g_strconcat ("'", _data_->_tmp42_, "'", NULL); -#line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp44_ = NULL; -#line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp44_ = _data_->_tmp43_; -#line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp45_ = NULL; -#line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp45_ = g_strdup_printf (_data_->_tmp36_, _data_->_tmp40_, _data_->_tmp44_); + _data_->_tmp42_ = g_strdup_printf (_ ("The merge of %s into %s has caused conflicts, would you like to checko" \ +"ut the merge to your working directory to resolve the conflicts?"), _data_->_tmp37_, _data_->_tmp41_); #line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_free0 (_data_->message); #line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->message = _data_->_tmp45_; + _data_->message = _data_->_tmp42_; #line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp44_); + _g_free0 (_data_->_tmp41_); #line 188 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp40_); -#line 1874 "gitg-ref-action-merge.c" + _g_free0 (_data_->_tmp37_); +#line 1847 "gitg-ref-action-merge.c" } #line 191 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp46_ = NULL; -#line 191 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp46_ = _ ("Merge has conflicts"); -#line 191 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp47_ = NULL; -#line 191 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp47_ = _data_->message; -#line 191 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp48_ = NULL; + _data_->_tmp43_ = NULL; #line 191 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp48_ = _ ("Cancel"); + _data_->_tmp43_ = _data_->message; #line 191 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp49_ = NULL; + _data_->_tmp44_ = NULL; #line 191 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp49_ = _ ("Checkout"); + _data_->_tmp44_ = gitg_ext_user_query_new_full (_ ("Merge has conflicts"), _data_->_tmp43_, GTK_MESSAGE_QUESTION, _ ("Cancel"), GTK_RESPONSE_CANCEL, _ ("Checkout"), GTK_RESPONSE_OK, NULL); #line 191 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp50_ = NULL; -#line 191 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp50_ = gitg_ext_user_query_new_full (_data_->_tmp46_, _data_->_tmp47_, GTK_MESSAGE_QUESTION, _data_->_tmp48_, GTK_RESPONSE_CANCEL, _data_->_tmp49_, GTK_RESPONSE_OK, NULL); -#line 191 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->q = _data_->_tmp50_; + _data_->q = _data_->_tmp44_; #line 197 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp51_ = NULL; + _data_->_tmp45_ = NULL; #line 197 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp51_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); + _data_->_tmp45_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); #line 197 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp52_ = NULL; + _data_->_tmp46_ = NULL; #line 197 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp52_ = _data_->_tmp51_; + _data_->_tmp46_ = _data_->_tmp45_; #line 197 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp53_ = NULL; + _data_->_tmp47_ = NULL; #line 197 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp53_ = _data_->_tmp52_; + _data_->_tmp47_ = _data_->_tmp46_; #line 197 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp54_ = NULL; + _data_->_tmp48_ = NULL; #line 197 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp54_ = _data_->q; + _data_->_tmp48_ = _data_->q; #line 197 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_state_ = 1; #line 197 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gitg_ext_application_user_query_async (_data_->_tmp53_, _data_->_tmp54_, gitg_ref_action_merge_checkout_conflicts_ready, _data_); + gitg_ext_application_user_query_async (_data_->_tmp47_, _data_->_tmp48_, gitg_ref_action_merge_checkout_conflicts_ready, _data_); #line 197 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 1920 "gitg-ref-action-merge.c" +#line 1881 "gitg-ref-action-merge.c" _state_1: #line 197 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp55_ = 0; + _data_->_tmp49_ = 0; #line 197 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp55_ = gitg_ext_application_user_query_finish (_data_->_tmp53_, _data_->_res_); + _data_->_tmp49_ = gitg_ext_application_user_query_finish (_data_->_tmp47_, _data_->_res_); #line 197 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp56_ = FALSE; + _data_->_tmp50_ = FALSE; #line 197 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp56_ = _data_->_tmp55_ != GTK_RESPONSE_OK; + _data_->_tmp50_ = _data_->_tmp49_ != GTK_RESPONSE_OK; #line 197 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp53_); + _g_object_unref0 (_data_->_tmp47_); #line 197 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - if (_data_->_tmp56_) { -#line 199 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp57_ = NULL; -#line 199 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp57_ = _data_->notification; + if (_data_->_tmp50_) { #line 199 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp58_ = NULL; + _data_->_tmp51_ = NULL; #line 199 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp58_ = _ ("Merge failed with conflicts"); + _data_->_tmp51_ = _data_->notification; #line 199 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gitg_simple_notification_error (_data_->_tmp57_, _data_->_tmp58_); + gitg_simple_notification_error (_data_->_tmp51_, _ ("Merge failed with conflicts")); #line 200 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->result = FALSE; #line 200 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -1959,56 +1916,56 @@ if (_data_->_state_ == 0) { #line 200 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1960 "gitg-ref-action-merge.c" +#line 1917 "gitg-ref-action-merge.c" } else { #line 200 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1964 "gitg-ref-action-merge.c" +#line 1921 "gitg-ref-action-merge.c" } #line 200 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); #line 200 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 1970 "gitg-ref-action-merge.c" +#line 1927 "gitg-ref-action-merge.c" } #line 203 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp59_ = NULL; + _data_->_tmp52_ = NULL; #line 203 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp59_ = _data_->self->priv->d_support; + _data_->_tmp52_ = _data_->self->priv->d_support; #line 203 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp60_ = NULL; + _data_->_tmp53_ = NULL; #line 203 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp60_ = _data_->notification; + _data_->_tmp53_ = _data_->notification; #line 203 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp61_ = NULL; + _data_->_tmp54_ = NULL; #line 203 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp61_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) _data_->self); + _data_->_tmp54_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) _data_->self); #line 203 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp62_ = NULL; + _data_->_tmp55_ = NULL; #line 203 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp62_ = _data_->_tmp61_; + _data_->_tmp55_ = _data_->_tmp54_; #line 203 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp63_ = NULL; + _data_->_tmp56_ = NULL; #line 203 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp63_ = _data_->index; + _data_->_tmp56_ = _data_->index; #line 203 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp64_ = NULL; + _data_->_tmp57_ = NULL; #line 203 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp64_ = _data_->head; + _data_->_tmp57_ = _data_->head; #line 203 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_state_ = 2; #line 203 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gitg_action_support_checkout_conflicts (_data_->_tmp59_, _data_->_tmp60_, _data_->_tmp62_, _data_->_tmp63_, _data_->_tmp64_, gitg_ref_action_merge_checkout_conflicts_ready, _data_); + gitg_action_support_checkout_conflicts (_data_->_tmp52_, _data_->_tmp53_, _data_->_tmp55_, _data_->_tmp56_, _data_->_tmp57_, gitg_ref_action_merge_checkout_conflicts_ready, _data_); #line 203 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2002 "gitg-ref-action-merge.c" +#line 1959 "gitg-ref-action-merge.c" _state_2: #line 203 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp65_ = FALSE; + _data_->_tmp58_ = FALSE; #line 203 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp65_ = gitg_action_support_checkout_conflicts_finish (_data_->_tmp59_, _data_->_res_); + _data_->_tmp58_ = gitg_action_support_checkout_conflicts_finish (_data_->_tmp52_, _data_->_res_); #line 203 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - if (!_data_->_tmp65_) { + if (!_data_->_tmp58_) { #line 205 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->result = FALSE; #line 205 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -2025,38 +1982,34 @@ if (_data_->_state_ == 0) { #line 205 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2026 "gitg-ref-action-merge.c" +#line 1983 "gitg-ref-action-merge.c" } else { #line 205 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2030 "gitg-ref-action-merge.c" +#line 1987 "gitg-ref-action-merge.c" } #line 205 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); #line 205 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2036 "gitg-ref-action-merge.c" +#line 1993 "gitg-ref-action-merge.c" } #line 208 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp66_ = NULL; + _data_->_tmp59_ = NULL; #line 208 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp66_ = _data_->index; + _data_->_tmp59_ = _data_->index; #line 208 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp67_ = NULL; + _data_->_tmp60_ = NULL; #line 208 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp67_ = _data_->source; + _data_->_tmp60_ = _data_->source; #line 208 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gitg_ref_action_merge_write_merge_state_files (_data_->self, _data_->_tmp66_, _data_->_tmp67_); -#line 210 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp68_ = NULL; -#line 210 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp68_ = _data_->notification; + gitg_ref_action_merge_write_merge_state_files (_data_->self, _data_->_tmp59_, _data_->_tmp60_); #line 210 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp69_ = NULL; + _data_->_tmp61_ = NULL; #line 210 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp69_ = _ ("Finished merge with conflicts in working directory"); + _data_->_tmp61_ = _data_->notification; #line 210 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gitg_simple_notification_success (_data_->_tmp68_, _data_->_tmp69_); + gitg_simple_notification_success (_data_->_tmp61_, _ ("Finished merge with conflicts in working directory")); #line 211 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->result = TRUE; #line 211 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -2073,11 +2026,11 @@ if (_data_->_state_ == 0) { #line 211 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2074 "gitg-ref-action-merge.c" +#line 2027 "gitg-ref-action-merge.c" } else { #line 211 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2078 "gitg-ref-action-merge.c" +#line 2031 "gitg-ref-action-merge.c" } #line 211 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); @@ -2097,17 +2050,17 @@ if (_data_->_state_ == 0) { #line 170 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2098 "gitg-ref-action-merge.c" +#line 2051 "gitg-ref-action-merge.c" } else { #line 170 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2102 "gitg-ref-action-merge.c" +#line 2055 "gitg-ref-action-merge.c" } #line 170 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); #line 170 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2108 "gitg-ref-action-merge.c" +#line 2061 "gitg-ref-action-merge.c" } @@ -2122,7 +2075,7 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_slice_free (GitgRefActionMergeMergeData, _data_); -#line 2123 "gitg-ref-action-merge.c" +#line 2076 "gitg-ref-action-merge.c" } @@ -2151,7 +2104,7 @@ _data_->source = _tmp2_; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_merge_co (_data_); -#line 2152 "gitg-ref-action-merge.c" +#line 2105 "gitg-ref-action-merge.c" } @@ -2166,7 +2119,7 @@ _data_->result = NULL; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return result; -#line 2167 "gitg-ref-action-merge.c" +#line 2120 "gitg-ref-action-merge.c" } @@ -2180,7 +2133,7 @@ _data_->_res_ = _res_; #line 245 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_merge_co (_data_); -#line 2181 "gitg-ref-action-merge.c" +#line 2134 "gitg-ref-action-merge.c" } @@ -2189,24 +2142,24 @@ switch (_data_->_state_) { #line 214 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" case 0: -#line 2190 "gitg-ref-action-merge.c" +#line 2143 "gitg-ref-action-merge.c" goto _state_0; #line 214 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" case 1: -#line 2194 "gitg-ref-action-merge.c" +#line 2147 "gitg-ref-action-merge.c" goto _state_1; #line 214 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" case 2: -#line 2198 "gitg-ref-action-merge.c" +#line 2151 "gitg-ref-action-merge.c" goto _state_2; #line 214 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" case 3: -#line 2202 "gitg-ref-action-merge.c" +#line 2155 "gitg-ref-action-merge.c" goto _state_3; default: #line 214 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_assert_not_reached (); -#line 2207 "gitg-ref-action-merge.c" +#line 2160 "gitg-ref-action-merge.c" } _state_0: #line 219 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -2280,69 +2233,69 @@ #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp15_ = NULL; #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp15_ = _ ("Merge %s into %s"); + _data_->_tmp15_ = _data_->theirs_name; #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp16_ = NULL; #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp16_ = _data_->theirs_name; + _data_->_tmp16_ = string_to_string (_data_->_tmp15_); #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp17_ = NULL; #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp17_ = string_to_string (_data_->_tmp16_); + _data_->_tmp17_ = g_strconcat ("'", _data_->_tmp16_, "'", NULL); #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp18_ = NULL; #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp18_ = g_strconcat ("'", _data_->_tmp17_, "'", NULL); + _data_->_tmp18_ = _data_->_tmp17_; #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp19_ = NULL; #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp19_ = _data_->_tmp18_; + _data_->_tmp19_ = _data_->ours_name; #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp20_ = NULL; #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp20_ = _data_->ours_name; + _data_->_tmp20_ = string_to_string (_data_->_tmp19_); #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp21_ = NULL; #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp21_ = string_to_string (_data_->_tmp20_); + _data_->_tmp21_ = g_strconcat ("'", _data_->_tmp20_, "'", NULL); #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp22_ = NULL; #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp22_ = g_strconcat ("'", _data_->_tmp21_, "'", NULL); + _data_->_tmp22_ = _data_->_tmp21_; #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp23_ = NULL; #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp23_ = _data_->_tmp22_; + _data_->_tmp23_ = g_strdup_printf (_ ("Merge %s into %s"), _data_->_tmp18_, _data_->_tmp22_); #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp24_ = NULL; #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp24_ = g_strdup_printf (_data_->_tmp15_, _data_->_tmp19_, _data_->_tmp23_); + _data_->_tmp24_ = _data_->_tmp23_; #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp25_ = NULL; #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp25_ = _data_->_tmp24_; -#line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp26_ = NULL; -#line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp26_ = gitg_simple_notification_new (_data_->_tmp25_, NULL); + _data_->_tmp25_ = gitg_simple_notification_new (_data_->_tmp24_, NULL); #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - g_object_ref_sink (_data_->_tmp26_); + g_object_ref_sink (_data_->_tmp25_); #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp27_ = NULL; + _data_->_tmp26_ = NULL; #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp27_ = _data_->_tmp26_; + _data_->_tmp26_ = _data_->_tmp25_; #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp25_); + _g_free0 (_data_->_tmp24_); #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp23_); + _g_free0 (_data_->_tmp22_); #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp19_); + _g_free0 (_data_->_tmp18_); #line 222 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->notification = _data_->_tmp27_; + _data_->notification = _data_->_tmp26_; +#line 223 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _data_->_tmp27_ = NULL; +#line 223 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _data_->_tmp27_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); #line 223 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp28_ = NULL; #line 223 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp28_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); + _data_->_tmp28_ = _data_->_tmp27_; #line 223 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp29_ = NULL; #line 223 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -2350,11 +2303,11 @@ #line 223 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp30_ = NULL; #line 223 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp30_ = _data_->_tmp29_; + _data_->_tmp30_ = gitg_ext_application_get_notifications (_data_->_tmp29_); #line 223 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp31_ = NULL; #line 223 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp31_ = gitg_ext_application_get_notifications (_data_->_tmp30_); + _data_->_tmp31_ = _data_->_tmp30_; #line 223 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp32_ = NULL; #line 223 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -2362,92 +2315,88 @@ #line 223 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp33_ = NULL; #line 223 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp33_ = _data_->_tmp32_; -#line 223 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp34_ = NULL; + _data_->_tmp33_ = _data_->notification; #line 223 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp34_ = _data_->notification; + gitg_ext_notifications_add (_data_->_tmp32_, (GitgExtNotification*) _data_->_tmp33_); #line 223 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gitg_ext_notifications_add (_data_->_tmp33_, (GitgExtNotification*) _data_->_tmp34_); + _g_object_unref0 (_data_->_tmp32_); #line 223 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp33_); -#line 223 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp30_); -#line 2374 "gitg-ref-action-merge.c" + _g_object_unref0 (_data_->_tmp29_); +#line 2323 "gitg-ref-action-merge.c" { #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp36_ = NULL; + _data_->_tmp35_ = NULL; #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp36_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) _data_->self); + _data_->_tmp35_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) _data_->self); #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp37_ = NULL; + _data_->_tmp36_ = NULL; #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp37_ = _data_->_tmp36_; + _data_->_tmp36_ = _data_->_tmp35_; #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp38_ = NULL; + _data_->_tmp37_ = NULL; #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp38_ = ggit_ref_resolve ((GgitRef*) _data_->_tmp37_, &_data_->_inner_error_); + _data_->_tmp37_ = ggit_ref_resolve ((GgitRef*) _data_->_tmp36_, &_data_->_inner_error_); #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp35_ = _data_->_tmp38_; + _data_->_tmp34_ = _data_->_tmp37_; #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 2392 "gitg-ref-action-merge.c" +#line 2341 "gitg-ref-action-merge.c" goto __catch97_g_error; } #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp40_ = NULL; + _data_->_tmp39_ = NULL; #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp40_ = _data_->_tmp35_; + _data_->_tmp39_ = _data_->_tmp34_; #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp35_ = NULL; + _data_->_tmp34_ = NULL; #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp41_ = NULL; + _data_->_tmp40_ = NULL; #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp41_ = _data_->_tmp40_; + _data_->_tmp40_ = _data_->_tmp39_; #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp42_ = NULL; + _data_->_tmp41_ = NULL; #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp42_ = ggit_ref_lookup (_data_->_tmp41_, &_data_->_inner_error_); + _data_->_tmp41_ = ggit_ref_lookup (_data_->_tmp40_, &_data_->_inner_error_); #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp43_ = NULL; + _data_->_tmp42_ = NULL; #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp43_ = _data_->_tmp42_; + _data_->_tmp42_ = _data_->_tmp41_; #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp41_); + _g_object_unref0 (_data_->_tmp40_); #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp39_ = _data_->_tmp43_; + _data_->_tmp38_ = _data_->_tmp42_; #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp35_); -#line 2421 "gitg-ref-action-merge.c" + _g_object_unref0 (_data_->_tmp34_); +#line 2370 "gitg-ref-action-merge.c" goto __catch97_g_error; } #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp44_ = NULL; + _data_->_tmp43_ = NULL; #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp44_ = _data_->_tmp39_; + _data_->_tmp43_ = _data_->_tmp38_; #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp39_ = NULL; + _data_->_tmp38_ = NULL; #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp45_ = NULL; + _data_->_tmp44_ = NULL; #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp45_ = G_TYPE_CHECK_INSTANCE_TYPE (_data_->_tmp44_, ggit_commit_get_type ()) ? ((GgitCommit*) _data_->_tmp44_) : NULL; + _data_->_tmp44_ = G_TYPE_CHECK_INSTANCE_TYPE (_data_->_tmp43_, ggit_commit_get_type ()) ? ((GgitCommit*) _data_->_tmp43_) : NULL; #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - if (_data_->_tmp45_ == NULL) { + if (_data_->_tmp44_ == NULL) { #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp44_); -#line 2438 "gitg-ref-action-merge.c" + _g_object_unref0 (_data_->_tmp43_); +#line 2387 "gitg-ref-action-merge.c" } #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (_data_->ours); #line 227 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->ours = _data_->_tmp45_; + _data_->ours = _data_->_tmp44_; #line 225 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp39_); + _g_object_unref0 (_data_->_tmp38_); #line 225 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp35_); -#line 2448 "gitg-ref-action-merge.c" + _g_object_unref0 (_data_->_tmp34_); +#line 2397 "gitg-ref-action-merge.c" } goto __finally97; __catch97_g_error: @@ -2457,33 +2406,29 @@ #line 225 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_inner_error_ = NULL; #line 231 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _data_->_tmp45_ = NULL; +#line 231 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _data_->_tmp45_ = _data_->notification; +#line 231 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp46_ = NULL; #line 231 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp46_ = _data_->notification; + _data_->_tmp46_ = _data_->e; #line 231 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp47_ = NULL; #line 231 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp47_ = _ ("Failed to lookup our commit: %s"); + _data_->_tmp47_ = _data_->_tmp46_->message; #line 231 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp48_ = NULL; #line 231 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp48_ = _data_->e; + _data_->_tmp48_ = g_strdup_printf (_ ("Failed to lookup our commit: %s"), _data_->_tmp47_); #line 231 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp49_ = NULL; #line 231 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp49_ = _data_->_tmp48_->message; -#line 231 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp50_ = NULL; + _data_->_tmp49_ = _data_->_tmp48_; #line 231 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp50_ = g_strdup_printf (_data_->_tmp47_, _data_->_tmp49_); + gitg_simple_notification_error (_data_->_tmp45_, _data_->_tmp49_); #line 231 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp51_ = NULL; -#line 231 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp51_ = _data_->_tmp50_; -#line 231 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gitg_simple_notification_error (_data_->_tmp46_, _data_->_tmp51_); -#line 231 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp51_); + _g_free0 (_data_->_tmp49_); #line 232 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->result = NULL; #line 232 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -2502,17 +2447,17 @@ if (_data_->_state_ == 0) { #line 232 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2503 "gitg-ref-action-merge.c" +#line 2448 "gitg-ref-action-merge.c" } else { #line 232 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2507 "gitg-ref-action-merge.c" +#line 2452 "gitg-ref-action-merge.c" } #line 232 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); #line 232 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2513 "gitg-ref-action-merge.c" +#line 2458 "gitg-ref-action-merge.c" } __finally97: #line 225 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -2533,78 +2478,78 @@ g_clear_error (&_data_->_inner_error_); #line 225 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2534 "gitg-ref-action-merge.c" +#line 2479 "gitg-ref-action-merge.c" } { #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp53_ = NULL; + _data_->_tmp51_ = NULL; #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp53_ = _data_->source; + _data_->_tmp51_ = _data_->source; #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp54_ = NULL; + _data_->_tmp52_ = NULL; #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp54_ = ggit_ref_resolve ((GgitRef*) _data_->_tmp53_, &_data_->_inner_error_); + _data_->_tmp52_ = ggit_ref_resolve ((GgitRef*) _data_->_tmp51_, &_data_->_inner_error_); #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp52_ = _data_->_tmp54_; + _data_->_tmp50_ = _data_->_tmp52_; #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 2549 "gitg-ref-action-merge.c" +#line 2494 "gitg-ref-action-merge.c" goto __catch98_g_error; } #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp56_ = NULL; + _data_->_tmp54_ = NULL; #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp56_ = _data_->_tmp52_; + _data_->_tmp54_ = _data_->_tmp50_; #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp52_ = NULL; + _data_->_tmp50_ = NULL; #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp57_ = NULL; + _data_->_tmp55_ = NULL; #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp57_ = _data_->_tmp56_; + _data_->_tmp55_ = _data_->_tmp54_; #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp58_ = NULL; + _data_->_tmp56_ = NULL; #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp58_ = ggit_ref_lookup (_data_->_tmp57_, &_data_->_inner_error_); + _data_->_tmp56_ = ggit_ref_lookup (_data_->_tmp55_, &_data_->_inner_error_); #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp59_ = NULL; + _data_->_tmp57_ = NULL; #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp59_ = _data_->_tmp58_; + _data_->_tmp57_ = _data_->_tmp56_; #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp57_); + _g_object_unref0 (_data_->_tmp55_); #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp55_ = _data_->_tmp59_; + _data_->_tmp53_ = _data_->_tmp57_; #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp52_); -#line 2578 "gitg-ref-action-merge.c" + _g_object_unref0 (_data_->_tmp50_); +#line 2523 "gitg-ref-action-merge.c" goto __catch98_g_error; } #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp60_ = NULL; + _data_->_tmp58_ = NULL; #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp60_ = _data_->_tmp55_; + _data_->_tmp58_ = _data_->_tmp53_; #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp55_ = NULL; + _data_->_tmp53_ = NULL; #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp61_ = NULL; + _data_->_tmp59_ = NULL; #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp61_ = G_TYPE_CHECK_INSTANCE_TYPE (_data_->_tmp60_, ggit_commit_get_type ()) ? ((GgitCommit*) _data_->_tmp60_) : NULL; + _data_->_tmp59_ = G_TYPE_CHECK_INSTANCE_TYPE (_data_->_tmp58_, ggit_commit_get_type ()) ? ((GgitCommit*) _data_->_tmp58_) : NULL; #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - if (_data_->_tmp61_ == NULL) { + if (_data_->_tmp59_ == NULL) { #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp60_); -#line 2595 "gitg-ref-action-merge.c" + _g_object_unref0 (_data_->_tmp58_); +#line 2540 "gitg-ref-action-merge.c" } #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (_data_->theirs); #line 237 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->theirs = _data_->_tmp61_; + _data_->theirs = _data_->_tmp59_; #line 235 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp55_); + _g_object_unref0 (_data_->_tmp53_); #line 235 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp52_); -#line 2605 "gitg-ref-action-merge.c" + _g_object_unref0 (_data_->_tmp50_); +#line 2550 "gitg-ref-action-merge.c" } goto __finally98; __catch98_g_error: @@ -2614,33 +2559,29 @@ #line 235 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_inner_error_ = NULL; #line 241 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp62_ = NULL; -#line 241 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp62_ = _data_->notification; -#line 241 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp63_ = NULL; + _data_->_tmp60_ = NULL; #line 241 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp63_ = _ ("Failed to lookup their commit: %s"); + _data_->_tmp60_ = _data_->notification; #line 241 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp64_ = NULL; + _data_->_tmp61_ = NULL; #line 241 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp64_ = _data_->_vala1_e; + _data_->_tmp61_ = _data_->_vala1_e; #line 241 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp65_ = NULL; + _data_->_tmp62_ = NULL; #line 241 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp65_ = _data_->_tmp64_->message; + _data_->_tmp62_ = _data_->_tmp61_->message; #line 241 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp66_ = NULL; + _data_->_tmp63_ = NULL; #line 241 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp66_ = g_strdup_printf (_data_->_tmp63_, _data_->_tmp65_); + _data_->_tmp63_ = g_strdup_printf (_ ("Failed to lookup their commit: %s"), _data_->_tmp62_); #line 241 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp67_ = NULL; + _data_->_tmp64_ = NULL; #line 241 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp67_ = _data_->_tmp66_; + _data_->_tmp64_ = _data_->_tmp63_; #line 241 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gitg_simple_notification_error (_data_->_tmp62_, _data_->_tmp67_); + gitg_simple_notification_error (_data_->_tmp60_, _data_->_tmp64_); #line 241 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp67_); + _g_free0 (_data_->_tmp64_); #line 242 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->result = NULL; #line 242 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -2659,17 +2600,17 @@ if (_data_->_state_ == 0) { #line 242 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2660 "gitg-ref-action-merge.c" +#line 2601 "gitg-ref-action-merge.c" } else { #line 242 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2664 "gitg-ref-action-merge.c" +#line 2605 "gitg-ref-action-merge.c" } #line 242 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); #line 242 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2670 "gitg-ref-action-merge.c" +#line 2611 "gitg-ref-action-merge.c" } __finally98: #line 235 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -2690,40 +2631,40 @@ g_clear_error (&_data_->_inner_error_); #line 235 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2691 "gitg-ref-action-merge.c" +#line 2632 "gitg-ref-action-merge.c" } #line 245 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp68_ = NULL; + _data_->_tmp65_ = NULL; #line 245 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp68_ = _data_->notification; + _data_->_tmp65_ = _data_->notification; #line 245 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp69_ = NULL; + _data_->_tmp66_ = NULL; #line 245 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp69_ = _data_->ours; + _data_->_tmp66_ = _data_->ours; #line 245 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp70_ = NULL; + _data_->_tmp67_ = NULL; #line 245 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp70_ = _data_->theirs; + _data_->_tmp67_ = _data_->theirs; #line 245 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_state_ = 1; #line 245 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gitg_ref_action_merge_create_merge_index (_data_->self, _data_->_tmp68_, _data_->_tmp69_, _data_->_tmp70_, gitg_ref_action_merge_merge_ready, _data_); + gitg_ref_action_merge_create_merge_index (_data_->self, _data_->_tmp65_, _data_->_tmp66_, _data_->_tmp67_, gitg_ref_action_merge_merge_ready, _data_); #line 245 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2711 "gitg-ref-action-merge.c" +#line 2652 "gitg-ref-action-merge.c" _state_1: #line 245 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp71_ = NULL; + _data_->_tmp68_ = NULL; #line 245 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp71_ = gitg_ref_action_merge_create_merge_index_finish (_data_->self, _data_->_res_); + _data_->_tmp68_ = gitg_ref_action_merge_create_merge_index_finish (_data_->self, _data_->_res_); #line 245 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->index = _data_->_tmp71_; + _data_->index = _data_->_tmp68_; #line 247 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp72_ = NULL; + _data_->_tmp69_ = NULL; #line 247 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp72_ = _data_->index; + _data_->_tmp69_ = _data_->index; #line 247 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - if (_data_->_tmp72_ == NULL) { + if (_data_->_tmp69_ == NULL) { #line 249 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->result = NULL; #line 249 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -2742,47 +2683,47 @@ if (_data_->_state_ == 0) { #line 249 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2743 "gitg-ref-action-merge.c" +#line 2684 "gitg-ref-action-merge.c" } else { #line 249 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2747 "gitg-ref-action-merge.c" +#line 2688 "gitg-ref-action-merge.c" } #line 249 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); #line 249 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2753 "gitg-ref-action-merge.c" +#line 2694 "gitg-ref-action-merge.c" } #line 252 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp73_ = NULL; + _data_->_tmp70_ = NULL; #line 252 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp73_ = _data_->index; + _data_->_tmp70_ = _data_->index; #line 252 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp74_ = FALSE; + _data_->_tmp71_ = FALSE; #line 252 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp74_ = ggit_index_has_conflicts (_data_->_tmp73_); + _data_->_tmp71_ = ggit_index_has_conflicts (_data_->_tmp70_); #line 252 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - if (_data_->_tmp74_) { + if (_data_->_tmp71_) { #line 254 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp75_ = NULL; + _data_->_tmp72_ = NULL; #line 254 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp75_ = _data_->notification; + _data_->_tmp72_ = _data_->notification; #line 254 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp76_ = NULL; + _data_->_tmp73_ = NULL; #line 254 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp76_ = _data_->index; + _data_->_tmp73_ = _data_->index; #line 254 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp77_ = NULL; + _data_->_tmp74_ = NULL; #line 254 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp77_ = _data_->source; + _data_->_tmp74_ = _data_->source; #line 254 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_state_ = 2; #line 254 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gitg_ref_action_merge_checkout_conflicts (_data_->self, _data_->_tmp75_, _data_->_tmp76_, _data_->_tmp77_, gitg_ref_action_merge_merge_ready, _data_); + gitg_ref_action_merge_checkout_conflicts (_data_->self, _data_->_tmp72_, _data_->_tmp73_, _data_->_tmp74_, gitg_ref_action_merge_merge_ready, _data_); #line 254 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2783 "gitg-ref-action-merge.c" +#line 2724 "gitg-ref-action-merge.c" _state_2: #line 254 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_checkout_conflicts_finish (_data_->self, _data_->_res_); @@ -2804,166 +2745,178 @@ if (_data_->_state_ == 0) { #line 255 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2805 "gitg-ref-action-merge.c" +#line 2746 "gitg-ref-action-merge.c" } else { #line 255 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2809 "gitg-ref-action-merge.c" +#line 2750 "gitg-ref-action-merge.c" } #line 255 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); #line 255 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2815 "gitg-ref-action-merge.c" +#line 2756 "gitg-ref-action-merge.c" } #line 260 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp78_ = NULL; + _data_->_tmp75_ = NULL; #line 260 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp78_ = _data_->source; + _data_->_tmp75_ = _data_->source; #line 260 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp79_ = NULL; + _data_->_tmp76_ = NULL; #line 260 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp79_ = gitg_ref_get_parsed_name (_data_->_tmp78_); + _data_->_tmp76_ = gitg_ref_get_parsed_name (_data_->_tmp75_); #line 260 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp80_ = NULL; + _data_->_tmp77_ = NULL; #line 260 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp80_ = _data_->_tmp79_; + _data_->_tmp77_ = _data_->_tmp76_; #line 260 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp81_ = NULL; + _data_->_tmp78_ = NULL; #line 260 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp81_ = _data_->_tmp80_; + _data_->_tmp78_ = _data_->_tmp77_; #line 260 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp82_ = 0; + _data_->_tmp79_ = 0; #line 260 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp82_ = gitg_parsed_ref_name_get_rtype (_data_->_tmp81_); + _data_->_tmp79_ = gitg_parsed_ref_name_get_rtype (_data_->_tmp78_); #line 260 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp83_ = 0; + _data_->_tmp80_ = 0; #line 260 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp83_ = _data_->_tmp82_; + _data_->_tmp80_ = _data_->_tmp79_; #line 260 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp84_ = FALSE; + _data_->_tmp81_ = FALSE; #line 260 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp84_ = _data_->_tmp83_ == GITG_REF_TYPE_REMOTE; + _data_->_tmp81_ = _data_->_tmp80_ == GITG_REF_TYPE_REMOTE; #line 260 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp81_); + _g_object_unref0 (_data_->_tmp78_); #line 260 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - if (_data_->_tmp84_) { + if (_data_->_tmp81_) { #line 262 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp85_ = NULL; + _data_->_tmp82_ = NULL; #line 262 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp85_ = _data_->theirs_name; + _data_->_tmp82_ = _data_->theirs_name; #line 262 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp86_ = NULL; + _data_->_tmp83_ = NULL; #line 262 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp86_ = string_to_string (_data_->_tmp85_); + _data_->_tmp83_ = string_to_string (_data_->_tmp82_); #line 262 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp87_ = NULL; + _data_->_tmp84_ = NULL; #line 262 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp87_ = g_strconcat ("Merge remote branch '", _data_->_tmp86_, "'", NULL); + _data_->_tmp84_ = g_strconcat ("Merge remote branch '", _data_->_tmp83_, "'", NULL); #line 262 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_free0 (_data_->msg); #line 262 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->msg = _data_->_tmp87_; -#line 2865 "gitg-ref-action-merge.c" + _data_->msg = _data_->_tmp84_; +#line 2806 "gitg-ref-action-merge.c" } else { #line 266 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp88_ = NULL; + _data_->_tmp85_ = NULL; #line 266 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp88_ = _data_->theirs_name; + _data_->_tmp85_ = _data_->theirs_name; #line 266 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp89_ = NULL; + _data_->_tmp86_ = NULL; #line 266 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp89_ = string_to_string (_data_->_tmp88_); + _data_->_tmp86_ = string_to_string (_data_->_tmp85_); #line 266 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp90_ = NULL; + _data_->_tmp87_ = NULL; #line 266 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp90_ = g_strconcat ("Merge branch '", _data_->_tmp89_, "'", NULL); + _data_->_tmp87_ = g_strconcat ("Merge branch '", _data_->_tmp86_, "'", NULL); #line 266 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_free0 (_data_->msg); #line 266 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->msg = _data_->_tmp90_; -#line 2883 "gitg-ref-action-merge.c" + _data_->msg = _data_->_tmp87_; +#line 2824 "gitg-ref-action-merge.c" } #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _data_->_tmp88_ = NULL; +#line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _data_->_tmp88_ = _data_->self->priv->d_support; +#line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _data_->_tmp89_ = NULL; +#line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _data_->_tmp89_ = _data_->notification; +#line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _data_->_tmp90_ = NULL; +#line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _data_->_tmp90_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) _data_->self); +#line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp91_ = NULL; #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp91_ = _data_->self->priv->d_support; + _data_->_tmp91_ = _data_->_tmp90_; #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp92_ = NULL; #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp92_ = _data_->notification; + _data_->_tmp92_ = _data_->index; #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp93_ = NULL; #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp93_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) _data_->self); + _data_->_tmp93_ = _data_->ours; #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp94_ = NULL; #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp94_ = _data_->_tmp93_; + _data_->_tmp94_ = ggit_object_get_id ((GgitObject*) _data_->_tmp93_); #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp95_ = NULL; #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp95_ = _data_->index; + _data_->_tmp95_ = _data_->theirs; #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp96_ = NULL; #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp96_ = _data_->ours; + _data_->_tmp96_ = ggit_object_get_id ((GgitObject*) _data_->_tmp95_); #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp97_ = NULL; #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp97_ = ggit_object_get_id ((GgitObject*) _data_->_tmp96_); -#line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp98_ = NULL; -#line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp98_ = _data_->theirs; -#line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp99_ = NULL; -#line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp99_ = ggit_object_get_id ((GgitObject*) _data_->_tmp98_); -#line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp100_ = NULL; + _data_->_tmp97_ = g_new0 (GgitOId*, 2 + 1); #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp100_ = g_new0 (GgitOId*, 2 + 1); + _data_->_tmp97_[0] = _data_->_tmp94_; #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp100_[0] = _data_->_tmp97_; + _data_->_tmp97_[1] = _data_->_tmp96_; #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp100_[1] = _data_->_tmp99_; -#line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp101_ = NULL; + _data_->_tmp98_ = NULL; #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp101_ = _data_->msg; + _data_->_tmp98_ = _data_->msg; #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_state_ = 3; #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gitg_action_support_commit_index (_data_->_tmp91_, _data_->_tmp92_, _data_->_tmp94_, _data_->_tmp95_, _data_->_tmp100_, 2, NULL, _data_->_tmp101_, gitg_ref_action_merge_merge_ready, _data_); + gitg_action_support_commit_index (_data_->_tmp88_, _data_->_tmp89_, _data_->_tmp91_, _data_->_tmp92_, _data_->_tmp97_, 2, NULL, _data_->_tmp98_, gitg_ref_action_merge_merge_ready, _data_); #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2939 "gitg-ref-action-merge.c" +#line 2880 "gitg-ref-action-merge.c" _state_3: #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp102_ = NULL; + _data_->_tmp99_ = NULL; #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp102_ = gitg_action_support_commit_index_finish (_data_->_tmp91_, _data_->_res_); + _data_->_tmp99_ = gitg_action_support_commit_index_finish (_data_->_tmp88_, _data_->_res_); #line 269 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->oid = _data_->_tmp102_; + _data_->oid = _data_->_tmp99_; #line 276 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp103_ = NULL; + _data_->_tmp100_ = NULL; #line 276 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp103_ = _data_->oid; + _data_->_tmp100_ = _data_->oid; #line 276 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - if (_data_->_tmp103_ != NULL) { + if (_data_->_tmp100_ != NULL) { +#line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _data_->_tmp101_ = NULL; +#line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _data_->_tmp101_ = _data_->notification; +#line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _data_->_tmp102_ = NULL; +#line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _data_->_tmp102_ = _data_->theirs_name; +#line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _data_->_tmp103_ = NULL; +#line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _data_->_tmp103_ = string_to_string (_data_->_tmp102_); #line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp104_ = NULL; #line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp104_ = _data_->notification; + _data_->_tmp104_ = g_strconcat ("'", _data_->_tmp103_, "'", NULL); #line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp105_ = NULL; #line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp105_ = _ ("Successfully merged %s into %s"); + _data_->_tmp105_ = _data_->_tmp104_; #line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp106_ = NULL; #line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp106_ = _data_->theirs_name; + _data_->_tmp106_ = _data_->ours_name; #line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp107_ = NULL; #line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -2979,36 +2932,20 @@ #line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp110_ = NULL; #line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp110_ = _data_->ours_name; + _data_->_tmp110_ = g_strdup_printf (_ ("Successfully merged %s into %s"), _data_->_tmp105_, _data_->_tmp109_); #line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->_tmp111_ = NULL; #line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp111_ = string_to_string (_data_->_tmp110_); -#line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp112_ = NULL; -#line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp112_ = g_strconcat ("'", _data_->_tmp111_, "'", NULL); -#line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp113_ = NULL; -#line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp113_ = _data_->_tmp112_; -#line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp114_ = NULL; -#line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp114_ = g_strdup_printf (_data_->_tmp105_, _data_->_tmp109_, _data_->_tmp113_); -#line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp115_ = NULL; -#line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _data_->_tmp115_ = _data_->_tmp114_; -#line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gitg_simple_notification_success (_data_->_tmp104_, _data_->_tmp115_); + _data_->_tmp111_ = _data_->_tmp110_; #line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp115_); + gitg_simple_notification_success (_data_->_tmp101_, _data_->_tmp111_); #line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp113_); + _g_free0 (_data_->_tmp111_); #line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_free0 (_data_->_tmp109_); -#line 3009 "gitg-ref-action-merge.c" +#line 278 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _g_free0 (_data_->_tmp105_); +#line 2946 "gitg-ref-action-merge.c" } #line 281 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data_->result = _data_->oid; @@ -3030,11 +2967,11 @@ if (_data_->_state_ == 0) { #line 281 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3031 "gitg-ref-action-merge.c" +#line 2968 "gitg-ref-action-merge.c" } else { #line 281 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3035 "gitg-ref-action-merge.c" +#line 2972 "gitg-ref-action-merge.c" } #line 281 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); @@ -3060,17 +2997,17 @@ if (_data_->_state_ == 0) { #line 214 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3061 "gitg-ref-action-merge.c" +#line 2998 "gitg-ref-action-merge.c" } else { #line 214 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3065 "gitg-ref-action-merge.c" +#line 3002 "gitg-ref-action-merge.c" } #line 214 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); #line 214 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 3071 "gitg-ref-action-merge.c" +#line 3008 "gitg-ref-action-merge.c" } @@ -3088,7 +3025,7 @@ _tmp2_ = _tmp1_; #line 287 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" __vala_GgitOId_free0 (_tmp2_); -#line 3089 "gitg-ref-action-merge.c" +#line 3026 "gitg-ref-action-merge.c" } @@ -3097,7 +3034,7 @@ __lambda140_ ((GitgRefActionMerge*) self, source_object, res); #line 286 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_object_unref (self); -#line 3098 "gitg-ref-action-merge.c" +#line 3035 "gitg-ref-action-merge.c" } @@ -3111,7 +3048,7 @@ _tmp0_ = source; #line 286 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_merge (self, _tmp0_, ___lambda140__gasync_ready_callback, g_object_ref (self)); -#line 3112 "gitg-ref-action-merge.c" +#line 3049 "gitg-ref-action-merge.c" } @@ -3137,7 +3074,7 @@ _tmp3_ = branch; #line 295 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp3_ != NULL) { -#line 3138 "gitg-ref-action-merge.c" +#line 3075 "gitg-ref-action-merge.c" { GgitRef* _tmp4_ = NULL; GgitBranch* _tmp5_ = NULL; @@ -3152,7 +3089,7 @@ _tmp4_ = _tmp6_; #line 299 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3153 "gitg-ref-action-merge.c" +#line 3090 "gitg-ref-action-merge.c" goto __catch99_g_error; } #line 299 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -3165,7 +3102,7 @@ if (_tmp8_ == NULL) { #line 299 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (_tmp7_); -#line 3166 "gitg-ref-action-merge.c" +#line 3103 "gitg-ref-action-merge.c" } #line 299 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" result = _tmp8_; @@ -3175,7 +3112,7 @@ _g_object_unref0 (branch); #line 299 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return result; -#line 3176 "gitg-ref-action-merge.c" +#line 3113 "gitg-ref-action-merge.c" } goto __finally99; __catch99_g_error: @@ -3184,7 +3121,7 @@ g_clear_error (&_inner_error_); #line 297 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _inner_error_ = NULL; -#line 3185 "gitg-ref-action-merge.c" +#line 3122 "gitg-ref-action-merge.c" } __finally99: #line 297 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -3197,7 +3134,7 @@ g_clear_error (&_inner_error_); #line 297 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return NULL; -#line 3198 "gitg-ref-action-merge.c" +#line 3135 "gitg-ref-action-merge.c" } } #line 303 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -3206,7 +3143,7 @@ _g_object_unref0 (branch); #line 303 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return result; -#line 3207 "gitg-ref-action-merge.c" +#line 3144 "gitg-ref-action-merge.c" } @@ -3215,7 +3152,7 @@ g_atomic_int_inc (&_data54_->_ref_count_); #line 306 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return _data54_; -#line 3216 "gitg-ref-action-merge.c" +#line 3153 "gitg-ref-action-merge.c" } @@ -3224,7 +3161,7 @@ _data54_ = (Block54Data*) _userdata_; #line 306 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (g_atomic_int_dec_and_test (&_data54_->_ref_count_)) { -#line 3225 "gitg-ref-action-merge.c" +#line 3162 "gitg-ref-action-merge.c" GitgRefActionMerge* self; #line 306 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" self = _data54_->self; @@ -3234,7 +3171,7 @@ _g_object_unref0 (self); #line 306 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_slice_free (Block54Data, _data54_); -#line 3235 "gitg-ref-action-merge.c" +#line 3172 "gitg-ref-action-merge.c" } } @@ -3248,14 +3185,14 @@ _tmp0_ = _data54_->source; #line 323 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_activate_source (self, _tmp0_); -#line 3249 "gitg-ref-action-merge.c" +#line 3186 "gitg-ref-action-merge.c" } static void ___lambda141__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 322 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" __lambda141_ (self); -#line 3256 "gitg-ref-action-merge.c" +#line 3193 "gitg-ref-action-merge.c" } @@ -3279,25 +3216,24 @@ GtkMenuItem* _tmp17_ = NULL; const gchar* _tmp18_ = NULL; const gchar* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; + gchar* _tmp20_ = NULL; gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; + GitgRef* _tmp22_ = NULL; GitgRef* _tmp23_ = NULL; - GitgRef* _tmp24_ = NULL; + GitgParsedRefName* _tmp24_ = NULL; GitgParsedRefName* _tmp25_ = NULL; GitgParsedRefName* _tmp26_ = NULL; - GitgParsedRefName* _tmp27_ = NULL; + gchar* _tmp27_ = NULL; gchar* _tmp28_ = NULL; gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - const gchar* _tmp31_ = NULL; + const gchar* _tmp30_ = NULL; + gchar* _tmp31_ = NULL; gchar* _tmp32_ = NULL; gchar* _tmp33_ = NULL; gchar* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; - GtkMenuItem* _tmp36_ = NULL; - GtkMenu* _tmp37_ = NULL; - GtkMenuItem* _tmp38_ = NULL; + GtkMenuItem* _tmp35_ = NULL; + GtkMenu* _tmp36_ = NULL; + GtkMenuItem* _tmp37_ = NULL; #line 306 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_return_if_fail (self != NULL); #line 306 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -3320,7 +3256,7 @@ _tmp2_ = _data54_->source; #line 308 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp2_ == NULL) { -#line 3321 "gitg-ref-action-merge.c" +#line 3257 "gitg-ref-action-merge.c" GtkSeparatorMenuItem* sep = NULL; GtkSeparatorMenuItem* _tmp3_ = NULL; GtkSeparatorMenuItem* _tmp4_ = NULL; @@ -3350,7 +3286,7 @@ _data54_ = NULL; #line 313 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return; -#line 3351 "gitg-ref-action-merge.c" +#line 3287 "gitg-ref-action-merge.c" } #line 316 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp7_ = _data54_->source; @@ -3385,63 +3321,61 @@ #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp17_ = item; #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp18_ = _ ("Merge %s into branch %s"); + _tmp18_ = name; #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp19_ = name; + _tmp19_ = string_to_string (_tmp18_); #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp20_ = string_to_string (_tmp19_); + _tmp20_ = g_strconcat ("'", _tmp19_, "'", NULL); #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp21_ = g_strconcat ("'", _tmp20_, "'", NULL); + _tmp21_ = _tmp20_; #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp22_ = _tmp21_; + _tmp22_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp23_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); + _tmp23_ = _tmp22_; #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp24_ = _tmp23_; + _tmp24_ = gitg_ref_get_parsed_name (_tmp23_); #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp25_ = gitg_ref_get_parsed_name (_tmp24_); + _tmp25_ = _tmp24_; #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp26_ = _tmp25_; #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp27_ = _tmp26_; + _tmp27_ = gitg_parsed_ref_name_get_shortname (_tmp26_); #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp28_ = gitg_parsed_ref_name_get_shortname (_tmp27_); + _tmp28_ = _tmp27_; #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp29_ = _tmp28_; #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp30_ = _tmp29_; + _tmp30_ = string_to_string (_tmp29_); #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp31_ = string_to_string (_tmp30_); + _tmp31_ = g_strconcat ("'", _tmp30_, "'", NULL); #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp32_ = g_strconcat ("'", _tmp31_, "'", NULL); + _tmp32_ = _tmp31_; #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp33_ = _tmp32_; + _tmp33_ = g_strdup_printf (_ ("Merge %s into branch %s"), _tmp21_, _tmp32_); #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp34_ = g_strdup_printf (_tmp18_, _tmp22_, _tmp33_); + _tmp34_ = _tmp33_; #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp35_ = _tmp34_; + gtk_widget_set_tooltip_text ((GtkWidget*) _tmp17_, _tmp34_); #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gtk_widget_set_tooltip_text ((GtkWidget*) _tmp17_, _tmp35_); + _g_free0 (_tmp34_); #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_free0 (_tmp35_); + _g_free0 (_tmp32_); #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_free0 (_tmp33_); + _g_free0 (_tmp29_); #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_free0 (_tmp30_); + _g_object_unref0 (_tmp26_); #line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_tmp27_); -#line 320 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp21_); #line 322 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp36_ = item; + _tmp35_ = item; #line 322 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - g_signal_connect_data (_tmp36_, "activate", (GCallback) ___lambda141__gtk_menu_item_activate, block54_data_ref (_data54_), (GClosureNotify) block54_data_unref, 0); + g_signal_connect_data (_tmp35_, "activate", (GCallback) ___lambda141__gtk_menu_item_activate, block54_data_ref (_data54_), (GClosureNotify) block54_data_unref, 0); #line 326 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp37_ = submenu; + _tmp36_ = submenu; #line 326 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp38_ = item; + _tmp37_ = item; #line 326 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gtk_menu_shell_append ((GtkMenuShell*) _tmp37_, (GtkWidget*) _tmp38_); + gtk_menu_shell_append ((GtkMenuShell*) _tmp36_, (GtkWidget*) _tmp37_); #line 306 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (item); #line 306 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -3450,73 +3384,73 @@ block54_data_unref (_data54_); #line 306 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _data54_ = NULL; -#line 3451 "gitg-ref-action-merge.c" +#line 3385 "gitg-ref-action-merge.c" } -static void _vala_array_add15 (GitgRef*** array, int* length, int* size, GitgRef* value) { +static void _vala_array_add15 (GitgRef** * array, int* length, int* size, GitgRef* value) { #line 385 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if ((*length) == (*size)) { #line 385 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" *size = (*size) ? (2 * (*size)) : 4; #line 385 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" *array = g_renew (GitgRef*, *array, (*size) + 1); -#line 3462 "gitg-ref-action-merge.c" +#line 3396 "gitg-ref-action-merge.c" } #line 385 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" (*array)[(*length)++] = value; #line 385 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" (*array)[*length] = NULL; -#line 3468 "gitg-ref-action-merge.c" +#line 3402 "gitg-ref-action-merge.c" } -static void _vala_array_add16 (GitgRef*** array, int* length, int* size, GitgRef* value) { +static void _vala_array_add16 (GitgRef** * array, int* length, int* size, GitgRef* value) { #line 389 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if ((*length) == (*size)) { #line 389 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" *size = (*size) ? (2 * (*size)) : 4; #line 389 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" *array = g_renew (GitgRef*, *array, (*size) + 1); -#line 3479 "gitg-ref-action-merge.c" +#line 3413 "gitg-ref-action-merge.c" } #line 389 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" (*array)[(*length)++] = value; #line 389 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" (*array)[*length] = NULL; -#line 3485 "gitg-ref-action-merge.c" +#line 3419 "gitg-ref-action-merge.c" } -static void _vala_array_add17 (GitgRefActionMergeRemoteSource** array, int* length, int* size, const GitgRefActionMergeRemoteSource* value) { +static void _vala_array_add17 (GitgRefActionMergeRemoteSource* * array, int* length, int* size, const GitgRefActionMergeRemoteSource* value) { #line 402 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if ((*length) == (*size)) { #line 402 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" *size = (*size) ? (2 * (*size)) : 4; #line 402 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" *array = g_renew (GitgRefActionMergeRemoteSource, *array, *size); -#line 3496 "gitg-ref-action-merge.c" +#line 3430 "gitg-ref-action-merge.c" } #line 402 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" (*array)[(*length)++] = *value; -#line 3500 "gitg-ref-action-merge.c" +#line 3434 "gitg-ref-action-merge.c" } -static void _vala_array_add18 (GitgRef*** array, int* length, int* size, GitgRef* value) { +static void _vala_array_add18 (GitgRef** * array, int* length, int* size, GitgRef* value) { #line 406 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if ((*length) == (*size)) { #line 406 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" *size = (*size) ? (2 * (*size)) : 4; #line 406 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" *array = g_renew (GitgRef*, *array, (*size) + 1); -#line 3511 "gitg-ref-action-merge.c" +#line 3445 "gitg-ref-action-merge.c" } #line 406 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" (*array)[(*length)++] = value; #line 406 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" (*array)[*length] = NULL; -#line 3517 "gitg-ref-action-merge.c" +#line 3451 "gitg-ref-action-merge.c" } @@ -3539,7 +3473,7 @@ if (_tmp0_) { #line 333 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return; -#line 3540 "gitg-ref-action-merge.c" +#line 3474 "gitg-ref-action-merge.c" } #line 336 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" self->priv->d_has_sourced = TRUE; @@ -3551,7 +3485,7 @@ if (!_tmp2_) { #line 340 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return; -#line 3552 "gitg-ref-action-merge.c" +#line 3486 "gitg-ref-action-merge.c" } #line 345 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp3_ = gitg_ref_action_merge_upstream_reference (self); @@ -3591,7 +3525,7 @@ self->priv->_d_tag_sources_size_ = self->priv->d_tag_sources_length1; #line 351 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" target_oid = NULL; -#line 3592 "gitg-ref-action-merge.c" +#line 3526 "gitg-ref-action-merge.c" { GgitRef* _tmp7_ = NULL; GitgRef* _tmp8_ = NULL; @@ -3610,7 +3544,7 @@ _tmp7_ = _tmp10_; #line 355 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3611 "gitg-ref-action-merge.c" +#line 3545 "gitg-ref-action-merge.c" goto __catch100_g_error; } #line 355 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -3629,7 +3563,7 @@ _g_object_unref0 (_tmp12_); #line 353 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (_tmp7_); -#line 3630 "gitg-ref-action-merge.c" +#line 3564 "gitg-ref-action-merge.c" } goto __finally100; __catch100_g_error: @@ -3638,7 +3572,7 @@ g_clear_error (&_inner_error_); #line 353 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _inner_error_ = NULL; -#line 3639 "gitg-ref-action-merge.c" +#line 3573 "gitg-ref-action-merge.c" } __finally100: #line 353 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -3651,11 +3585,11 @@ g_clear_error (&_inner_error_); #line 353 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return; -#line 3652 "gitg-ref-action-merge.c" +#line 3586 "gitg-ref-action-merge.c" } #line 358 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" last_remote = NULL; -#line 3656 "gitg-ref-action-merge.c" +#line 3590 "gitg-ref-action-merge.c" { GeeList* _r_list = NULL; GitgExtRefActionInterface* _tmp14_ = NULL; @@ -3689,7 +3623,7 @@ _r_index = -1; #line 360 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" while (TRUE) { -#line 3690 "gitg-ref-action-merge.c" +#line 3624 "gitg-ref-action-merge.c" gint _tmp21_ = 0; gint _tmp22_ = 0; gint _tmp23_ = 0; @@ -3714,7 +3648,7 @@ if (!(_tmp22_ < _tmp23_)) { #line 360 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" break; -#line 3715 "gitg-ref-action-merge.c" +#line 3649 "gitg-ref-action-merge.c" } #line 360 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp24_ = _r_list; @@ -3728,7 +3662,7 @@ _tmp28_ = self->priv->d_upstream; #line 362 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp28_ != NULL) { -#line 3729 "gitg-ref-action-merge.c" +#line 3663 "gitg-ref-action-merge.c" GitgRef* _tmp29_ = NULL; const gchar* _tmp30_ = NULL; GitgRef* _tmp31_ = NULL; @@ -3743,11 +3677,11 @@ _tmp32_ = ggit_ref_get_name ((GgitRef*) _tmp31_); #line 362 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp27_ = g_strcmp0 (_tmp30_, _tmp32_) == 0; -#line 3744 "gitg-ref-action-merge.c" +#line 3678 "gitg-ref-action-merge.c" } else { #line 362 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp27_ = FALSE; -#line 3748 "gitg-ref-action-merge.c" +#line 3682 "gitg-ref-action-merge.c" } #line 362 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp27_) { @@ -3755,19 +3689,19 @@ _g_object_unref0 (r); #line 364 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" continue; -#line 3756 "gitg-ref-action-merge.c" +#line 3690 "gitg-ref-action-merge.c" } #line 368 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp33_ = target_oid; #line 368 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp33_ != NULL) { -#line 3762 "gitg-ref-action-merge.c" +#line 3696 "gitg-ref-action-merge.c" GgitOId* oid = NULL; gboolean _tmp40_ = FALSE; GgitOId* _tmp41_ = NULL; #line 370 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" oid = NULL; -#line 3768 "gitg-ref-action-merge.c" +#line 3702 "gitg-ref-action-merge.c" { GgitRef* _tmp34_ = NULL; GitgRef* _tmp35_ = NULL; @@ -3783,7 +3717,7 @@ _tmp34_ = _tmp36_; #line 374 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3784 "gitg-ref-action-merge.c" +#line 3718 "gitg-ref-action-merge.c" goto __catch101_g_error; } #line 374 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -3802,7 +3736,7 @@ _g_object_unref0 (_tmp38_); #line 372 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (_tmp34_); -#line 3803 "gitg-ref-action-merge.c" +#line 3737 "gitg-ref-action-merge.c" } goto __finally101; __catch101_g_error: @@ -3811,7 +3745,7 @@ g_clear_error (&_inner_error_); #line 372 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _inner_error_ = NULL; -#line 3812 "gitg-ref-action-merge.c" +#line 3746 "gitg-ref-action-merge.c" } __finally101: #line 372 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -3832,13 +3766,13 @@ g_clear_error (&_inner_error_); #line 372 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return; -#line 3833 "gitg-ref-action-merge.c" +#line 3767 "gitg-ref-action-merge.c" } #line 377 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp41_ = oid; #line 377 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp41_ != NULL) { -#line 3839 "gitg-ref-action-merge.c" +#line 3773 "gitg-ref-action-merge.c" GgitOId* _tmp42_ = NULL; GgitOId* _tmp43_ = NULL; gboolean _tmp44_ = FALSE; @@ -3850,11 +3784,11 @@ _tmp44_ = ggit_oid_equal (_tmp42_, _tmp43_); #line 377 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp40_ = _tmp44_; -#line 3851 "gitg-ref-action-merge.c" +#line 3785 "gitg-ref-action-merge.c" } else { #line 377 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp40_ = FALSE; -#line 3855 "gitg-ref-action-merge.c" +#line 3789 "gitg-ref-action-merge.c" } #line 377 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp40_) { @@ -3864,11 +3798,11 @@ _g_object_unref0 (r); #line 379 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" continue; -#line 3865 "gitg-ref-action-merge.c" +#line 3799 "gitg-ref-action-merge.c" } #line 368 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" __vala_GgitOId_free0 (oid); -#line 3869 "gitg-ref-action-merge.c" +#line 3803 "gitg-ref-action-merge.c" } #line 383 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp45_ = r; @@ -3876,7 +3810,7 @@ _tmp46_ = ggit_ref_is_branch ((GgitRef*) _tmp45_); #line 383 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp46_) { -#line 3877 "gitg-ref-action-merge.c" +#line 3811 "gitg-ref-action-merge.c" GitgRef** _tmp47_ = NULL; gint _tmp47__length1 = 0; GitgRef* _tmp48_ = NULL; @@ -3891,7 +3825,7 @@ _tmp49_ = _g_object_ref0 (_tmp48_); #line 385 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _vala_array_add15 (&self->priv->d_local_sources, &self->priv->d_local_sources_length1, &self->priv->_d_local_sources_size_, _tmp49_); -#line 3892 "gitg-ref-action-merge.c" +#line 3826 "gitg-ref-action-merge.c" } else { GitgRef* _tmp50_ = NULL; gboolean _tmp51_ = FALSE; @@ -3901,7 +3835,7 @@ _tmp51_ = ggit_ref_is_tag ((GgitRef*) _tmp50_); #line 387 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp51_) { -#line 3902 "gitg-ref-action-merge.c" +#line 3836 "gitg-ref-action-merge.c" GitgRef** _tmp52_ = NULL; gint _tmp52__length1 = 0; GitgRef* _tmp53_ = NULL; @@ -3916,7 +3850,7 @@ _tmp54_ = _g_object_ref0 (_tmp53_); #line 389 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _vala_array_add16 (&self->priv->d_tag_sources, &self->priv->d_tag_sources_length1, &self->priv->_d_tag_sources_size_, _tmp54_); -#line 3917 "gitg-ref-action-merge.c" +#line 3851 "gitg-ref-action-merge.c" } else { GitgRef* _tmp55_ = NULL; GitgParsedRefName* _tmp56_ = NULL; @@ -3943,7 +3877,7 @@ _g_object_unref0 (_tmp58_); #line 391 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp61_) { -#line 3944 "gitg-ref-action-merge.c" +#line 3878 "gitg-ref-action-merge.c" gchar* remote_name = NULL; GitgRef* _tmp62_ = NULL; GitgParsedRefName* _tmp63_ = NULL; @@ -3980,7 +3914,7 @@ _tmp70_ = last_remote; #line 395 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (g_strcmp0 (_tmp69_, _tmp70_) != 0) { -#line 3981 "gitg-ref-action-merge.c" +#line 3915 "gitg-ref-action-merge.c" GitgRefActionMergeRemoteSource source = {0}; const gchar* _tmp71_ = NULL; gchar* _tmp72_ = NULL; @@ -4032,7 +3966,7 @@ _vala_array_add17 (&self->priv->d_remote_sources, &self->priv->d_remote_sources_length1, &self->priv->_d_remote_sources_size_, &_tmp79_); #line 395 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_remote_source_destroy (&source); -#line 4033 "gitg-ref-action-merge.c" +#line 3967 "gitg-ref-action-merge.c" } else { GitgRefActionMergeRemoteSource* _tmp80_ = NULL; gint _tmp80__length1 = 0; @@ -4072,7 +4006,7 @@ _tmp86_ = _g_object_ref0 (_tmp85_); #line 406 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _vala_array_add18 (&_tmp80_[_tmp81__length1 - 1].sources, &_tmp80_[_tmp81__length1 - 1].sources_length1, &_tmp80_[_tmp81__length1 - 1]._sources_size_, _tmp86_); -#line 4073 "gitg-ref-action-merge.c" +#line 4007 "gitg-ref-action-merge.c" } #line 409 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp87_ = remote_name; @@ -4084,23 +4018,23 @@ last_remote = _tmp88_; #line 391 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_free0 (remote_name); -#line 4085 "gitg-ref-action-merge.c" +#line 4019 "gitg-ref-action-merge.c" } } } #line 360 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (r); -#line 4091 "gitg-ref-action-merge.c" +#line 4025 "gitg-ref-action-merge.c" } #line 360 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (_r_list); -#line 4095 "gitg-ref-action-merge.c" +#line 4029 "gitg-ref-action-merge.c" } #line 329 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_free0 (last_remote); #line 329 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" __vala_GgitOId_free0 (target_oid); -#line 4101 "gitg-ref-action-merge.c" +#line 4035 "gitg-ref-action-merge.c" } @@ -4120,9 +4054,9 @@ gchar* _tmp10_ = NULL; gboolean _tmp11_ = FALSE; gboolean _tmp12_ = FALSE; - GtkMenuItem* _tmp70_ = NULL; - GtkMenu* _tmp71_ = NULL; - GtkMenuItem* _tmp72_ = NULL; + GtkMenuItem* _tmp69_ = NULL; + GtkMenu* _tmp70_ = NULL; + GtkMenuItem* _tmp71_ = NULL; #line 414 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" self = (GitgRefActionMerge*) base; #line 414 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -4135,7 +4069,7 @@ if (!_tmp1_) { #line 418 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return; -#line 4136 "gitg-ref-action-merge.c" +#line 4070 "gitg-ref-action-merge.c" } #line 421 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp2_ = gitg_ext_ui_element_get_display_name ((GitgExtUIElement*) self); @@ -4171,7 +4105,7 @@ _tmp12_ = _tmp11_; #line 424 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp12_) { -#line 4172 "gitg-ref-action-merge.c" +#line 4106 "gitg-ref-action-merge.c" GtkMenu* submenu = NULL; GtkMenu* _tmp13_ = NULL; GtkMenu* _tmp14_ = NULL; @@ -4182,8 +4116,8 @@ gint _tmp25__length1 = 0; GitgRef** _tmp47_ = NULL; gint _tmp47__length1 = 0; - GtkMenuItem* _tmp67_ = NULL; - GtkMenu* _tmp68_ = NULL; + GtkMenuItem* _tmp66_ = NULL; + GtkMenu* _tmp67_ = NULL; #line 426 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp13_ = (GtkMenu*) gtk_menu_new (); #line 426 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -4198,7 +4132,7 @@ _tmp15_ = self->priv->d_upstream; #line 429 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp15_ != NULL) { -#line 4199 "gitg-ref-action-merge.c" +#line 4133 "gitg-ref-action-merge.c" GtkMenu* _tmp16_ = NULL; GitgRef* _tmp17_ = NULL; #line 431 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -4207,7 +4141,7 @@ _tmp17_ = self->priv->d_upstream; #line 431 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_add_merge_source (self, _tmp16_, _tmp17_); -#line 4208 "gitg-ref-action-merge.c" +#line 4142 "gitg-ref-action-merge.c" } #line 434 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp18_ = self->priv->d_local_sources; @@ -4215,7 +4149,7 @@ _tmp18__length1 = self->priv->d_local_sources_length1; #line 434 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp18__length1 != 0) { -#line 4216 "gitg-ref-action-merge.c" +#line 4150 "gitg-ref-action-merge.c" GitgRef* _tmp19_ = NULL; GitgRef** _tmp21_ = NULL; gint _tmp21__length1 = 0; @@ -4223,19 +4157,19 @@ _tmp19_ = self->priv->d_upstream; #line 436 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp19_ != NULL) { -#line 4224 "gitg-ref-action-merge.c" +#line 4158 "gitg-ref-action-merge.c" GtkMenu* _tmp20_ = NULL; #line 439 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp20_ = submenu; #line 439 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_add_merge_source (self, _tmp20_, NULL); -#line 4230 "gitg-ref-action-merge.c" +#line 4164 "gitg-ref-action-merge.c" } #line 442 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp21_ = self->priv->d_local_sources; #line 442 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp21__length1 = self->priv->d_local_sources_length1; -#line 4236 "gitg-ref-action-merge.c" +#line 4170 "gitg-ref-action-merge.c" { GitgRef** source_collection = NULL; gint source_collection_length1 = 0; @@ -4247,14 +4181,14 @@ source_collection_length1 = _tmp21__length1; #line 442 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" for (source_it = 0; source_it < _tmp21__length1; source_it = source_it + 1) { -#line 4248 "gitg-ref-action-merge.c" +#line 4182 "gitg-ref-action-merge.c" GitgRef* _tmp22_ = NULL; GitgRef* source = NULL; #line 442 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp22_ = _g_object_ref0 (source_collection[source_it]); #line 442 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" source = _tmp22_; -#line 4255 "gitg-ref-action-merge.c" +#line 4189 "gitg-ref-action-merge.c" { GtkMenu* _tmp23_ = NULL; GitgRef* _tmp24_ = NULL; @@ -4266,7 +4200,7 @@ gitg_ref_action_merge_add_merge_source (self, _tmp23_, _tmp24_); #line 442 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (source); -#line 4267 "gitg-ref-action-merge.c" +#line 4201 "gitg-ref-action-merge.c" } } } @@ -4277,7 +4211,7 @@ _tmp25__length1 = self->priv->d_remote_sources_length1; #line 448 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp25__length1 != 0) { -#line 4278 "gitg-ref-action-merge.c" +#line 4212 "gitg-ref-action-merge.c" gboolean _tmp26_ = FALSE; GitgRef** _tmp27_ = NULL; gint _tmp27__length1 = 0; @@ -4291,30 +4225,30 @@ if (_tmp27__length1 != 0) { #line 450 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp26_ = TRUE; -#line 4292 "gitg-ref-action-merge.c" +#line 4226 "gitg-ref-action-merge.c" } else { GitgRef* _tmp28_ = NULL; #line 450 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp28_ = self->priv->d_upstream; #line 450 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp26_ = _tmp28_ != NULL; -#line 4299 "gitg-ref-action-merge.c" +#line 4233 "gitg-ref-action-merge.c" } #line 450 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp26_) { -#line 4303 "gitg-ref-action-merge.c" +#line 4237 "gitg-ref-action-merge.c" GtkMenu* _tmp29_ = NULL; #line 453 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp29_ = submenu; #line 453 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_add_merge_source (self, _tmp29_, NULL); -#line 4309 "gitg-ref-action-merge.c" +#line 4243 "gitg-ref-action-merge.c" } #line 456 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp30_ = self->priv->d_remote_sources; #line 456 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp30__length1 = self->priv->d_remote_sources_length1; -#line 4315 "gitg-ref-action-merge.c" +#line 4249 "gitg-ref-action-merge.c" { GitgRefActionMergeRemoteSource* remote_collection = NULL; gint remote_collection_length1 = 0; @@ -4326,14 +4260,14 @@ remote_collection_length1 = _tmp30__length1; #line 456 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" for (remote_it = 0; remote_it < _tmp30__length1; remote_it = remote_it + 1) { -#line 4327 "gitg-ref-action-merge.c" +#line 4261 "gitg-ref-action-merge.c" GitgRefActionMergeRemoteSource _tmp31_ = {0}; GitgRefActionMergeRemoteSource remote = {0}; #line 456 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_remote_source_copy (&remote_collection[remote_it], &_tmp31_); #line 456 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" remote = _tmp31_; -#line 4334 "gitg-ref-action-merge.c" +#line 4268 "gitg-ref-action-merge.c" { GtkMenuItem* subitem = NULL; GitgRefActionMergeRemoteSource _tmp32_ = {0}; @@ -4380,7 +4314,7 @@ _tmp39_ = _tmp38_.sources; #line 464 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp39__length1 = _tmp38_.sources_length1; -#line 4381 "gitg-ref-action-merge.c" +#line 4315 "gitg-ref-action-merge.c" { GitgRef** source_collection = NULL; gint source_collection_length1 = 0; @@ -4392,14 +4326,14 @@ source_collection_length1 = _tmp39__length1; #line 464 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" for (source_it = 0; source_it < _tmp39__length1; source_it = source_it + 1) { -#line 4393 "gitg-ref-action-merge.c" +#line 4327 "gitg-ref-action-merge.c" GitgRef* _tmp40_ = NULL; GitgRef* source = NULL; #line 464 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp40_ = _g_object_ref0 (source_collection[source_it]); #line 464 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" source = _tmp40_; -#line 4400 "gitg-ref-action-merge.c" +#line 4334 "gitg-ref-action-merge.c" { GtkMenu* _tmp41_ = NULL; GitgRef* _tmp42_ = NULL; @@ -4411,7 +4345,7 @@ gitg_ref_action_merge_add_merge_source (self, _tmp41_, _tmp42_); #line 464 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (source); -#line 4412 "gitg-ref-action-merge.c" +#line 4346 "gitg-ref-action-merge.c" } } } @@ -4433,7 +4367,7 @@ _g_object_unref0 (subitem); #line 456 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_remote_source_destroy (&remote); -#line 4434 "gitg-ref-action-merge.c" +#line 4368 "gitg-ref-action-merge.c" } } } @@ -4444,24 +4378,23 @@ _tmp47__length1 = self->priv->d_tag_sources_length1; #line 474 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp47__length1 != 0) { -#line 4445 "gitg-ref-action-merge.c" +#line 4379 "gitg-ref-action-merge.c" gboolean _tmp48_ = FALSE; gboolean _tmp49_ = FALSE; GitgRefActionMergeRemoteSource* _tmp50_ = NULL; gint _tmp50__length1 = 0; GtkMenuItem* subitem = NULL; - const gchar* _tmp54_ = NULL; + GtkMenuItem* _tmp54_ = NULL; GtkMenuItem* _tmp55_ = NULL; - GtkMenuItem* _tmp56_ = NULL; GtkMenu* subsubmenu = NULL; + GtkMenu* _tmp56_ = NULL; GtkMenu* _tmp57_ = NULL; - GtkMenu* _tmp58_ = NULL; - GitgRef** _tmp59_ = NULL; - gint _tmp59__length1 = 0; - GtkMenuItem* _tmp63_ = NULL; + GitgRef** _tmp58_ = NULL; + gint _tmp58__length1 = 0; + GtkMenuItem* _tmp62_ = NULL; + GtkMenu* _tmp63_ = NULL; GtkMenu* _tmp64_ = NULL; - GtkMenu* _tmp65_ = NULL; - GtkMenuItem* _tmp66_ = NULL; + GtkMenuItem* _tmp65_ = NULL; #line 476 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp50_ = self->priv->d_remote_sources; #line 476 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" @@ -4470,7 +4403,7 @@ if (_tmp50__length1 != 0) { #line 476 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp49_ = TRUE; -#line 4471 "gitg-ref-action-merge.c" +#line 4404 "gitg-ref-action-merge.c" } else { GitgRef** _tmp51_ = NULL; gint _tmp51__length1 = 0; @@ -4480,140 +4413,138 @@ _tmp51__length1 = self->priv->d_local_sources_length1; #line 476 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp49_ = _tmp51__length1 != 0; -#line 4481 "gitg-ref-action-merge.c" +#line 4414 "gitg-ref-action-merge.c" } #line 476 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp49_) { #line 476 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp48_ = TRUE; -#line 4487 "gitg-ref-action-merge.c" +#line 4420 "gitg-ref-action-merge.c" } else { GitgRef* _tmp52_ = NULL; #line 476 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp52_ = self->priv->d_upstream; #line 476 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp48_ = _tmp52_ != NULL; -#line 4494 "gitg-ref-action-merge.c" +#line 4427 "gitg-ref-action-merge.c" } #line 476 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp48_) { -#line 4498 "gitg-ref-action-merge.c" +#line 4431 "gitg-ref-action-merge.c" GtkMenu* _tmp53_ = NULL; #line 479 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp53_ = submenu; #line 479 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_add_merge_source (self, _tmp53_, NULL); -#line 4504 "gitg-ref-action-merge.c" +#line 4437 "gitg-ref-action-merge.c" } #line 482 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp54_ = _ ("Tags"); -#line 482 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp55_ = (GtkMenuItem*) gtk_menu_item_new_with_label (_tmp54_); + _tmp54_ = (GtkMenuItem*) gtk_menu_item_new_with_label (_ ("Tags")); #line 482 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - g_object_ref_sink (_tmp55_); + g_object_ref_sink (_tmp54_); #line 482 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - subitem = _tmp55_; + subitem = _tmp54_; #line 483 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp56_ = subitem; + _tmp55_ = subitem; #line 483 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gtk_widget_show ((GtkWidget*) _tmp56_); + gtk_widget_show ((GtkWidget*) _tmp55_); #line 485 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp57_ = (GtkMenu*) gtk_menu_new (); + _tmp56_ = (GtkMenu*) gtk_menu_new (); #line 485 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - g_object_ref_sink (_tmp57_); + g_object_ref_sink (_tmp56_); #line 485 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - subsubmenu = _tmp57_; + subsubmenu = _tmp56_; #line 486 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp58_ = subsubmenu; + _tmp57_ = subsubmenu; #line 486 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gtk_widget_show ((GtkWidget*) _tmp58_); + gtk_widget_show ((GtkWidget*) _tmp57_); #line 488 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp59_ = self->priv->d_tag_sources; + _tmp58_ = self->priv->d_tag_sources; #line 488 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp59__length1 = self->priv->d_tag_sources_length1; -#line 4532 "gitg-ref-action-merge.c" + _tmp58__length1 = self->priv->d_tag_sources_length1; +#line 4463 "gitg-ref-action-merge.c" { GitgRef** source_collection = NULL; gint source_collection_length1 = 0; gint _source_collection_size_ = 0; gint source_it = 0; #line 488 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - source_collection = _tmp59_; + source_collection = _tmp58_; #line 488 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - source_collection_length1 = _tmp59__length1; + source_collection_length1 = _tmp58__length1; #line 488 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - for (source_it = 0; source_it < _tmp59__length1; source_it = source_it + 1) { -#line 4544 "gitg-ref-action-merge.c" - GitgRef* _tmp60_ = NULL; + for (source_it = 0; source_it < _tmp58__length1; source_it = source_it + 1) { +#line 4475 "gitg-ref-action-merge.c" + GitgRef* _tmp59_ = NULL; GitgRef* source = NULL; #line 488 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp60_ = _g_object_ref0 (source_collection[source_it]); + _tmp59_ = _g_object_ref0 (source_collection[source_it]); #line 488 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - source = _tmp60_; -#line 4551 "gitg-ref-action-merge.c" + source = _tmp59_; +#line 4482 "gitg-ref-action-merge.c" { - GtkMenu* _tmp61_ = NULL; - GitgRef* _tmp62_ = NULL; + GtkMenu* _tmp60_ = NULL; + GitgRef* _tmp61_ = NULL; #line 490 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp61_ = subsubmenu; + _tmp60_ = subsubmenu; #line 490 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp62_ = source; + _tmp61_ = source; #line 490 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gitg_ref_action_merge_add_merge_source (self, _tmp61_, _tmp62_); + gitg_ref_action_merge_add_merge_source (self, _tmp60_, _tmp61_); #line 488 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (source); -#line 4563 "gitg-ref-action-merge.c" +#line 4494 "gitg-ref-action-merge.c" } } } #line 493 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp63_ = subitem; + _tmp62_ = subitem; #line 493 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp64_ = subsubmenu; + _tmp63_ = subsubmenu; #line 493 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gtk_menu_item_set_submenu (_tmp63_, _tmp64_); + gtk_menu_item_set_submenu (_tmp62_, _tmp63_); #line 494 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp65_ = submenu; + _tmp64_ = submenu; #line 494 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp66_ = subitem; + _tmp65_ = subitem; #line 494 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gtk_menu_shell_append ((GtkMenuShell*) _tmp65_, (GtkWidget*) _tmp66_); + gtk_menu_shell_append ((GtkMenuShell*) _tmp64_, (GtkWidget*) _tmp65_); #line 474 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (subsubmenu); #line 474 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (subitem); -#line 4583 "gitg-ref-action-merge.c" +#line 4514 "gitg-ref-action-merge.c" } #line 497 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp67_ = item; + _tmp66_ = item; #line 497 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp68_ = submenu; + _tmp67_ = submenu; #line 497 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gtk_menu_item_set_submenu (_tmp67_, _tmp68_); + gtk_menu_item_set_submenu (_tmp66_, _tmp67_); #line 424 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (submenu); -#line 4593 "gitg-ref-action-merge.c" +#line 4524 "gitg-ref-action-merge.c" } else { - GtkMenuItem* _tmp69_ = NULL; + GtkMenuItem* _tmp68_ = NULL; #line 501 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp69_ = item; + _tmp68_ = item; #line 501 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gtk_widget_set_sensitive ((GtkWidget*) _tmp69_, FALSE); -#line 4600 "gitg-ref-action-merge.c" + gtk_widget_set_sensitive ((GtkWidget*) _tmp68_, FALSE); +#line 4531 "gitg-ref-action-merge.c" } #line 504 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp70_ = item; + _tmp69_ = item; #line 504 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gtk_widget_show ((GtkWidget*) _tmp70_); + gtk_widget_show ((GtkWidget*) _tmp69_); #line 505 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp71_ = menu; + _tmp70_ = menu; #line 505 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp72_ = item; + _tmp71_ = item; #line 505 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - gtk_menu_shell_append ((GtkMenuShell*) _tmp71_, (GtkWidget*) _tmp72_); + gtk_menu_shell_append ((GtkMenuShell*) _tmp70_, (GtkWidget*) _tmp71_); #line 414 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (item); -#line 4614 "gitg-ref-action-merge.c" +#line 4545 "gitg-ref-action-merge.c" } @@ -4632,27 +4563,31 @@ result = _tmp1_; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return result; -#line 4633 "gitg-ref-action-merge.c" +#line 4564 "gitg-ref-action-merge.c" } static void gitg_ref_action_merge_real_set_application (GitgExtUIElement* base, GitgExtApplication* value) { GitgRefActionMerge* self; - GitgExtApplication* _tmp0_ = NULL; - GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" self = (GitgRefActionMerge*) base; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp0_ = value; + if (gitg_ref_action_merge_real_get_application (self) != value) { +#line 4574 "gitg-ref-action-merge.c" + GitgExtApplication* _tmp0_ = NULL; + GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (self->priv->_application); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _g_object_unref0 (self->priv->_application); #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - self->priv->_application = _tmp1_; + self->priv->_application = _tmp1_; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - g_object_notify ((GObject *) self, "application"); -#line 4653 "gitg-ref-action-merge.c" + g_object_notify ((GObject *) self, "application"); +#line 4587 "gitg-ref-action-merge.c" + } } @@ -4668,27 +4603,31 @@ result = _tmp0_; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return result; -#line 4669 "gitg-ref-action-merge.c" +#line 4604 "gitg-ref-action-merge.c" } static void gitg_ref_action_merge_real_set_action_interface (GitgExtRefAction* base, GitgExtRefActionInterface* value) { GitgRefActionMerge* self; - GitgExtRefActionInterface* _tmp0_ = NULL; - GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" self = (GitgRefActionMerge*) base; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp0_ = value; + if (gitg_ref_action_merge_real_get_action_interface (self) != value) { +#line 4614 "gitg-ref-action-merge.c" + GitgExtRefActionInterface* _tmp0_ = NULL; + GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (self->priv->_action_interface); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + _g_object_unref0 (self->priv->_action_interface); #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - self->priv->_action_interface = _tmp1_; + self->priv->_action_interface = _tmp1_; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - g_object_notify ((GObject *) self, "action-interface"); -#line 4689 "gitg-ref-action-merge.c" + g_object_notify ((GObject *) self, "action-interface"); +#line 4627 "gitg-ref-action-merge.c" + } } @@ -4704,27 +4643,31 @@ result = _tmp0_; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return result; -#line 4705 "gitg-ref-action-merge.c" +#line 4644 "gitg-ref-action-merge.c" } static void gitg_ref_action_merge_real_set_reference (GitgExtRefAction* base, GitgRef* value) { GitgRefActionMerge* self; - GitgRef* _tmp0_ = NULL; - GitgRef* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" self = (GitgRefActionMerge*) base; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp0_ = value; + if (gitg_ref_action_merge_real_get_reference (self) != value) { +#line 4654 "gitg-ref-action-merge.c" + GitgRef* _tmp0_ = NULL; + GitgRef* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (self->priv->_reference); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - self->priv->_reference = _tmp1_; + _g_object_unref0 (self->priv->_reference); #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - g_object_notify ((GObject *) self, "reference"); -#line 4725 "gitg-ref-action-merge.c" + self->priv->_reference = _tmp1_; +#line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" + g_object_notify ((GObject *) self, "reference"); +#line 4667 "gitg-ref-action-merge.c" + } } @@ -4740,107 +4683,101 @@ result = _tmp0_; #line 58 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return result; -#line 4741 "gitg-ref-action-merge.c" +#line 4684 "gitg-ref-action-merge.c" } static gchar* gitg_ref_action_merge_real_get_display_name (GitgExtUIElement* base) { gchar* result; GitgRefActionMerge* self; - const gchar* _tmp0_ = NULL; + GitgRef* _tmp0_ = NULL; GitgRef* _tmp1_ = NULL; - GitgRef* _tmp2_ = NULL; + GitgParsedRefName* _tmp2_ = NULL; GitgParsedRefName* _tmp3_ = NULL; GitgParsedRefName* _tmp4_ = NULL; - GitgParsedRefName* _tmp5_ = NULL; + gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; #line 63 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" self = (GitgRefActionMerge*) base; #line 63 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp0_ = _ ("Merge into %s"); + _tmp0_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); #line 63 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp1_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); + _tmp1_ = _tmp0_; #line 63 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp2_ = _tmp1_; + _tmp2_ = gitg_ref_get_parsed_name (_tmp1_); #line 63 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp3_ = gitg_ref_get_parsed_name (_tmp2_); + _tmp3_ = _tmp2_; #line 63 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp4_ = _tmp3_; #line 63 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp5_ = _tmp4_; + _tmp5_ = gitg_parsed_ref_name_get_shortname (_tmp4_); #line 63 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp6_ = gitg_parsed_ref_name_get_shortname (_tmp5_); + _tmp6_ = _tmp5_; #line 63 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp7_ = _tmp6_; #line 63 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp8_ = _tmp7_; + _tmp8_ = g_strdup_printf (_ ("Merge into %s"), _tmp7_); #line 63 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp9_ = g_strdup_printf (_tmp0_, _tmp8_); + _tmp9_ = _tmp8_; #line 63 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp10_ = _tmp9_; + _g_free0 (_tmp7_); #line 63 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_free0 (_tmp8_); + _g_object_unref0 (_tmp4_); #line 63 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_tmp5_); -#line 63 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - result = _tmp10_; + result = _tmp9_; #line 63 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return result; -#line 4791 "gitg-ref-action-merge.c" +#line 4731 "gitg-ref-action-merge.c" } static gchar* gitg_ref_action_merge_real_get_description (GitgExtUIElement* base) { gchar* result; GitgRefActionMerge* self; - const gchar* _tmp0_ = NULL; + GitgRef* _tmp0_ = NULL; GitgRef* _tmp1_ = NULL; - GitgRef* _tmp2_ = NULL; + GitgParsedRefName* _tmp2_ = NULL; GitgParsedRefName* _tmp3_ = NULL; GitgParsedRefName* _tmp4_ = NULL; - GitgParsedRefName* _tmp5_ = NULL; + gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" self = (GitgRefActionMerge*) base; #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp0_ = _ ("Merge another branch into branch %s"); + _tmp0_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp1_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); + _tmp1_ = _tmp0_; #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp2_ = _tmp1_; + _tmp2_ = gitg_ref_get_parsed_name (_tmp1_); #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp3_ = gitg_ref_get_parsed_name (_tmp2_); + _tmp3_ = _tmp2_; #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp4_ = _tmp3_; #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp5_ = _tmp4_; + _tmp5_ = gitg_parsed_ref_name_get_shortname (_tmp4_); #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp6_ = gitg_parsed_ref_name_get_shortname (_tmp5_); + _tmp6_ = _tmp5_; #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp7_ = _tmp6_; #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp8_ = _tmp7_; -#line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp9_ = g_strdup_printf (_tmp0_, _tmp8_); + _tmp8_ = g_strdup_printf (_ ("Merge another branch into branch %s"), _tmp7_); #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp7_); #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - result = _tmp10_; + result = _tmp9_; #line 69 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return result; -#line 4841 "gitg-ref-action-merge.c" +#line 4778 "gitg-ref-action-merge.c" } @@ -4862,7 +4799,7 @@ result = _tmp2_; #line 76 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return result; -#line 4863 "gitg-ref-action-merge.c" +#line 4800 "gitg-ref-action-merge.c" } @@ -4883,7 +4820,7 @@ if (_tmp3_ != NULL) { #line 86 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp2_ = TRUE; -#line 4884 "gitg-ref-action-merge.c" +#line 4821 "gitg-ref-action-merge.c" } else { GitgRef** _tmp4_ = NULL; gint _tmp4__length1 = 0; @@ -4893,13 +4830,13 @@ _tmp4__length1 = self->priv->d_local_sources_length1; #line 87 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp2_ = _tmp4__length1 != 0; -#line 4894 "gitg-ref-action-merge.c" +#line 4831 "gitg-ref-action-merge.c" } #line 86 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp2_) { #line 86 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp1_ = TRUE; -#line 4900 "gitg-ref-action-merge.c" +#line 4837 "gitg-ref-action-merge.c" } else { GitgRefActionMergeRemoteSource* _tmp5_ = NULL; gint _tmp5__length1 = 0; @@ -4909,13 +4846,13 @@ _tmp5__length1 = self->priv->d_remote_sources_length1; #line 88 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp1_ = _tmp5__length1 != 0; -#line 4910 "gitg-ref-action-merge.c" +#line 4847 "gitg-ref-action-merge.c" } #line 86 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" if (_tmp1_) { #line 86 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp0_ = TRUE; -#line 4916 "gitg-ref-action-merge.c" +#line 4853 "gitg-ref-action-merge.c" } else { GitgRef** _tmp6_ = NULL; gint _tmp6__length1 = 0; @@ -4925,13 +4862,13 @@ _tmp6__length1 = self->priv->d_tag_sources_length1; #line 89 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp0_ = _tmp6__length1 != 0; -#line 4926 "gitg-ref-action-merge.c" +#line 4863 "gitg-ref-action-merge.c" } #line 86 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" result = _tmp0_; #line 86 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return result; -#line 4932 "gitg-ref-action-merge.c" +#line 4869 "gitg-ref-action-merge.c" } @@ -4942,17 +4879,17 @@ result = g_new0 (GitgRef*, length + 1); #line 32 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" for (i = 0; i < length; i++) { -#line 4943 "gitg-ref-action-merge.c" +#line 4880 "gitg-ref-action-merge.c" GitgRef* _tmp0_ = NULL; #line 32 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 32 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" result[i] = _tmp0_; -#line 4949 "gitg-ref-action-merge.c" +#line 4886 "gitg-ref-action-merge.c" } #line 32 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return result; -#line 4953 "gitg-ref-action-merge.c" +#line 4890 "gitg-ref-action-merge.c" } @@ -4987,7 +4924,7 @@ (*dest).sources_length1 = _tmp3__length1; #line 32 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" (*dest)._sources_size_ = (*dest).sources_length1; -#line 4988 "gitg-ref-action-merge.c" +#line 4925 "gitg-ref-action-merge.c" } @@ -4996,7 +4933,7 @@ _g_free0 ((*self).name); #line 35 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" (*self).sources = (_vala_array_free ((*self).sources, (*self).sources_length1, (GDestroyNotify) g_object_unref), NULL); -#line 4997 "gitg-ref-action-merge.c" +#line 4934 "gitg-ref-action-merge.c" } @@ -5008,7 +4945,7 @@ gitg_ref_action_merge_remote_source_copy (self, dup); #line 32 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" return dup; -#line 5009 "gitg-ref-action-merge.c" +#line 4946 "gitg-ref-action-merge.c" } @@ -5017,7 +4954,7 @@ gitg_ref_action_merge_remote_source_destroy (self); #line 32 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_free (self); -#line 5018 "gitg-ref-action-merge.c" +#line 4955 "gitg-ref-action-merge.c" } @@ -5059,7 +4996,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REF_ACTION_MERGE_AVAILABLE, g_param_spec_boolean ("available", "available", "available", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REF_ACTION_MERGE_ENABLED, g_param_spec_boolean ("enabled", "enabled", "enabled", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 5060 "gitg-ref-action-merge.c" +#line 4997 "gitg-ref-action-merge.c" } @@ -5080,7 +5017,7 @@ iface->get_available = gitg_ref_action_merge_real_get_available; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" iface->get_enabled = gitg_ref_action_merge_real_get_enabled; -#line 5081 "gitg-ref-action-merge.c" +#line 5018 "gitg-ref-action-merge.c" } @@ -5088,8 +5025,8 @@ #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_gitg_ext_action_parent_iface = g_type_interface_peek_parent (iface); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" - iface->populate_menu = (void (*)(GitgExtAction*, GtkMenu*)) gitg_ref_action_merge_real_populate_menu; -#line 5090 "gitg-ref-action-merge.c" + iface->populate_menu = (void (*) (GitgExtAction *, GtkMenu*)) gitg_ref_action_merge_real_populate_menu; +#line 5027 "gitg-ref-action-merge.c" } @@ -5104,18 +5041,18 @@ iface->get_reference = gitg_ref_action_merge_real_get_reference; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" iface->set_reference = gitg_ref_action_merge_real_set_reference; -#line 5105 "gitg-ref-action-merge.c" +#line 5042 "gitg-ref-action-merge.c" } static void gitg_ref_action_merge_instance_init (GitgRefActionMerge * self) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" self->priv = GITG_REF_ACTION_MERGE_GET_PRIVATE (self); -#line 5112 "gitg-ref-action-merge.c" +#line 5049 "gitg-ref-action-merge.c" } -static void gitg_ref_action_merge_finalize (GObject* obj) { +static void gitg_ref_action_merge_finalize (GObject * obj) { GitgRefActionMerge * self; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_REF_ACTION_MERGE, GitgRefActionMerge); @@ -5137,7 +5074,7 @@ _g_object_unref0 (self->priv->d_support); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" G_OBJECT_CLASS (gitg_ref_action_merge_parent_class)->finalize (obj); -#line 5138 "gitg-ref-action-merge.c" +#line 5075 "gitg-ref-action-merge.c" } @@ -5212,13 +5149,13 @@ g_value_set_boolean (value, gitg_ext_ui_element_get_enabled ((GitgExtUIElement*) self)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" break; -#line 5213 "gitg-ref-action-merge.c" +#line 5150 "gitg-ref-action-merge.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" break; -#line 5219 "gitg-ref-action-merge.c" +#line 5156 "gitg-ref-action-merge.c" } } @@ -5246,13 +5183,13 @@ gitg_ext_ref_action_set_reference ((GitgExtRefAction*) self, g_value_get_object (value)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" break; -#line 5247 "gitg-ref-action-merge.c" +#line 5184 "gitg-ref-action-merge.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-merge.vala" break; -#line 5253 "gitg-ref-action-merge.c" +#line 5190 "gitg-ref-action-merge.c" } } diff -Nru gitg-3.22.0/gitg/gitg-ref-action-rename.c gitg-3.23.0/gitg/gitg-ref-action-rename.c --- gitg-3.22.0/gitg/gitg-ref-action-rename.c 2016-08-17 18:00:36.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-ref-action-rename.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ref-action-rename.c generated by valac 0.32.1, the Vala compiler +/* gitg-ref-action-rename.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ref-action-rename.vala, do not modify */ /* @@ -63,9 +63,9 @@ static gpointer gitg_ref_action_rename_parent_class = NULL; -static GitgExtUIElementIface* gitg_ref_action_rename_gitg_ext_ui_element_parent_iface = NULL; -static GitgExtActionIface* gitg_ref_action_rename_gitg_ext_action_parent_iface = NULL; -static GitgExtRefActionIface* gitg_ref_action_rename_gitg_ext_ref_action_parent_iface = NULL; +static GitgExtUIElementIface * gitg_ref_action_rename_gitg_ext_ui_element_parent_iface = NULL; +static GitgExtActionIface * gitg_ref_action_rename_gitg_ext_action_parent_iface = NULL; +static GitgExtRefActionIface * gitg_ref_action_rename_gitg_ext_ref_action_parent_iface = NULL; GType gitg_ref_action_rename_get_type (void) G_GNUC_CONST; #define GITG_REF_ACTION_RENAME_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_REF_ACTION_RENAME, GitgRefActionRenamePrivate)) @@ -85,7 +85,7 @@ static void gitg_ref_action_rename_real_activate (GitgExtUIElement* base); static void gitg_ref_action_rename_on_ref_name_editing_done (GitgRefActionRename* self, const gchar* new_text, gboolean cancelled); static void _gitg_ref_action_rename_on_ref_name_editing_done_gitg_ext_ref_name_editing_done (const gchar* new_name, gboolean cancelled, gpointer self); -static void gitg_ref_action_rename_finalize (GObject* obj); +static void gitg_ref_action_rename_finalize (GObject * obj); static void _vala_gitg_ref_action_rename_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_ref_action_rename_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -153,11 +153,11 @@ static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 163 "gitg-ref-action-rename.c" } @@ -193,15 +193,15 @@ gboolean _tmp38_ = FALSE; gboolean _tmp39_ = FALSE; GgitBranch* branch = NULL; - GitgRef* _tmp50_ = NULL; - GitgRef* _tmp51_ = NULL; - GgitBranch* _tmp52_ = NULL; + GitgRef* _tmp48_ = NULL; + GitgRef* _tmp49_ = NULL; + GgitBranch* _tmp50_ = NULL; GitgRef* new_ref = NULL; - GitgExtRefActionInterface* _tmp81_ = NULL; - GitgExtRefActionInterface* _tmp82_ = NULL; - GitgRef* _tmp83_ = NULL; - GitgRef* _tmp84_ = NULL; - GitgRef* _tmp85_ = NULL; + GitgExtRefActionInterface* _tmp78_ = NULL; + GitgExtRefActionInterface* _tmp79_ = NULL; + GitgRef* _tmp80_ = NULL; + GitgRef* _tmp81_ = NULL; + GitgRef* _tmp82_ = NULL; GError * _inner_error_ = NULL; #line 70 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" g_return_if_fail (self != NULL); @@ -365,41 +365,35 @@ #line 366 "gitg-ref-action-rename.c" gchar* msg = NULL; const gchar* _tmp40_ = NULL; - const gchar* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; + gchar* _tmp41_ = NULL; + GitgExtRefActionInterface* _tmp42_ = NULL; GitgExtRefActionInterface* _tmp43_ = NULL; - GitgExtRefActionInterface* _tmp44_ = NULL; + GitgExtApplication* _tmp44_ = NULL; GitgExtApplication* _tmp45_ = NULL; GitgExtApplication* _tmp46_ = NULL; - GitgExtApplication* _tmp47_ = NULL; - const gchar* _tmp48_ = NULL; - const gchar* _tmp49_ = NULL; + const gchar* _tmp47_ = NULL; #line 100 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp40_ = _ ("The specified name ‘%s’ contains invalid characters"); + _tmp40_ = new_text; #line 100 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp41_ = new_text; + _tmp41_ = g_strdup_printf (_ ("The specified name ‘%s’ contains invalid characters"), _tmp40_); #line 100 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp42_ = g_strdup_printf (_tmp40_, _tmp41_); -#line 100 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - msg = _tmp42_; -#line 102 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp43_ = gitg_ext_ref_action_get_action_interface ((GitgExtRefAction*) self); + msg = _tmp41_; #line 102 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp44_ = _tmp43_; + _tmp42_ = gitg_ext_ref_action_get_action_interface ((GitgExtRefAction*) self); #line 102 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp45_ = gitg_ext_ref_action_interface_get_application (_tmp44_); + _tmp43_ = _tmp42_; #line 102 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp46_ = _tmp45_; + _tmp44_ = gitg_ext_ref_action_interface_get_application (_tmp43_); #line 102 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp47_ = _tmp46_; + _tmp45_ = _tmp44_; #line 102 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp48_ = _ ("Invalid name"); + _tmp46_ = _tmp45_; #line 102 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp49_ = msg; + _tmp47_ = msg; #line 102 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - gitg_ext_application_show_infobar (_tmp47_, _tmp48_, _tmp49_, GTK_MESSAGE_ERROR); + gitg_ext_application_show_infobar (_tmp46_, _ ("Invalid name"), _tmp47_, GTK_MESSAGE_ERROR); #line 102 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _g_object_unref0 (_tmp47_); + _g_object_unref0 (_tmp46_); #line 106 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" _g_free0 (msg); #line 106 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" @@ -410,169 +404,166 @@ _g_free0 (orig); #line 106 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" return; -#line 414 "gitg-ref-action-rename.c" +#line 408 "gitg-ref-action-rename.c" } #line 109 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp50_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); + _tmp48_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); #line 109 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp51_ = _tmp50_; + _tmp49_ = _tmp48_; #line 109 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp52_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp51_, ggit_branch_get_type ()) ? ((GgitBranch*) _tmp51_) : NULL); + _tmp50_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp49_, ggit_branch_get_type ()) ? ((GgitBranch*) _tmp49_) : NULL); #line 109 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - branch = _tmp52_; + branch = _tmp50_; #line 110 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" new_ref = NULL; -#line 426 "gitg-ref-action-rename.c" +#line 420 "gitg-ref-action-rename.c" { - GgitBranch* _tmp53_ = NULL; + GgitBranch* _tmp51_ = NULL; #line 114 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp53_ = branch; + _tmp51_ = branch; #line 114 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - if (_tmp53_ != NULL) { -#line 433 "gitg-ref-action-rename.c" - GgitBranch* _tmp54_ = NULL; + if (_tmp51_ != NULL) { +#line 427 "gitg-ref-action-rename.c" + GgitBranch* _tmp52_ = NULL; + GgitBranch* _tmp53_ = NULL; + const gchar* _tmp54_ = NULL; GgitBranch* _tmp55_ = NULL; - const gchar* _tmp56_ = NULL; - GgitBranch* _tmp57_ = NULL; - GgitBranch* _tmp58_ = NULL; - GitgRef* _tmp59_ = NULL; + GgitBranch* _tmp56_ = NULL; + GitgRef* _tmp57_ = NULL; #line 116 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp55_ = branch; + _tmp53_ = branch; #line 116 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp56_ = new_text; + _tmp54_ = new_text; #line 116 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp57_ = ggit_branch_move (_tmp55_, _tmp56_, GGIT_CREATE_NONE, &_inner_error_); + _tmp55_ = ggit_branch_move (_tmp53_, _tmp54_, GGIT_CREATE_NONE, &_inner_error_); #line 116 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp54_ = _tmp57_; + _tmp52_ = _tmp55_; #line 116 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 450 "gitg-ref-action-rename.c" +#line 444 "gitg-ref-action-rename.c" goto __catch102_g_error; } #line 116 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp58_ = _tmp54_; + _tmp56_ = _tmp52_; #line 116 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp54_ = NULL; + _tmp52_ = NULL; #line 116 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp59_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp58_, GITG_TYPE_REF) ? ((GitgRef*) _tmp58_) : NULL; + _tmp57_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp56_, GITG_TYPE_REF) ? ((GitgRef*) _tmp56_) : NULL; #line 116 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - if (_tmp59_ == NULL) { + if (_tmp57_ == NULL) { #line 116 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _g_object_unref0 (_tmp58_); -#line 463 "gitg-ref-action-rename.c" + _g_object_unref0 (_tmp56_); +#line 457 "gitg-ref-action-rename.c" } #line 116 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" _g_object_unref0 (new_ref); #line 116 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - new_ref = _tmp59_; + new_ref = _tmp57_; #line 114 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _g_object_unref0 (_tmp54_); -#line 471 "gitg-ref-action-rename.c" + _g_object_unref0 (_tmp52_); +#line 465 "gitg-ref-action-rename.c" } else { gchar* msg = NULL; - GitgRef* _tmp60_ = NULL; - GitgRef* _tmp61_ = NULL; - const gchar* _tmp62_ = NULL; - const gchar* _tmp63_ = NULL; - gchar* _tmp64_ = NULL; - GgitRef* _tmp65_ = NULL; - GitgRef* _tmp66_ = NULL; - GitgRef* _tmp67_ = NULL; - const gchar* _tmp68_ = NULL; - const gchar* _tmp69_ = NULL; - GgitRef* _tmp70_ = NULL; - GgitRef* _tmp71_ = NULL; - GitgRef* _tmp72_ = NULL; + GitgRef* _tmp58_ = NULL; + GitgRef* _tmp59_ = NULL; + const gchar* _tmp60_ = NULL; + const gchar* _tmp61_ = NULL; + gchar* _tmp62_ = NULL; + GgitRef* _tmp63_ = NULL; + GitgRef* _tmp64_ = NULL; + GitgRef* _tmp65_ = NULL; + const gchar* _tmp66_ = NULL; + const gchar* _tmp67_ = NULL; + GgitRef* _tmp68_ = NULL; + GgitRef* _tmp69_ = NULL; + GitgRef* _tmp70_ = NULL; #line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp60_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); + _tmp58_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); #line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp61_ = _tmp60_; + _tmp59_ = _tmp58_; #line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp62_ = ggit_ref_get_name ((GgitRef*) _tmp61_); + _tmp60_ = ggit_ref_get_name ((GgitRef*) _tmp59_); #line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp63_ = new_text; + _tmp61_ = new_text; #line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp64_ = g_strdup_printf ("rename: ref %s to %s", _tmp62_, _tmp63_); + _tmp62_ = g_strdup_printf ("rename: ref %s to %s", _tmp60_, _tmp61_); #line 121 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - msg = _tmp64_; + msg = _tmp62_; #line 124 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp66_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); + _tmp64_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); #line 124 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp67_ = _tmp66_; + _tmp65_ = _tmp64_; #line 124 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp68_ = new_text; + _tmp66_ = new_text; #line 124 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp69_ = msg; + _tmp67_ = msg; #line 124 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp70_ = ggit_ref_rename ((GgitRef*) _tmp67_, _tmp68_, FALSE, _tmp69_, &_inner_error_); + _tmp68_ = ggit_ref_rename ((GgitRef*) _tmp65_, _tmp66_, FALSE, _tmp67_, &_inner_error_); #line 124 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp65_ = _tmp70_; + _tmp63_ = _tmp68_; #line 124 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 124 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" _g_free0 (msg); -#line 515 "gitg-ref-action-rename.c" +#line 509 "gitg-ref-action-rename.c" goto __catch102_g_error; } #line 124 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp71_ = _tmp65_; + _tmp69_ = _tmp63_; #line 124 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp65_ = NULL; + _tmp63_ = NULL; #line 124 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp72_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp71_, GITG_TYPE_REF) ? ((GitgRef*) _tmp71_) : NULL; + _tmp70_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp69_, GITG_TYPE_REF) ? ((GitgRef*) _tmp69_) : NULL; #line 124 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - if (_tmp72_ == NULL) { + if (_tmp70_ == NULL) { #line 124 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _g_object_unref0 (_tmp71_); -#line 528 "gitg-ref-action-rename.c" + _g_object_unref0 (_tmp69_); +#line 522 "gitg-ref-action-rename.c" } #line 124 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" _g_object_unref0 (new_ref); #line 124 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - new_ref = _tmp72_; + new_ref = _tmp70_; #line 114 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _g_object_unref0 (_tmp65_); + _g_object_unref0 (_tmp63_); #line 114 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" _g_free0 (msg); -#line 538 "gitg-ref-action-rename.c" +#line 532 "gitg-ref-action-rename.c" } } goto __finally102; __catch102_g_error: { GError* e = NULL; - GitgExtRefActionInterface* _tmp73_ = NULL; - GitgExtRefActionInterface* _tmp74_ = NULL; + GitgExtRefActionInterface* _tmp71_ = NULL; + GitgExtRefActionInterface* _tmp72_ = NULL; + GitgExtApplication* _tmp73_ = NULL; + GitgExtApplication* _tmp74_ = NULL; GitgExtApplication* _tmp75_ = NULL; - GitgExtApplication* _tmp76_ = NULL; - GitgExtApplication* _tmp77_ = NULL; - const gchar* _tmp78_ = NULL; - GError* _tmp79_ = NULL; - const gchar* _tmp80_ = NULL; + GError* _tmp76_ = NULL; + const gchar* _tmp77_ = NULL; #line 112 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" e = _inner_error_; #line 112 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" _inner_error_ = NULL; #line 131 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp73_ = gitg_ext_ref_action_get_action_interface ((GitgExtRefAction*) self); -#line 131 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp74_ = _tmp73_; + _tmp71_ = gitg_ext_ref_action_get_action_interface ((GitgExtRefAction*) self); #line 131 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp75_ = gitg_ext_ref_action_interface_get_application (_tmp74_); + _tmp72_ = _tmp71_; #line 131 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp76_ = _tmp75_; + _tmp73_ = gitg_ext_ref_action_interface_get_application (_tmp72_); #line 131 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp77_ = _tmp76_; + _tmp74_ = _tmp73_; #line 131 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp78_ = _ ("Failed to rename"); + _tmp75_ = _tmp74_; #line 131 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp79_ = e; + _tmp76_ = e; #line 131 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp80_ = _tmp79_->message; + _tmp77_ = _tmp76_->message; #line 131 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - gitg_ext_application_show_infobar (_tmp77_, _tmp78_, _tmp80_, GTK_MESSAGE_ERROR); + gitg_ext_application_show_infobar (_tmp75_, _ ("Failed to rename"), _tmp77_, GTK_MESSAGE_ERROR); #line 131 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _g_object_unref0 (_tmp77_); + _g_object_unref0 (_tmp75_); #line 135 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" _g_error_free0 (e); #line 135 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" @@ -587,7 +578,7 @@ _g_free0 (orig); #line 135 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" return; -#line 591 "gitg-ref-action-rename.c" +#line 582 "gitg-ref-action-rename.c" } __finally102: #line 112 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" @@ -608,20 +599,20 @@ g_clear_error (&_inner_error_); #line 112 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" return; -#line 612 "gitg-ref-action-rename.c" +#line 603 "gitg-ref-action-rename.c" } #line 138 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp81_ = gitg_ext_ref_action_get_action_interface ((GitgExtRefAction*) self); + _tmp78_ = gitg_ext_ref_action_get_action_interface ((GitgExtRefAction*) self); #line 138 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp82_ = _tmp81_; + _tmp79_ = _tmp78_; #line 138 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp83_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); + _tmp80_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); #line 138 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp84_ = _tmp83_; + _tmp81_ = _tmp80_; #line 138 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp85_ = new_ref; + _tmp82_ = new_ref; #line 138 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - gitg_ext_ref_action_interface_replace_ref (_tmp82_, _tmp84_, _tmp85_); + gitg_ext_ref_action_interface_replace_ref (_tmp79_, _tmp81_, _tmp82_); #line 70 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" _g_object_unref0 (new_ref); #line 70 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" @@ -632,7 +623,7 @@ _g_free0 (prefix); #line 70 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" _g_free0 (orig); -#line 636 "gitg-ref-action-rename.c" +#line 627 "gitg-ref-action-rename.c" } @@ -651,27 +642,31 @@ result = _tmp1_; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" return result; -#line 655 "gitg-ref-action-rename.c" +#line 646 "gitg-ref-action-rename.c" } static void gitg_ref_action_rename_real_set_application (GitgExtUIElement* base, GitgExtApplication* value) { GitgRefActionRename* self; - GitgExtApplication* _tmp0_ = NULL; - GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" self = (GitgRefActionRename*) base; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp0_ = value; + if (gitg_ref_action_rename_real_get_application (self) != value) { +#line 656 "gitg-ref-action-rename.c" + GitgExtApplication* _tmp0_ = NULL; + GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _g_object_unref0 (self->priv->_application); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" + _g_object_unref0 (self->priv->_application); #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - self->priv->_application = _tmp1_; + self->priv->_application = _tmp1_; #line 28 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - g_object_notify ((GObject *) self, "application"); -#line 675 "gitg-ref-action-rename.c" + g_object_notify ((GObject *) self, "application"); +#line 669 "gitg-ref-action-rename.c" + } } @@ -687,27 +682,31 @@ result = _tmp0_; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" return result; -#line 691 "gitg-ref-action-rename.c" +#line 686 "gitg-ref-action-rename.c" } static void gitg_ref_action_rename_real_set_action_interface (GitgExtRefAction* base, GitgExtRefActionInterface* value) { GitgRefActionRename* self; - GitgExtRefActionInterface* _tmp0_ = NULL; - GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" self = (GitgRefActionRename*) base; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp0_ = value; + if (gitg_ref_action_rename_real_get_action_interface (self) != value) { +#line 696 "gitg-ref-action-rename.c" + GitgExtRefActionInterface* _tmp0_ = NULL; + GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _g_object_unref0 (self->priv->_action_interface); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" + _g_object_unref0 (self->priv->_action_interface); #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - self->priv->_action_interface = _tmp1_; + self->priv->_action_interface = _tmp1_; #line 29 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - g_object_notify ((GObject *) self, "action-interface"); -#line 711 "gitg-ref-action-rename.c" + g_object_notify ((GObject *) self, "action-interface"); +#line 709 "gitg-ref-action-rename.c" + } } @@ -723,27 +722,31 @@ result = _tmp0_; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" return result; -#line 727 "gitg-ref-action-rename.c" +#line 726 "gitg-ref-action-rename.c" } static void gitg_ref_action_rename_real_set_reference (GitgExtRefAction* base, GitgRef* value) { GitgRefActionRename* self; - GitgRef* _tmp0_ = NULL; - GitgRef* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" self = (GitgRefActionRename*) base; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp0_ = value; + if (gitg_ref_action_rename_real_get_reference (self) != value) { +#line 736 "gitg-ref-action-rename.c" + GitgRef* _tmp0_ = NULL; + GitgRef* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _g_object_unref0 (self->priv->_reference); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - self->priv->_reference = _tmp1_; + _g_object_unref0 (self->priv->_reference); #line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - g_object_notify ((GObject *) self, "reference"); -#line 747 "gitg-ref-action-rename.c" + self->priv->_reference = _tmp1_; +#line 30 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" + g_object_notify ((GObject *) self, "reference"); +#line 749 "gitg-ref-action-rename.c" + } } @@ -759,23 +762,20 @@ result = _tmp0_; #line 43 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" return result; -#line 763 "gitg-ref-action-rename.c" +#line 766 "gitg-ref-action-rename.c" } static gchar* gitg_ref_action_rename_real_get_display_name (GitgExtUIElement* base) { gchar* result; GitgRefActionRename* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 48 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" self = (GitgRefActionRename*) base; #line 48 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp0_ = _ ("Rename"); -#line 48 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (_ ("Rename")); #line 48 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - result = _tmp1_; + result = _tmp0_; #line 48 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" return result; #line 782 "gitg-ref-action-rename.c" @@ -785,19 +785,16 @@ static gchar* gitg_ref_action_rename_real_get_description (GitgExtUIElement* base) { gchar* result; GitgRefActionRename* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 53 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" self = (GitgRefActionRename*) base; #line 53 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp0_ = _ ("Rename the selected reference"); -#line 53 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (_ ("Rename the selected reference")); #line 53 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - result = _tmp1_; + result = _tmp0_; #line 53 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" return result; -#line 801 "gitg-ref-action-rename.c" +#line 798 "gitg-ref-action-rename.c" } @@ -820,7 +817,7 @@ if (_tmp3_) { #line 60 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" _tmp0_ = TRUE; -#line 824 "gitg-ref-action-rename.c" +#line 821 "gitg-ref-action-rename.c" } else { GitgRef* _tmp4_ = NULL; GitgRef* _tmp5_ = NULL; @@ -833,13 +830,13 @@ _tmp6_ = ggit_ref_is_tag ((GgitRef*) _tmp5_); #line 61 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" _tmp0_ = _tmp6_; -#line 837 "gitg-ref-action-rename.c" +#line 834 "gitg-ref-action-rename.c" } #line 60 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" result = _tmp0_; #line 60 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" return result; -#line 843 "gitg-ref-action-rename.c" +#line 840 "gitg-ref-action-rename.c" } @@ -868,7 +865,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REF_ACTION_RENAME_DESCRIPTION, g_param_spec_string ("description", "description", "description", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REF_ACTION_RENAME_ENABLED, g_param_spec_boolean ("enabled", "enabled", "enabled", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 872 "gitg-ref-action-rename.c" +#line 869 "gitg-ref-action-rename.c" } @@ -876,7 +873,7 @@ #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" gitg_ref_action_rename_gitg_ext_ui_element_parent_iface = g_type_interface_peek_parent (iface); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" - iface->activate = (void (*)(GitgExtUIElement*)) gitg_ref_action_rename_real_activate; + iface->activate = (void (*) (GitgExtUIElement *)) gitg_ref_action_rename_real_activate; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" iface->get_application = gitg_ref_action_rename_real_get_application; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" @@ -889,14 +886,14 @@ iface->get_description = gitg_ref_action_rename_real_get_description; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" iface->get_enabled = gitg_ref_action_rename_real_get_enabled; -#line 893 "gitg-ref-action-rename.c" +#line 890 "gitg-ref-action-rename.c" } static void gitg_ref_action_rename_gitg_ext_action_interface_init (GitgExtActionIface * iface) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" gitg_ref_action_rename_gitg_ext_action_parent_iface = g_type_interface_peek_parent (iface); -#line 900 "gitg-ref-action-rename.c" +#line 897 "gitg-ref-action-rename.c" } @@ -911,18 +908,18 @@ iface->get_reference = gitg_ref_action_rename_real_get_reference; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" iface->set_reference = gitg_ref_action_rename_real_set_reference; -#line 915 "gitg-ref-action-rename.c" +#line 912 "gitg-ref-action-rename.c" } static void gitg_ref_action_rename_instance_init (GitgRefActionRename * self) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" self->priv = GITG_REF_ACTION_RENAME_GET_PRIVATE (self); -#line 922 "gitg-ref-action-rename.c" +#line 919 "gitg-ref-action-rename.c" } -static void gitg_ref_action_rename_finalize (GObject* obj) { +static void gitg_ref_action_rename_finalize (GObject * obj) { GitgRefActionRename * self; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_REF_ACTION_RENAME, GitgRefActionRename); @@ -934,7 +931,7 @@ _g_object_unref0 (self->priv->_reference); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" G_OBJECT_CLASS (gitg_ref_action_rename_parent_class)->finalize (obj); -#line 938 "gitg-ref-action-rename.c" +#line 935 "gitg-ref-action-rename.c" } @@ -1003,13 +1000,13 @@ g_value_set_boolean (value, gitg_ext_ui_element_get_enabled ((GitgExtUIElement*) self)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" break; -#line 1007 "gitg-ref-action-rename.c" +#line 1004 "gitg-ref-action-rename.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" break; -#line 1013 "gitg-ref-action-rename.c" +#line 1010 "gitg-ref-action-rename.c" } } @@ -1037,13 +1034,13 @@ gitg_ext_ref_action_set_reference ((GitgExtRefAction*) self, g_value_get_object (value)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" break; -#line 1041 "gitg-ref-action-rename.c" +#line 1038 "gitg-ref-action-rename.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ref-action-rename.vala" break; -#line 1047 "gitg-ref-action-rename.c" +#line 1044 "gitg-ref-action-rename.c" } } diff -Nru gitg-3.22.0/gitg/gitg-remote-manager.c gitg-3.23.0/gitg/gitg-remote-manager.c --- gitg-3.22.0/gitg/gitg-remote-manager.c 2016-08-17 18:00:36.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-remote-manager.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-remote-manager.c generated by valac 0.32.1, the Vala compiler +/* gitg-remote-manager.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-remote-manager.vala, do not modify */ /* @@ -110,8 +110,8 @@ static gpointer gitg_remote_manager_parent_class = NULL; static gpointer gitg_remote_manager_ui_credentials_provider_parent_class = NULL; -static GitgCredentialsProviderIface* gitg_remote_manager_ui_credentials_provider_gitg_credentials_provider_parent_iface = NULL; -static GitgExtRemoteLookupIface* gitg_remote_manager_gitg_ext_remote_lookup_parent_iface = NULL; +static GitgCredentialsProviderIface * gitg_remote_manager_ui_credentials_provider_gitg_credentials_provider_parent_iface = NULL; +static GitgExtRemoteLookupIface * gitg_remote_manager_gitg_ext_remote_lookup_parent_iface = NULL; GType gitg_remote_manager_get_type (void) G_GNUC_CONST; static GType gitg_remote_manager_instead_of_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; @@ -124,12 +124,12 @@ enum { GITG_REMOTE_MANAGER_DUMMY_PROPERTY }; -static void _vala_GitgRemoteManagerInsteadOf_array_free (GitgRemoteManagerInsteadOf* array, gint array_length); +static void _vala_GitgRemoteManagerInsteadOf_array_free (GitgRemoteManagerInsteadOf * array, gint array_length); GitgRemoteManager* gitg_remote_manager_new (GitgWindow* window); GitgRemoteManager* gitg_remote_manager_construct (GType object_type, GitgWindow* window); static void gitg_remote_manager_extract_insteadof (GitgRemoteManager* self); static gint ___lambda110_ (GitgRemoteManager* self, GMatchInfo* info, const gchar* value); -static void _vala_array_add19 (GitgRemoteManagerInsteadOf** array, int* length, int* size, const GitgRemoteManagerInsteadOf* value); +static void _vala_array_add19 (GitgRemoteManagerInsteadOf* * array, int* length, int* size, const GitgRemoteManagerInsteadOf* value); static gint ____lambda110__ggit_config_match_callback (GMatchInfo* match_info, const gchar* value, gpointer self); static GitgRemote* gitg_remote_manager_real_lookup (GitgExtRemoteLookup* base, const gchar* name); static GitgRemoteManagerUICredentialsProvider* gitg_remote_manager_ui_credentials_provider_new (GitgRemote* remote, GtkWindow* window); @@ -140,13 +140,13 @@ GITG_REMOTE_MANAGER_UI_CREDENTIALS_PROVIDER_DUMMY_PROPERTY }; static GgitCred* gitg_remote_manager_ui_credentials_provider_real_credentials (GitgCredentialsProvider* base, const gchar* url, const gchar* username_from_url, GgitCredtype allowed_types, GError** error); -static void gitg_remote_manager_ui_credentials_provider_finalize (GObject* obj); -static void gitg_remote_manager_finalize (GObject* obj); +static void gitg_remote_manager_ui_credentials_provider_finalize (GObject * obj); +static void gitg_remote_manager_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_GitgRemoteManagerInsteadOf_array_free (GitgRemoteManagerInsteadOf* array, gint array_length) { +static void _vala_GitgRemoteManagerInsteadOf_array_free (GitgRemoteManagerInsteadOf * array, gint array_length) { #line 56 "/home/jesse/dev/gitg/gitg/gitg-remote-manager.vala" if (array != NULL) { #line 153 "gitg-remote-manager.c" @@ -209,7 +209,7 @@ } -static void _vala_array_add19 (GitgRemoteManagerInsteadOf** array, int* length, int* size, const GitgRemoteManagerInsteadOf* value) { +static void _vala_array_add19 (GitgRemoteManagerInsteadOf* * array, int* length, int* size, const GitgRemoteManagerInsteadOf* value) { #line 99 "/home/jesse/dev/gitg/gitg/gitg-remote-manager.vala" if ((*length) == (*size)) { #line 99 "/home/jesse/dev/gitg/gitg/gitg-remote-manager.vala" @@ -542,37 +542,37 @@ glong _tmp1_ = 0L; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1315 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1315 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { #line 558 "gitg-remote-manager.c" glong _tmp4_ = 0L; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = maxlen; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 566 "gitg-remote-manager.c" } else { gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = (glong) (_tmp5_ - _tmp6_); -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 578 "gitg-remote-manager.c" } @@ -592,112 +592,112 @@ glong _tmp20_ = 0L; glong _tmp21_ = 0L; gchar* _tmp22_ = NULL; -#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1325 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = offset; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { #line 602 "gitg-remote-manager.c" glong _tmp2_ = 0L; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = len; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); #line 608 "gitg-remote-manager.c" } else { -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = FALSE; #line 612 "gitg-remote-manager.c" } -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_) { #line 616 "gitg-remote-manager.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; glong _tmp5_ = 0L; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = offset; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = len; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = _tmp5_; #line 628 "gitg-remote-manager.c" } else { gint _tmp6_ = 0; gint _tmp7_ = 0; -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = strlen (self); -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = _tmp6_; -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; #line 638 "gitg-remote-manager.c" } -#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = offset; -#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { #line 644 "gitg-remote-manager.c" glong _tmp9_ = 0L; glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1335 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = string_length; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1335 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = offset; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1335 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" offset = _tmp9_ + _tmp10_; -#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = offset; -#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); #line 658 "gitg-remote-manager.c" } else { glong _tmp12_ = 0L; glong _tmp13_ = 0L; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = offset; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = string_length; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); #line 668 "gitg-remote-manager.c" } -#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1340 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = len; -#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1340 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { #line 674 "gitg-remote-manager.c" glong _tmp15_ = 0L; glong _tmp16_ = 0L; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1341 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1341 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = offset; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1341 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; #line 683 "gitg-remote-manager.c" } -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = offset; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = len; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = string_length; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = offset; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = len; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp22_; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 703 "gitg-remote-manager.c" } @@ -1376,7 +1376,7 @@ #line 25 "/home/jesse/dev/gitg/gitg/gitg-remote-manager.vala" gitg_remote_manager_ui_credentials_provider_gitg_credentials_provider_parent_iface = g_type_interface_peek_parent (iface); #line 25 "/home/jesse/dev/gitg/gitg/gitg-remote-manager.vala" - iface->credentials = (GgitCred* (*)(GitgCredentialsProvider*, const gchar*, const gchar*, GgitCredtype, GError**)) gitg_remote_manager_ui_credentials_provider_real_credentials; + iface->credentials = (GgitCred* (*) (GitgCredentialsProvider *, const gchar*, const gchar*, GgitCredtype, GError**)) gitg_remote_manager_ui_credentials_provider_real_credentials; #line 1381 "gitg-remote-manager.c" } @@ -1388,7 +1388,7 @@ } -static void gitg_remote_manager_ui_credentials_provider_finalize (GObject* obj) { +static void gitg_remote_manager_ui_credentials_provider_finalize (GObject * obj) { GitgRemoteManagerUICredentialsProvider * self; #line 25 "/home/jesse/dev/gitg/gitg/gitg-remote-manager.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_REMOTE_MANAGER_TYPE_UI_CREDENTIALS_PROVIDER, GitgRemoteManagerUICredentialsProvider); @@ -1495,7 +1495,7 @@ #line 23 "/home/jesse/dev/gitg/gitg/gitg-remote-manager.vala" gitg_remote_manager_gitg_ext_remote_lookup_parent_iface = g_type_interface_peek_parent (iface); #line 23 "/home/jesse/dev/gitg/gitg/gitg-remote-manager.vala" - iface->lookup = (GitgRemote* (*)(GitgExtRemoteLookup*, const gchar*)) gitg_remote_manager_real_lookup; + iface->lookup = (GitgRemote* (*) (GitgExtRemoteLookup *, const gchar*)) gitg_remote_manager_real_lookup; #line 1500 "gitg-remote-manager.c" } @@ -1507,7 +1507,7 @@ } -static void gitg_remote_manager_finalize (GObject* obj) { +static void gitg_remote_manager_finalize (GObject * obj) { GitgRemoteManager * self; #line 23 "/home/jesse/dev/gitg/gitg/gitg-remote-manager.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_REMOTE_MANAGER, GitgRemoteManager); diff -Nru gitg-3.22.0/gitg/gitg-remote-notification.c gitg-3.23.0/gitg/gitg-remote-notification.c --- gitg-3.22.0/gitg/gitg-remote-notification.c 2016-08-09 09:50:55.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-remote-notification.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-remote-notification.c generated by valac 0.32.1, the Vala compiler +/* gitg-remote-notification.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-remote-notification.vala, do not modify */ /* @@ -48,6 +48,11 @@ typedef struct _Block57Data Block57Data; typedef struct _Block58Data Block58Data; typedef struct _Block59Data Block59Data; +enum { + GITG_REMOTE_NOTIFICATION_CANCEL_SIGNAL, + GITG_REMOTE_NOTIFICATION_LAST_SIGNAL +}; +static guint gitg_remote_notification_signals[GITG_REMOTE_NOTIFICATION_LAST_SIGNAL] = {0}; struct _GitgRemoteNotification { GitgProgressBin parent_instance; @@ -99,7 +104,7 @@ static gpointer gitg_remote_notification_parent_class = NULL; -static GitgExtNotificationIface* gitg_remote_notification_gitg_ext_notification_parent_iface = NULL; +static GitgExtNotificationIface * gitg_remote_notification_gitg_ext_notification_parent_iface = NULL; GType gitg_remote_notification_get_type (void) G_GNUC_CONST; #define GITG_REMOTE_NOTIFICATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_REMOTE_NOTIFICATION, GitgRemoteNotificationPrivate)) @@ -140,7 +145,7 @@ static void block59_data_unref (void * _userdata_); static gboolean _gitg_remote_notification_remote_state___lambda136_ (Block59Data* _data59_); static gboolean __gitg_remote_notification_remote_state___lambda136__gsource_func (gpointer self); -static void gitg_remote_notification_finalize (GObject* obj); +static void gitg_remote_notification_finalize (GObject * obj); static void _vala_gitg_remote_notification_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_remote_notification_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -148,7 +153,7 @@ static gpointer _g_object_ref0 (gpointer self) { #line 48 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" return self ? g_object_ref (self) : NULL; -#line 152 "gitg-remote-notification.c" +#line 157 "gitg-remote-notification.c" } @@ -180,14 +185,14 @@ g_object_bind_property_with_closures ((GObject*) _tmp3_, "transfer-progress", (GObject*) self, "fraction", G_BINDING_DEFAULT, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); #line 46 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" return self; -#line 184 "gitg-remote-notification.c" +#line 189 "gitg-remote-notification.c" } GitgRemoteNotification* gitg_remote_notification_new (GitgRemote* remote) { #line 46 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" return gitg_remote_notification_construct (GITG_TYPE_REMOTE_NOTIFICATION, remote); -#line 191 "gitg-remote-notification.c" +#line 196 "gitg-remote-notification.c" } @@ -196,7 +201,7 @@ g_atomic_int_inc (&_data55_->_ref_count_); #line 59 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" return _data55_; -#line 200 "gitg-remote-notification.c" +#line 205 "gitg-remote-notification.c" } @@ -205,7 +210,7 @@ _data55_ = (Block55Data*) _userdata_; #line 59 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" if (g_atomic_int_dec_and_test (&_data55_->_ref_count_)) { -#line 209 "gitg-remote-notification.c" +#line 214 "gitg-remote-notification.c" GitgRemoteNotification* self; #line 59 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" self = _data55_->self; @@ -215,7 +220,7 @@ _g_object_unref0 (self); #line 59 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" g_slice_free (Block55Data, _data55_); -#line 219 "gitg-remote-notification.c" +#line 224 "gitg-remote-notification.c" } } @@ -246,7 +251,7 @@ result = FALSE; #line 69 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" return result; -#line 250 "gitg-remote-notification.c" +#line 255 "gitg-remote-notification.c" } @@ -255,7 +260,7 @@ result = __lambda132_ (self); #line 61 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" return result; -#line 259 "gitg-remote-notification.c" +#line 264 "gitg-remote-notification.c" } @@ -287,7 +292,7 @@ block55_data_unref (_data55_); #line 59 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" _data55_ = NULL; -#line 291 "gitg-remote-notification.c" +#line 296 "gitg-remote-notification.c" } @@ -296,7 +301,7 @@ g_atomic_int_inc (&_data56_->_ref_count_); #line 73 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" return _data56_; -#line 300 "gitg-remote-notification.c" +#line 305 "gitg-remote-notification.c" } @@ -305,7 +310,7 @@ _data56_ = (Block56Data*) _userdata_; #line 73 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" if (g_atomic_int_dec_and_test (&_data56_->_ref_count_)) { -#line 309 "gitg-remote-notification.c" +#line 314 "gitg-remote-notification.c" GitgRemoteNotification* self; #line 73 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" self = _data56_->self; @@ -315,7 +320,7 @@ _g_object_unref0 (self); #line 73 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" g_slice_free (Block56Data, _data56_); -#line 319 "gitg-remote-notification.c" +#line 324 "gitg-remote-notification.c" } } @@ -346,7 +351,7 @@ result = FALSE; #line 82 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" return result; -#line 350 "gitg-remote-notification.c" +#line 355 "gitg-remote-notification.c" } @@ -355,7 +360,7 @@ result = __lambda135_ (self); #line 75 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" return result; -#line 359 "gitg-remote-notification.c" +#line 364 "gitg-remote-notification.c" } @@ -387,7 +392,7 @@ block56_data_unref (_data56_); #line 73 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" _data56_ = NULL; -#line 391 "gitg-remote-notification.c" +#line 396 "gitg-remote-notification.c" } @@ -396,7 +401,7 @@ g_atomic_int_inc (&_data57_->_ref_count_); #line 86 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" return _data57_; -#line 400 "gitg-remote-notification.c" +#line 405 "gitg-remote-notification.c" } @@ -405,7 +410,7 @@ _data57_ = (Block57Data*) _userdata_; #line 86 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" if (g_atomic_int_dec_and_test (&_data57_->_ref_count_)) { -#line 409 "gitg-remote-notification.c" +#line 414 "gitg-remote-notification.c" GitgRemoteNotification* self; #line 86 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" self = _data57_->self; @@ -413,7 +418,7 @@ _g_object_unref0 (self); #line 86 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" g_slice_free (Block57Data, _data57_); -#line 417 "gitg-remote-notification.c" +#line 422 "gitg-remote-notification.c" } } @@ -422,8 +427,7 @@ GitgRemoteNotification* self; gboolean result = FALSE; GtkButton* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + gboolean _tmp1_ = FALSE; #line 88 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" self = _data57_->self; #line 89 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" @@ -431,22 +435,20 @@ #line 90 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" _tmp0_ = self->priv->d_button_cancel; #line 90 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" - _tmp1_ = _ ("Close"); -#line 90 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" - gtk_button_set_label (_tmp0_, _tmp1_); + gtk_button_set_label (_tmp0_, _ ("Close")); #line 92 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" - _tmp2_ = _data57_->auto_close; + _tmp1_ = _data57_->auto_close; #line 92 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" - if (_tmp2_) { + if (_tmp1_) { #line 94 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" g_signal_emit_by_name ((GitgExtNotification*) self, "close", (guint) 3000); -#line 444 "gitg-remote-notification.c" +#line 446 "gitg-remote-notification.c" } #line 97 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" result = FALSE; #line 97 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" return result; -#line 450 "gitg-remote-notification.c" +#line 452 "gitg-remote-notification.c" } @@ -455,7 +457,7 @@ result = __lambda134_ (self); #line 88 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" return result; -#line 459 "gitg-remote-notification.c" +#line 461 "gitg-remote-notification.c" } @@ -480,7 +482,7 @@ block57_data_unref (_data57_); #line 86 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" _data57_ = NULL; -#line 484 "gitg-remote-notification.c" +#line 486 "gitg-remote-notification.c" } @@ -494,11 +496,11 @@ if (_tmp0_) { #line 145 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" g_signal_emit_by_name ((GitgExtNotification*) self, "close", (guint) 0); -#line 498 "gitg-remote-notification.c" +#line 500 "gitg-remote-notification.c" } else { #line 149 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" - g_signal_emit_by_name (self, "cancel"); -#line 502 "gitg-remote-notification.c" + g_signal_emit (self, gitg_remote_notification_signals[GITG_REMOTE_NOTIFICATION_CANCEL_SIGNAL], 0); +#line 504 "gitg-remote-notification.c" } } @@ -506,7 +508,7 @@ static void _gitg_remote_notification_on_button_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 24 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" gitg_remote_notification_on_button_cancel_clicked ((GitgRemoteNotification*) self); -#line 510 "gitg-remote-notification.c" +#line 512 "gitg-remote-notification.c" } @@ -522,7 +524,7 @@ result = _tmp0_; #line 56 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" return result; -#line 526 "gitg-remote-notification.c" +#line 528 "gitg-remote-notification.c" } @@ -537,7 +539,7 @@ result = _tmp0_; #line 105 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" return result; -#line 541 "gitg-remote-notification.c" +#line 543 "gitg-remote-notification.c" } @@ -546,7 +548,7 @@ g_atomic_int_inc (&_data58_->_ref_count_); #line 108 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" return _data58_; -#line 550 "gitg-remote-notification.c" +#line 552 "gitg-remote-notification.c" } @@ -555,7 +557,7 @@ _data58_ = (Block58Data*) _userdata_; #line 108 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" if (g_atomic_int_dec_and_test (&_data58_->_ref_count_)) { -#line 559 "gitg-remote-notification.c" +#line 561 "gitg-remote-notification.c" GitgRemoteNotification* self; #line 108 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" self = _data58_->self; @@ -565,7 +567,7 @@ _g_object_unref0 (self); #line 108 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" g_slice_free (Block58Data, _data58_); -#line 569 "gitg-remote-notification.c" +#line 571 "gitg-remote-notification.c" } } @@ -587,7 +589,7 @@ result = FALSE; #line 112 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" return result; -#line 591 "gitg-remote-notification.c" +#line 593 "gitg-remote-notification.c" } @@ -596,39 +598,43 @@ result = _gitg_remote_notification_text___lambda133_ (self); #line 110 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" return result; -#line 600 "gitg-remote-notification.c" +#line 602 "gitg-remote-notification.c" } void gitg_remote_notification_set_text (GitgRemoteNotification* self, const gchar* value) { - Block58Data* _data58_; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; #line 108 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" g_return_if_fail (self != NULL); #line 108 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" - _data58_ = g_slice_new0 (Block58Data); + if (g_strcmp0 (value, gitg_remote_notification_get_text (self)) != 0) { +#line 611 "gitg-remote-notification.c" + Block58Data* _data58_; + const gchar* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; #line 108 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" - _data58_->_ref_count_ = 1; + _data58_ = g_slice_new0 (Block58Data); #line 108 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" - _data58_->self = g_object_ref (self); + _data58_->_ref_count_ = 1; #line 108 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" - _tmp0_ = value; + _data58_->self = g_object_ref (self); #line 108 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = value; #line 108 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" - _g_free0 (_data58_->value); + _tmp1_ = g_strdup (_tmp0_); #line 108 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" - _data58_->value = _tmp1_; + _g_free0 (_data58_->value); +#line 108 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" + _data58_->value = _tmp1_; #line 110 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, __gitg_remote_notification_text___lambda133__gsource_func, block58_data_ref (_data58_), block58_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, __gitg_remote_notification_text___lambda133__gsource_func, block58_data_ref (_data58_), block58_data_unref); #line 108 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" - block58_data_unref (_data58_); + block58_data_unref (_data58_); #line 108 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" - _data58_ = NULL; + _data58_ = NULL; #line 108 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" - g_object_notify ((GObject *) self, "text"); -#line 632 "gitg-remote-notification.c" + g_object_notify ((GObject *) self, "text"); +#line 637 "gitg-remote-notification.c" + } } @@ -637,7 +643,7 @@ g_atomic_int_inc (&_data59_->_ref_count_); #line 119 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" return _data59_; -#line 641 "gitg-remote-notification.c" +#line 647 "gitg-remote-notification.c" } @@ -646,7 +652,7 @@ _data59_ = (Block59Data*) _userdata_; #line 119 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" if (g_atomic_int_dec_and_test (&_data59_->_ref_count_)) { -#line 650 "gitg-remote-notification.c" +#line 656 "gitg-remote-notification.c" GitgRemoteNotification* self; #line 119 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" self = _data59_->self; @@ -654,7 +660,7 @@ _g_object_unref0 (self); #line 119 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" g_slice_free (Block59Data, _data59_); -#line 658 "gitg-remote-notification.c" +#line 664 "gitg-remote-notification.c" } } @@ -671,7 +677,7 @@ switch (_tmp0_) { #line 122 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" case GITG_REMOTE_STATE_CONNECTING: -#line 675 "gitg-remote-notification.c" +#line 681 "gitg-remote-notification.c" { GtkImage* _tmp1_ = NULL; #line 125 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" @@ -680,11 +686,11 @@ g_object_set (_tmp1_, "icon-name", "network-wireless-acquiring-symbolic", NULL); #line 126 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" break; -#line 684 "gitg-remote-notification.c" +#line 690 "gitg-remote-notification.c" } #line 122 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" case GITG_REMOTE_STATE_CONNECTED: -#line 688 "gitg-remote-notification.c" +#line 694 "gitg-remote-notification.c" { GtkImage* _tmp2_ = NULL; #line 128 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" @@ -693,11 +699,11 @@ g_object_set (_tmp2_, "icon-name", "network-idle-symbolic", NULL); #line 129 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" break; -#line 697 "gitg-remote-notification.c" +#line 703 "gitg-remote-notification.c" } #line 122 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" case GITG_REMOTE_STATE_TRANSFERRING: -#line 701 "gitg-remote-notification.c" +#line 707 "gitg-remote-notification.c" { GtkImage* _tmp3_ = NULL; #line 131 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" @@ -706,18 +712,18 @@ g_object_set (_tmp3_, "icon-name", "network-transmit-receive-symbolic", NULL); #line 132 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" break; -#line 710 "gitg-remote-notification.c" +#line 716 "gitg-remote-notification.c" } default: #line 122 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" break; -#line 715 "gitg-remote-notification.c" +#line 721 "gitg-remote-notification.c" } #line 135 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" result = FALSE; #line 135 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" return result; -#line 721 "gitg-remote-notification.c" +#line 727 "gitg-remote-notification.c" } @@ -726,7 +732,7 @@ result = _gitg_remote_notification_remote_state___lambda136_ (self); #line 121 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" return result; -#line 730 "gitg-remote-notification.c" +#line 736 "gitg-remote-notification.c" } @@ -753,7 +759,7 @@ _data59_ = NULL; #line 119 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" g_object_notify ((GObject *) self, "remote-state"); -#line 757 "gitg-remote-notification.c" +#line 763 "gitg-remote-notification.c" } @@ -780,7 +786,7 @@ #line 24 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/gitg/ui/gitg-remote-notification.ui"); #line 24 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" - g_signal_new ("cancel", GITG_TYPE_REMOTE_NOTIFICATION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_remote_notification_signals[GITG_REMOTE_NOTIFICATION_CANCEL_SIGNAL] = g_signal_new ("cancel", GITG_TYPE_REMOTE_NOTIFICATION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 24 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "image_icon", FALSE, GitgRemoteNotification_private_offset + G_STRUCT_OFFSET (GitgRemoteNotificationPrivate, d_image_icon)); #line 24 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" @@ -789,7 +795,7 @@ gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "button_cancel", FALSE, GitgRemoteNotification_private_offset + G_STRUCT_OFFSET (GitgRemoteNotificationPrivate, d_button_cancel)); #line 24 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_button_cancel_clicked", G_CALLBACK(_gitg_remote_notification_on_button_cancel_clicked_gtk_button_clicked)); -#line 793 "gitg-remote-notification.c" +#line 799 "gitg-remote-notification.c" } @@ -798,7 +804,7 @@ gitg_remote_notification_gitg_ext_notification_parent_iface = g_type_interface_peek_parent (iface); #line 24 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" iface->get_widget = gitg_remote_notification_real_get_widget; -#line 802 "gitg-remote-notification.c" +#line 808 "gitg-remote-notification.c" } @@ -807,11 +813,11 @@ self->priv = GITG_REMOTE_NOTIFICATION_GET_PRIVATE (self); #line 24 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 811 "gitg-remote-notification.c" +#line 817 "gitg-remote-notification.c" } -static void gitg_remote_notification_finalize (GObject* obj) { +static void gitg_remote_notification_finalize (GObject * obj) { GitgRemoteNotification * self; #line 24 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_REMOTE_NOTIFICATION, GitgRemoteNotification); @@ -827,7 +833,7 @@ _g_free0 (self->priv->d_text); #line 24 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" G_OBJECT_CLASS (gitg_remote_notification_parent_class)->finalize (obj); -#line 831 "gitg-remote-notification.c" +#line 837 "gitg-remote-notification.c" } @@ -862,13 +868,13 @@ g_value_set_string (value, gitg_remote_notification_get_text (self)); #line 24 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" break; -#line 866 "gitg-remote-notification.c" +#line 872 "gitg-remote-notification.c" default: #line 24 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 24 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" break; -#line 872 "gitg-remote-notification.c" +#line 878 "gitg-remote-notification.c" } } @@ -890,13 +896,13 @@ gitg_remote_notification_set_remote_state (self, g_value_get_enum (value)); #line 24 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" break; -#line 894 "gitg-remote-notification.c" +#line 900 "gitg-remote-notification.c" default: #line 24 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 24 "/home/jesse/dev/gitg/gitg/gitg-remote-notification.vala" break; -#line 900 "gitg-remote-notification.c" +#line 906 "gitg-remote-notification.c" } } diff -Nru gitg-3.22.0/gitg/gitg-simple-notification.c gitg-3.23.0/gitg/gitg-simple-notification.c --- gitg-3.22.0/gitg/gitg-simple-notification.c 2016-08-09 09:50:55.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-simple-notification.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-simple-notification.c generated by valac 0.32.1, the Vala compiler +/* gitg-simple-notification.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-simple-notification.vala, do not modify */ /* @@ -47,6 +47,11 @@ typedef struct _Block62Data Block62Data; typedef struct _Block63Data Block63Data; typedef struct _Block64Data Block64Data; +enum { + GITG_SIMPLE_NOTIFICATION_CANCEL_SIGNAL, + GITG_SIMPLE_NOTIFICATION_LAST_SIGNAL +}; +static guint gitg_simple_notification_signals[GITG_SIMPLE_NOTIFICATION_LAST_SIGNAL] = {0}; struct _GitgSimpleNotification { GtkGrid parent_instance; @@ -98,7 +103,7 @@ static gpointer gitg_simple_notification_parent_class = NULL; -static GitgExtNotificationIface* gitg_simple_notification_gitg_ext_notification_parent_iface = NULL; +static GitgExtNotificationIface * gitg_simple_notification_gitg_ext_notification_parent_iface = NULL; GType gitg_simple_notification_get_type (void) G_GNUC_CONST; #define GITG_SIMPLE_NOTIFICATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_SIMPLE_NOTIFICATION, GitgSimpleNotificationPrivate)) @@ -138,7 +143,7 @@ static void block64_data_unref (void * _userdata_); static gboolean _gitg_simple_notification_message___lambda70_ (Block64Data* _data64_); static gboolean __gitg_simple_notification_message___lambda70__gsource_func (gpointer self); -static void gitg_simple_notification_finalize (GObject* obj); +static void gitg_simple_notification_finalize (GObject * obj); static void _vala_gitg_simple_notification_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_simple_notification_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -160,14 +165,14 @@ gtk_spinner_start (_tmp2_); #line 48 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" return self; -#line 164 "gitg-simple-notification.c" +#line 169 "gitg-simple-notification.c" } GitgSimpleNotification* gitg_simple_notification_new (const gchar* title, const gchar* message) { #line 48 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" return gitg_simple_notification_construct (GITG_TYPE_SIMPLE_NOTIFICATION, title, message); -#line 171 "gitg-simple-notification.c" +#line 176 "gitg-simple-notification.c" } @@ -176,7 +181,7 @@ g_atomic_int_inc (&_data60_->_ref_count_); #line 59 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" return _data60_; -#line 180 "gitg-simple-notification.c" +#line 185 "gitg-simple-notification.c" } @@ -185,7 +190,7 @@ _data60_ = (Block60Data*) _userdata_; #line 59 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" if (g_atomic_int_dec_and_test (&_data60_->_ref_count_)) { -#line 189 "gitg-simple-notification.c" +#line 194 "gitg-simple-notification.c" GitgSimpleNotification* self; #line 59 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" self = _data60_->self; @@ -195,7 +200,7 @@ _g_object_unref0 (self); #line 59 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" g_slice_free (Block60Data, _data60_); -#line 199 "gitg-simple-notification.c" +#line 204 "gitg-simple-notification.c" } } @@ -241,7 +246,7 @@ result = FALSE; #line 73 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" return result; -#line 245 "gitg-simple-notification.c" +#line 250 "gitg-simple-notification.c" } @@ -250,7 +255,7 @@ result = __lambda69_ (self); #line 61 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" return result; -#line 254 "gitg-simple-notification.c" +#line 259 "gitg-simple-notification.c" } @@ -282,7 +287,7 @@ block60_data_unref (_data60_); #line 59 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" _data60_ = NULL; -#line 286 "gitg-simple-notification.c" +#line 291 "gitg-simple-notification.c" } @@ -291,7 +296,7 @@ g_atomic_int_inc (&_data61_->_ref_count_); #line 77 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" return _data61_; -#line 295 "gitg-simple-notification.c" +#line 300 "gitg-simple-notification.c" } @@ -300,7 +305,7 @@ _data61_ = (Block61Data*) _userdata_; #line 77 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" if (g_atomic_int_dec_and_test (&_data61_->_ref_count_)) { -#line 304 "gitg-simple-notification.c" +#line 309 "gitg-simple-notification.c" GitgSimpleNotification* self; #line 77 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" self = _data61_->self; @@ -310,7 +315,7 @@ _g_object_unref0 (self); #line 77 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" g_slice_free (Block61Data, _data61_); -#line 314 "gitg-simple-notification.c" +#line 319 "gitg-simple-notification.c" } } @@ -356,7 +361,7 @@ result = FALSE; #line 91 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" return result; -#line 360 "gitg-simple-notification.c" +#line 365 "gitg-simple-notification.c" } @@ -365,7 +370,7 @@ result = __lambda72_ (self); #line 79 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" return result; -#line 369 "gitg-simple-notification.c" +#line 374 "gitg-simple-notification.c" } @@ -397,7 +402,7 @@ block61_data_unref (_data61_); #line 77 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" _data61_ = NULL; -#line 401 "gitg-simple-notification.c" +#line 406 "gitg-simple-notification.c" } @@ -406,7 +411,7 @@ g_atomic_int_inc (&_data62_->_ref_count_); #line 95 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" return _data62_; -#line 410 "gitg-simple-notification.c" +#line 415 "gitg-simple-notification.c" } @@ -415,7 +420,7 @@ _data62_ = (Block62Data*) _userdata_; #line 95 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" if (g_atomic_int_dec_and_test (&_data62_->_ref_count_)) { -#line 419 "gitg-simple-notification.c" +#line 424 "gitg-simple-notification.c" GitgSimpleNotification* self; #line 95 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" self = _data62_->self; @@ -423,7 +428,7 @@ _g_object_unref0 (self); #line 95 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" g_slice_free (Block62Data, _data62_); -#line 427 "gitg-simple-notification.c" +#line 432 "gitg-simple-notification.c" } } @@ -432,8 +437,7 @@ GitgSimpleNotification* self; gboolean result = FALSE; GtkButton* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + gboolean _tmp1_ = FALSE; #line 97 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" self = _data62_->self; #line 98 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" @@ -441,22 +445,20 @@ #line 99 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" _tmp0_ = self->priv->d_button_cancel; #line 99 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" - _tmp1_ = _ ("Close"); -#line 99 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" - gtk_button_set_label (_tmp0_, _tmp1_); + gtk_button_set_label (_tmp0_, _ ("Close")); #line 101 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" - _tmp2_ = _data62_->auto_close; + _tmp1_ = _data62_->auto_close; #line 101 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" - if (_tmp2_) { + if (_tmp1_) { #line 103 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" g_signal_emit_by_name ((GitgExtNotification*) self, "close", (guint) 3000); -#line 454 "gitg-simple-notification.c" +#line 456 "gitg-simple-notification.c" } #line 106 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" result = FALSE; #line 106 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" return result; -#line 460 "gitg-simple-notification.c" +#line 462 "gitg-simple-notification.c" } @@ -465,7 +467,7 @@ result = __lambda71_ (self); #line 97 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" return result; -#line 469 "gitg-simple-notification.c" +#line 471 "gitg-simple-notification.c" } @@ -490,7 +492,7 @@ block62_data_unref (_data62_); #line 95 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" _data62_ = NULL; -#line 494 "gitg-simple-notification.c" +#line 496 "gitg-simple-notification.c" } @@ -504,11 +506,11 @@ if (_tmp0_) { #line 137 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" g_signal_emit_by_name ((GitgExtNotification*) self, "close", (guint) 0); -#line 508 "gitg-simple-notification.c" +#line 510 "gitg-simple-notification.c" } else { #line 141 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" - g_signal_emit_by_name (self, "cancel"); -#line 512 "gitg-simple-notification.c" + g_signal_emit (self, gitg_simple_notification_signals[GITG_SIMPLE_NOTIFICATION_CANCEL_SIGNAL], 0); +#line 514 "gitg-simple-notification.c" } } @@ -516,14 +518,14 @@ static void _gitg_simple_notification_on_button_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 24 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" gitg_simple_notification_on_button_cancel_clicked ((GitgSimpleNotification*) self); -#line 520 "gitg-simple-notification.c" +#line 522 "gitg-simple-notification.c" } static gpointer _g_object_ref0 (gpointer self) { #line 56 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" return self ? g_object_ref (self) : NULL; -#line 527 "gitg-simple-notification.c" +#line 529 "gitg-simple-notification.c" } @@ -539,7 +541,7 @@ result = _tmp0_; #line 56 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" return result; -#line 543 "gitg-simple-notification.c" +#line 545 "gitg-simple-notification.c" } @@ -548,7 +550,7 @@ g_atomic_int_inc (&_data63_->_ref_count_); #line 112 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" return _data63_; -#line 552 "gitg-simple-notification.c" +#line 554 "gitg-simple-notification.c" } @@ -557,7 +559,7 @@ _data63_ = (Block63Data*) _userdata_; #line 112 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" if (g_atomic_int_dec_and_test (&_data63_->_ref_count_)) { -#line 561 "gitg-simple-notification.c" +#line 563 "gitg-simple-notification.c" GitgSimpleNotification* self; #line 112 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" self = _data63_->self; @@ -567,7 +569,7 @@ _g_object_unref0 (self); #line 112 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" g_slice_free (Block63Data, _data63_); -#line 571 "gitg-simple-notification.c" +#line 573 "gitg-simple-notification.c" } } @@ -589,7 +591,7 @@ result = FALSE; #line 116 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" return result; -#line 593 "gitg-simple-notification.c" +#line 595 "gitg-simple-notification.c" } @@ -598,7 +600,7 @@ result = _gitg_simple_notification_title___lambda73_ (self); #line 114 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" return result; -#line 602 "gitg-simple-notification.c" +#line 604 "gitg-simple-notification.c" } @@ -630,7 +632,7 @@ _data63_ = NULL; #line 112 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" g_object_notify ((GObject *) self, "title"); -#line 634 "gitg-simple-notification.c" +#line 636 "gitg-simple-notification.c" } @@ -639,7 +641,7 @@ g_atomic_int_inc (&_data64_->_ref_count_); #line 123 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" return _data64_; -#line 643 "gitg-simple-notification.c" +#line 645 "gitg-simple-notification.c" } @@ -648,7 +650,7 @@ _data64_ = (Block64Data*) _userdata_; #line 123 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" if (g_atomic_int_dec_and_test (&_data64_->_ref_count_)) { -#line 652 "gitg-simple-notification.c" +#line 654 "gitg-simple-notification.c" GitgSimpleNotification* self; #line 123 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" self = _data64_->self; @@ -658,7 +660,7 @@ _g_object_unref0 (self); #line 123 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" g_slice_free (Block64Data, _data64_); -#line 662 "gitg-simple-notification.c" +#line 664 "gitg-simple-notification.c" } } @@ -680,7 +682,7 @@ result = FALSE; #line 127 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" return result; -#line 684 "gitg-simple-notification.c" +#line 686 "gitg-simple-notification.c" } @@ -689,7 +691,7 @@ result = _gitg_simple_notification_message___lambda70_ (self); #line 125 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" return result; -#line 693 "gitg-simple-notification.c" +#line 695 "gitg-simple-notification.c" } @@ -721,7 +723,7 @@ _data64_ = NULL; #line 123 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" g_object_notify ((GObject *) self, "message"); -#line 725 "gitg-simple-notification.c" +#line 727 "gitg-simple-notification.c" } @@ -748,7 +750,7 @@ #line 24 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/gitg/ui/gitg-simple-notification.ui"); #line 24 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" - g_signal_new ("cancel", GITG_TYPE_SIMPLE_NOTIFICATION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_simple_notification_signals[GITG_SIMPLE_NOTIFICATION_CANCEL_SIGNAL] = g_signal_new ("cancel", GITG_TYPE_SIMPLE_NOTIFICATION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 24 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "spinner", FALSE, GitgSimpleNotification_private_offset + G_STRUCT_OFFSET (GitgSimpleNotificationPrivate, d_spinner)); #line 24 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" @@ -761,7 +763,7 @@ gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "button_cancel", FALSE, GitgSimpleNotification_private_offset + G_STRUCT_OFFSET (GitgSimpleNotificationPrivate, d_button_cancel)); #line 24 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_button_cancel_clicked", G_CALLBACK(_gitg_simple_notification_on_button_cancel_clicked_gtk_button_clicked)); -#line 765 "gitg-simple-notification.c" +#line 767 "gitg-simple-notification.c" } @@ -770,7 +772,7 @@ gitg_simple_notification_gitg_ext_notification_parent_iface = g_type_interface_peek_parent (iface); #line 24 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" iface->get_widget = gitg_simple_notification_real_get_widget; -#line 774 "gitg-simple-notification.c" +#line 776 "gitg-simple-notification.c" } @@ -779,11 +781,11 @@ self->priv = GITG_SIMPLE_NOTIFICATION_GET_PRIVATE (self); #line 24 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 783 "gitg-simple-notification.c" +#line 785 "gitg-simple-notification.c" } -static void gitg_simple_notification_finalize (GObject* obj) { +static void gitg_simple_notification_finalize (GObject * obj) { GitgSimpleNotification * self; #line 24 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_SIMPLE_NOTIFICATION, GitgSimpleNotification); @@ -799,7 +801,7 @@ _g_object_unref0 (self->priv->d_button_cancel); #line 24 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" G_OBJECT_CLASS (gitg_simple_notification_parent_class)->finalize (obj); -#line 803 "gitg-simple-notification.c" +#line 805 "gitg-simple-notification.c" } @@ -828,13 +830,13 @@ g_value_take_object (value, gitg_ext_notification_get_widget ((GitgExtNotification*) self)); #line 24 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" break; -#line 832 "gitg-simple-notification.c" +#line 834 "gitg-simple-notification.c" default: #line 24 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 24 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" break; -#line 838 "gitg-simple-notification.c" +#line 840 "gitg-simple-notification.c" } } @@ -856,13 +858,13 @@ gitg_simple_notification_set_message (self, g_value_get_string (value)); #line 24 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" break; -#line 860 "gitg-simple-notification.c" +#line 862 "gitg-simple-notification.c" default: #line 24 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 24 "/home/jesse/dev/gitg/gitg/gitg-simple-notification.vala" break; -#line 866 "gitg-simple-notification.c" +#line 868 "gitg-simple-notification.c" } } diff -Nru gitg-3.22.0/gitg/gitg-ui-elements.c gitg-3.23.0/gitg/gitg-ui-elements.c --- gitg-3.22.0/gitg/gitg-ui-elements.c 2016-08-18 10:53:13.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-ui-elements.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ui-elements.c generated by valac 0.32.1, the Vala compiler +/* gitg-ui-elements.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ui-elements.vala, do not modify */ /* @@ -114,8 +114,8 @@ gconstpointer gitg_ui_elements_get_current (GitgUIElements* self); void gitg_ui_elements_set_current (GitgUIElements* self, gconstpointer value); gpointer* gitg_ui_elements_get_available_elements (GitgUIElements* self, int* result_length1); -static void _vala_array_add20 (gpointer** array, int* length, int* size, gpointer value); -static void gitg_ui_elements_finalize (GObject* obj); +static void _vala_array_add20 (gpointer* * array, int* length, int* size, gpointer value); +static void gitg_ui_elements_finalize (GObject * obj); static void _vala_gitg_ui_elements_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_ui_elements_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -1614,41 +1614,45 @@ void gitg_ui_elements_set_current (GitgUIElements* self, gconstpointer value) { - gconstpointer _tmp0_ = NULL; #line 45 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" g_return_if_fail (self != NULL); +#line 45 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" + if (gitg_ui_elements_get_current (self) != value) { +#line 1622 "gitg-ui-elements.c" + gconstpointer _tmp0_ = NULL; #line 47 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" - _tmp0_ = value; + _tmp0_ = value; #line 47 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" - if (_tmp0_ != NULL) { -#line 1625 "gitg-ui-elements.c" - gconstpointer _tmp1_ = NULL; + if (_tmp0_ != NULL) { +#line 1628 "gitg-ui-elements.c" + gconstpointer _tmp1_ = NULL; #line 49 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" - _tmp1_ = value; + _tmp1_ = value; #line 49 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" - gitg_ui_elements_set_current_impl (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GITG_EXT_TYPE_UI_ELEMENT, GitgExtUIElement)); -#line 1631 "gitg-ui-elements.c" - } + gitg_ui_elements_set_current_impl (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GITG_EXT_TYPE_UI_ELEMENT, GitgExtUIElement)); +#line 1634 "gitg-ui-elements.c" + } #line 45 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" - g_object_notify ((GObject *) self, "current"); -#line 1635 "gitg-ui-elements.c" + g_object_notify ((GObject *) self, "current"); +#line 1638 "gitg-ui-elements.c" + } } -static void _vala_array_add20 (gpointer** array, int* length, int* size, gpointer value) { +static void _vala_array_add20 (gpointer* * array, int* length, int* size, gpointer value) { #line 62 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" if ((*length) == (*size)) { #line 62 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" *size = (*size) ? (2 * (*size)) : 4; #line 62 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" *array = g_renew (gpointer, *array, (*size) + 1); -#line 1646 "gitg-ui-elements.c" +#line 1650 "gitg-ui-elements.c" } #line 62 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" (*array)[(*length)++] = value; #line 62 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" (*array)[*length] = NULL; -#line 1652 "gitg-ui-elements.c" +#line 1656 "gitg-ui-elements.c" } @@ -1673,7 +1677,7 @@ _ret_size_ = ret_length1; #line 60 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" _tmp1_ = self->priv->d_available_elements; -#line 1677 "gitg-ui-elements.c" +#line 1681 "gitg-ui-elements.c" { GList* elem_collection = NULL; GList* elem_it = NULL; @@ -1681,14 +1685,14 @@ elem_collection = _tmp1_; #line 60 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" for (elem_it = elem_collection; elem_it != NULL; elem_it = elem_it->next) { -#line 1685 "gitg-ui-elements.c" +#line 1689 "gitg-ui-elements.c" GitgExtUIElement* _tmp2_ = NULL; GitgExtUIElement* elem = NULL; #line 60 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" _tmp2_ = _g_object_ref0 ((GitgExtUIElement*) elem_it->data); #line 60 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" elem = _tmp2_; -#line 1692 "gitg-ui-elements.c" +#line 1696 "gitg-ui-elements.c" { gpointer* _tmp3_ = NULL; gint _tmp3__length1 = 0; @@ -1706,7 +1710,7 @@ _vala_array_add20 (&ret, &ret_length1, &_ret_size_, _tmp5_); #line 60 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" _g_object_unref0 (elem); -#line 1710 "gitg-ui-elements.c" +#line 1714 "gitg-ui-elements.c" } } } @@ -1718,13 +1722,13 @@ if (result_length1) { #line 65 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" *result_length1 = _tmp6__length1; -#line 1722 "gitg-ui-elements.c" +#line 1726 "gitg-ui-elements.c" } #line 65 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" result = _tmp6_; #line 65 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" return result; -#line 1728 "gitg-ui-elements.c" +#line 1732 "gitg-ui-elements.c" } @@ -1747,18 +1751,18 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_UI_ELEMENTS_T_DESTROY_FUNC, g_param_spec_pointer ("t-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_UI_ELEMENTS_CURRENT, g_param_spec_pointer ("current", "current", "current", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); -#line 1751 "gitg-ui-elements.c" +#line 1755 "gitg-ui-elements.c" } static void gitg_ui_elements_instance_init (GitgUIElements * self) { #line 23 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" self->priv = GITG_UI_ELEMENTS_GET_PRIVATE (self); -#line 1758 "gitg-ui-elements.c" +#line 1762 "gitg-ui-elements.c" } -static void gitg_ui_elements_finalize (GObject* obj) { +static void gitg_ui_elements_finalize (GObject * obj) { GitgUIElements * self; #line 23 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_UI_ELEMENTS, GitgUIElements); @@ -1776,7 +1780,7 @@ _g_object_unref0 (self->priv->d_builtin_elements); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" G_OBJECT_CLASS (gitg_ui_elements_parent_class)->finalize (obj); -#line 1780 "gitg-ui-elements.c" +#line 1784 "gitg-ui-elements.c" } @@ -1803,13 +1807,13 @@ g_value_set_pointer (value, gitg_ui_elements_get_current (self)); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" break; -#line 1807 "gitg-ui-elements.c" +#line 1811 "gitg-ui-elements.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" break; -#line 1813 "gitg-ui-elements.c" +#line 1817 "gitg-ui-elements.c" } } @@ -1843,13 +1847,13 @@ self->priv->t_destroy_func = g_value_get_pointer (value); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" break; -#line 1847 "gitg-ui-elements.c" +#line 1851 "gitg-ui-elements.c" default: #line 23 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/gitg-ui-elements.vala" break; -#line 1853 "gitg-ui-elements.c" +#line 1857 "gitg-ui-elements.c" } } diff -Nru gitg-3.22.0/gitg/gitg-window.c gitg-3.23.0/gitg/gitg-window.c --- gitg-3.22.0/gitg/gitg-window.c 2016-09-18 12:01:48.000000000 +0000 +++ gitg-3.23.0/gitg/gitg-window.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-window.c generated by valac 0.32.1, the Vala compiler +/* gitg-window.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-window.vala, do not modify */ /* @@ -171,6 +171,12 @@ typedef struct _GitgWindowUserQueryAsyncData GitgWindowUserQueryAsyncData; typedef struct _Block70Data Block70Data; typedef struct _Block71Data Block71Data; +enum { + GITG_WINDOW_CHANGE_TO_ACTIVITY_SIGNAL, + GITG_WINDOW_CANCEL_SIGNAL, + GITG_WINDOW_LAST_SIGNAL +}; +static guint gitg_window_signals[GITG_WINDOW_LAST_SIGNAL] = {0}; struct _GitgWindow { GtkApplicationWindow parent_instance; @@ -302,8 +308,8 @@ static gpointer gitg_window_parent_class = NULL; -static GitgExtApplicationIface* gitg_window_gitg_ext_application_parent_iface = NULL; -static GInitableIface* gitg_window_g_initable_parent_iface = NULL; +static GitgExtApplicationIface * gitg_window_gitg_ext_application_parent_iface = NULL; +static GInitableIface * gitg_window_g_initable_parent_iface = NULL; GType gitg_window_get_type (void) G_GNUC_CONST; GType gitg_recursive_monitor_get_type (void) G_GNUC_CONST; @@ -467,7 +473,7 @@ gpointer gitg_builder_load_object (GType t_type, GBoxedCopyFunc t_dup_func, GDestroyNotify t_destroy_func, const gchar* id, const gchar* object); static void _gitg_window___lambda167_ (GitgWindow* self, GtkInfoBar* w, gint r); static void __gitg_window___lambda167__gtk_info_bar_response (GtkInfoBar* _sender, gint response_id, gpointer self); -static void gitg_window_finalize (GObject* obj); +static void gitg_window_finalize (GObject * obj); static void _vala_gitg_window_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_window_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -491,42 +497,42 @@ static void _gitg_window_on_search_activated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 152 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_on_search_activated ((GitgWindow*) self, action); -#line 495 "gitg-window.c" +#line 501 "gitg-window.c" } static void _gitg_window_on_gear_menu_activated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 152 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_on_gear_menu_activated ((GitgWindow*) self, action); -#line 502 "gitg-window.c" +#line 508 "gitg-window.c" } static void _gitg_window_on_close_activated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 152 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_on_close_activated ((GitgWindow*) self); -#line 509 "gitg-window.c" +#line 515 "gitg-window.c" } static void _gitg_window_on_reload_activated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 152 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_on_reload_activated ((GitgWindow*) self); -#line 516 "gitg-window.c" +#line 522 "gitg-window.c" } static void _gitg_window_on_repo_author_details_activated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 152 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_on_repo_author_details_activated ((GitgWindow*) self); -#line 523 "gitg-window.c" +#line 529 "gitg-window.c" } static void _gitg_window_on_select_activated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 152 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_on_select_activated ((GitgWindow*) self, action); -#line 530 "gitg-window.c" +#line 536 "gitg-window.c" } @@ -537,14 +543,14 @@ g_return_if_fail (dash != NULL); #line 164 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_ext_application_set_repository ((GitgExtApplication*) self, NULL); -#line 541 "gitg-window.c" +#line 547 "gitg-window.c" } static void _gitg_window_dash_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_dash_button_clicked ((GitgWindow*) self, _sender); -#line 548 "gitg-window.c" +#line 554 "gitg-window.c" } @@ -553,7 +559,7 @@ g_atomic_int_inc (&_data65_->_ref_count_); #line 168 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return _data65_; -#line 557 "gitg-window.c" +#line 563 "gitg-window.c" } @@ -562,7 +568,7 @@ _data65_ = (Block65Data*) _userdata_; #line 168 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (g_atomic_int_dec_and_test (&_data65_->_ref_count_)) { -#line 566 "gitg-window.c" +#line 572 "gitg-window.c" GitgWindow* self; #line 168 "/home/jesse/dev/gitg/gitg/gitg-window.vala" self = _data65_->self; @@ -572,7 +578,7 @@ _g_object_unref0 (self); #line 168 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_slice_free (Block65Data, _data65_); -#line 576 "gitg-window.c" +#line 582 "gitg-window.c" } } @@ -589,7 +595,7 @@ _tmp0_ = id; #line 173 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) { -#line 593 "gitg-window.c" +#line 599 "gitg-window.c" GitgDashView* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; @@ -618,20 +624,20 @@ gitg_dash_view_clone_repository (_tmp1_, _tmp3_, _tmp6_, _tmp8_); #line 175 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (_tmp6_); -#line 622 "gitg-window.c" +#line 628 "gitg-window.c" } #line 178 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp9_ = d; #line 178 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gtk_widget_destroy ((GtkWidget*) _tmp9_); -#line 628 "gitg-window.c" +#line 634 "gitg-window.c" } static void ___lambda116__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { #line 172 "/home/jesse/dev/gitg/gitg/gitg-window.vala" __lambda116_ (self, _sender, response_id); -#line 635 "gitg-window.c" +#line 641 "gitg-window.c" } @@ -660,14 +666,14 @@ block65_data_unref (_data65_); #line 168 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _data65_ = NULL; -#line 664 "gitg-window.c" +#line 670 "gitg-window.c" } static void _gitg_window_clone_repository_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_clone_repository_clicked ((GitgWindow*) self); -#line 671 "gitg-window.c" +#line 677 "gitg-window.c" } @@ -676,7 +682,7 @@ g_atomic_int_inc (&_data66_->_ref_count_); #line 185 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return _data66_; -#line 680 "gitg-window.c" +#line 686 "gitg-window.c" } @@ -685,7 +691,7 @@ _data66_ = (Block66Data*) _userdata_; #line 185 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (g_atomic_int_dec_and_test (&_data66_->_ref_count_)) { -#line 689 "gitg-window.c" +#line 695 "gitg-window.c" GitgWindow* self; #line 185 "/home/jesse/dev/gitg/gitg/gitg-window.vala" self = _data66_->self; @@ -697,7 +703,7 @@ _g_object_unref0 (self); #line 185 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_slice_free (Block66Data, _data66_); -#line 701 "gitg-window.c" +#line 707 "gitg-window.c" } } @@ -714,7 +720,7 @@ _tmp0_ = id; #line 205 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) { -#line 718 "gitg-window.c" +#line 724 "gitg-window.c" GFile* file = NULL; GFile* _tmp1_ = NULL; GFile* _tmp2_ = NULL; @@ -730,7 +736,7 @@ _tmp2_ = file; #line 209 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp2_ == NULL) { -#line 734 "gitg-window.c" +#line 740 "gitg-window.c" GFile* _tmp3_ = NULL; #line 211 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp3_ = gtk_file_chooser_get_current_folder_file ((GtkFileChooser*) _data66_->chooser); @@ -738,7 +744,7 @@ _g_object_unref0 (file); #line 211 "/home/jesse/dev/gitg/gitg/gitg-window.vala" file = _tmp3_; -#line 742 "gitg-window.c" +#line 748 "gitg-window.c" } #line 214 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp4_ = self->priv->d_dash_view; @@ -752,31 +758,27 @@ gitg_dash_view_add_repository_from_location (_tmp4_, _tmp5_, _tmp7_); #line 205 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (file); -#line 756 "gitg-window.c" +#line 762 "gitg-window.c" } #line 217 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp8_ = c; #line 217 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gtk_widget_destroy ((GtkWidget*) _tmp8_); -#line 762 "gitg-window.c" +#line 768 "gitg-window.c" } static void ___lambda117__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { #line 204 "/home/jesse/dev/gitg/gitg/gitg-window.vala" __lambda117_ (self, _sender, response_id); -#line 769 "gitg-window.c" +#line 775 "gitg-window.c" } static void gitg_window_add_repository_clicked (GitgWindow* self) { Block66Data* _data66_; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - GtkFileChooserDialog* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GtkCheckButton* _tmp5_ = NULL; + GtkFileChooserDialog* _tmp0_ = NULL; + GtkCheckButton* _tmp1_ = NULL; #line 185 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_return_if_fail (self != NULL); #line 185 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -786,25 +788,17 @@ #line 185 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _data66_->self = g_object_ref (self); #line 187 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp0_ = _ ("Add Repository"); -#line 187 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp1_ = _ ("_Cancel"); -#line 187 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp2_ = _ ("_Add"); -#line 187 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp3_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp0_, (GtkWindow*) self, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, _tmp1_, GTK_RESPONSE_CANCEL, _tmp2_, GTK_RESPONSE_OK, NULL); + _tmp0_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_ ("Add Repository"), (GtkWindow*) self, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, _ ("_Cancel"), GTK_RESPONSE_CANCEL, _ ("_Add"), GTK_RESPONSE_OK, NULL); #line 187 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - g_object_ref_sink (_tmp3_); + g_object_ref_sink (_tmp0_); #line 187 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _data66_->chooser = _tmp3_; -#line 193 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp4_ = _ ("_Scan for all git repositories from this directory"); + _data66_->chooser = _tmp0_; #line 193 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp5_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp4_); + _tmp1_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_ ("_Scan for all git repositories from this directory")); #line 193 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - g_object_ref_sink (_tmp5_); + g_object_ref_sink (_tmp1_); #line 193 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _data66_->scan_all = _tmp5_; + _data66_->scan_all = _tmp1_; #line 195 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gtk_widget_set_halign ((GtkWidget*) _data66_->scan_all, GTK_ALIGN_END); #line 196 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -825,14 +819,14 @@ block66_data_unref (_data66_); #line 185 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _data66_ = NULL; -#line 829 "gitg-window.c" +#line 823 "gitg-window.c" } static void _gitg_window_add_repository_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_add_repository_clicked ((GitgWindow*) self); -#line 836 "gitg-window.c" +#line 830 "gitg-window.c" } @@ -857,7 +851,7 @@ if (_tmp2_ == NULL) { #line 226 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (_tmp1_); -#line 861 "gitg-window.c" +#line 855 "gitg-window.c" } #line 226 "/home/jesse/dev/gitg/gitg/gitg-window.vala" searchable = _tmp2_; @@ -867,7 +861,7 @@ _tmp4_ = gtk_toggle_button_get_active (_tmp3_); #line 228 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp4_) { -#line 871 "gitg-window.c" +#line 865 "gitg-window.c" GtkSearchEntry* _tmp5_ = NULL; GtkSearchEntry* _tmp6_ = NULL; GitgExtSearchable* _tmp7_ = NULL; @@ -905,7 +899,7 @@ _tmp13_ = self->priv->d_search_entry; #line 234 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_ext_searchable_set_search_entry (_tmp12_, (GtkEntry*) _tmp13_); -#line 909 "gitg-window.c" +#line 903 "gitg-window.c" } else { GitgExtSearchable* _tmp14_ = NULL; GitgExtSearchable* _tmp15_ = NULL; @@ -917,18 +911,18 @@ _tmp15_ = searchable; #line 239 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_ext_searchable_set_search_entry (_tmp15_, NULL); -#line 921 "gitg-window.c" +#line 915 "gitg-window.c" } #line 224 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (searchable); -#line 925 "gitg-window.c" +#line 919 "gitg-window.c" } static void _gitg_window_search_button_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) { #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_search_button_toggled ((GitgWindow*) self, _sender); -#line 932 "gitg-window.c" +#line 926 "gitg-window.c" } @@ -962,7 +956,7 @@ if (_tmp2_ == NULL) { #line 246 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (_tmp1_); -#line 966 "gitg-window.c" +#line 960 "gitg-window.c" } #line 246 "/home/jesse/dev/gitg/gitg/gitg-window.vala" searchable = _tmp2_; @@ -992,7 +986,7 @@ _g_free0 (_tmp11_); #line 249 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp12_) { -#line 996 "gitg-window.c" +#line 990 "gitg-window.c" GitgExtSearchable* _tmp13_ = NULL; const gchar* _tmp14_ = NULL; #line 251 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -1001,27 +995,27 @@ _tmp14_ = ntext; #line 251 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_ext_searchable_set_search_text (_tmp13_, _tmp14_); -#line 1005 "gitg-window.c" +#line 999 "gitg-window.c" } #line 244 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_free0 (ntext); #line 244 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (searchable); -#line 1011 "gitg-window.c" +#line 1005 "gitg-window.c" } static void _gitg_window_search_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_search_entry_changed ((GitgWindow*) self, _sender); -#line 1018 "gitg-window.c" +#line 1012 "gitg-window.c" } static gpointer _g_object_ref0 (gpointer self) { #line 371 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return self ? g_object_ref (self) : NULL; -#line 1025 "gitg-window.c" +#line 1019 "gitg-window.c" } @@ -1065,7 +1059,7 @@ if (_tmp7_) { #line 374 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp4_ = TRUE; -#line 1069 "gitg-window.c" +#line 1063 "gitg-window.c" } else { gboolean _tmp8_ = FALSE; const gchar* _tmp9_ = NULL; @@ -1073,7 +1067,7 @@ _tmp9_ = theme; #line 374 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp9_ != NULL) { -#line 1077 "gitg-window.c" +#line 1071 "gitg-window.c" const gchar* _tmp10_ = NULL; gboolean _tmp11_ = FALSE; #line 374 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -1082,15 +1076,15 @@ _tmp11_ = g_str_has_suffix (_tmp10_, ":dark"); #line 374 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp8_ = _tmp11_; -#line 1086 "gitg-window.c" +#line 1080 "gitg-window.c" } else { #line 374 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp8_ = FALSE; -#line 1090 "gitg-window.c" +#line 1084 "gitg-window.c" } #line 374 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp4_ = _tmp8_; -#line 1094 "gitg-window.c" +#line 1088 "gitg-window.c" } #line 374 "/home/jesse/dev/gitg/gitg/gitg-window.vala" dark = _tmp4_; @@ -1098,26 +1092,26 @@ _tmp12_ = dark; #line 376 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp12_) { -#line 1102 "gitg-window.c" +#line 1096 "gitg-window.c" GtkStyleContext* _tmp13_ = NULL; #line 378 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp13_ = gtk_widget_get_style_context ((GtkWidget*) self); #line 378 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gtk_style_context_add_class (_tmp13_, "dark"); -#line 1108 "gitg-window.c" +#line 1102 "gitg-window.c" } else { GtkStyleContext* _tmp14_ = NULL; #line 382 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp14_ = gtk_widget_get_style_context ((GtkWidget*) self); #line 382 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gtk_style_context_remove_class (_tmp14_, "dark"); -#line 1115 "gitg-window.c" +#line 1109 "gitg-window.c" } #line 367 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_free0 (theme); #line 367 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (settings); -#line 1121 "gitg-window.c" +#line 1115 "gitg-window.c" } @@ -1134,7 +1128,7 @@ ret = FALSE; #line 390 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (GTK_WIDGET_CLASS (gitg_window_parent_class)->delete_event != NULL) { -#line 1138 "gitg-window.c" +#line 1132 "gitg-window.c" GdkEventAny* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; #line 392 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -1143,7 +1137,7 @@ _tmp1_ = GTK_WIDGET_CLASS (gitg_window_parent_class)->delete_event ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), _tmp0_); #line 392 "/home/jesse/dev/gitg/gitg/gitg-window.vala" ret = _tmp1_; -#line 1147 "gitg-window.c" +#line 1141 "gitg-window.c" } #line 395 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp2_ = ret; @@ -1151,13 +1145,13 @@ if (!_tmp2_) { #line 397 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_ext_application_set_repository ((GitgExtApplication*) self, NULL); -#line 1155 "gitg-window.c" +#line 1149 "gitg-window.c" } #line 400 "/home/jesse/dev/gitg/gitg/gitg-window.vala" result = ret; #line 400 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 1161 "gitg-window.c" +#line 1155 "gitg-window.c" } @@ -1166,7 +1160,7 @@ g_return_if_fail (self != NULL); #line 405 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gtk_window_close ((GtkWindow*) self); -#line 1170 "gitg-window.c" +#line 1164 "gitg-window.c" } @@ -1186,7 +1180,7 @@ _tmp2_ = _tmp1_; #line 410 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp2_) { -#line 1190 "gitg-window.c" +#line 1184 "gitg-window.c" gboolean state = FALSE; GSimpleAction* _tmp3_ = NULL; GVariant* _tmp4_ = NULL; @@ -1225,7 +1219,7 @@ g_simple_action_set_state (_tmp8_, _tmp11_); #line 413 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_variant_unref0 (_tmp11_); -#line 1229 "gitg-window.c" +#line 1223 "gitg-window.c" } } @@ -1270,7 +1264,7 @@ g_simple_action_set_state (_tmp5_, _tmp7_); #line 421 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_variant_unref0 (_tmp7_); -#line 1274 "gitg-window.c" +#line 1268 "gitg-window.c" } @@ -1305,19 +1299,19 @@ result = (GitgExtApplication*) window; #line 460 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 1309 "gitg-window.c" +#line 1303 "gitg-window.c" } static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1321 "gitg-window.c" +#line 1315 "gitg-window.c" } @@ -1327,7 +1321,7 @@ gchar* title = NULL; gchar* subtitle = NULL; GitgRepository* _tmp1_ = NULL; - gboolean _tmp43_ = FALSE; + gboolean _tmp42_ = FALSE; GError * _inner_error_ = NULL; #line 463 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_return_if_fail (self != NULL); @@ -1341,7 +1335,7 @@ _tmp1_ = self->priv->d_repository; #line 469 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp1_ != NULL) { -#line 1345 "gitg-window.c" +#line 1339 "gitg-window.c" GFile* workdir = NULL; GitgRepository* _tmp2_ = NULL; GFile* _tmp3_ = NULL; @@ -1358,7 +1352,7 @@ _tmp4_ = workdir; #line 473 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp4_ != NULL) { -#line 1362 "gitg-window.c" +#line 1356 "gitg-window.c" gchar* parent_path = NULL; GFile* _tmp5_ = NULL; GFile* _tmp6_ = NULL; @@ -1435,7 +1429,7 @@ _g_free0 (_tmp21_); #line 473 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_free0 (parent_path); -#line 1439 "gitg-window.c" +#line 1433 "gitg-window.c" } else { GitgRepository* _tmp24_ = NULL; gchar* _tmp25_ = NULL; @@ -1450,11 +1444,11 @@ _g_free0 (title); #line 482 "/home/jesse/dev/gitg/gitg/gitg-window.vala" title = _tmp26_; -#line 1454 "gitg-window.c" +#line 1448 "gitg-window.c" } #line 485 "/home/jesse/dev/gitg/gitg/gitg-window.vala" head_name = NULL; -#line 1458 "gitg-window.c" +#line 1452 "gitg-window.c" { GitgRef* head = NULL; GitgRepository* _tmp27_ = NULL; @@ -1484,7 +1478,7 @@ head = _tmp31_; #line 489 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1488 "gitg-window.c" +#line 1482 "gitg-window.c" goto __catch109_g_error; } #line 490 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -1507,7 +1501,7 @@ _g_object_unref0 (_tmp35_); #line 487 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (head); -#line 1511 "gitg-window.c" +#line 1505 "gitg-window.c" } goto __finally109; __catch109_g_error: @@ -1516,7 +1510,7 @@ g_clear_error (&_inner_error_); #line 487 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _inner_error_ = NULL; -#line 1520 "gitg-window.c" +#line 1514 "gitg-window.c" } __finally109: #line 487 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -1537,13 +1531,13 @@ g_clear_error (&_inner_error_); #line 487 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return; -#line 1541 "gitg-window.c" +#line 1535 "gitg-window.c" } #line 494 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp38_ = head_name; #line 494 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp38_ != NULL) { -#line 1547 "gitg-window.c" +#line 1541 "gitg-window.c" const gchar* _tmp39_ = NULL; gchar* _tmp40_ = NULL; #line 496 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -1554,68 +1548,65 @@ _g_free0 (subtitle); #line 496 "/home/jesse/dev/gitg/gitg/gitg-window.vala" subtitle = _tmp40_; -#line 1558 "gitg-window.c" +#line 1552 "gitg-window.c" } #line 469 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_free0 (head_name); #line 469 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (workdir); -#line 1564 "gitg-window.c" +#line 1558 "gitg-window.c" } else { - const gchar* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; -#line 501 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp41_ = _ ("Projects"); + gchar* _tmp41_ = NULL; #line 501 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp42_ = g_strdup (_tmp41_); + _tmp41_ = g_strdup (_ ("Projects")); #line 501 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_free0 (title); #line 501 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - title = _tmp42_; -#line 1576 "gitg-window.c" + title = _tmp41_; +#line 1567 "gitg-window.c" } #line 504 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp43_ = gitg_platform_support_use_native_window_controls (NULL); + _tmp42_ = gitg_platform_support_use_native_window_controls (NULL); #line 504 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - if (_tmp43_) { -#line 1582 "gitg-window.c" - GtkHeaderBar* _tmp44_ = NULL; + if (_tmp42_) { +#line 1573 "gitg-window.c" + GtkHeaderBar* _tmp43_ = NULL; + const gchar* _tmp44_ = NULL; const gchar* _tmp45_ = NULL; - const gchar* _tmp46_ = NULL; #line 506 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp44_ = self->priv->d_header_bar; + _tmp43_ = self->priv->d_header_bar; #line 506 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp45_ = subtitle; + _tmp44_ = subtitle; #line 506 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_header_bar_set_title (_tmp44_, _tmp45_); + gtk_header_bar_set_title (_tmp43_, _tmp44_); #line 507 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp46_ = title; + _tmp45_ = title; #line 507 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_window_set_title ((GtkWindow*) self, _tmp46_); -#line 1596 "gitg-window.c" + gtk_window_set_title ((GtkWindow*) self, _tmp45_); +#line 1587 "gitg-window.c" } else { - const gchar* _tmp47_ = NULL; - GtkHeaderBar* _tmp48_ = NULL; - const gchar* _tmp49_ = NULL; - GtkHeaderBar* _tmp50_ = NULL; - const gchar* _tmp51_ = NULL; + const gchar* _tmp46_ = NULL; + GtkHeaderBar* _tmp47_ = NULL; + const gchar* _tmp48_ = NULL; + GtkHeaderBar* _tmp49_ = NULL; + const gchar* _tmp50_ = NULL; #line 511 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp47_ = windowtitle; + _tmp46_ = windowtitle; #line 511 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_window_set_title ((GtkWindow*) self, _tmp47_); + gtk_window_set_title ((GtkWindow*) self, _tmp46_); #line 512 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp48_ = self->priv->d_header_bar; + _tmp47_ = self->priv->d_header_bar; #line 512 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp49_ = title; + _tmp48_ = title; #line 512 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_header_bar_set_title (_tmp48_, _tmp49_); + gtk_header_bar_set_title (_tmp47_, _tmp48_); #line 513 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp50_ = self->priv->d_header_bar; + _tmp49_ = self->priv->d_header_bar; #line 513 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp51_ = subtitle; + _tmp50_ = subtitle; #line 513 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_header_bar_set_subtitle (_tmp50_, _tmp51_); -#line 1619 "gitg-window.c" + gtk_header_bar_set_subtitle (_tmp49_, _tmp50_); +#line 1610 "gitg-window.c" } #line 463 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_free0 (subtitle); @@ -1623,7 +1614,7 @@ _g_free0 (title); #line 463 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_free0 (windowtitle); -#line 1627 "gitg-window.c" +#line 1618 "gitg-window.c" } @@ -1645,7 +1636,7 @@ _tmp1_ = self->priv->d_repository; #line 522 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp1_ != NULL) { -#line 1649 "gitg-window.c" +#line 1640 "gitg-window.c" GtkStack* _tmp2_ = NULL; GtkStack* _tmp3_ = NULL; GtkStack* _tmp4_ = NULL; @@ -1713,7 +1704,7 @@ _tmp16_ = self->priv->d_gear_menu; #line 536 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gtk_widget_set_sensitive ((GtkWidget*) _tmp16_, TRUE); -#line 1717 "gitg-window.c" +#line 1708 "gitg-window.c" } else { GtkStack* _tmp17_ = NULL; GtkStack* _tmp18_ = NULL; @@ -1774,7 +1765,7 @@ _tmp29_ = self->priv->d_dash_model; #line 551 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gtk_widget_set_sensitive ((GtkWidget*) _tmp28_, _tmp29_ != NULL); -#line 1778 "gitg-window.c" +#line 1769 "gitg-window.c" } #line 554 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp30_ = self->priv->d_activities; @@ -1786,7 +1777,7 @@ if (_tmp31_ != NULL) { #line 558 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_activate_default_activity (self); -#line 1790 "gitg-window.c" +#line 1781 "gitg-window.c" } #line 561 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp32_ = self->priv->d_mode; @@ -1794,7 +1785,7 @@ if (_tmp32_ == GITG_WINDOW_MODE_DASH) { #line 563 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_on_current_activity_changed (self); -#line 1798 "gitg-window.c" +#line 1789 "gitg-window.c" } } @@ -1807,7 +1798,7 @@ result = FALSE; #line 571 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 1811 "gitg-window.c" +#line 1802 "gitg-window.c" } @@ -1816,7 +1807,7 @@ result = ___lambda118_ ((GitgWindow*) self); #line 569 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 1820 "gitg-window.c" +#line 1811 "gitg-window.c" } @@ -1831,11 +1822,11 @@ if (_tmp0_ != NULL) { #line 569 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda118__gsource_func, g_object_ref (self), g_object_unref); -#line 1835 "gitg-window.c" +#line 1826 "gitg-window.c" } #line 575 "/home/jesse/dev/gitg/gitg/gitg-window.vala" GTK_WIDGET_CLASS (gitg_window_parent_class)->realize ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow)); -#line 1839 "gitg-window.c" +#line 1830 "gitg-window.c" } @@ -1867,7 +1858,7 @@ result = _tmp4_; #line 581 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 1871 "gitg-window.c" +#line 1862 "gitg-window.c" } @@ -1886,7 +1877,7 @@ _tmp1_ = gtk_widget_get_realized ((GtkWidget*) self); #line 586 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp1_) { -#line 1890 "gitg-window.c" +#line 1881 "gitg-window.c" GdkWindow* _tmp2_ = NULL; GdkWindowState _tmp3_ = 0; #line 586 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -1895,15 +1886,15 @@ _tmp3_ = gdk_window_get_state (_tmp2_); #line 586 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp0_ = !((_tmp3_ & GDK_WINDOW_STATE_MAXIMIZED) == GDK_WINDOW_STATE_MAXIMIZED); -#line 1899 "gitg-window.c" +#line 1890 "gitg-window.c" } else { #line 586 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp0_ = FALSE; -#line 1903 "gitg-window.c" +#line 1894 "gitg-window.c" } #line 586 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp0_) { -#line 1907 "gitg-window.c" +#line 1898 "gitg-window.c" GSettings* _tmp4_ = NULL; GdkEventConfigure* _tmp5_ = NULL; gint _tmp6_ = 0; @@ -1921,7 +1912,7 @@ _tmp8_ = _tmp7_->height; #line 588 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_settings_set (_tmp4_, "size", "(ii)", _tmp6_, _tmp8_); -#line 1925 "gitg-window.c" +#line 1916 "gitg-window.c" } #line 591 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp9_ = event; @@ -1931,7 +1922,7 @@ result = _tmp10_; #line 591 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 1935 "gitg-window.c" +#line 1926 "gitg-window.c" } @@ -1992,7 +1983,7 @@ if (_tmp12_) { #line 602 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp9_ = TRUE; -#line 1996 "gitg-window.c" +#line 1987 "gitg-window.c" } else { GFile* _tmp13_ = NULL; GFile* _tmp14_ = NULL; @@ -2005,13 +1996,13 @@ _tmp15_ = g_file_has_prefix (_tmp13_, _tmp14_); #line 602 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp9_ = _tmp15_; -#line 2009 "gitg-window.c" +#line 2000 "gitg-window.c" } #line 602 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp9_) { #line 602 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp8_ = TRUE; -#line 2015 "gitg-window.c" +#line 2006 "gitg-window.c" } else { GFile* _tmp16_ = NULL; GFile* _tmp17_ = NULL; @@ -2024,7 +2015,7 @@ _tmp18_ = g_file_equal (_tmp16_, _tmp17_); #line 602 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp8_ = _tmp18_; -#line 2028 "gitg-window.c" +#line 2019 "gitg-window.c" } #line 602 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp8_) { @@ -2040,7 +2031,7 @@ _g_object_unref0 (l); #line 604 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 2044 "gitg-window.c" +#line 2035 "gitg-window.c" } else { GFile* _tmp19_ = NULL; GFile* _tmp20_ = NULL; @@ -2065,7 +2056,7 @@ _g_object_unref0 (l); #line 608 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 2069 "gitg-window.c" +#line 2060 "gitg-window.c" } else { #line 612 "/home/jesse/dev/gitg/gitg/gitg-window.vala" result = GITG_EXT_EXTERNAL_CHANGE_HINT_NONE; @@ -2079,7 +2070,7 @@ _g_object_unref0 (l); #line 612 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 2083 "gitg-window.c" +#line 2074 "gitg-window.c" } } #line 594 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -2090,7 +2081,7 @@ _g_object_unref0 (refs); #line 594 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (l); -#line 2094 "gitg-window.c" +#line 2085 "gitg-window.c" } @@ -2110,7 +2101,7 @@ result = _tmp1_ != GITG_EXT_EXTERNAL_CHANGE_HINT_NONE; #line 619 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 2114 "gitg-window.c" +#line 2105 "gitg-window.c" } @@ -2126,7 +2117,7 @@ _tmp0_ = self->priv->d_repository_monitor; #line 624 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp0_ != NULL) { -#line 2130 "gitg-window.c" +#line 2121 "gitg-window.c" GitgRecursiveMonitor* _tmp1_ = NULL; #line 626 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp1_ = self->priv->d_repository_monitor; @@ -2136,7 +2127,7 @@ _g_object_unref0 (self->priv->d_repository_monitor); #line 627 "/home/jesse/dev/gitg/gitg/gitg-window.vala" self->priv->d_repository_monitor = NULL; -#line 2140 "gitg-window.c" +#line 2131 "gitg-window.c" } #line 630 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp2_ = repository; @@ -2152,7 +2143,7 @@ if (_tmp4_ != NULL) { #line 634 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_update_enable_monitoring (self); -#line 2156 "gitg-window.c" +#line 2147 "gitg-window.c" } #line 637 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp5_ = gitg_remote_manager_new (self); @@ -2162,7 +2153,7 @@ self->priv->d_remote_manager = _tmp5_; #line 638 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_object_notify ((GObject*) self, "repository"); -#line 2166 "gitg-window.c" +#line 2157 "gitg-window.c" } @@ -2171,7 +2162,7 @@ result = gitg_window_filter_repository_changes ((GitgWindow*) self, file); #line 667 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 2175 "gitg-window.c" +#line 2166 "gitg-window.c" } @@ -2186,7 +2177,7 @@ _tmp0_ = files; #line 671 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp0__length1 = files_length1; -#line 2190 "gitg-window.c" +#line 2181 "gitg-window.c" { GFile** f_collection = NULL; gint f_collection_length1 = 0; @@ -2198,14 +2189,14 @@ f_collection_length1 = _tmp0__length1; #line 671 "/home/jesse/dev/gitg/gitg/gitg-window.vala" for (f_it = 0; f_it < _tmp0__length1; f_it = f_it + 1) { -#line 2202 "gitg-window.c" +#line 2193 "gitg-window.c" GFile* _tmp1_ = NULL; GFile* f = NULL; #line 671 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp1_ = _g_object_ref0 (f_collection[f_it]); #line 671 "/home/jesse/dev/gitg/gitg/gitg-window.vala" f = _tmp1_; -#line 2209 "gitg-window.c" +#line 2200 "gitg-window.c" { GitgExtExternalChangeHint _tmp2_ = 0; GFile* _tmp3_ = NULL; @@ -2220,7 +2211,7 @@ hint = _tmp2_ | _tmp4_; #line 671 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (f); -#line 2224 "gitg-window.c" +#line 2215 "gitg-window.c" } } } @@ -2228,14 +2219,14 @@ _tmp5_ = hint; #line 676 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_signal_emit_by_name ((GitgExtApplication*) self, "repository-changed-externally", _tmp5_); -#line 2232 "gitg-window.c" +#line 2223 "gitg-window.c" } static void ____lambda92__gitg_recursive_monitor_changed (GitgRecursiveMonitor* _sender, GFile** files, int files_length1, gpointer self) { #line 668 "/home/jesse/dev/gitg/gitg/gitg-window.vala" ___lambda92_ ((GitgWindow*) self, files, files_length1); -#line 2239 "gitg-window.c" +#line 2230 "gitg-window.c" } @@ -2250,7 +2241,7 @@ _tmp0_ = self->priv->d_repository_monitor; #line 659 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp0_ != NULL) { -#line 2254 "gitg-window.c" +#line 2245 "gitg-window.c" GitgRecursiveMonitor* _tmp1_ = NULL; #line 661 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp1_ = self->priv->d_repository_monitor; @@ -2260,7 +2251,7 @@ _g_object_unref0 (self->priv->d_repository_monitor); #line 662 "/home/jesse/dev/gitg/gitg/gitg-window.vala" self->priv->d_repository_monitor = NULL; -#line 2264 "gitg-window.c" +#line 2255 "gitg-window.c" } #line 665 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp3_ = gitg_window_get_enable_monitoring (self); @@ -2268,21 +2259,21 @@ _tmp4_ = _tmp3_; #line 665 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp4_) { -#line 2272 "gitg-window.c" +#line 2263 "gitg-window.c" GitgRepository* _tmp5_ = NULL; #line 665 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp5_ = self->priv->d_repository; #line 665 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp2_ = _tmp5_ != NULL; -#line 2278 "gitg-window.c" +#line 2269 "gitg-window.c" } else { #line 665 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp2_ = FALSE; -#line 2282 "gitg-window.c" +#line 2273 "gitg-window.c" } #line 665 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp2_) { -#line 2286 "gitg-window.c" +#line 2277 "gitg-window.c" GitgRepository* _tmp6_ = NULL; GFile* _tmp7_ = NULL; GFile* _tmp8_ = NULL; @@ -2306,7 +2297,7 @@ _tmp10_ = self->priv->d_repository_monitor; #line 668 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_signal_connect_object (_tmp10_, "changed", (GCallback) ____lambda92__gitg_recursive_monitor_changed, self, 0); -#line 2310 "gitg-window.c" +#line 2301 "gitg-window.c" } } @@ -2315,7 +2306,7 @@ GError * _inner_error_ = NULL; #line 681 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_return_if_fail (self != NULL); -#line 2319 "gitg-window.c" +#line 2310 "gitg-window.c" { GitgRepository* _tmp0_ = NULL; GitgRepository* _tmp1_ = NULL; @@ -2347,7 +2338,7 @@ _tmp0_ = _tmp7_; #line 685 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2351 "gitg-window.c" +#line 2342 "gitg-window.c" goto __catch110_g_error; } #line 685 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -2356,7 +2347,7 @@ gitg_window_update_title (self); #line 683 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (_tmp0_); -#line 2360 "gitg-window.c" +#line 2351 "gitg-window.c" } goto __finally110; __catch110_g_error: @@ -2365,7 +2356,7 @@ g_clear_error (&_inner_error_); #line 683 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _inner_error_ = NULL; -#line 2369 "gitg-window.c" +#line 2360 "gitg-window.c" } __finally110: #line 683 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -2376,7 +2367,7 @@ g_clear_error (&_inner_error_); #line 683 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return; -#line 2380 "gitg-window.c" +#line 2371 "gitg-window.c" } } @@ -2397,7 +2388,7 @@ g_return_if_fail (self != NULL); #line 693 "/home/jesse/dev/gitg/gitg/gitg-window.vala" repo_config = NULL; -#line 2401 "gitg-window.c" +#line 2392 "gitg-window.c" { GgitConfig* _tmp0_ = NULL; GitgRepository* _tmp1_ = NULL; @@ -2411,7 +2402,7 @@ _tmp0_ = _tmp2_; #line 697 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2415 "gitg-window.c" +#line 2406 "gitg-window.c" goto __catch111_g_error; } #line 697 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -2424,7 +2415,7 @@ repo_config = _tmp3_; #line 695 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (_tmp0_); -#line 2428 "gitg-window.c" +#line 2419 "gitg-window.c" } goto __finally111; __catch111_g_error: @@ -2440,7 +2431,7 @@ _g_object_unref0 (repo_config); #line 701 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return; -#line 2444 "gitg-window.c" +#line 2435 "gitg-window.c" } __finally111: #line 695 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -2453,7 +2444,7 @@ g_clear_error (&_inner_error_); #line 695 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return; -#line 2457 "gitg-window.c" +#line 2448 "gitg-window.c" } #line 704 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp4_ = repo_config; @@ -2483,7 +2474,7 @@ _g_object_unref0 (author_details); #line 691 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (repo_config); -#line 2487 "gitg-window.c" +#line 2478 "gitg-window.c" } @@ -2523,7 +2514,7 @@ _tmp4_ = searchable; #line 718 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp4_ != NULL) { -#line 2527 "gitg-window.c" +#line 2518 "gitg-window.c" GtkToggleButton* _tmp5_ = NULL; GtkSearchEntry* _tmp6_ = NULL; GitgExtSearchable* _tmp7_ = NULL; @@ -2578,7 +2569,7 @@ _g_object_unref0 (self->priv->d_searchable_available_binding); #line 724 "/home/jesse/dev/gitg/gitg/gitg-window.vala" self->priv->d_searchable_available_binding = _tmp18_; -#line 2582 "gitg-window.c" +#line 2573 "gitg-window.c" } else { GtkToggleButton* _tmp19_ = NULL; GtkToggleButton* _tmp20_ = NULL; @@ -2600,7 +2591,7 @@ _tmp22_ = self->priv->d_search_entry; #line 735 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gtk_entry_set_text ((GtkEntry*) _tmp22_, ""); -#line 2604 "gitg-window.c" +#line 2595 "gitg-window.c" } #line 738 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp23_ = current; @@ -2620,22 +2611,22 @@ _tmp25_ = selectable; #line 743 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp25_ != NULL) { -#line 2624 "gitg-window.c" +#line 2615 "gitg-window.c" GtkToggleButton* _tmp26_ = NULL; gchar* tooltip = NULL; GitgExtSelectable* _tmp27_ = NULL; gchar* _tmp28_ = NULL; gchar* _tmp29_ = NULL; const gchar* _tmp30_ = NULL; - GtkToggleButton* _tmp33_ = NULL; - const gchar* _tmp34_ = NULL; - GitgExtSelectable* _tmp35_ = NULL; + GtkToggleButton* _tmp32_ = NULL; + const gchar* _tmp33_ = NULL; + GitgExtSelectable* _tmp34_ = NULL; + GBinding* _tmp35_ = NULL; GBinding* _tmp36_ = NULL; - GBinding* _tmp37_ = NULL; - GitgExtSelectable* _tmp38_ = NULL; - GtkToggleButton* _tmp39_ = NULL; + GitgExtSelectable* _tmp37_ = NULL; + GtkToggleButton* _tmp38_ = NULL; + GBinding* _tmp39_ = NULL; GBinding* _tmp40_ = NULL; - GBinding* _tmp41_ = NULL; #line 745 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp26_ = self->priv->d_select_button; #line 745 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -2652,67 +2643,64 @@ _tmp30_ = tooltip; #line 749 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp30_ == NULL) { -#line 2656 "gitg-window.c" - const gchar* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; +#line 2647 "gitg-window.c" + gchar* _tmp31_ = NULL; #line 751 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp31_ = _ ("Select items"); -#line 751 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp32_ = g_strdup (_tmp31_); + _tmp31_ = g_strdup (_ ("Select items")); #line 751 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_free0 (tooltip); #line 751 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - tooltip = _tmp32_; -#line 2667 "gitg-window.c" + tooltip = _tmp31_; +#line 2655 "gitg-window.c" } #line 754 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp33_ = self->priv->d_select_button; + _tmp32_ = self->priv->d_select_button; #line 754 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp34_ = tooltip; + _tmp33_ = tooltip; #line 754 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_widget_set_tooltip_text ((GtkWidget*) _tmp33_, _tmp34_); + gtk_widget_set_tooltip_text ((GtkWidget*) _tmp32_, _tmp33_); #line 756 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp35_ = selectable; + _tmp34_ = selectable; #line 756 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp36_ = g_object_bind_property_with_closures ((GObject*) _tmp35_, "selectable-mode", (GObject*) self, "selectable-mode", G_BINDING_DEFAULT, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); + _tmp35_ = g_object_bind_property_with_closures ((GObject*) _tmp34_, "selectable-mode", (GObject*) self, "selectable-mode", G_BINDING_DEFAULT, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); #line 756 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp37_ = _g_object_ref0 (_tmp36_); + _tmp36_ = _g_object_ref0 (_tmp35_); #line 756 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (self->priv->d_selectable_mode_binding); #line 756 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - self->priv->d_selectable_mode_binding = _tmp37_; + self->priv->d_selectable_mode_binding = _tmp36_; #line 761 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp38_ = selectable; + _tmp37_ = selectable; #line 761 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp39_ = self->priv->d_select_button; + _tmp38_ = self->priv->d_select_button; #line 761 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp40_ = g_object_bind_property_with_closures ((GObject*) _tmp38_, "selectable-available", (GObject*) _tmp39_, "sensitive", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); + _tmp39_ = g_object_bind_property_with_closures ((GObject*) _tmp37_, "selectable-available", (GObject*) _tmp38_, "sensitive", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); #line 761 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp41_ = _g_object_ref0 (_tmp40_); + _tmp40_ = _g_object_ref0 (_tmp39_); #line 761 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (self->priv->d_selectable_available_binding); #line 761 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - self->priv->d_selectable_available_binding = _tmp41_; + self->priv->d_selectable_available_binding = _tmp40_; #line 743 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_free0 (tooltip); -#line 2699 "gitg-window.c" +#line 2687 "gitg-window.c" } else { + GtkToggleButton* _tmp41_ = NULL; GtkToggleButton* _tmp42_ = NULL; GtkToggleButton* _tmp43_ = NULL; - GtkToggleButton* _tmp44_ = NULL; #line 769 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp42_ = self->priv->d_select_button; + _tmp41_ = self->priv->d_select_button; #line 769 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_widget_set_visible ((GtkWidget*) _tmp42_, FALSE); + gtk_widget_set_visible ((GtkWidget*) _tmp41_, FALSE); #line 770 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp43_ = self->priv->d_select_button; + _tmp42_ = self->priv->d_select_button; #line 770 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_toggle_button_set_active (_tmp43_, FALSE); + gtk_toggle_button_set_active (_tmp42_, FALSE); #line 771 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp44_ = self->priv->d_select_button; + _tmp43_ = self->priv->d_select_button; #line 771 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_widget_set_sensitive ((GtkWidget*) _tmp44_, FALSE); -#line 2716 "gitg-window.c" + gtk_widget_set_sensitive ((GtkWidget*) _tmp43_, FALSE); +#line 2704 "gitg-window.c" } #line 708 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (selectable); @@ -2720,7 +2708,7 @@ _g_object_unref0 (searchable); #line 708 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (current); -#line 2724 "gitg-window.c" +#line 2712 "gitg-window.c" } @@ -2729,7 +2717,7 @@ g_atomic_int_inc (&_data67_->_ref_count_); #line 775 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return _data67_; -#line 2733 "gitg-window.c" +#line 2721 "gitg-window.c" } @@ -2738,7 +2726,7 @@ _data67_ = (Block67Data*) _userdata_; #line 775 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (g_atomic_int_dec_and_test (&_data67_->_ref_count_)) { -#line 2742 "gitg-window.c" +#line 2730 "gitg-window.c" GitgWindow* self; #line 775 "/home/jesse/dev/gitg/gitg/gitg-window.vala" self = _data67_->self; @@ -2750,7 +2738,7 @@ _g_object_unref0 (self); #line 775 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_slice_free (Block67Data, _data67_); -#line 2754 "gitg-window.c" +#line 2742 "gitg-window.c" } } @@ -2782,7 +2770,7 @@ _tmp4_ = gitg_ext_activity_is_default_for (_tmp2_, _tmp3_); #line 793 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp4_) { -#line 2786 "gitg-window.c" +#line 2774 "gitg-window.c" GitgExtActivity* _tmp5_ = NULL; GitgExtActivity* _tmp6_ = NULL; #line 795 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -2793,7 +2781,7 @@ _g_object_unref0 (_data67_->def); #line 795 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _data67_->def = _tmp6_; -#line 2797 "gitg-window.c" +#line 2785 "gitg-window.c" } #line 798 "/home/jesse/dev/gitg/gitg/gitg-window.vala" result = TRUE; @@ -2801,7 +2789,7 @@ _g_object_unref0 (activity); #line 798 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 2805 "gitg-window.c" +#line 2793 "gitg-window.c" } @@ -2810,7 +2798,7 @@ result = __lambda108_ (self, element); #line 790 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 2814 "gitg-window.c" +#line 2802 "gitg-window.c" } @@ -2835,18 +2823,18 @@ if (_tmp1_ == NULL) { #line 779 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp0_ = TRUE; -#line 2839 "gitg-window.c" +#line 2827 "gitg-window.c" } else { const gchar* _tmp2_ = NULL; #line 779 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp2_ = action; #line 779 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp0_ = g_strcmp0 (_tmp2_, "") == 0; -#line 2846 "gitg-window.c" +#line 2834 "gitg-window.c" } #line 779 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp0_) { -#line 2850 "gitg-window.c" +#line 2838 "gitg-window.c" GSettings* _tmp3_ = NULL; gchar* _tmp4_ = NULL; #line 781 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -2857,7 +2845,7 @@ _g_free0 (_data67_->default_activity); #line 781 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _data67_->default_activity = _tmp4_; -#line 2861 "gitg-window.c" +#line 2849 "gitg-window.c" } else { const gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; @@ -2869,7 +2857,7 @@ _g_free0 (_data67_->default_activity); #line 785 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _data67_->default_activity = _tmp6_; -#line 2873 "gitg-window.c" +#line 2861 "gitg-window.c" } #line 788 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _data67_->def = NULL; @@ -2881,7 +2869,7 @@ _tmp8_ = _data67_->def; #line 801 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp8_ != NULL) { -#line 2885 "gitg-window.c" +#line 2873 "gitg-window.c" GitgUIElements* _tmp9_ = NULL; GitgExtActivity* _tmp10_ = NULL; #line 803 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -2898,7 +2886,7 @@ _data67_ = NULL; #line 804 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 2902 "gitg-window.c" +#line 2890 "gitg-window.c" } #line 807 "/home/jesse/dev/gitg/gitg/gitg-window.vala" result = FALSE; @@ -2908,7 +2896,7 @@ _data67_ = NULL; #line 807 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 2912 "gitg-window.c" +#line 2900 "gitg-window.c" } @@ -2933,7 +2921,7 @@ _tmp3_ = gitg_ext_activity_is_default_for (_tmp2_, ""); #line 817 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp3_) { -#line 2937 "gitg-window.c" +#line 2925 "gitg-window.c" GitgUIElements* _tmp4_ = NULL; GitgExtActivity* _tmp5_ = NULL; #line 819 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -2948,7 +2936,7 @@ _g_object_unref0 (activity); #line 820 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 2952 "gitg-window.c" +#line 2940 "gitg-window.c" } #line 823 "/home/jesse/dev/gitg/gitg/gitg-window.vala" result = TRUE; @@ -2956,7 +2944,7 @@ _g_object_unref0 (activity); #line 823 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 2960 "gitg-window.c" +#line 2948 "gitg-window.c" } @@ -2965,7 +2953,7 @@ result = ___lambda109_ ((GitgWindow*) self, element); #line 814 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 2969 "gitg-window.c" +#line 2957 "gitg-window.c" } @@ -2980,13 +2968,13 @@ _tmp1_ = gitg_window_activate_activity (self, _tmp0_); #line 812 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (!_tmp1_) { -#line 2984 "gitg-window.c" +#line 2972 "gitg-window.c" GitgUIElements* _tmp2_ = NULL; #line 814 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp2_ = self->priv->d_activities; #line 814 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_ui_elements_foreach (_tmp2_, ____lambda109__gitg_ui_elements_foreach_ui_element_func, self); -#line 2990 "gitg-window.c" +#line 2978 "gitg-window.c" } } @@ -2994,7 +2982,7 @@ static void _gitg_window_on_current_activity_changed_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 854 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_on_current_activity_changed ((GitgWindow*) self); -#line 2998 "gitg-window.c" +#line 2986 "gitg-window.c" } @@ -3115,7 +3103,7 @@ if ((_tmp20_ & GDK_WINDOW_STATE_MAXIMIZED) == GDK_WINDOW_STATE_MAXIMIZED) { #line 861 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gtk_window_maximize ((GtkWindow*) self); -#line 3119 "gitg-window.c" +#line 3107 "gitg-window.c" } #line 867 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp21_ = self->priv->d_state_settings; @@ -3135,7 +3123,7 @@ _g_object_unref0 (app); #line 870 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 3139 "gitg-window.c" +#line 3127 "gitg-window.c" } @@ -3155,7 +3143,7 @@ _tmp1_ = environment; #line 877 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp1__length1 = environment_length1; -#line 3159 "gitg-window.c" +#line 3147 "gitg-window.c" { gchar** e_collection = NULL; gint e_collection_length1 = 0; @@ -3167,14 +3155,14 @@ e_collection_length1 = _tmp1__length1; #line 877 "/home/jesse/dev/gitg/gitg/gitg-window.vala" for (e_it = 0; e_it < _tmp1__length1; e_it = e_it + 1) { -#line 3171 "gitg-window.c" +#line 3159 "gitg-window.c" gchar* _tmp2_ = NULL; gchar* e = NULL; #line 877 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp2_ = g_strdup (e_collection[e_it]); #line 877 "/home/jesse/dev/gitg/gitg/gitg-window.vala" e = _tmp2_; -#line 3178 "gitg-window.c" +#line 3166 "gitg-window.c" { gchar** parts = NULL; const gchar* _tmp3_ = NULL; @@ -3200,7 +3188,7 @@ _tmp6__length1 = parts_length1; #line 881 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp6__length1 == 1) { -#line 3204 "gitg-window.c" +#line 3192 "gitg-window.c" GeeHashMap* _tmp7_ = NULL; gchar** _tmp8_ = NULL; gint _tmp8__length1 = 0; @@ -3215,7 +3203,7 @@ _tmp9_ = _tmp8_[0]; #line 883 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gee_abstract_map_set ((GeeAbstractMap*) _tmp7_, _tmp9_, ""); -#line 3219 "gitg-window.c" +#line 3207 "gitg-window.c" } else { GeeHashMap* _tmp10_ = NULL; gchar** _tmp11_ = NULL; @@ -3240,13 +3228,13 @@ _tmp14_ = _tmp13_[1]; #line 887 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gee_abstract_map_set ((GeeAbstractMap*) _tmp10_, _tmp12_, _tmp14_); -#line 3244 "gitg-window.c" +#line 3232 "gitg-window.c" } #line 877 "/home/jesse/dev/gitg/gitg/gitg-window.vala" parts = (_vala_array_free (parts, parts_length1, (GDestroyNotify) g_free), NULL); #line 877 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_free0 (e); -#line 3250 "gitg-window.c" +#line 3238 "gitg-window.c" } } } @@ -3272,7 +3260,7 @@ _tmp1_ = ret; #line 898 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp1_ != NULL) { -#line 3276 "gitg-window.c" +#line 3264 "gitg-window.c" GitgWindow* _tmp2_ = NULL; GtkApplication* _tmp3_ = NULL; GitgWindow* _tmp4_ = NULL; @@ -3302,17 +3290,17 @@ _g_free0 (_tmp6_->priv->d_action); #line 902 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp6_->priv->d_action = _tmp8_; -#line 3306 "gitg-window.c" +#line 3294 "gitg-window.c" } { GitgWindow* _tmp9_ = NULL; #line 907 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp9_ = ret; #line 907 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - g_initable_init (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, G_TYPE_INITABLE, GInitable), NULL, &_inner_error_); + g_initable_init (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, g_initable_get_type (), GInitable), NULL, &_inner_error_); #line 907 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3316 "gitg-window.c" +#line 3304 "gitg-window.c" goto __catch112_g_error; } } @@ -3323,7 +3311,7 @@ g_clear_error (&_inner_error_); #line 905 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _inner_error_ = NULL; -#line 3327 "gitg-window.c" +#line 3315 "gitg-window.c" } __finally112: #line 905 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -3336,7 +3324,7 @@ g_clear_error (&_inner_error_); #line 905 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return NULL; -#line 3340 "gitg-window.c" +#line 3328 "gitg-window.c" } #line 910 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp10_ = ret; @@ -3346,7 +3334,7 @@ result = ret; #line 911 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 3350 "gitg-window.c" +#line 3338 "gitg-window.c" } @@ -3378,7 +3366,7 @@ _tmp3_ = v; #line 919 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp3_ != NULL) { -#line 3382 "gitg-window.c" +#line 3370 "gitg-window.c" GitgUIElements* _tmp4_ = NULL; GitgExtActivity* _tmp5_ = NULL; #line 921 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -3387,7 +3375,7 @@ _tmp5_ = v; #line 921 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_ui_elements_set_current (_tmp4_, _tmp5_); -#line 3391 "gitg-window.c" +#line 3379 "gitg-window.c" } #line 924 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp6_ = self->priv->d_activities; @@ -3403,7 +3391,7 @@ result = v; #line 926 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 3407 "gitg-window.c" +#line 3395 "gitg-window.c" } else { #line 930 "/home/jesse/dev/gitg/gitg/gitg-window.vala" result = NULL; @@ -3411,11 +3399,11 @@ _g_object_unref0 (v); #line 930 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 3415 "gitg-window.c" +#line 3403 "gitg-window.c" } #line 915 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (v); -#line 3419 "gitg-window.c" +#line 3407 "gitg-window.c" } @@ -3439,7 +3427,7 @@ result = (GitgExtActivity*) _tmp2_; #line 936 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 3443 "gitg-window.c" +#line 3431 "gitg-window.c" } @@ -3449,7 +3437,7 @@ GitgRepository* repository = NULL; gboolean _tmp0_ = FALSE; GitgRepository* _tmp1_ = NULL; - GitgRepository* _tmp23_ = NULL; + GitgRepository* _tmp22_ = NULL; GError * _inner_error_ = NULL; #line 939 "/home/jesse/dev/gitg/gitg/gitg-window.vala" self = (GitgWindow*) base; @@ -3461,7 +3449,7 @@ _tmp1_ = self->priv->d_repository; #line 944 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp1_ != NULL) { -#line 3465 "gitg-window.c" +#line 3453 "gitg-window.c" GitgRepository* _tmp2_ = NULL; GFile* _tmp3_ = NULL; GFile* _tmp4_ = NULL; @@ -3481,11 +3469,11 @@ _tmp0_ = _tmp6_; #line 945 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (_tmp4_); -#line 3485 "gitg-window.c" +#line 3473 "gitg-window.c" } else { #line 944 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp0_ = FALSE; -#line 3489 "gitg-window.c" +#line 3477 "gitg-window.c" } #line 944 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp0_) { @@ -3495,7 +3483,7 @@ _g_object_unref0 (repo); #line 947 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return; -#line 3499 "gitg-window.c" +#line 3487 "gitg-window.c" } { GFile* _tmp7_ = NULL; @@ -3510,7 +3498,7 @@ _tmp7_ = _tmp9_; #line 952 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3514 "gitg-window.c" +#line 3502 "gitg-window.c" goto __catch113_g_error; } #line 952 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -3523,7 +3511,7 @@ repo = _tmp10_; #line 950 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (_tmp7_); -#line 3527 "gitg-window.c" +#line 3515 "gitg-window.c" } goto __finally113; __catch113_g_error: @@ -3534,11 +3522,10 @@ gchar* _tmp12_ = NULL; gchar* title = NULL; const gchar* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - GError* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; + gchar* _tmp14_ = NULL; + const gchar* _tmp15_ = NULL; + GError* _tmp16_ = NULL; + const gchar* _tmp17_ = NULL; #line 950 "/home/jesse/dev/gitg/gitg/gitg-window.vala" e = _inner_error_; #line 950 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -3550,21 +3537,19 @@ #line 956 "/home/jesse/dev/gitg/gitg/gitg-window.vala" repo_name = _tmp12_; #line 958 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp13_ = _ ("'%s' is not a Git repository."); + _tmp13_ = repo_name; #line 958 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp14_ = repo_name; + _tmp14_ = g_strdup_printf (_ ("'%s' is not a Git repository."), _tmp13_); #line 958 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp15_ = g_strdup_printf (_tmp13_, _tmp14_); -#line 958 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - title = _tmp15_; + title = _tmp14_; #line 959 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp16_ = title; + _tmp15_ = title; #line 959 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp17_ = e; + _tmp16_ = e; #line 959 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp18_ = _tmp17_->message; + _tmp17_ = _tmp16_->message; #line 959 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gitg_ext_application_show_infobar ((GitgExtApplication*) self, _tmp16_, _tmp18_, GTK_MESSAGE_WARNING); + gitg_ext_application_show_infobar ((GitgExtApplication*) self, _tmp15_, _tmp17_, GTK_MESSAGE_WARNING); #line 961 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_free0 (title); #line 961 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -3577,7 +3562,7 @@ _g_object_unref0 (repo); #line 961 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return; -#line 3581 "gitg-window.c" +#line 3566 "gitg-window.c" } __finally113: #line 950 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -3592,35 +3577,35 @@ g_clear_error (&_inner_error_); #line 950 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return; -#line 3596 "gitg-window.c" +#line 3581 "gitg-window.c" } { - GitgRepository* _tmp19_ = NULL; - GFile* _tmp20_ = NULL; + GitgRepository* _tmp18_ = NULL; + GFile* _tmp19_ = NULL; + GitgRepository* _tmp20_ = NULL; GitgRepository* _tmp21_ = NULL; - GitgRepository* _tmp22_ = NULL; #line 966 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp20_ = repo; + _tmp19_ = repo; #line 966 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp21_ = gitg_repository_new (_tmp20_, NULL, &_inner_error_); + _tmp20_ = gitg_repository_new (_tmp19_, NULL, &_inner_error_); #line 966 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp19_ = _tmp21_; + _tmp18_ = _tmp20_; #line 966 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3611 "gitg-window.c" +#line 3596 "gitg-window.c" goto __catch114_g_error; } #line 966 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp22_ = _tmp19_; + _tmp21_ = _tmp18_; #line 966 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp19_ = NULL; + _tmp18_ = NULL; #line 966 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (repository); #line 966 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - repository = _tmp22_; + repository = _tmp21_; #line 964 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _g_object_unref0 (_tmp19_); -#line 3624 "gitg-window.c" + _g_object_unref0 (_tmp18_); +#line 3609 "gitg-window.c" } goto __finally114; __catch114_g_error: @@ -3629,7 +3614,7 @@ g_clear_error (&_inner_error_); #line 964 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _inner_error_ = NULL; -#line 3633 "gitg-window.c" +#line 3618 "gitg-window.c" } __finally114: #line 964 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -3644,17 +3629,17 @@ g_clear_error (&_inner_error_); #line 964 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return; -#line 3648 "gitg-window.c" +#line 3633 "gitg-window.c" } #line 970 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp23_ = repository; + _tmp22_ = repository; #line 970 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gitg_ext_application_set_repository ((GitgExtApplication*) self, _tmp23_); + gitg_ext_application_set_repository ((GitgExtApplication*) self, _tmp22_); #line 939 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (repository); #line 939 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (repo); -#line 3658 "gitg-window.c" +#line 3643 "gitg-window.c" } @@ -3663,7 +3648,7 @@ g_atomic_int_inc (&_data68_->_ref_count_); #line 973 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return _data68_; -#line 3667 "gitg-window.c" +#line 3652 "gitg-window.c" } @@ -3672,7 +3657,7 @@ _data68_ = (Block68Data*) _userdata_; #line 973 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (g_atomic_int_dec_and_test (&_data68_->_ref_count_)) { -#line 3676 "gitg-window.c" +#line 3661 "gitg-window.c" GitgWindow* self; #line 973 "/home/jesse/dev/gitg/gitg/gitg-window.vala" self = _data68_->self; @@ -3684,7 +3669,7 @@ _g_object_unref0 (self); #line 973 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_slice_free (Block68Data, _data68_); -#line 3688 "gitg-window.c" +#line 3673 "gitg-window.c" } } @@ -3765,7 +3750,7 @@ _g_free0 (primary); #line 986 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 3769 "gitg-window.c" +#line 3754 "gitg-window.c" } @@ -3774,7 +3759,7 @@ result = __lambda162_ (self); #line 977 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 3778 "gitg-window.c" +#line 3763 "gitg-window.c" } @@ -3824,7 +3809,7 @@ block68_data_unref (_data68_); #line 973 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _data68_ = NULL; -#line 3828 "gitg-window.c" +#line 3813 "gitg-window.c" } @@ -3837,7 +3822,7 @@ _g_object_unref0 (_data_->self); #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_slice_free (GitgWindowUserQueryAsyncData, _data_); -#line 3841 "gitg-window.c" +#line 3826 "gitg-window.c" } @@ -3869,7 +3854,7 @@ _data_->query = _tmp2_; #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_real_user_query_async_co (_data_); -#line 3873 "gitg-window.c" +#line 3858 "gitg-window.c" } @@ -3882,7 +3867,7 @@ result = _data_->result; #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 3886 "gitg-window.c" +#line 3871 "gitg-window.c" } @@ -3891,7 +3876,7 @@ g_atomic_int_inc (&_data69_->_ref_count_); #line 990 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return _data69_; -#line 3895 "gitg-window.c" +#line 3880 "gitg-window.c" } @@ -3900,7 +3885,7 @@ _data69_ = (Block69Data*) _userdata_; #line 990 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (g_atomic_int_dec_and_test (&_data69_->_ref_count_)) { -#line 3904 "gitg-window.c" +#line 3889 "gitg-window.c" GitgWindow* self; #line 990 "/home/jesse/dev/gitg/gitg/gitg-window.vala" self = _data69_->self; @@ -3916,7 +3901,7 @@ _g_object_unref0 (self); #line 990 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_slice_free (Block69Data, _data69_); -#line 3920 "gitg-window.c" +#line 3905 "gitg-window.c" } } @@ -3926,7 +3911,7 @@ result = gitg_window_real_user_query_async_co (self); #line 992 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 3930 "gitg-window.c" +#line 3915 "gitg-window.c" } @@ -3957,7 +3942,7 @@ result = TRUE; #line 999 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 3961 "gitg-window.c" +#line 3946 "gitg-window.c" } @@ -3966,7 +3951,7 @@ result = __lambda163_ (self, response_type); #line 995 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 3970 "gitg-window.c" +#line 3955 "gitg-window.c" } @@ -3975,16 +3960,16 @@ switch (_data_->_state_) { #line 990 "/home/jesse/dev/gitg/gitg/gitg-window.vala" case 0: -#line 3979 "gitg-window.c" +#line 3964 "gitg-window.c" goto _state_0; #line 990 "/home/jesse/dev/gitg/gitg/gitg-window.vala" case 1: -#line 3983 "gitg-window.c" +#line 3968 "gitg-window.c" goto _state_1; default: #line 990 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_assert_not_reached (); -#line 3988 "gitg-window.c" +#line 3973 "gitg-window.c" } _state_0: #line 990 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -4019,7 +4004,7 @@ _data_->_state_ = 1; #line 1004 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return FALSE; -#line 4023 "gitg-window.c" +#line 4008 "gitg-window.c" _state_1: ; #line 1006 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -4032,11 +4017,11 @@ if (_data_->_state_ == 0) { #line 1006 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 4036 "gitg-window.c" +#line 4021 "gitg-window.c" } else { #line 1006 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_simple_async_result_complete (_data_->_async_result); -#line 4040 "gitg-window.c" +#line 4025 "gitg-window.c" } #line 1006 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_object_unref (_data_->_async_result); @@ -4050,17 +4035,17 @@ if (_data_->_state_ == 0) { #line 990 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 4054 "gitg-window.c" +#line 4039 "gitg-window.c" } else { #line 990 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_simple_async_result_complete (_data_->_async_result); -#line 4058 "gitg-window.c" +#line 4043 "gitg-window.c" } #line 990 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_object_unref (_data_->_async_result); #line 990 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return FALSE; -#line 4064 "gitg-window.c" +#line 4049 "gitg-window.c" } @@ -4069,7 +4054,7 @@ g_atomic_int_inc (&_data70_->_ref_count_); #line 1009 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return _data70_; -#line 4073 "gitg-window.c" +#line 4058 "gitg-window.c" } @@ -4078,7 +4063,7 @@ _data70_ = (Block70Data*) _userdata_; #line 1009 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (g_atomic_int_dec_and_test (&_data70_->_ref_count_)) { -#line 4082 "gitg-window.c" +#line 4067 "gitg-window.c" GitgWindow* self; #line 1009 "/home/jesse/dev/gitg/gitg/gitg-window.vala" self = _data70_->self; @@ -4090,7 +4075,7 @@ _g_object_unref0 (self); #line 1009 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_slice_free (Block70Data, _data70_); -#line 4094 "gitg-window.c" +#line 4079 "gitg-window.c" } } @@ -4112,14 +4097,14 @@ _tmp2_ = _data70_->qid; #line 1056 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_signal_handler_disconnect ((GObject*) _tmp1_, _tmp2_); -#line 4116 "gitg-window.c" +#line 4101 "gitg-window.c" } static void ___lambda164__gitg_ext_user_query_quit (GitgExtUserQuery* _sender, gpointer self) { #line 1054 "/home/jesse/dev/gitg/gitg/gitg-window.vala" __lambda164_ (self); -#line 4123 "gitg-window.c" +#line 4108 "gitg-window.c" } @@ -4145,7 +4130,7 @@ g_signal_emit_by_name (_tmp1_, "response", (GtkResponseType) _tmp2_, &_tmp3_); #line 1062 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp3_) { -#line 4149 "gitg-window.c" +#line 4134 "gitg-window.c" GtkMessageDialog* _tmp4_ = NULL; GitgExtUserQuery* _tmp5_ = NULL; gulong _tmp6_ = 0UL; @@ -4159,7 +4144,7 @@ _tmp6_ = _data70_->qid; #line 1065 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_signal_handler_disconnect ((GObject*) _tmp5_, _tmp6_); -#line 4163 "gitg-window.c" +#line 4148 "gitg-window.c" } } @@ -4167,7 +4152,7 @@ static void ___lambda165__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { #line 1059 "/home/jesse/dev/gitg/gitg/gitg-window.vala" __lambda165_ (self, _sender, response_id); -#line 4171 "gitg-window.c" +#line 4156 "gitg-window.c" } @@ -4285,13 +4270,13 @@ _tmp21_ = _tmp20_; #line 1022 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp21_) { -#line 4289 "gitg-window.c" +#line 4274 "gitg-window.c" GtkMessageDialog* _tmp22_ = NULL; #line 1024 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp22_ = _data70_->dlg; #line 1024 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_object_set (_tmp22_, "secondary-use-markup", TRUE, NULL); -#line 4295 "gitg-window.c" +#line 4280 "gitg-window.c" } #line 1027 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp23_ = _data70_->dlg; @@ -4311,7 +4296,7 @@ _tmp29_ = _tmp28_; #line 1029 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp29__length1 = _tmp28__length1; -#line 4315 "gitg-window.c" +#line 4300 "gitg-window.c" { GitgExtUserQueryResponse** response_collection = NULL; gint response_collection_length1 = 0; @@ -4323,14 +4308,14 @@ response_collection_length1 = _tmp29__length1; #line 1029 "/home/jesse/dev/gitg/gitg/gitg-window.vala" for (response_it = 0; response_it < _tmp29__length1; response_it = response_it + 1) { -#line 4327 "gitg-window.c" +#line 4312 "gitg-window.c" GitgExtUserQueryResponse* _tmp30_ = NULL; GitgExtUserQueryResponse* response = NULL; #line 1029 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp30_ = _g_object_ref0 (response_collection[response_it]); #line 1029 "/home/jesse/dev/gitg/gitg/gitg-window.vala" response = _tmp30_; -#line 4334 "gitg-window.c" +#line 4319 "gitg-window.c" { GtkWidget* button = NULL; GtkMessageDialog* _tmp31_ = NULL; @@ -4373,7 +4358,7 @@ _tmp42_ = _tmp41_; #line 1033 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp39_ == _tmp42_) { -#line 4377 "gitg-window.c" +#line 4362 "gitg-window.c" GtkWidget* _tmp43_ = NULL; GtkWidget* _tmp44_ = NULL; GitgExtUserQuery* _tmp45_ = NULL; @@ -4395,7 +4380,7 @@ _tmp47_ = _tmp46_; #line 1038 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp47_) { -#line 4399 "gitg-window.c" +#line 4384 "gitg-window.c" GtkWidget* _tmp48_ = NULL; GtkStyleContext* _tmp49_ = NULL; #line 1040 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -4404,7 +4389,7 @@ _tmp49_ = gtk_widget_get_style_context (_tmp48_); #line 1040 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gtk_style_context_add_class (_tmp49_, GTK_STYLE_CLASS_DESTRUCTIVE_ACTION); -#line 4408 "gitg-window.c" +#line 4393 "gitg-window.c" } else { GtkWidget* _tmp50_ = NULL; GtkStyleContext* _tmp51_ = NULL; @@ -4414,14 +4399,14 @@ _tmp51_ = gtk_widget_get_style_context (_tmp50_); #line 1044 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gtk_style_context_add_class (_tmp51_, GTK_STYLE_CLASS_SUGGESTED_ACTION); -#line 4418 "gitg-window.c" +#line 4403 "gitg-window.c" } } #line 1029 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (button); #line 1029 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (response); -#line 4425 "gitg-window.c" +#line 4410 "gitg-window.c" } } } @@ -4459,7 +4444,7 @@ block70_data_unref (_data70_); #line 1009 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _data70_ = NULL; -#line 4463 "gitg-window.c" +#line 4448 "gitg-window.c" } @@ -4480,7 +4465,7 @@ email = NULL; #line 1081 "/home/jesse/dev/gitg/gitg/gitg-window.vala" committer = NULL; -#line 4484 "gitg-window.c" +#line 4469 "gitg-window.c" { GgitSignature* _tmp0_ = NULL; GitgRepository* _tmp1_ = NULL; @@ -4524,7 +4509,7 @@ _tmp0_ = _tmp8_; #line 1085 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4528 "gitg-window.c" +#line 4513 "gitg-window.c" goto __catch115_g_error; } #line 1085 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -4563,7 +4548,7 @@ _g_free0 (user); #line 1092 "/home/jesse/dev/gitg/gitg/gitg-window.vala" user = NULL; -#line 4567 "gitg-window.c" +#line 4552 "gitg-window.c" } #line 1095 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp17_ = email; @@ -4573,11 +4558,11 @@ _g_free0 (email); #line 1097 "/home/jesse/dev/gitg/gitg/gitg-window.vala" email = NULL; -#line 4577 "gitg-window.c" +#line 4562 "gitg-window.c" } #line 1083 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_object_unref0 (_tmp0_); -#line 4581 "gitg-window.c" +#line 4566 "gitg-window.c" } goto __finally115; __catch115_g_error: @@ -4586,7 +4571,7 @@ g_clear_error (&_inner_error_); #line 1083 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _inner_error_ = NULL; -#line 4590 "gitg-window.c" +#line 4575 "gitg-window.c" } __finally115: #line 1083 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -4603,7 +4588,7 @@ g_clear_error (&_inner_error_); #line 1083 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return NULL; -#line 4607 "gitg-window.c" +#line 4592 "gitg-window.c" } #line 1101 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp19_ = user; @@ -4611,94 +4596,82 @@ if (_tmp19_ == NULL) { #line 1101 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp18_ = TRUE; -#line 4615 "gitg-window.c" +#line 4600 "gitg-window.c" } else { const gchar* _tmp20_ = NULL; #line 1101 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp20_ = email; #line 1101 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp18_ = _tmp20_ == NULL; -#line 4622 "gitg-window.c" +#line 4607 "gitg-window.c" } #line 1101 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp18_) { -#line 4626 "gitg-window.c" +#line 4611 "gitg-window.c" gchar* secmsg = NULL; gboolean _tmp21_ = FALSE; const gchar* _tmp22_ = NULL; - const gchar* _tmp31_ = NULL; - const gchar* _tmp32_ = NULL; + const gchar* _tmp28_ = NULL; #line 1105 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp22_ = user; #line 1105 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp22_ == NULL) { -#line 4636 "gitg-window.c" +#line 4620 "gitg-window.c" const gchar* _tmp23_ = NULL; #line 1105 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp23_ = email; #line 1105 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp21_ = _tmp23_ == NULL; -#line 4642 "gitg-window.c" +#line 4626 "gitg-window.c" } else { #line 1105 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp21_ = FALSE; -#line 4646 "gitg-window.c" +#line 4630 "gitg-window.c" } #line 1105 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp21_) { -#line 4650 "gitg-window.c" - const gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; -#line 1107 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp24_ = _ ("Your user name and email are not configured yet. Please go to the user" \ -" configuration and provide your name and email."); +#line 4634 "gitg-window.c" + gchar* _tmp24_ = NULL; #line 1107 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp25_ = g_strdup (_tmp24_); + _tmp24_ = g_strdup (_ ("Your user name and email are not configured yet. Please go to the user" \ +" configuration and provide your name and email.")); #line 1107 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_free0 (secmsg); #line 1107 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - secmsg = _tmp25_; -#line 4661 "gitg-window.c" + secmsg = _tmp24_; +#line 4642 "gitg-window.c" } else { - const gchar* _tmp26_ = NULL; + const gchar* _tmp25_ = NULL; #line 1109 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp26_ = user; + _tmp25_ = user; #line 1109 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - if (_tmp26_ == NULL) { -#line 4668 "gitg-window.c" - const gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; -#line 1111 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp27_ = _ ("Your user name is not configured yet. Please go to the user configurat" \ -"ion and provide your name."); + if (_tmp25_ == NULL) { +#line 4649 "gitg-window.c" + gchar* _tmp26_ = NULL; #line 1111 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp28_ = g_strdup (_tmp27_); + _tmp26_ = g_strdup (_ ("Your user name is not configured yet. Please go to the user configurat" \ +"ion and provide your name.")); #line 1111 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_free0 (secmsg); #line 1111 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - secmsg = _tmp28_; -#line 4679 "gitg-window.c" + secmsg = _tmp26_; +#line 4657 "gitg-window.c" } else { - const gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; -#line 1115 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp29_ = _ ("Your email is not configured yet. Please go to the user configuration " \ -"and provide your email."); + gchar* _tmp27_ = NULL; #line 1115 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp30_ = g_strdup (_tmp29_); + _tmp27_ = g_strdup (_ ("Your email is not configured yet. Please go to the user configuration " \ +"and provide your email.")); #line 1115 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_free0 (secmsg); #line 1115 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - secmsg = _tmp30_; -#line 4691 "gitg-window.c" + secmsg = _tmp27_; +#line 4666 "gitg-window.c" } } #line 1118 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp31_ = _ ("Missing author details"); + _tmp28_ = secmsg; #line 1118 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp32_ = secmsg; -#line 1118 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gitg_ext_application_show_infobar ((GitgExtApplication*) self, _tmp31_, _tmp32_, GTK_MESSAGE_ERROR); + gitg_ext_application_show_infobar ((GitgExtApplication*) self, _ ("Missing author details"), _tmp28_, GTK_MESSAGE_ERROR); #line 1119 "/home/jesse/dev/gitg/gitg/gitg-window.vala" result = NULL; #line 1119 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -4711,7 +4684,7 @@ _g_free0 (user); #line 1119 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 4712 "gitg-window.c" +#line 4685 "gitg-window.c" } #line 1122 "/home/jesse/dev/gitg/gitg/gitg-window.vala" result = committer; @@ -4721,7 +4694,7 @@ _g_free0 (user); #line 1122 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 4722 "gitg-window.c" +#line 4695 "gitg-window.c" } @@ -4734,29 +4707,29 @@ _tmp0_ = hint; #line 1157 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp0_ != NULL) { -#line 4735 "gitg-window.c" +#line 4708 "gitg-window.c" const gchar* _tmp1_ = NULL; #line 1159 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp1_ = hint; #line 1159 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_activate_activity (self, _tmp1_); -#line 4741 "gitg-window.c" +#line 4714 "gitg-window.c" } #line 1162 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp2_ = command_lines; #line 1162 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp2_ != NULL) { -#line 4747 "gitg-window.c" +#line 4720 "gitg-window.c" GitgExtCommandLines* _tmp3_ = NULL; #line 1164 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp3_ = command_lines; #line 1164 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_ext_command_lines_apply (_tmp3_, (GitgExtApplication*) self); -#line 4753 "gitg-window.c" +#line 4726 "gitg-window.c" } #line 1167 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gtk_window_present ((GtkWindow*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow)); -#line 4757 "gitg-window.c" +#line 4730 "gitg-window.c" } @@ -4800,7 +4773,7 @@ g_simple_action_set_state (_tmp5_, _tmp7_); #line 1173 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_variant_unref0 (_tmp7_); -#line 4801 "gitg-window.c" +#line 4774 "gitg-window.c" } @@ -4809,14 +4782,14 @@ g_return_if_fail (self != NULL); #line 1236 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_set_selectable_mode (self, GITG_EXT_SELECTION_MODE_NORMAL); -#line 4810 "gitg-window.c" +#line 4783 "gitg-window.c" } static void _gitg_window_on_select_cancel_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_on_select_cancel_button_clicked ((GitgWindow*) self); -#line 4817 "gitg-window.c" +#line 4790 "gitg-window.c" } @@ -4826,14 +4799,14 @@ self = (GitgWindow*) g_object_new (object_type, NULL); #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return self; -#line 4827 "gitg-window.c" +#line 4800 "gitg-window.c" } GitgWindow* gitg_window_new (void) { #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return gitg_window_construct (GITG_TYPE_WINDOW); -#line 4834 "gitg-window.c" +#line 4807 "gitg-window.c" } @@ -4847,7 +4820,7 @@ _tmp0_ = self->priv->d_mode; #line 428 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp0_ == GITG_WINDOW_MODE_ACTIVITY) { -#line 4848 "gitg-window.c" +#line 4821 "gitg-window.c" GitgUIElements* _tmp1_ = NULL; gconstpointer _tmp2_ = NULL; GitgExtActivity* _tmp3_ = NULL; @@ -4864,7 +4837,7 @@ result = _tmp4_; #line 430 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 4865 "gitg-window.c" +#line 4838 "gitg-window.c" } else { GitgDashView* _tmp5_ = NULL; GitgExtActivity* _tmp6_ = NULL; @@ -4876,7 +4849,7 @@ result = _tmp6_; #line 434 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 4877 "gitg-window.c" +#line 4850 "gitg-window.c" } } @@ -4896,7 +4869,7 @@ result = _tmp1_; #line 441 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 4897 "gitg-window.c" +#line 4870 "gitg-window.c" } @@ -4915,7 +4888,7 @@ result = _tmp1_; #line 447 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 4916 "gitg-window.c" +#line 4889 "gitg-window.c" } @@ -4930,7 +4903,7 @@ gitg_window_set_repository_internal (self, _tmp0_); #line 451 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_repository_changed (self); -#line 4931 "gitg-window.c" +#line 4904 "gitg-window.c" } @@ -4945,23 +4918,27 @@ result = _tmp0_; #line 647 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 4946 "gitg-window.c" +#line 4919 "gitg-window.c" } void gitg_window_set_enable_monitoring (GitgWindow* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 650 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_return_if_fail (self != NULL); +#line 650 "/home/jesse/dev/gitg/gitg/gitg-window.vala" + if (gitg_window_get_enable_monitoring (self) != value) { +#line 4928 "gitg-window.c" + gboolean _tmp0_ = FALSE; #line 652 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp0_ = value; + _tmp0_ = value; #line 652 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - self->priv->d_enable_monitoring = _tmp0_; + self->priv->d_enable_monitoring = _tmp0_; #line 653 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gitg_window_update_enable_monitoring (self); + gitg_window_update_enable_monitoring (self); #line 650 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - g_object_notify ((GObject *) self, "enable-monitoring"); -#line 4962 "gitg-window.c" + g_object_notify ((GObject *) self, "enable-monitoring"); +#line 4938 "gitg-window.c" + } } @@ -4980,7 +4957,7 @@ result = _tmp1_; #line 1074 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 4981 "gitg-window.c" +#line 4958 "gitg-window.c" } @@ -4996,89 +4973,93 @@ result = _tmp0_; #line 1127 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 4997 "gitg-window.c" +#line 4974 "gitg-window.c" } static void gitg_window_real_set_busy (GitgExtApplication* base, gboolean value) { GitgWindow* self; - gboolean _tmp0_ = FALSE; - GdkWindow* win = NULL; - GtkDialog* _tmp1_ = NULL; - gboolean _tmp7_ = FALSE; #line 1128 "/home/jesse/dev/gitg/gitg/gitg-window.vala" self = (GitgWindow*) base; +#line 1128 "/home/jesse/dev/gitg/gitg/gitg-window.vala" + if (gitg_window_real_get_busy (self) != value) { +#line 4984 "gitg-window.c" + gboolean _tmp0_ = FALSE; + GdkWindow* win = NULL; + GtkDialog* _tmp1_ = NULL; + gboolean _tmp7_ = FALSE; #line 1130 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp0_ = value; + _tmp0_ = value; #line 1130 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - self->priv->d_busy = _tmp0_; + self->priv->d_busy = _tmp0_; #line 1134 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp1_ = self->priv->d_dialog; + _tmp1_ = self->priv->d_dialog; #line 1134 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - if (_tmp1_ != NULL) { -#line 5017 "gitg-window.c" - GtkDialog* _tmp2_ = NULL; - GdkWindow* _tmp3_ = NULL; - GdkWindow* _tmp4_ = NULL; + if (_tmp1_ != NULL) { +#line 4997 "gitg-window.c" + GtkDialog* _tmp2_ = NULL; + GdkWindow* _tmp3_ = NULL; + GdkWindow* _tmp4_ = NULL; #line 1136 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp2_ = self->priv->d_dialog; + _tmp2_ = self->priv->d_dialog; #line 1136 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp3_ = gtk_widget_get_window ((GtkWidget*) _tmp2_); + _tmp3_ = gtk_widget_get_window ((GtkWidget*) _tmp2_); #line 1136 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp4_ = _g_object_ref0 (_tmp3_); #line 1136 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _g_object_unref0 (win); + _g_object_unref0 (win); #line 1136 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - win = _tmp4_; -#line 5031 "gitg-window.c" - } else { - GdkWindow* _tmp5_ = NULL; - GdkWindow* _tmp6_ = NULL; + win = _tmp4_; +#line 5011 "gitg-window.c" + } else { + GdkWindow* _tmp5_ = NULL; + GdkWindow* _tmp6_ = NULL; #line 1140 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp5_ = gtk_widget_get_window ((GtkWidget*) self); + _tmp5_ = gtk_widget_get_window ((GtkWidget*) self); #line 1140 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp6_ = _g_object_ref0 (_tmp5_); + _tmp6_ = _g_object_ref0 (_tmp5_); #line 1140 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _g_object_unref0 (win); + _g_object_unref0 (win); #line 1140 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - win = _tmp6_; -#line 5043 "gitg-window.c" - } + win = _tmp6_; +#line 5023 "gitg-window.c" + } #line 1143 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp7_ = self->priv->d_busy; + _tmp7_ = self->priv->d_busy; #line 1143 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - if (_tmp7_) { -#line 5049 "gitg-window.c" - GdkWindow* _tmp8_ = NULL; - GdkDisplay* _tmp9_ = NULL; - GdkCursor* _tmp10_ = NULL; - GdkCursor* _tmp11_ = NULL; + if (_tmp7_) { +#line 5029 "gitg-window.c" + GdkWindow* _tmp8_ = NULL; + GdkDisplay* _tmp9_ = NULL; + GdkCursor* _tmp10_ = NULL; + GdkCursor* _tmp11_ = NULL; #line 1145 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp8_ = win; + _tmp8_ = win; #line 1145 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp9_ = gtk_widget_get_display ((GtkWidget*) self); + _tmp9_ = gtk_widget_get_display ((GtkWidget*) self); #line 1145 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp10_ = gdk_cursor_new_for_display (_tmp9_, GDK_WATCH); + _tmp10_ = gdk_cursor_new_for_display (_tmp9_, GDK_WATCH); #line 1145 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp11_ = _tmp10_; + _tmp11_ = _tmp10_; #line 1145 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gdk_window_set_cursor (_tmp8_, _tmp11_); + gdk_window_set_cursor (_tmp8_, _tmp11_); #line 1145 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _g_object_unref0 (_tmp11_); -#line 5066 "gitg-window.c" - } else { - GdkWindow* _tmp12_ = NULL; + _g_object_unref0 (_tmp11_); +#line 5046 "gitg-window.c" + } else { + GdkWindow* _tmp12_ = NULL; #line 1150 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp12_ = win; + _tmp12_ = win; #line 1150 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gdk_window_set_cursor (_tmp12_, NULL); -#line 5073 "gitg-window.c" - } + gdk_window_set_cursor (_tmp12_, NULL); +#line 5053 "gitg-window.c" + } #line 1128 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _g_object_unref0 (win); + _g_object_unref0 (win); #line 1128 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - g_object_notify ((GObject *) self, "busy"); -#line 5079 "gitg-window.c" + g_object_notify ((GObject *) self, "busy"); +#line 5059 "gitg-window.c" + } } @@ -5093,371 +5074,375 @@ result = _tmp0_; #line 1178 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 5094 "gitg-window.c" +#line 5075 "gitg-window.c" } void gitg_window_set_selectable_mode (GitgWindow* self, GitgExtSelectionMode value) { - GitgExtSelectable* selectable = NULL; - GitgExtActivity* _tmp0_ = NULL; - GitgExtActivity* _tmp1_ = NULL; - GitgExtSelectable* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - GitgExtSelectable* _tmp4_ = NULL; - GitgExtSelectionMode _tmp7_ = 0; - GitgExtSelectable* _tmp8_ = NULL; - GitgExtSelectionMode _tmp9_ = 0; - GtkStyleContext* ctx = NULL; - GtkHeaderBar* _tmp10_ = NULL; - GtkStyleContext* _tmp11_ = NULL; - GtkStyleContext* _tmp12_ = NULL; - GitgExtSelectionMode _tmp13_ = 0; - gboolean issel = FALSE; - GitgExtSelectionMode _tmp25_ = 0; - GitgExtSearchable* searchable = NULL; - GitgExtActivity* _tmp26_ = NULL; - GitgExtActivity* _tmp27_ = NULL; - GitgExtSearchable* _tmp28_ = NULL; - gboolean _tmp29_ = FALSE; - gboolean _tmp30_ = FALSE; - GtkHeaderBar* _tmp32_ = NULL; - gboolean _tmp33_ = FALSE; - gboolean _tmp34_ = FALSE; - GtkToggleButton* _tmp36_ = NULL; - gboolean _tmp37_ = FALSE; - gboolean _tmp38_ = FALSE; - GtkMenuButton* _tmp40_ = NULL; - GtkToggleButton* _tmp41_ = NULL; - gboolean _tmp42_ = FALSE; - gboolean _tmp43_ = FALSE; - gboolean _tmp44_ = FALSE; - GtkButton* _tmp46_ = NULL; - gboolean _tmp47_ = FALSE; - gboolean _tmp48_ = FALSE; - GtkButton* _tmp50_ = NULL; - gboolean _tmp51_ = FALSE; - gboolean _tmp52_ = FALSE; - GtkButton* _tmp54_ = NULL; - gboolean _tmp55_ = FALSE; - gboolean _tmp56_ = FALSE; - GtkStackSwitcher* _tmp58_ = NULL; - GtkButton* _tmp59_ = NULL; - gboolean _tmp60_ = FALSE; - GtkToggleButton* _tmp61_ = NULL; - gboolean _tmp62_ = FALSE; #line 1179 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_return_if_fail (self != NULL); +#line 1179 "/home/jesse/dev/gitg/gitg/gitg-window.vala" + if (gitg_window_get_selectable_mode (self) != value) { +#line 5084 "gitg-window.c" + GitgExtSelectable* selectable = NULL; + GitgExtActivity* _tmp0_ = NULL; + GitgExtActivity* _tmp1_ = NULL; + GitgExtSelectable* _tmp2_ = NULL; + gboolean _tmp3_ = FALSE; + GitgExtSelectable* _tmp4_ = NULL; + GitgExtSelectionMode _tmp7_ = 0; + GitgExtSelectable* _tmp8_ = NULL; + GitgExtSelectionMode _tmp9_ = 0; + GtkStyleContext* ctx = NULL; + GtkHeaderBar* _tmp10_ = NULL; + GtkStyleContext* _tmp11_ = NULL; + GtkStyleContext* _tmp12_ = NULL; + GitgExtSelectionMode _tmp13_ = 0; + gboolean issel = FALSE; + GitgExtSelectionMode _tmp25_ = 0; + GitgExtSearchable* searchable = NULL; + GitgExtActivity* _tmp26_ = NULL; + GitgExtActivity* _tmp27_ = NULL; + GitgExtSearchable* _tmp28_ = NULL; + gboolean _tmp29_ = FALSE; + gboolean _tmp30_ = FALSE; + GtkHeaderBar* _tmp32_ = NULL; + gboolean _tmp33_ = FALSE; + gboolean _tmp34_ = FALSE; + GtkToggleButton* _tmp36_ = NULL; + gboolean _tmp37_ = FALSE; + gboolean _tmp38_ = FALSE; + GtkMenuButton* _tmp40_ = NULL; + GtkToggleButton* _tmp41_ = NULL; + gboolean _tmp42_ = FALSE; + gboolean _tmp43_ = FALSE; + gboolean _tmp44_ = FALSE; + GtkButton* _tmp46_ = NULL; + gboolean _tmp47_ = FALSE; + gboolean _tmp48_ = FALSE; + GtkButton* _tmp50_ = NULL; + gboolean _tmp51_ = FALSE; + gboolean _tmp52_ = FALSE; + GtkButton* _tmp54_ = NULL; + gboolean _tmp55_ = FALSE; + gboolean _tmp56_ = FALSE; + GtkStackSwitcher* _tmp58_ = NULL; + GtkButton* _tmp59_ = NULL; + gboolean _tmp60_ = FALSE; + GtkToggleButton* _tmp61_ = NULL; + gboolean _tmp62_ = FALSE; #line 1181 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp0_ = gitg_ext_application_get_current_activity ((GitgExtApplication*) self); + _tmp0_ = gitg_ext_application_get_current_activity ((GitgExtApplication*) self); #line 1181 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp1_ = _tmp0_; + _tmp1_ = _tmp0_; #line 1181 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, GITG_EXT_TYPE_SELECTABLE) ? ((GitgExtSelectable*) _tmp1_) : NULL; + _tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, GITG_EXT_TYPE_SELECTABLE) ? ((GitgExtSelectable*) _tmp1_) : NULL; #line 1181 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - if (_tmp2_ == NULL) { + if (_tmp2_ == NULL) { #line 1181 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _g_object_unref0 (_tmp1_); -#line 5158 "gitg-window.c" - } + _g_object_unref0 (_tmp1_); +#line 5142 "gitg-window.c" + } #line 1181 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - selectable = _tmp2_; + selectable = _tmp2_; #line 1183 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp4_ = selectable; + _tmp4_ = selectable; #line 1183 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - if (_tmp4_ == NULL) { + if (_tmp4_ == NULL) { #line 1183 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp3_ = TRUE; -#line 5168 "gitg-window.c" - } else { - GitgExtSelectionMode _tmp5_ = 0; - GitgExtSelectionMode _tmp6_ = 0; + _tmp3_ = TRUE; +#line 5152 "gitg-window.c" + } else { + GitgExtSelectionMode _tmp5_ = 0; + GitgExtSelectionMode _tmp6_ = 0; #line 1183 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp5_ = self->priv->d_selectable_mode; + _tmp5_ = self->priv->d_selectable_mode; #line 1183 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp6_ = value; + _tmp6_ = value; #line 1183 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp3_ = _tmp5_ == _tmp6_; -#line 5178 "gitg-window.c" - } + _tmp3_ = _tmp5_ == _tmp6_; +#line 5162 "gitg-window.c" + } #line 1183 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - if (_tmp3_) { + if (_tmp3_) { #line 1185 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _g_object_unref0 (selectable); + _g_object_unref0 (selectable); #line 1185 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - return; -#line 5186 "gitg-window.c" - } + return; +#line 5170 "gitg-window.c" + } #line 1188 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp7_ = value; + _tmp7_ = value; #line 1188 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - self->priv->d_selectable_mode = _tmp7_; + self->priv->d_selectable_mode = _tmp7_; #line 1189 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp8_ = selectable; + _tmp8_ = selectable; #line 1189 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp9_ = value; + _tmp9_ = value; #line 1189 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gitg_ext_selectable_set_selectable_mode (_tmp8_, _tmp9_); + gitg_ext_selectable_set_selectable_mode (_tmp8_, _tmp9_); #line 1191 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp10_ = self->priv->d_header_bar; + _tmp10_ = self->priv->d_header_bar; #line 1191 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp11_ = gtk_widget_get_style_context ((GtkWidget*) _tmp10_); + _tmp11_ = gtk_widget_get_style_context ((GtkWidget*) _tmp10_); #line 1191 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp12_ = _g_object_ref0 (_tmp11_); + _tmp12_ = _g_object_ref0 (_tmp11_); #line 1191 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - ctx = _tmp12_; + ctx = _tmp12_; #line 1193 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp13_ = self->priv->d_selectable_mode; + _tmp13_ = self->priv->d_selectable_mode; #line 1193 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - if (_tmp13_ == GITG_EXT_SELECTION_MODE_SELECTION) { -#line 5210 "gitg-window.c" - GtkStyleContext* _tmp14_ = NULL; - GitgExtSelectable* _tmp15_ = NULL; - GtkWidget* _tmp16_ = NULL; - GtkWidget* _tmp17_ = NULL; - GtkWidget* _tmp18_ = NULL; + if (_tmp13_ == GITG_EXT_SELECTION_MODE_SELECTION) { +#line 5194 "gitg-window.c" + GtkStyleContext* _tmp14_ = NULL; + GitgExtSelectable* _tmp15_ = NULL; + GtkWidget* _tmp16_ = NULL; + GtkWidget* _tmp17_ = NULL; + GtkWidget* _tmp18_ = NULL; #line 1195 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp14_ = ctx; + _tmp14_ = ctx; #line 1195 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_style_context_add_class (_tmp14_, "selection-mode"); + gtk_style_context_add_class (_tmp14_, "selection-mode"); #line 1197 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp15_ = selectable; + _tmp15_ = selectable; #line 1197 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp16_ = gitg_ext_selectable_get_action_widget (_tmp15_); + _tmp16_ = gitg_ext_selectable_get_action_widget (_tmp15_); #line 1197 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp17_ = _tmp16_; + _tmp17_ = _tmp16_; #line 1197 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _g_object_unref0 (self->priv->d_select_actions); + _g_object_unref0 (self->priv->d_select_actions); #line 1197 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - self->priv->d_select_actions = _tmp17_; + self->priv->d_select_actions = _tmp17_; #line 1199 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp18_ = self->priv->d_select_actions; + _tmp18_ = self->priv->d_select_actions; #line 1199 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - if (_tmp18_ != NULL) { -#line 5234 "gitg-window.c" - GtkGrid* _tmp19_ = NULL; - GtkWidget* _tmp20_ = NULL; - GtkWidget* _tmp21_ = NULL; + if (_tmp18_ != NULL) { +#line 5218 "gitg-window.c" + GtkGrid* _tmp19_ = NULL; + GtkWidget* _tmp20_ = NULL; + GtkWidget* _tmp21_ = NULL; #line 1201 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp19_ = self->priv->d_grid_main; + _tmp19_ = self->priv->d_grid_main; #line 1201 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp20_ = self->priv->d_select_actions; + _tmp20_ = self->priv->d_select_actions; #line 1201 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_grid_attach (_tmp19_, _tmp20_, 0, 3, 1, 1); + gtk_grid_attach (_tmp19_, _tmp20_, 0, 3, 1, 1); #line 1202 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp21_ = self->priv->d_select_actions; + _tmp21_ = self->priv->d_select_actions; #line 1202 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_widget_show (_tmp21_); -#line 5248 "gitg-window.c" - } - } else { - GtkStyleContext* _tmp22_ = NULL; - GtkWidget* _tmp23_ = NULL; + gtk_widget_show (_tmp21_); +#line 5232 "gitg-window.c" + } + } else { + GtkStyleContext* _tmp22_ = NULL; + GtkWidget* _tmp23_ = NULL; #line 1207 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp22_ = ctx; + _tmp22_ = ctx; #line 1207 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_style_context_remove_class (_tmp22_, "selection-mode"); + gtk_style_context_remove_class (_tmp22_, "selection-mode"); #line 1209 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp23_ = self->priv->d_select_actions; + _tmp23_ = self->priv->d_select_actions; #line 1209 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - if (_tmp23_ != NULL) { -#line 5261 "gitg-window.c" - GtkWidget* _tmp24_ = NULL; + if (_tmp23_ != NULL) { +#line 5245 "gitg-window.c" + GtkWidget* _tmp24_ = NULL; #line 1211 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp24_ = self->priv->d_select_actions; + _tmp24_ = self->priv->d_select_actions; #line 1211 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_widget_destroy (_tmp24_); + gtk_widget_destroy (_tmp24_); #line 1212 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _g_object_unref0 (self->priv->d_select_actions); + _g_object_unref0 (self->priv->d_select_actions); #line 1212 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - self->priv->d_select_actions = NULL; -#line 5271 "gitg-window.c" + self->priv->d_select_actions = NULL; +#line 5255 "gitg-window.c" + } } - } #line 1216 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp25_ = self->priv->d_selectable_mode; + _tmp25_ = self->priv->d_selectable_mode; #line 1216 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - issel = _tmp25_ == GITG_EXT_SELECTION_MODE_SELECTION; + issel = _tmp25_ == GITG_EXT_SELECTION_MODE_SELECTION; #line 1217 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp26_ = gitg_ext_application_get_current_activity ((GitgExtApplication*) self); + _tmp26_ = gitg_ext_application_get_current_activity ((GitgExtApplication*) self); #line 1217 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp27_ = _tmp26_; + _tmp27_ = _tmp26_; #line 1217 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp28_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, GITG_EXT_TYPE_SEARCHABLE) ? ((GitgExtSearchable*) _tmp27_) : NULL; + _tmp28_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, GITG_EXT_TYPE_SEARCHABLE) ? ((GitgExtSearchable*) _tmp27_) : NULL; #line 1217 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - if (_tmp28_ == NULL) { + if (_tmp28_ == NULL) { #line 1217 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _g_object_unref0 (_tmp27_); -#line 5288 "gitg-window.c" - } + _g_object_unref0 (_tmp27_); +#line 5272 "gitg-window.c" + } #line 1217 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - searchable = _tmp28_; + searchable = _tmp28_; #line 1219 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp30_ = gitg_platform_support_use_native_window_controls (NULL); + _tmp30_ = gitg_platform_support_use_native_window_controls (NULL); #line 1219 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - if (!_tmp30_) { -#line 5296 "gitg-window.c" - gboolean _tmp31_ = FALSE; + if (!_tmp30_) { +#line 5280 "gitg-window.c" + gboolean _tmp31_ = FALSE; #line 1219 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp31_ = issel; + _tmp31_ = issel; #line 1219 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp29_ = !_tmp31_; -#line 5302 "gitg-window.c" - } else { + _tmp29_ = !_tmp31_; +#line 5286 "gitg-window.c" + } else { #line 1219 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp29_ = FALSE; -#line 5306 "gitg-window.c" - } + _tmp29_ = FALSE; +#line 5290 "gitg-window.c" + } #line 1219 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp32_ = self->priv->d_header_bar; + _tmp32_ = self->priv->d_header_bar; #line 1219 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_header_bar_set_show_close_button (_tmp32_, _tmp29_); + gtk_header_bar_set_show_close_button (_tmp32_, _tmp29_); #line 1220 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp34_ = issel; + _tmp34_ = issel; #line 1220 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - if (!_tmp34_) { -#line 5316 "gitg-window.c" - GitgExtSearchable* _tmp35_ = NULL; + if (!_tmp34_) { +#line 5300 "gitg-window.c" + GitgExtSearchable* _tmp35_ = NULL; #line 1220 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp35_ = searchable; + _tmp35_ = searchable; #line 1220 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp33_ = _tmp35_ != NULL; -#line 5322 "gitg-window.c" - } else { + _tmp33_ = _tmp35_ != NULL; +#line 5306 "gitg-window.c" + } else { #line 1220 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp33_ = FALSE; -#line 5326 "gitg-window.c" - } + _tmp33_ = FALSE; +#line 5310 "gitg-window.c" + } #line 1220 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp36_ = self->priv->d_search_button; + _tmp36_ = self->priv->d_search_button; #line 1220 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_widget_set_visible ((GtkWidget*) _tmp36_, _tmp33_); + gtk_widget_set_visible ((GtkWidget*) _tmp36_, _tmp33_); #line 1221 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp38_ = issel; + _tmp38_ = issel; #line 1221 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - if (!_tmp38_) { -#line 5336 "gitg-window.c" - GitgRepository* _tmp39_ = NULL; + if (!_tmp38_) { +#line 5320 "gitg-window.c" + GitgRepository* _tmp39_ = NULL; #line 1221 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp39_ = self->priv->d_repository; + _tmp39_ = self->priv->d_repository; #line 1221 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp37_ = _tmp39_ != NULL; -#line 5342 "gitg-window.c" - } else { + _tmp37_ = _tmp39_ != NULL; +#line 5326 "gitg-window.c" + } else { #line 1221 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp37_ = FALSE; -#line 5346 "gitg-window.c" - } + _tmp37_ = FALSE; +#line 5330 "gitg-window.c" + } #line 1221 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp40_ = self->priv->d_gear_menu; + _tmp40_ = self->priv->d_gear_menu; #line 1221 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_widget_set_visible ((GtkWidget*) _tmp40_, _tmp37_); + gtk_widget_set_visible ((GtkWidget*) _tmp40_, _tmp37_); #line 1222 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp41_ = self->priv->d_select_button; + _tmp41_ = self->priv->d_select_button; #line 1222 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp42_ = issel; + _tmp42_ = issel; #line 1222 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_widget_set_visible ((GtkWidget*) _tmp41_, !_tmp42_); + gtk_widget_set_visible ((GtkWidget*) _tmp41_, !_tmp42_); #line 1223 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp44_ = issel; + _tmp44_ = issel; #line 1223 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - if (!_tmp44_) { -#line 5362 "gitg-window.c" - GitgRepository* _tmp45_ = NULL; + if (!_tmp44_) { +#line 5346 "gitg-window.c" + GitgRepository* _tmp45_ = NULL; #line 1223 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp45_ = self->priv->d_repository; + _tmp45_ = self->priv->d_repository; #line 1223 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp43_ = _tmp45_ != NULL; -#line 5368 "gitg-window.c" - } else { + _tmp43_ = _tmp45_ != NULL; +#line 5352 "gitg-window.c" + } else { #line 1223 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp43_ = FALSE; -#line 5372 "gitg-window.c" - } + _tmp43_ = FALSE; +#line 5356 "gitg-window.c" + } #line 1223 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp46_ = self->priv->d_dash_button; + _tmp46_ = self->priv->d_dash_button; #line 1223 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_widget_set_visible ((GtkWidget*) _tmp46_, _tmp43_); + gtk_widget_set_visible ((GtkWidget*) _tmp46_, _tmp43_); #line 1224 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp48_ = issel; + _tmp48_ = issel; #line 1224 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - if (!_tmp48_) { -#line 5382 "gitg-window.c" - GitgRepository* _tmp49_ = NULL; + if (!_tmp48_) { +#line 5366 "gitg-window.c" + GitgRepository* _tmp49_ = NULL; #line 1224 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp49_ = self->priv->d_repository; + _tmp49_ = self->priv->d_repository; #line 1224 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp47_ = _tmp49_ == NULL; -#line 5388 "gitg-window.c" - } else { + _tmp47_ = _tmp49_ == NULL; +#line 5372 "gitg-window.c" + } else { #line 1224 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp47_ = FALSE; -#line 5392 "gitg-window.c" - } + _tmp47_ = FALSE; +#line 5376 "gitg-window.c" + } #line 1224 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp50_ = self->priv->d_clone_button; + _tmp50_ = self->priv->d_clone_button; #line 1224 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_widget_set_visible ((GtkWidget*) _tmp50_, _tmp47_); + gtk_widget_set_visible ((GtkWidget*) _tmp50_, _tmp47_); #line 1225 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp52_ = issel; + _tmp52_ = issel; #line 1225 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - if (!_tmp52_) { -#line 5402 "gitg-window.c" - GitgRepository* _tmp53_ = NULL; + if (!_tmp52_) { +#line 5386 "gitg-window.c" + GitgRepository* _tmp53_ = NULL; #line 1225 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp53_ = self->priv->d_repository; + _tmp53_ = self->priv->d_repository; #line 1225 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp51_ = _tmp53_ == NULL; -#line 5408 "gitg-window.c" - } else { + _tmp51_ = _tmp53_ == NULL; +#line 5392 "gitg-window.c" + } else { #line 1225 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp51_ = FALSE; -#line 5412 "gitg-window.c" - } + _tmp51_ = FALSE; +#line 5396 "gitg-window.c" + } #line 1225 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp54_ = self->priv->d_add_button; + _tmp54_ = self->priv->d_add_button; #line 1225 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_widget_set_visible ((GtkWidget*) _tmp54_, _tmp51_); + gtk_widget_set_visible ((GtkWidget*) _tmp54_, _tmp51_); #line 1226 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp56_ = issel; + _tmp56_ = issel; #line 1226 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - if (!_tmp56_) { -#line 5422 "gitg-window.c" - GitgRepository* _tmp57_ = NULL; + if (!_tmp56_) { +#line 5406 "gitg-window.c" + GitgRepository* _tmp57_ = NULL; #line 1226 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp57_ = self->priv->d_repository; + _tmp57_ = self->priv->d_repository; #line 1226 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp55_ = _tmp57_ != NULL; -#line 5428 "gitg-window.c" - } else { + _tmp55_ = _tmp57_ != NULL; +#line 5412 "gitg-window.c" + } else { #line 1226 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp55_ = FALSE; -#line 5432 "gitg-window.c" - } + _tmp55_ = FALSE; +#line 5416 "gitg-window.c" + } #line 1226 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp58_ = self->priv->d_activities_switcher; + _tmp58_ = self->priv->d_activities_switcher; #line 1226 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_widget_set_visible ((GtkWidget*) _tmp58_, _tmp55_); + gtk_widget_set_visible ((GtkWidget*) _tmp58_, _tmp55_); #line 1227 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp59_ = self->priv->d_select_cancel_button; + _tmp59_ = self->priv->d_select_cancel_button; #line 1227 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp60_ = issel; + _tmp60_ = issel; #line 1227 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_widget_set_visible ((GtkWidget*) _tmp59_, _tmp60_); + gtk_widget_set_visible ((GtkWidget*) _tmp59_, _tmp60_); #line 1229 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp61_ = self->priv->d_select_button; + _tmp61_ = self->priv->d_select_button; #line 1229 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _tmp62_ = issel; + _tmp62_ = issel; #line 1229 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - gtk_toggle_button_set_active (_tmp61_, _tmp62_); + gtk_toggle_button_set_active (_tmp61_, _tmp62_); #line 1179 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _g_object_unref0 (searchable); + _g_object_unref0 (searchable); #line 1179 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _g_object_unref0 (ctx); + _g_object_unref0 (ctx); #line 1179 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - _g_object_unref0 (selectable); + _g_object_unref0 (selectable); #line 1179 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - g_object_notify ((GObject *) self, "selectable-mode"); -#line 5458 "gitg-window.c" + g_object_notify ((GObject *) self, "selectable-mode"); +#line 5442 "gitg-window.c" + } } @@ -5476,7 +5461,7 @@ result = _tmp1_; #line 1254 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 5477 "gitg-window.c" +#line 5462 "gitg-window.c" } @@ -5495,7 +5480,7 @@ result = _tmp1_; #line 1259 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 5496 "gitg-window.c" +#line 5481 "gitg-window.c" } @@ -5529,13 +5514,13 @@ result = FALSE; #line 119 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 5530 "gitg-window.c" +#line 5515 "gitg-window.c" } #line 122 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp1_ = i; #line 122 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp1_ == 0) { -#line 5536 "gitg-window.c" +#line 5521 "gitg-window.c" GitgWindowMode _tmp2_ = 0; #line 124 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp2_ = self->priv->d_mode; @@ -5547,13 +5532,13 @@ result = TRUE; #line 127 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 5548 "gitg-window.c" +#line 5533 "gitg-window.c" } else { #line 131 "/home/jesse/dev/gitg/gitg/gitg-window.vala" result = FALSE; #line 131 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 5554 "gitg-window.c" +#line 5539 "gitg-window.c" } } #line 135 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -5564,7 +5549,7 @@ result = FALSE; #line 137 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 5565 "gitg-window.c" +#line 5550 "gitg-window.c" } #line 140 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp4_ = self->priv->d_activities; @@ -5598,7 +5583,7 @@ elems = (_vala_array_free (elems, elems_length1, (GDestroyNotify) g_object_unref), NULL); #line 145 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 5599 "gitg-window.c" +#line 5584 "gitg-window.c" } #line 148 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp10_ = self->priv->d_activities; @@ -5618,7 +5603,7 @@ elems = (_vala_array_free (elems, elems_length1, (GDestroyNotify) g_object_unref), NULL); #line 149 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return result; -#line 5619 "gitg-window.c" +#line 5604 "gitg-window.c" } @@ -5640,13 +5625,13 @@ data1 = closure->data; #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" data2 = param_values->data[0].v_pointer; -#line 5641 "gitg-window.c" +#line 5626 "gitg-window.c" } else { #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" data1 = param_values->data[0].v_pointer; #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" data2 = closure->data; -#line 5647 "gitg-window.c" +#line 5632 "gitg-window.c" } #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" callback = (GMarshalFunc_BOOLEAN__INT) (marshal_data ? marshal_data : cc->callback); @@ -5654,7 +5639,7 @@ v_return = callback (data1, g_value_get_int (param_values + 1), data2); #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_value_set_boolean (return_value, v_return); -#line 5655 "gitg-window.c" +#line 5640 "gitg-window.c" } @@ -5670,17 +5655,17 @@ _tmp2_ = _tmp1_; #line 1242 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp2_) { -#line 5671 "gitg-window.c" +#line 5656 "gitg-window.c" GtkInfoBar* _tmp3_ = NULL; #line 1244 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp3_ = self->priv->d_infobar; #line 1244 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gtk_widget_hide ((GtkWidget*) _tmp3_); -#line 5677 "gitg-window.c" +#line 5662 "gitg-window.c" } else { #line 1248 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_set_selectable_mode (self, GITG_EXT_SELECTION_MODE_NORMAL); -#line 5681 "gitg-window.c" +#line 5666 "gitg-window.c" } } @@ -5690,7 +5675,7 @@ g_atomic_int_inc (&_data71_->_ref_count_); #line 255 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return _data71_; -#line 5691 "gitg-window.c" +#line 5676 "gitg-window.c" } @@ -5699,7 +5684,7 @@ _data71_ = (Block71Data*) _userdata_; #line 255 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (g_atomic_int_dec_and_test (&_data71_->_ref_count_)) { -#line 5700 "gitg-window.c" +#line 5685 "gitg-window.c" GitgWindow* self; #line 255 "/home/jesse/dev/gitg/gitg/gitg-window.vala" self = _data71_->self; @@ -5709,7 +5694,7 @@ _g_object_unref0 (self); #line 255 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_slice_free (Block71Data, _data71_); -#line 5710 "gitg-window.c" +#line 5695 "gitg-window.c" } } @@ -5745,11 +5730,11 @@ if (_tmp5_) { #line 279 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_set_selectable_mode (self, GITG_EXT_SELECTION_MODE_SELECTION); -#line 5746 "gitg-window.c" +#line 5731 "gitg-window.c" } else { #line 283 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_set_selectable_mode (self, GITG_EXT_SELECTION_MODE_NORMAL); -#line 5750 "gitg-window.c" +#line 5735 "gitg-window.c" } } @@ -5757,7 +5742,7 @@ static void __gitg_window___lambda166__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 274 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _gitg_window___lambda166_ (self); -#line 5758 "gitg-window.c" +#line 5743 "gitg-window.c" } @@ -5769,14 +5754,14 @@ _tmp0_ = self->priv->d_infobar; #line 339 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gtk_widget_hide ((GtkWidget*) _tmp0_); -#line 5770 "gitg-window.c" +#line 5755 "gitg-window.c" } static void __gitg_window___lambda167__gtk_info_bar_response (GtkInfoBar* _sender, gint response_id, gpointer self) { #line 338 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _gitg_window___lambda167_ ((GitgWindow*) self, _sender, response_id); -#line 5777 "gitg-window.c" +#line 5762 "gitg-window.c" } @@ -5850,7 +5835,7 @@ _tmp0_ = gitg_platform_support_use_native_window_controls (NULL); #line 257 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp0_) { -#line 5851 "gitg-window.c" +#line 5836 "gitg-window.c" GtkGrid* _tmp1_ = NULL; GtkHeaderBar* _tmp2_ = NULL; #line 259 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -5861,7 +5846,7 @@ _tmp2_ = self->priv->d_header_bar; #line 260 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gtk_grid_attach (_tmp1_, (GtkWidget*) _tmp2_, 0, 0, 1, 1); -#line 5862 "gitg-window.c" +#line 5847 "gitg-window.c" } else { GtkHeaderBar* _tmp3_ = NULL; GtkHeaderBar* _tmp4_ = NULL; @@ -5876,7 +5861,7 @@ _tmp5_ = gtk_widget_get_style_context ((GtkWidget*) _tmp4_); #line 265 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gtk_style_context_add_class (_tmp5_, "titlebar"); -#line 5877 "gitg-window.c" +#line 5862 "gitg-window.c" } #line 268 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_action_map_add_action_entries ((GActionMap*) self, GITG_WINDOW_win_entries, G_N_ELEMENTS (GITG_WINDOW_win_entries), self); @@ -5912,7 +5897,7 @@ _tmp14_ = _tmp13_; #line 291 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp14_) { -#line 5913 "gitg-window.c" +#line 5898 "gitg-window.c" gchar* _tmp15_ = NULL; #line 293 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp15_ = g_strdup ("win-menu"); @@ -5924,7 +5909,7 @@ _g_object_unref0 (self->priv->d_dash_model); #line 294 "/home/jesse/dev/gitg/gitg/gitg-window.vala" self->priv->d_dash_model = NULL; -#line 5925 "gitg-window.c" +#line 5910 "gitg-window.c" } else { gchar* _tmp16_ = NULL; const gchar* _tmp17_ = NULL; @@ -5951,7 +5936,7 @@ self->priv->d_dash_model = (GMenuModel*) _tmp20_; #line 299 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_free0 (_tmp19_); -#line 5952 "gitg-window.c" +#line 5937 "gitg-window.c" } #line 302 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp21_ = self->priv->d_dash_view; @@ -5997,7 +5982,7 @@ self->priv->d_environment = _tmp32_; #line 317 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp34_ = _tmp33_ = g_listenv (); -#line 5998 "gitg-window.c" +#line 5983 "gitg-window.c" { gchar** e_collection = NULL; gint e_collection_length1 = 0; @@ -6009,14 +5994,14 @@ e_collection_length1 = _vala_array_length (_tmp33_); #line 317 "/home/jesse/dev/gitg/gitg/gitg-window.vala" for (e_it = 0; e_it < _vala_array_length (_tmp33_); e_it = e_it + 1) { -#line 6010 "gitg-window.c" +#line 5995 "gitg-window.c" gchar* _tmp35_ = NULL; gchar* e = NULL; #line 317 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp35_ = g_strdup (e_collection[e_it]); #line 317 "/home/jesse/dev/gitg/gitg/gitg-window.vala" e = _tmp35_; -#line 6017 "gitg-window.c" +#line 6002 "gitg-window.c" { GeeHashMap* _tmp36_ = NULL; const gchar* _tmp37_ = NULL; @@ -6034,38 +6019,38 @@ gee_abstract_map_set ((GeeAbstractMap*) _tmp36_, _tmp37_, _tmp39_); #line 317 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _g_free0 (e); -#line 6035 "gitg-window.c" +#line 6020 "gitg-window.c" } } #line 317 "/home/jesse/dev/gitg/gitg/gitg-window.vala" e_collection = (_vala_array_free (e_collection, e_collection_length1, (GDestroyNotify) g_free), NULL); -#line 6040 "gitg-window.c" +#line 6025 "gitg-window.c" } #line 322 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp41_ = gtk_check_version ((guint) 3, (guint) 13, (guint) 2); #line 322 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp41_ != NULL) { -#line 6046 "gitg-window.c" +#line 6031 "gitg-window.c" GtkTextDirection _tmp42_ = 0; #line 323 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp42_ = gtk_widget_get_direction ((GtkWidget*) self); #line 323 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp40_ = _tmp42_ == GTK_TEXT_DIR_RTL; -#line 6052 "gitg-window.c" +#line 6037 "gitg-window.c" } else { #line 322 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp40_ = FALSE; -#line 6056 "gitg-window.c" +#line 6041 "gitg-window.c" } #line 322 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (_tmp40_) { -#line 6060 "gitg-window.c" +#line 6045 "gitg-window.c" GtkImage* _tmp43_ = NULL; #line 325 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp43_ = self->priv->dash_image; #line 325 "/home/jesse/dev/gitg/gitg/gitg-window.vala" g_object_set (_tmp43_, "icon-name", "go-previous-rtl-symbolic", NULL); -#line 6066 "gitg-window.c" +#line 6051 "gitg-window.c" } #line 328 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp44_ = self->priv->d_header_bar; @@ -6125,32 +6110,32 @@ _tmp62_ = gtk_binding_set_by_class (_tmp61_); #line 342 "/home/jesse/dev/gitg/gitg/gitg-window.vala" bset = _tmp62_; -#line 6126 "gitg-window.c" +#line 6111 "gitg-window.c" { gint i = 0; #line 344 "/home/jesse/dev/gitg/gitg/gitg-window.vala" i = 0; -#line 6131 "gitg-window.c" +#line 6116 "gitg-window.c" { gboolean _tmp63_ = FALSE; #line 344 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp63_ = TRUE; #line 344 "/home/jesse/dev/gitg/gitg/gitg-window.vala" while (TRUE) { -#line 6138 "gitg-window.c" +#line 6123 "gitg-window.c" gint _tmp65_ = 0; GtkBindingSet* _tmp66_ = NULL; gint _tmp67_ = 0; gint _tmp68_ = 0; #line 344 "/home/jesse/dev/gitg/gitg/gitg-window.vala" if (!_tmp63_) { -#line 6145 "gitg-window.c" +#line 6130 "gitg-window.c" gint _tmp64_ = 0; #line 344 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp64_ = i; #line 344 "/home/jesse/dev/gitg/gitg/gitg-window.vala" i = _tmp64_ + 1; -#line 6151 "gitg-window.c" +#line 6136 "gitg-window.c" } #line 344 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp63_ = FALSE; @@ -6160,7 +6145,7 @@ if (!(_tmp65_ < 10)) { #line 344 "/home/jesse/dev/gitg/gitg/gitg-window.vala" break; -#line 6161 "gitg-window.c" +#line 6146 "gitg-window.c" } #line 346 "/home/jesse/dev/gitg/gitg/gitg-window.vala" _tmp66_ = bset; @@ -6170,7 +6155,7 @@ _tmp68_ = i; #line 346 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gtk_binding_entry_add_signal (_tmp66_, (guint) (GDK_KEY_0 + _tmp67_), GDK_MOD1_MASK, "change-to-activity", (guint) 1, G_TYPE_INT, _tmp68_, NULL); -#line 6171 "gitg-window.c" +#line 6156 "gitg-window.c" } } } @@ -6190,7 +6175,7 @@ _data71_ = NULL; #line 255 "/home/jesse/dev/gitg/gitg/gitg-window.vala" return obj; -#line 6191 "gitg-window.c" +#line 6176 "gitg-window.c" } @@ -6245,9 +6230,9 @@ #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/gitg/ui/gitg-window.ui"); #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - g_signal_new ("change_to_activity", GITG_TYPE_WINDOW, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GitgWindowClass, change_to_activity), NULL, NULL, g_cclosure_user_marshal_BOOLEAN__INT, G_TYPE_BOOLEAN, 1, G_TYPE_INT); + gitg_window_signals[GITG_WINDOW_CHANGE_TO_ACTIVITY_SIGNAL] = g_signal_new ("change_to_activity", GITG_TYPE_WINDOW, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GitgWindowClass, change_to_activity), NULL, NULL, g_cclosure_user_marshal_BOOLEAN__INT, G_TYPE_BOOLEAN, 1, G_TYPE_INT); #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - g_signal_new ("cancel", GITG_TYPE_WINDOW, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GitgWindowClass, cancel), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_window_signals[GITG_WINDOW_CANCEL_SIGNAL] = g_signal_new ("cancel", GITG_TYPE_WINDOW, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GitgWindowClass, cancel), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "d_header_bar", FALSE, GitgWindow_private_offset + G_STRUCT_OFFSET (GitgWindowPrivate, d_header_bar)); #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -6302,7 +6287,7 @@ gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "search_entry_changed", G_CALLBACK(_gitg_window_search_entry_changed_gtk_editable_changed)); #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_select_cancel_button_clicked", G_CALLBACK(_gitg_window_on_select_cancel_button_clicked_gtk_button_clicked)); -#line 6303 "gitg-window.c" +#line 6288 "gitg-window.c" } @@ -6310,23 +6295,23 @@ #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_gitg_ext_application_parent_iface = g_type_interface_peek_parent (iface); #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - iface->open_new = (GitgExtApplication* (*)(GitgExtApplication*, GgitRepository*, const gchar*)) gitg_window_real_open_new; + iface->open_new = (GitgExtApplication* (*) (GitgExtApplication *, GgitRepository*, const gchar*)) gitg_window_real_open_new; #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - iface->set_activity_by_id = (GitgExtActivity* (*)(GitgExtApplication*, const gchar*)) gitg_window_real_set_activity_by_id; + iface->set_activity_by_id = (GitgExtActivity* (*) (GitgExtApplication *, const gchar*)) gitg_window_real_set_activity_by_id; #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - iface->get_activity_by_id = (GitgExtActivity* (*)(GitgExtApplication*, const gchar*)) gitg_window_real_get_activity_by_id; + iface->get_activity_by_id = (GitgExtActivity* (*) (GitgExtApplication *, const gchar*)) gitg_window_real_get_activity_by_id; #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - iface->open_repository = (void (*)(GitgExtApplication*, GFile*)) gitg_window_real_open_repository; + iface->open_repository = (void (*) (GitgExtApplication *, GFile*)) gitg_window_real_open_repository; #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - iface->show_infobar = (void (*)(GitgExtApplication*, const gchar*, const gchar*, GtkMessageType)) gitg_window_real_show_infobar; + iface->show_infobar = (void (*) (GitgExtApplication *, const gchar*, const gchar*, GtkMessageType)) gitg_window_real_show_infobar; #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - iface->user_query_async = (GtkResponseType (*)(GitgExtApplication*, GitgExtUserQuery*)) gitg_window_real_user_query_async; + iface->user_query_async = (GtkResponseType (*) (GitgExtApplication *, GitgExtUserQuery*)) gitg_window_real_user_query_async; #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" iface->user_query_finish = gitg_window_real_user_query_finish; #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - iface->user_query = (void (*)(GitgExtApplication*, GitgExtUserQuery*)) gitg_window_real_user_query; + iface->user_query = (void (*) (GitgExtApplication *, GitgExtUserQuery*)) gitg_window_real_user_query; #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - iface->get_verified_committer = (GgitSignature* (*)(GitgExtApplication*)) gitg_window_real_get_verified_committer; + iface->get_verified_committer = (GgitSignature* (*) (GitgExtApplication *)) gitg_window_real_get_verified_committer; #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" iface->get_current_activity = gitg_window_real_get_current_activity; #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" @@ -6345,7 +6330,7 @@ iface->get_remote_lookup = gitg_window_real_get_remote_lookup; #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" iface->get_notifications = gitg_window_real_get_notifications; -#line 6346 "gitg-window.c" +#line 6331 "gitg-window.c" } @@ -6353,8 +6338,8 @@ #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gitg_window_g_initable_parent_iface = g_type_interface_peek_parent (iface); #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" - iface->init = (gboolean (*)(GInitable*, GCancellable*, GError**)) gitg_window_real_init; -#line 6355 "gitg-window.c" + iface->init = (gboolean (*) (GInitable *, GCancellable*, GError**)) gitg_window_real_init; +#line 6340 "gitg-window.c" } @@ -6365,11 +6350,11 @@ g_type_ensure (GITG_TYPE_DASH_VIEW); #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 6366 "gitg-window.c" +#line 6351 "gitg-window.c" } -static void gitg_window_finalize (GObject* obj) { +static void gitg_window_finalize (GObject * obj) { GitgWindow * self; #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_WINDOW, GitgWindow); @@ -6451,7 +6436,7 @@ _g_object_unref0 (self->priv->d_overlay); #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" G_OBJECT_CLASS (gitg_window_parent_class)->finalize (obj); -#line 6452 "gitg-window.c" +#line 6437 "gitg-window.c" } @@ -6464,7 +6449,7 @@ GType gitg_window_type_id; gitg_window_type_id = g_type_register_static (gtk_application_window_get_type (), "GitgWindow", &g_define_type_info, 0); g_type_add_interface_static (gitg_window_type_id, GITG_EXT_TYPE_APPLICATION, &gitg_ext_application_info); - g_type_add_interface_static (gitg_window_type_id, G_TYPE_INITABLE, &g_initable_info); + g_type_add_interface_static (gitg_window_type_id, g_initable_get_type (), &g_initable_info); g_once_init_leave (&gitg_window_type_id__volatile, gitg_window_type_id); } return gitg_window_type_id__volatile; @@ -6530,13 +6515,13 @@ g_value_take_object (value, gitg_ext_application_get_notifications ((GitgExtApplication*) self)); #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" break; -#line 6531 "gitg-window.c" +#line 6516 "gitg-window.c" default: #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" break; -#line 6537 "gitg-window.c" +#line 6522 "gitg-window.c" } } @@ -6570,13 +6555,13 @@ gitg_window_set_selectable_mode (self, g_value_get_enum (value)); #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" break; -#line 6571 "gitg-window.c" +#line 6556 "gitg-window.c" default: #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 24 "/home/jesse/dev/gitg/gitg/gitg-window.vala" break; -#line 6577 "gitg-window.c" +#line 6562 "gitg-window.c" } } diff -Nru gitg-3.22.0/gitg/history/gitg-history-action-interface.c gitg-3.23.0/gitg/history/gitg-history-action-interface.c --- gitg-3.22.0/gitg/history/gitg-history-action-interface.c 2016-08-09 09:50:55.000000000 +0000 +++ gitg-3.23.0/gitg/history/gitg-history-action-interface.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-history-action-interface.c generated by valac 0.32.1, the Vala compiler +/* gitg-history-action-interface.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-history-action-interface.vala, do not modify */ /* @@ -49,6 +49,11 @@ typedef struct _GitgHistoryRefsList GitgHistoryRefsList; typedef struct _GitgHistoryRefsListClass GitgHistoryRefsListClass; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) +enum { + GITG_HISTORY_ACTION_INTERFACE_UPDATED_SIGNAL, + GITG_HISTORY_ACTION_INTERFACE_LAST_SIGNAL +}; +static guint gitg_history_action_interface_signals[GITG_HISTORY_ACTION_INTERFACE_LAST_SIGNAL] = {0}; struct _GitgHistoryActionInterface { GObject parent_instance; @@ -66,7 +71,7 @@ static gpointer gitg_history_action_interface_parent_class = NULL; -static GitgExtRefActionInterfaceIface* gitg_history_action_interface_gitg_ext_ref_action_interface_parent_iface = NULL; +static GitgExtRefActionInterfaceIface * gitg_history_action_interface_gitg_ext_ref_action_interface_parent_iface = NULL; GType gitg_history_action_interface_get_type (void) G_GNUC_CONST; GType gitg_history_refs_list_get_type (void) G_GNUC_CONST; @@ -90,7 +95,7 @@ static void gitg_history_action_interface_real_refresh (GitgExtRefActionInterface* base); void gitg_history_refs_list_set_repository (GitgHistoryRefsList* self, GitgRepository* value); GeeList* gitg_history_refs_list_get_references (GitgHistoryRefsList* self); -static void gitg_history_action_interface_finalize (GObject* obj); +static void gitg_history_action_interface_finalize (GObject * obj); static void _vala_gitg_history_action_interface_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_history_action_interface_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -98,7 +103,7 @@ static gpointer _g_object_ref0 (gpointer self) { #line 35 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" return self ? g_object_ref (self) : NULL; -#line 102 "gitg-history-action-interface.c" +#line 107 "gitg-history-action-interface.c" } @@ -125,14 +130,14 @@ self->priv->d_refs_list = _tmp2_; #line 31 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" return self; -#line 129 "gitg-history-action-interface.c" +#line 134 "gitg-history-action-interface.c" } GitgHistoryActionInterface* gitg_history_action_interface_new (GitgExtApplication* application, GitgHistoryRefsList* refs_list) { #line 31 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" return gitg_history_action_interface_construct (GITG_HISTORY_TYPE_ACTION_INTERFACE, application, refs_list); -#line 136 "gitg-history-action-interface.c" +#line 141 "gitg-history-action-interface.c" } @@ -175,8 +180,8 @@ #line 46 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" gitg_history_refs_list_add_ref (_tmp6_, _tmp7_); #line 47 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" - g_signal_emit_by_name (self, "updated"); -#line 180 "gitg-history-action-interface.c" + g_signal_emit (self, gitg_history_action_interface_signals[GITG_HISTORY_ACTION_INTERFACE_UPDATED_SIGNAL], 0); +#line 185 "gitg-history-action-interface.c" } @@ -219,8 +224,8 @@ #line 53 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" gitg_history_refs_list_remove_ref (_tmp6_, _tmp7_); #line 54 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" - g_signal_emit_by_name (self, "updated"); -#line 224 "gitg-history-action-interface.c" + g_signal_emit (self, gitg_history_action_interface_signals[GITG_HISTORY_ACTION_INTERFACE_UPDATED_SIGNAL], 0); +#line 229 "gitg-history-action-interface.c" } @@ -268,8 +273,8 @@ #line 60 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" gitg_history_refs_list_replace_ref (_tmp6_, _tmp7_, _tmp8_); #line 61 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" - g_signal_emit_by_name (self, "updated"); -#line 273 "gitg-history-action-interface.c" + g_signal_emit (self, gitg_history_action_interface_signals[GITG_HISTORY_ACTION_INTERFACE_UPDATED_SIGNAL], 0); +#line 278 "gitg-history-action-interface.c" } @@ -279,7 +284,7 @@ self = (GitgHistoryActionInterface*) base; #line 64 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" g_return_if_fail (reference != NULL); -#line 283 "gitg-history-action-interface.c" +#line 288 "gitg-history-action-interface.c" } @@ -316,7 +321,7 @@ done_target = NULL; #line 69 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" done_target_destroy_notify = NULL; -#line 320 "gitg-history-action-interface.c" +#line 325 "gitg-history-action-interface.c" } @@ -352,8 +357,8 @@ #line 76 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" _g_object_unref0 (_tmp3_); #line 77 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" - g_signal_emit_by_name (self, "updated"); -#line 357 "gitg-history-action-interface.c" + g_signal_emit (self, gitg_history_action_interface_signals[GITG_HISTORY_ACTION_INTERFACE_UPDATED_SIGNAL], 0); +#line 362 "gitg-history-action-interface.c" } @@ -372,27 +377,31 @@ result = _tmp1_; #line 25 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" return result; -#line 376 "gitg-history-action-interface.c" +#line 381 "gitg-history-action-interface.c" } static void gitg_history_action_interface_real_set_application (GitgExtRefActionInterface* base, GitgExtApplication* value) { GitgHistoryActionInterface* self; - GitgExtApplication* _tmp0_ = NULL; - GitgExtApplication* _tmp1_ = NULL; #line 25 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" self = (GitgHistoryActionInterface*) base; #line 25 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" - _tmp0_ = value; + if (gitg_history_action_interface_real_get_application (self) != value) { +#line 391 "gitg-history-action-interface.c" + GitgExtApplication* _tmp0_ = NULL; + GitgExtApplication* _tmp1_ = NULL; #line 25 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 25 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" - _g_object_unref0 (self->priv->_application); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 25 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" - self->priv->_application = _tmp1_; + _g_object_unref0 (self->priv->_application); #line 25 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" - g_object_notify ((GObject *) self, "application"); -#line 396 "gitg-history-action-interface.c" + self->priv->_application = _tmp1_; +#line 25 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" + g_object_notify ((GObject *) self, "application"); +#line 404 "gitg-history-action-interface.c" + } } @@ -414,7 +423,7 @@ result = _tmp2_; #line 40 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" return result; -#line 418 "gitg-history-action-interface.c" +#line 427 "gitg-history-action-interface.c" } @@ -434,8 +443,8 @@ #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_HISTORY_ACTION_INTERFACE_REFERENCES, g_param_spec_object ("references", "references", "references", GEE_TYPE_LIST, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" - g_signal_new ("updated", GITG_HISTORY_TYPE_ACTION_INTERFACE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 439 "gitg-history-action-interface.c" + gitg_history_action_interface_signals[GITG_HISTORY_ACTION_INTERFACE_UPDATED_SIGNAL] = g_signal_new ("updated", GITG_HISTORY_TYPE_ACTION_INTERFACE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 448 "gitg-history-action-interface.c" } @@ -443,35 +452,35 @@ #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" gitg_history_action_interface_gitg_ext_ref_action_interface_parent_iface = g_type_interface_peek_parent (iface); #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" - iface->add_ref = (void (*)(GitgExtRefActionInterface*, GitgRef*)) gitg_history_action_interface_real_add_ref; + iface->add_ref = (void (*) (GitgExtRefActionInterface *, GitgRef*)) gitg_history_action_interface_real_add_ref; #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" - iface->remove_ref = (void (*)(GitgExtRefActionInterface*, GitgRef*)) gitg_history_action_interface_real_remove_ref; + iface->remove_ref = (void (*) (GitgExtRefActionInterface *, GitgRef*)) gitg_history_action_interface_real_remove_ref; #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" - iface->replace_ref = (void (*)(GitgExtRefActionInterface*, GitgRef*, GitgRef*)) gitg_history_action_interface_real_replace_ref; + iface->replace_ref = (void (*) (GitgExtRefActionInterface *, GitgRef*, GitgRef*)) gitg_history_action_interface_real_replace_ref; #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" - iface->set_busy = (void (*)(GitgExtRefActionInterface*, GitgRef*, gboolean)) gitg_history_action_interface_real_set_busy; + iface->set_busy = (void (*) (GitgExtRefActionInterface *, GitgRef*, gboolean)) gitg_history_action_interface_real_set_busy; #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" - iface->edit_ref_name = (void (*)(GitgExtRefActionInterface*, GitgRef*, GitgExtRefNameEditingDone, void*, GDestroyNotify)) gitg_history_action_interface_real_edit_ref_name; + iface->edit_ref_name = (void (*) (GitgExtRefActionInterface *, GitgRef*, GitgExtRefNameEditingDone, void*, GDestroyNotify)) gitg_history_action_interface_real_edit_ref_name; #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" - iface->refresh = (void (*)(GitgExtRefActionInterface*)) gitg_history_action_interface_real_refresh; + iface->refresh = (void (*) (GitgExtRefActionInterface *)) gitg_history_action_interface_real_refresh; #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" iface->get_application = gitg_history_action_interface_real_get_application; #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" iface->set_application = gitg_history_action_interface_real_set_application; #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" iface->get_references = gitg_history_action_interface_real_get_references; -#line 464 "gitg-history-action-interface.c" +#line 473 "gitg-history-action-interface.c" } static void gitg_history_action_interface_instance_init (GitgHistoryActionInterface * self) { #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" self->priv = GITG_HISTORY_ACTION_INTERFACE_GET_PRIVATE (self); -#line 471 "gitg-history-action-interface.c" +#line 480 "gitg-history-action-interface.c" } -static void gitg_history_action_interface_finalize (GObject* obj) { +static void gitg_history_action_interface_finalize (GObject * obj) { GitgHistoryActionInterface * self; #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_HISTORY_TYPE_ACTION_INTERFACE, GitgHistoryActionInterface); @@ -481,7 +490,7 @@ _g_object_unref0 (self->priv->d_refs_list); #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" G_OBJECT_CLASS (gitg_history_action_interface_parent_class)->finalize (obj); -#line 485 "gitg-history-action-interface.c" +#line 494 "gitg-history-action-interface.c" } @@ -516,13 +525,13 @@ g_value_take_object (value, gitg_ext_ref_action_interface_get_references ((GitgExtRefActionInterface*) self)); #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" break; -#line 520 "gitg-history-action-interface.c" +#line 529 "gitg-history-action-interface.c" default: #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" break; -#line 526 "gitg-history-action-interface.c" +#line 535 "gitg-history-action-interface.c" } } @@ -538,13 +547,13 @@ gitg_ext_ref_action_interface_set_application ((GitgExtRefActionInterface*) self, g_value_get_object (value)); #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" break; -#line 542 "gitg-history-action-interface.c" +#line 551 "gitg-history-action-interface.c" default: #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-action-interface.vala" break; -#line 548 "gitg-history-action-interface.c" +#line 557 "gitg-history-action-interface.c" } } diff -Nru gitg-3.22.0/gitg/history/gitg-history.c gitg-3.23.0/gitg/history/gitg-history.c --- gitg-3.22.0/gitg/history/gitg-history.c 2016-08-18 17:25:47.000000000 +0000 +++ gitg-3.23.0/gitg/history/gitg-history.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-history.c generated by valac 0.32.1, the Vala compiler +/* gitg-history.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-history.vala, do not modify */ /* @@ -320,10 +320,10 @@ static gpointer gitg_history_activity_parent_class = NULL; -static GitgExtUIElementIface* gitg_history_activity_gitg_ext_ui_element_parent_iface = NULL; -static GitgExtActivityIface* gitg_history_activity_gitg_ext_activity_parent_iface = NULL; -static GitgExtSearchableIface* gitg_history_activity_gitg_ext_searchable_parent_iface = NULL; -static GitgExtHistoryIface* gitg_history_activity_gitg_ext_history_parent_iface = NULL; +static GitgExtUIElementIface * gitg_history_activity_gitg_ext_ui_element_parent_iface = NULL; +static GitgExtActivityIface * gitg_history_activity_gitg_ext_activity_parent_iface = NULL; +static GitgExtSearchableIface * gitg_history_activity_gitg_ext_searchable_parent_iface = NULL; +static GitgExtHistoryIface * gitg_history_activity_gitg_ext_history_parent_iface = NULL; GType gitg_history_default_selection_get_type (void) G_GNUC_CONST; GType gitg_history_activity_get_type (void) G_GNUC_CONST; @@ -385,7 +385,7 @@ static void gitg_history_activity_store_mainline (GitgHistoryActivity* self, GgitConfig* config, const gchar* mainline); static void gitg_history_activity_reload_mainline (GitgHistoryActivity* self); static GgitOId* gitg_history_activity_id_for_ref (GitgHistoryActivity* self, GgitRef* r); -static void _vala_array_add23 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add23 (gchar** * array, int* length, int* size, gchar* value); static Block77Data* block77_data_ref (Block77Data* _data77_); static void block77_data_unref (void * _userdata_); static void __lambda127_ (Block77Data* _data77_, GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter); @@ -476,17 +476,17 @@ static void __lambda142_ (Block80Data* _data80_, PeasExtensionSet* extset, PeasPluginInfo* info, PeasExtension* extension); static void ___lambda142__peas_extension_set_foreach_func (PeasExtensionSet* set, PeasPluginInfo* info, PeasExtension* exten, gpointer self); static void __lambda143_ (Block80Data* _data80_); -static void _vala_array_add24 (gchar*** array, int* length, int* size, gchar* value); -static void _vala_array_add25 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add24 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add25 (gchar** * array, int* length, int* size, gchar* value); static gchar** _vala_array_dup19 (gchar** self, int length); static void ___lambda143__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); GeeList* gitg_history_refs_list_get_selection (GitgHistoryRefsList* self); static GgitOId* _vala_GgitOId_copy (GgitOId* self); gboolean gitg_history_refs_list_get_is_all (GitgHistoryRefsList* self); gboolean gitg_history_refs_list_get_is_header (GitgHistoryRefsList* self); -static void _vala_array_add26 (GgitOId*** array, int* length, int* size, GgitOId* value); -static void _vala_array_add27 (GgitOId*** array, int* length, int* size, GgitOId* value); -static void _vala_array_add28 (GgitOId*** array, int* length, int* size, GgitOId* value); +static void _vala_array_add26 (GgitOId** * array, int* length, int* size, GgitOId* value); +static void _vala_array_add27 (GgitOId** * array, int* length, int* size, GgitOId* value); +static void _vala_array_add28 (GgitOId** * array, int* length, int* size, GgitOId* value); static gchar* gitg_history_activity_normalize (GitgHistoryActivity* self, const gchar* s); void gitg_history_activity_set_repository (GitgHistoryActivity* self, GitgRepository* value); GitgHistoryRefsList* gitg_history_activity_get_refs_list (GitgHistoryActivity* self); @@ -501,7 +501,7 @@ static void _gitg_history_activity_on_commit_model_finished_gitg_commit_model_finished (GitgCommitModel* _sender, gpointer self); static void _gitg_history_activity_repository_changed_externally_gitg_ext_application_repository_changed_externally (GitgExtApplication* _sender, GitgExtExternalChangeHint hint, gpointer self); static void _gitg_history_activity_repository_commits_changed_gitg_ext_application_repository_commits_changed (GitgExtApplication* _sender, gpointer self); -static void gitg_history_activity_finalize (GObject* obj); +static void gitg_history_activity_finalize (GObject * obj); static void _vala_gitg_history_activity_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_history_activity_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -1674,72 +1674,72 @@ gboolean _tmp2_ = FALSE; gchar** _tmp3_ = NULL; gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" separator = ""; #line 1684 "gitg-history.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = TRUE; #line 1694 "gitg-history.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; #line 1704 "gitg-history.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = TRUE; #line 1710 "gitg-history.c" } else { gboolean _tmp5_ = FALSE; gchar** _tmp6_ = NULL; gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { #line 1721 "gitg-history.c" gchar** _tmp7_ = NULL; gint _tmp7__length1 = 0; const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; #line 1733 "gitg-history.c" } else { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = FALSE; #line 1737 "gitg-history.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; #line 1741 "gitg-history.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_) { #line 1745 "gitg-history.c" gint i = 0; @@ -1762,16 +1762,16 @@ const gchar* _tmp44_ = NULL; void* _tmp45_ = NULL; const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1075 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" len = (gsize) 1; #line 1768 "gitg-history.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { #line 1777 "gitg-history.c" gboolean _tmp11_ = FALSE; @@ -1784,97 +1784,97 @@ gint _tmp23_ = 0; const gchar* _tmp24_ = NULL; gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp9_) { #line 1790 "gitg-history.c" gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp10_ + 1; #line 1796 "gitg-history.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { #line 1806 "gitg-history.c" gint _tmp14_ = 0; gchar** _tmp15_ = NULL; gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; #line 1818 "gitg-history.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 1822 "gitg-history.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = TRUE; #line 1828 "gitg-history.c" } else { gboolean _tmp16_ = FALSE; gchar** _tmp17_ = NULL; gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { #line 1839 "gitg-history.c" gchar** _tmp18_ = NULL; gint _tmp18__length1 = 0; gint _tmp19_ = 0; const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; #line 1854 "gitg-history.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = FALSE; #line 1858 "gitg-history.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; #line 1862 "gitg-history.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" break; #line 1868 "gitg-history.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { #line 1880 "gitg-history.c" gchar** _tmp25_ = NULL; @@ -1883,91 +1883,91 @@ const gchar* _tmp27_ = NULL; gint _tmp28_ = 0; gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; #line 1901 "gitg-history.c" } else { -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = 0; #line 1905 "gitg-history.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; #line 1911 "gitg-history.c" } } -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1079 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1079 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { #line 1918 "gitg-history.c" gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1080 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1080 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1080 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 1926 "gitg-history.c" } -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1082 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1082 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1082 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1085 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1085 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1085 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp45_; #line 1964 "gitg-history.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { #line 1973 "gitg-history.c" gint _tmp48_ = 0; @@ -1983,94 +1983,94 @@ const gchar* _tmp56_ = NULL; void* _tmp60_ = NULL; void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp46_) { #line 1989 "gitg-history.c" gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp47_ + 1; #line 1995 "gitg-history.c" } -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" break; #line 2009 "gitg-history.c" } -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1088 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1088 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1088 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1088 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { #line 2029 "gitg-history.c" gchar** _tmp57_ = NULL; gint _tmp57__length1 = 0; gint _tmp58_ = 0; const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; #line 2044 "gitg-history.c" } else { -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = ""; #line 2048 "gitg-history.c" } -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp61_; #line 2056 "gitg-history.c" } } -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1092 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1092 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1092 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1092 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 2067 "gitg-history.c" } else { gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1094 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1094 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1094 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 2076 "gitg-history.c" } @@ -2266,7 +2266,7 @@ } -static void _vala_array_add23 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add23 (gchar** * array, int* length, int* size, gchar* value) { #line 463 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if ((*length) == (*size)) { #line 463 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" @@ -4477,7 +4477,7 @@ } -static void _vala_array_add24 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add24 (gchar** * array, int* length, int* size, gchar* value) { #line 860 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if ((*length) == (*size)) { #line 860 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" @@ -4494,7 +4494,7 @@ } -static void _vala_array_add25 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add25 (gchar** * array, int* length, int* size, gchar* value) { #line 871 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if ((*length) == (*size)) { #line 871 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" @@ -4799,17 +4799,16 @@ GtkSeparatorMenuItem* _tmp103_ = NULL; GtkMenu* _tmp104_ = NULL; GtkSeparatorMenuItem* _tmp105_ = NULL; - const gchar* _tmp106_ = NULL; - GtkCheckMenuItem* _tmp107_ = NULL; - gchar** _tmp108_ = NULL; - gint _tmp108__length1 = 0; + GtkCheckMenuItem* _tmp106_ = NULL; + gchar** _tmp107_ = NULL; + gint _tmp107__length1 = 0; + GtkCheckMenuItem* _tmp114_ = NULL; GtkCheckMenuItem* _tmp115_ = NULL; - GtkCheckMenuItem* _tmp116_ = NULL; - GtkMenu* _tmp117_ = NULL; - GtkCheckMenuItem* _tmp118_ = NULL; - GtkMenu* _tmp119_ = NULL; + GtkMenu* _tmp116_ = NULL; + GtkCheckMenuItem* _tmp117_ = NULL; + GtkMenu* _tmp118_ = NULL; + GeeLinkedList* _tmp119_ = NULL; GeeLinkedList* _tmp120_ = NULL; - GeeLinkedList* _tmp121_ = NULL; #line 765 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" g_return_val_if_fail (self != NULL, NULL); #line 765 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" @@ -4970,13 +4969,13 @@ _tmp53_ = _tmp52_; #line 782 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (_tmp53_) { -#line 4974 "gitg-history.c" +#line 4973 "gitg-history.c" GeeLinkedList* _tmp54_ = NULL; #line 784 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp54_ = _data80_->actions; #line 784 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _tmp54_, NULL); -#line 4980 "gitg-history.c" +#line 4979 "gitg-history.c" } #line 787 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp55_ = _data80_->actions; @@ -5010,7 +5009,7 @@ _tmp66_ = _tmp65_; #line 791 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (_tmp66_) { -#line 5014 "gitg-history.c" +#line 5013 "gitg-history.c" GeeLinkedList* _tmp67_ = NULL; GeeLinkedList* _tmp68_ = NULL; GitgRefActionMerge* _tmp69_ = NULL; @@ -5024,7 +5023,7 @@ _tmp69_ = merge; #line 794 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" gitg_history_activity_add_ref_action (self, _tmp68_, (GitgExtRefAction*) _tmp69_); -#line 5028 "gitg-history.c" +#line 5027 "gitg-history.c" } #line 797 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp70_ = gitg_plugins_engine_get_default (); @@ -5080,7 +5079,7 @@ _data80_ = NULL; #line 820 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 5084 "gitg-history.c" +#line 5083 "gitg-history.c" } #line 823 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp83_ = (GtkMenu*) gtk_menu_new (); @@ -5088,7 +5087,7 @@ g_object_ref_sink (_tmp83_); #line 823 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" menu = _tmp83_; -#line 5092 "gitg-history.c" +#line 5091 "gitg-history.c" { GeeLinkedList* _ac_list = NULL; GeeLinkedList* _tmp84_ = NULL; @@ -5116,7 +5115,7 @@ _ac_index = -1; #line 825 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" while (TRUE) { -#line 5120 "gitg-history.c" +#line 5119 "gitg-history.c" gint _tmp89_ = 0; gint _tmp90_ = 0; gint _tmp91_ = 0; @@ -5137,7 +5136,7 @@ if (!(_tmp90_ < _tmp91_)) { #line 825 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" break; -#line 5141 "gitg-history.c" +#line 5140 "gitg-history.c" } #line 825 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp92_ = _ac_list; @@ -5151,7 +5150,7 @@ _tmp95_ = ac; #line 827 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (_tmp95_ != NULL) { -#line 5155 "gitg-history.c" +#line 5154 "gitg-history.c" GitgExtRefAction* _tmp96_ = NULL; GtkMenu* _tmp97_ = NULL; #line 829 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" @@ -5160,7 +5159,7 @@ _tmp97_ = menu; #line 829 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" gitg_ext_action_populate_menu ((GitgExtAction*) _tmp96_, _tmp97_); -#line 5164 "gitg-history.c" +#line 5163 "gitg-history.c" } else { GtkSeparatorMenuItem* sep = NULL; GtkSeparatorMenuItem* _tmp98_ = NULL; @@ -5185,15 +5184,15 @@ gtk_menu_shell_append ((GtkMenuShell*) _tmp100_, (GtkWidget*) ((GtkMenuItem*) _tmp101_)); #line 827 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _g_object_unref0 (sep); -#line 5189 "gitg-history.c" +#line 5188 "gitg-history.c" } #line 825 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _g_object_unref0 (ac); -#line 5193 "gitg-history.c" +#line 5192 "gitg-history.c" } #line 825 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _g_object_unref0 (_ac_list); -#line 5197 "gitg-history.c" +#line 5196 "gitg-history.c" } #line 839 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp102_ = (GtkSeparatorMenuItem*) gtk_separator_menu_item_new (); @@ -5212,96 +5211,94 @@ #line 841 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" gtk_menu_shell_append ((GtkMenuShell*) _tmp104_, (GtkWidget*) ((GtkMenuItem*) _tmp105_)); #line 843 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp106_ = _ ("Mainline"); -#line 843 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp107_ = (GtkCheckMenuItem*) gtk_check_menu_item_new_with_label (_tmp106_); + _tmp106_ = (GtkCheckMenuItem*) gtk_check_menu_item_new_with_label (_ ("Mainline")); #line 843 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - g_object_ref_sink (_tmp107_); + g_object_ref_sink (_tmp106_); #line 843 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _data80_->item = _tmp107_; + _data80_->item = _tmp106_; #line 844 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _data80_->pos = 0; #line 846 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp108_ = self->priv->d_mainline; + _tmp107_ = self->priv->d_mainline; #line 846 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp108__length1 = self->priv->d_mainline_length1; -#line 5229 "gitg-history.c" + _tmp107__length1 = self->priv->d_mainline_length1; +#line 5226 "gitg-history.c" { gchar** ml_collection = NULL; gint ml_collection_length1 = 0; gint _ml_collection_size_ = 0; gint ml_it = 0; #line 846 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - ml_collection = _tmp108_; + ml_collection = _tmp107_; #line 846 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - ml_collection_length1 = _tmp108__length1; + ml_collection_length1 = _tmp107__length1; #line 846 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - for (ml_it = 0; ml_it < _tmp108__length1; ml_it = ml_it + 1) { -#line 5241 "gitg-history.c" - gchar* _tmp109_ = NULL; + for (ml_it = 0; ml_it < _tmp107__length1; ml_it = ml_it + 1) { +#line 5238 "gitg-history.c" + gchar* _tmp108_ = NULL; gchar* ml = NULL; #line 846 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp109_ = g_strdup (ml_collection[ml_it]); + _tmp108_ = g_strdup (ml_collection[ml_it]); #line 846 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - ml = _tmp109_; -#line 5248 "gitg-history.c" + ml = _tmp108_; +#line 5245 "gitg-history.c" { - const gchar* _tmp110_ = NULL; - GitgRef* _tmp111_ = NULL; - const gchar* _tmp112_ = NULL; - gint _tmp114_ = 0; + const gchar* _tmp109_ = NULL; + GitgRef* _tmp110_ = NULL; + const gchar* _tmp111_ = NULL; + gint _tmp113_ = 0; #line 848 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp110_ = ml; + _tmp109_ = ml; #line 848 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp111_ = _data80_->reference; + _tmp110_ = _data80_->reference; #line 848 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp112_ = ggit_ref_get_name ((GgitRef*) _tmp111_); + _tmp111_ = ggit_ref_get_name ((GgitRef*) _tmp110_); #line 848 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - if (g_strcmp0 (_tmp110_, _tmp112_) == 0) { -#line 5262 "gitg-history.c" - GtkCheckMenuItem* _tmp113_ = NULL; + if (g_strcmp0 (_tmp109_, _tmp111_) == 0) { +#line 5259 "gitg-history.c" + GtkCheckMenuItem* _tmp112_ = NULL; #line 850 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp113_ = _data80_->item; + _tmp112_ = _data80_->item; #line 850 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - gtk_check_menu_item_set_active (_tmp113_, TRUE); + gtk_check_menu_item_set_active (_tmp112_, TRUE); #line 851 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _g_free0 (ml); #line 851 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" break; -#line 5272 "gitg-history.c" +#line 5269 "gitg-history.c" } #line 854 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp114_ = _data80_->pos; + _tmp113_ = _data80_->pos; #line 854 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _data80_->pos = _tmp114_ + 1; + _data80_->pos = _tmp113_ + 1; #line 846 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _g_free0 (ml); -#line 5280 "gitg-history.c" +#line 5277 "gitg-history.c" } } } #line 857 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp115_ = _data80_->item; + _tmp114_ = _data80_->item; #line 857 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - g_signal_connect_data ((GtkMenuItem*) _tmp115_, "activate", (GCallback) ___lambda143__gtk_menu_item_activate, block80_data_ref (_data80_), (GClosureNotify) block80_data_unref, 0); + g_signal_connect_data ((GtkMenuItem*) _tmp114_, "activate", (GCallback) ___lambda143__gtk_menu_item_activate, block80_data_ref (_data80_), (GClosureNotify) block80_data_unref, 0); #line 882 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp116_ = _data80_->item; + _tmp115_ = _data80_->item; #line 882 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - gtk_widget_show ((GtkWidget*) _tmp116_); + gtk_widget_show ((GtkWidget*) _tmp115_); #line 883 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp117_ = menu; + _tmp116_ = menu; #line 883 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp118_ = _data80_->item; + _tmp117_ = _data80_->item; #line 883 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - gtk_menu_shell_append ((GtkMenuShell*) _tmp117_, (GtkWidget*) ((GtkMenuItem*) _tmp118_)); + gtk_menu_shell_append ((GtkMenuShell*) _tmp116_, (GtkWidget*) ((GtkMenuItem*) _tmp117_)); #line 886 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp119_ = menu; + _tmp118_ = menu; #line 886 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp120_ = _data80_->actions; + _tmp119_ = _data80_->actions; #line 886 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp121_ = _g_object_ref0 (_tmp120_); + _tmp120_ = _g_object_ref0 (_tmp119_); #line 886 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - g_object_set_data_full ((GObject*) _tmp119_, "gitg-ext-actions", _tmp121_, g_object_unref); + g_object_set_data_full ((GObject*) _tmp118_, "gitg-ext-actions", _tmp120_, g_object_unref); #line 887 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" result = menu; #line 887 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" @@ -5320,7 +5317,7 @@ _data80_ = NULL; #line 887 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 5324 "gitg-history.c" +#line 5321 "gitg-history.c" } @@ -5348,7 +5345,7 @@ _tmp0_ = event; #line 892 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (_tmp0_ != NULL) { -#line 5352 "gitg-history.c" +#line 5349 "gitg-history.c" GtkListBoxRow* row = NULL; GitgHistoryPaned* _tmp1_ = NULL; GitgHistoryRefsList* _tmp2_ = NULL; @@ -5389,7 +5386,7 @@ gtk_list_box_select_row ((GtkListBox*) _tmp10_, _tmp11_); #line 892 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _g_object_unref0 (row); -#line 5393 "gitg-history.c" +#line 5390 "gitg-history.c" } #line 898 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp12_ = self->priv->d_main; @@ -5413,7 +5410,7 @@ if (_tmp20_) { #line 900 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp17_ = TRUE; -#line 5417 "gitg-history.c" +#line 5414 "gitg-history.c" } else { GeeList* _tmp21_ = NULL; gpointer _tmp22_ = NULL; @@ -5439,7 +5436,7 @@ _g_object_unref0 (_tmp26_); #line 900 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _g_object_unref0 (_tmp23_); -#line 5443 "gitg-history.c" +#line 5440 "gitg-history.c" } #line 900 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (_tmp17_) { @@ -5449,7 +5446,7 @@ _g_object_unref0 (references); #line 902 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 5453 "gitg-history.c" +#line 5450 "gitg-history.c" } #line 905 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp27_ = references; @@ -5469,7 +5466,7 @@ _g_object_unref0 (references); #line 905 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 5473 "gitg-history.c" +#line 5470 "gitg-history.c" } @@ -5483,7 +5480,7 @@ g_return_val_if_fail (r != NULL, NULL); #line 910 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" id = NULL; -#line 5487 "gitg-history.c" +#line 5484 "gitg-history.c" { GgitRef* resolved = NULL; GgitRef* _tmp0_ = NULL; @@ -5498,7 +5495,7 @@ resolved = _tmp1_; #line 914 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5502 "gitg-history.c" +#line 5499 "gitg-history.c" goto __catch129_g_error; } #line 916 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" @@ -5507,7 +5504,7 @@ _tmp3_ = ggit_ref_is_tag (_tmp2_); #line 916 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (_tmp3_) { -#line 5511 "gitg-history.c" +#line 5508 "gitg-history.c" GgitTag* t = NULL; GitgExtApplication* _tmp4_ = NULL; GitgExtApplication* _tmp5_ = NULL; @@ -5556,7 +5553,7 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 918 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _g_object_unref0 (resolved); -#line 5560 "gitg-history.c" +#line 5557 "gitg-history.c" goto __catch129_g_error; } #line 920 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" @@ -5569,7 +5566,7 @@ id = _tmp16_; #line 916 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _g_object_unref0 (t); -#line 5573 "gitg-history.c" +#line 5570 "gitg-history.c" } else { GgitRef* _tmp17_ = NULL; GgitOId* _tmp18_ = NULL; @@ -5581,11 +5578,11 @@ __vala_GgitOId_free0 (id); #line 924 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" id = _tmp18_; -#line 5585 "gitg-history.c" +#line 5582 "gitg-history.c" } #line 912 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _g_object_unref0 (resolved); -#line 5589 "gitg-history.c" +#line 5586 "gitg-history.c" } goto __finally129; __catch129_g_error: @@ -5594,7 +5591,7 @@ g_clear_error (&_inner_error_); #line 912 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _inner_error_ = NULL; -#line 5598 "gitg-history.c" +#line 5595 "gitg-history.c" } __finally129: #line 912 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" @@ -5607,78 +5604,78 @@ g_clear_error (&_inner_error_); #line 912 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return NULL; -#line 5611 "gitg-history.c" +#line 5608 "gitg-history.c" } #line 929 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" result = id; #line 929 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 5617 "gitg-history.c" +#line 5614 "gitg-history.c" } static GgitOId* _vala_GgitOId_copy (GgitOId* self) { #line 936 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return g_boxed_copy (ggit_oid_get_type (), self); -#line 5624 "gitg-history.c" +#line 5621 "gitg-history.c" } static gpointer __vala_GgitOId_copy0 (gpointer self) { #line 960 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return self ? _vala_GgitOId_copy (self) : NULL; -#line 5631 "gitg-history.c" +#line 5628 "gitg-history.c" } -static void _vala_array_add26 (GgitOId*** array, int* length, int* size, GgitOId* value) { +static void _vala_array_add26 (GgitOId** * array, int* length, int* size, GgitOId* value) { #line 960 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if ((*length) == (*size)) { #line 960 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" *size = (*size) ? (2 * (*size)) : 4; #line 960 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" *array = g_renew (GgitOId*, *array, (*size) + 1); -#line 5642 "gitg-history.c" +#line 5639 "gitg-history.c" } #line 960 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" (*array)[(*length)++] = value; #line 960 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" (*array)[*length] = NULL; -#line 5648 "gitg-history.c" +#line 5645 "gitg-history.c" } -static void _vala_array_add27 (GgitOId*** array, int* length, int* size, GgitOId* value) { +static void _vala_array_add27 (GgitOId** * array, int* length, int* size, GgitOId* value) { #line 972 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if ((*length) == (*size)) { #line 972 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" *size = (*size) ? (2 * (*size)) : 4; #line 972 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" *array = g_renew (GgitOId*, *array, (*size) + 1); -#line 5659 "gitg-history.c" +#line 5656 "gitg-history.c" } #line 972 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" (*array)[(*length)++] = value; #line 972 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" (*array)[*length] = NULL; -#line 5665 "gitg-history.c" +#line 5662 "gitg-history.c" } -static void _vala_array_add28 (GgitOId*** array, int* length, int* size, GgitOId* value) { +static void _vala_array_add28 (GgitOId** * array, int* length, int* size, GgitOId* value) { #line 994 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if ((*length) == (*size)) { #line 994 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" *size = (*size) ? (2 * (*size)) : 4; #line 994 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" *array = g_renew (GgitOId*, *array, (*size) + 1); -#line 5676 "gitg-history.c" +#line 5673 "gitg-history.c" } #line 994 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" (*array)[(*length)++] = value; #line 994 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" (*array)[*length] = NULL; -#line 5682 "gitg-history.c" +#line 5679 "gitg-history.c" } @@ -5791,7 +5788,7 @@ _g_object_unref0 (_tmp16_); #line 947 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (_tmp20_) { -#line 5795 "gitg-history.c" +#line 5792 "gitg-history.c" gchar** _tmp21_ = NULL; gint _tmp21__length1 = 0; GSettings* _tmp42_ = NULL; @@ -5800,7 +5797,7 @@ _tmp21_ = self->priv->d_mainline; #line 949 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp21__length1 = self->priv->d_mainline_length1; -#line 5804 "gitg-history.c" +#line 5801 "gitg-history.c" { gchar** ml_collection = NULL; gint ml_collection_length1 = 0; @@ -5812,14 +5809,14 @@ ml_collection_length1 = _tmp21__length1; #line 949 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" for (ml_it = 0; ml_it < _tmp21__length1; ml_it = ml_it + 1) { -#line 5816 "gitg-history.c" +#line 5813 "gitg-history.c" gchar* _tmp22_ = NULL; gchar* ml = NULL; #line 949 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp22_ = g_strdup (ml_collection[ml_it]); #line 949 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" ml = _tmp22_; -#line 5823 "gitg-history.c" +#line 5820 "gitg-history.c" { GgitOId* id = NULL; gboolean _tmp34_ = FALSE; @@ -5862,7 +5859,7 @@ _tmp23_ = _tmp32_; #line 955 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5866 "gitg-history.c" +#line 5863 "gitg-history.c" goto __catch130_g_error; } #line 955 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" @@ -5873,7 +5870,7 @@ id = _tmp33_; #line 953 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _g_object_unref0 (_tmp23_); -#line 5877 "gitg-history.c" +#line 5874 "gitg-history.c" } goto __finally130; __catch130_g_error: @@ -5888,7 +5885,7 @@ _g_free0 (ml); #line 956 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" continue; -#line 5892 "gitg-history.c" +#line 5889 "gitg-history.c" } __finally130: #line 953 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" @@ -5909,13 +5906,13 @@ g_clear_error (&_inner_error_); #line 953 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return; -#line 5913 "gitg-history.c" +#line 5910 "gitg-history.c" } #line 958 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp35_ = id; #line 958 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (_tmp35_ != NULL) { -#line 5919 "gitg-history.c" +#line 5916 "gitg-history.c" GeeHashSet* _tmp36_ = NULL; GgitOId* _tmp37_ = NULL; gboolean _tmp38_ = FALSE; @@ -5927,15 +5924,15 @@ _tmp38_ = gee_abstract_collection_add ((GeeAbstractCollection*) _tmp36_, _tmp37_); #line 958 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp34_ = _tmp38_; -#line 5931 "gitg-history.c" +#line 5928 "gitg-history.c" } else { #line 958 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp34_ = FALSE; -#line 5935 "gitg-history.c" +#line 5932 "gitg-history.c" } #line 958 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (_tmp34_) { -#line 5939 "gitg-history.c" +#line 5936 "gitg-history.c" GgitOId** _tmp39_ = NULL; gint _tmp39__length1 = 0; GgitOId* _tmp40_ = NULL; @@ -5950,13 +5947,13 @@ _tmp41_ = __vala_GgitOId_copy0 (_tmp40_); #line 960 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _vala_array_add26 (&permanent, &permanent_length1, &_permanent_size_, _tmp41_); -#line 5954 "gitg-history.c" +#line 5951 "gitg-history.c" } #line 949 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" __vala_GgitOId_free0 (id); #line 949 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _g_free0 (ml); -#line 5960 "gitg-history.c" +#line 5957 "gitg-history.c" } } } @@ -5966,7 +5963,7 @@ _tmp43_ = g_settings_get_boolean (_tmp42_, "mainline-head"); #line 964 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (_tmp43_) { -#line 5970 "gitg-history.c" +#line 5967 "gitg-history.c" { GitgRef* _tmp44_ = NULL; GitgExtApplication* _tmp45_ = NULL; @@ -6005,7 +6002,7 @@ _tmp44_ = _tmp52_; #line 968 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6009 "gitg-history.c" +#line 6006 "gitg-history.c" goto __catch131_g_error; } #line 968 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" @@ -6016,7 +6013,7 @@ _tmp55_ = head; #line 970 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (_tmp55_ != NULL) { -#line 6020 "gitg-history.c" +#line 6017 "gitg-history.c" GeeHashSet* _tmp56_ = NULL; GgitOId* _tmp57_ = NULL; gboolean _tmp58_ = FALSE; @@ -6028,15 +6025,15 @@ _tmp58_ = gee_abstract_collection_add ((GeeAbstractCollection*) _tmp56_, _tmp57_); #line 970 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp54_ = _tmp58_; -#line 6032 "gitg-history.c" +#line 6029 "gitg-history.c" } else { #line 970 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp54_ = FALSE; -#line 6036 "gitg-history.c" +#line 6033 "gitg-history.c" } #line 970 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (_tmp54_) { -#line 6040 "gitg-history.c" +#line 6037 "gitg-history.c" GgitOId** _tmp59_ = NULL; gint _tmp59__length1 = 0; GgitOId* _tmp60_ = NULL; @@ -6051,13 +6048,13 @@ _tmp61_ = __vala_GgitOId_copy0 (_tmp60_); #line 972 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _vala_array_add27 (&permanent, &permanent_length1, &_permanent_size_, _tmp61_); -#line 6055 "gitg-history.c" +#line 6052 "gitg-history.c" } #line 966 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" __vala_GgitOId_free0 (head); #line 966 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _g_object_unref0 (_tmp44_); -#line 6061 "gitg-history.c" +#line 6058 "gitg-history.c" } goto __finally131; __catch131_g_error: @@ -6066,7 +6063,7 @@ g_clear_error (&_inner_error_); #line 966 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _inner_error_ = NULL; -#line 6070 "gitg-history.c" +#line 6067 "gitg-history.c" } __finally131: #line 966 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" @@ -6083,7 +6080,7 @@ g_clear_error (&_inner_error_); #line 966 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return; -#line 6087 "gitg-history.c" +#line 6084 "gitg-history.c" } } } @@ -6093,7 +6090,7 @@ _tmp63_ = g_settings_get_boolean (_tmp62_, "show-upstream-with-branch"); #line 978 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" show_upstream_with_branch = _tmp63_; -#line 6097 "gitg-history.c" +#line 6094 "gitg-history.c" { GeeList* _r_list = NULL; GitgHistoryPaned* _tmp64_ = NULL; @@ -6130,7 +6127,7 @@ _r_index = -1; #line 980 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" while (TRUE) { -#line 6134 "gitg-history.c" +#line 6131 "gitg-history.c" gint _tmp72_ = 0; gint _tmp73_ = 0; gint _tmp74_ = 0; @@ -6154,7 +6151,7 @@ if (!(_tmp73_ < _tmp74_)) { #line 980 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" break; -#line 6158 "gitg-history.c" +#line 6155 "gitg-history.c" } #line 980 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp75_ = _r_list; @@ -6174,7 +6171,7 @@ _tmp80_ = id; #line 984 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (_tmp80_ != NULL) { -#line 6178 "gitg-history.c" +#line 6175 "gitg-history.c" GeeHashSet* _tmp81_ = NULL; GgitOId* _tmp82_ = NULL; gboolean _tmp83_ = FALSE; @@ -6190,7 +6187,7 @@ _tmp83_ = isall; #line 988 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (!_tmp83_) { -#line 6194 "gitg-history.c" +#line 6191 "gitg-history.c" GeeHashSet* _tmp84_ = NULL; GgitOId* _tmp85_ = NULL; gboolean _tmp86_ = FALSE; @@ -6205,7 +6202,7 @@ _tmp87_ = isheader; #line 992 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (!_tmp87_) { -#line 6209 "gitg-history.c" +#line 6206 "gitg-history.c" GeeHashSet* _tmp88_ = NULL; GgitOId* _tmp89_ = NULL; gboolean _tmp90_ = FALSE; @@ -6217,15 +6214,15 @@ _tmp90_ = gee_abstract_collection_add ((GeeAbstractCollection*) _tmp88_, _tmp89_); #line 992 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp86_ = _tmp90_; -#line 6221 "gitg-history.c" +#line 6218 "gitg-history.c" } else { #line 992 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp86_ = FALSE; -#line 6225 "gitg-history.c" +#line 6222 "gitg-history.c" } #line 992 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (_tmp86_) { -#line 6229 "gitg-history.c" +#line 6226 "gitg-history.c" GgitOId** _tmp91_ = NULL; gint _tmp91__length1 = 0; GgitOId* _tmp92_ = NULL; @@ -6240,14 +6237,14 @@ _tmp93_ = __vala_GgitOId_copy0 (_tmp92_); #line 994 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _vala_array_add28 (&permanent, &permanent_length1, &_permanent_size_, _tmp93_); -#line 6244 "gitg-history.c" +#line 6241 "gitg-history.c" } } #line 998 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp95_ = show_upstream_with_branch; #line 998 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (_tmp95_) { -#line 6251 "gitg-history.c" +#line 6248 "gitg-history.c" GitgRef* _tmp96_ = NULL; gboolean _tmp97_ = FALSE; #line 998 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" @@ -6256,15 +6253,15 @@ _tmp97_ = ggit_ref_is_branch ((GgitRef*) _tmp96_); #line 998 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp94_ = _tmp97_; -#line 6260 "gitg-history.c" +#line 6257 "gitg-history.c" } else { #line 998 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp94_ = FALSE; -#line 6264 "gitg-history.c" +#line 6261 "gitg-history.c" } #line 998 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (_tmp94_) { -#line 6268 "gitg-history.c" +#line 6265 "gitg-history.c" GitgBranch* branch = NULL; GitgRef* _tmp98_ = NULL; GitgBranch* _tmp99_ = NULL; @@ -6274,7 +6271,7 @@ _tmp99_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp98_, GITG_TYPE_BRANCH) ? ((GitgBranch*) _tmp98_) : NULL); #line 1000 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" branch = _tmp99_; -#line 6278 "gitg-history.c" +#line 6275 "gitg-history.c" { GitgRef* _tmp100_ = NULL; GitgBranch* _tmp101_ = NULL; @@ -6290,7 +6287,7 @@ _tmp100_ = _tmp102_; #line 1004 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6294 "gitg-history.c" +#line 6291 "gitg-history.c" goto __catch132_g_error; } #line 1004 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" @@ -6301,7 +6298,7 @@ _tmp104_ = upid; #line 1006 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (_tmp104_ != NULL) { -#line 6305 "gitg-history.c" +#line 6302 "gitg-history.c" GeeHashSet* _tmp105_ = NULL; GgitOId* _tmp106_ = NULL; #line 1008 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" @@ -6310,13 +6307,13 @@ _tmp106_ = upid; #line 1008 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _tmp105_, _tmp106_); -#line 6314 "gitg-history.c" +#line 6311 "gitg-history.c" } #line 1002 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" __vala_GgitOId_free0 (upid); #line 1002 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _g_object_unref0 (_tmp100_); -#line 6320 "gitg-history.c" +#line 6317 "gitg-history.c" } goto __finally132; __catch132_g_error: @@ -6325,7 +6322,7 @@ g_clear_error (&_inner_error_); #line 1002 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _inner_error_ = NULL; -#line 6329 "gitg-history.c" +#line 6326 "gitg-history.c" } __finally132: #line 1002 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" @@ -6350,22 +6347,22 @@ g_clear_error (&_inner_error_); #line 1002 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return; -#line 6354 "gitg-history.c" +#line 6351 "gitg-history.c" } #line 998 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _g_object_unref0 (branch); -#line 6358 "gitg-history.c" +#line 6355 "gitg-history.c" } } #line 980 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" __vala_GgitOId_free0 (id); #line 980 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _g_object_unref0 (r); -#line 6365 "gitg-history.c" +#line 6362 "gitg-history.c" } #line 980 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _g_object_unref0 (_r_list); -#line 6369 "gitg-history.c" +#line 6366 "gitg-history.c" } #line 1015 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp107_ = self->priv->d_commit_list_model; @@ -6399,7 +6396,7 @@ _g_object_unref0 (perm_uniq); #line 932 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _g_object_unref0 (include); -#line 6403 "gitg-history.c" +#line 6400 "gitg-history.c" } @@ -6414,7 +6411,7 @@ _tmp1_ = action; #line 1028 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (_tmp1_ != NULL) { -#line 6418 "gitg-history.c" +#line 6415 "gitg-history.c" GitgExtCommitAction* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; gboolean _tmp4_ = FALSE; @@ -6426,15 +6423,15 @@ _tmp4_ = _tmp3_; #line 1028 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp0_ = _tmp4_; -#line 6430 "gitg-history.c" +#line 6427 "gitg-history.c" } else { #line 1028 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp0_ = FALSE; -#line 6434 "gitg-history.c" +#line 6431 "gitg-history.c" } #line 1028 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (_tmp0_) { -#line 6438 "gitg-history.c" +#line 6435 "gitg-history.c" GeeLinkedList* _tmp5_ = NULL; GitgExtCommitAction* _tmp6_ = NULL; #line 1030 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" @@ -6443,7 +6440,7 @@ _tmp6_ = action; #line 1030 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _tmp5_, _tmp6_); -#line 6447 "gitg-history.c" +#line 6444 "gitg-history.c" } } @@ -6475,7 +6472,7 @@ result = _tmp4_; #line 1036 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 6479 "gitg-history.c" +#line 6476 "gitg-history.c" } @@ -6483,19 +6480,19 @@ gboolean result = FALSE; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1395 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1395 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1396 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = needle; -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1396 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1396 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_ != NULL; -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1396 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 6499 "gitg-history.c" +#line 6496 "gitg-history.c" } @@ -6566,7 +6563,7 @@ _g_object_unref0 (c); #line 1045 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 6570 "gitg-history.c" +#line 6567 "gitg-history.c" } #line 1048 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp9_ = key; @@ -6600,7 +6597,7 @@ _g_object_unref0 (c); #line 1053 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 6604 "gitg-history.c" +#line 6601 "gitg-history.c" } #line 1056 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp17_ = c; @@ -6630,7 +6627,7 @@ _g_object_unref0 (c); #line 1060 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 6634 "gitg-history.c" +#line 6631 "gitg-history.c" } #line 1063 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" result = TRUE; @@ -6644,7 +6641,7 @@ _g_object_unref0 (c); #line 1063 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 6648 "gitg-history.c" +#line 6645 "gitg-history.c" } @@ -6663,27 +6660,31 @@ result = _tmp1_; #line 37 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 6667 "gitg-history.c" +#line 6664 "gitg-history.c" } static void gitg_history_activity_real_set_application (GitgExtUIElement* base, GitgExtApplication* value) { GitgHistoryActivity* self; - GitgExtApplication* _tmp0_ = NULL; - GitgExtApplication* _tmp1_ = NULL; #line 37 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" self = (GitgHistoryActivity*) base; #line 37 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp0_ = value; + if (gitg_history_activity_real_get_application (self) != value) { +#line 6674 "gitg-history.c" + GitgExtApplication* _tmp0_ = NULL; + GitgExtApplication* _tmp1_ = NULL; #line 37 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 37 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _g_object_unref0 (self->priv->_application); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 37 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" + _g_object_unref0 (self->priv->_application); #line 37 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - self->priv->_application = _tmp1_; + self->priv->_application = _tmp1_; #line 37 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - g_object_notify ((GObject *) self, "application"); + g_object_notify ((GObject *) self, "application"); #line 6687 "gitg-history.c" + } } @@ -6699,7 +6700,7 @@ result = _tmp0_; #line 70 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 6703 "gitg-history.c" +#line 6704 "gitg-history.c" } @@ -6714,39 +6715,43 @@ result = _tmp0_; #line 79 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 6718 "gitg-history.c" +#line 6719 "gitg-history.c" } void gitg_history_activity_set_repository (GitgHistoryActivity* self, GitgRepository* value) { - GitgRepository* _tmp0_ = NULL; - GitgRepository* _tmp1_ = NULL; #line 82 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" g_return_if_fail (self != NULL); +#line 82 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" + if (gitg_history_activity_get_repository (self) != value) { +#line 6728 "gitg-history.c" + GitgRepository* _tmp0_ = NULL; + GitgRepository* _tmp1_ = NULL; #line 84 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp0_ = self->priv->d_repository; + _tmp0_ = self->priv->d_repository; #line 84 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp1_ = value; + _tmp1_ = value; #line 84 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - if (_tmp0_ != _tmp1_) { -#line 6733 "gitg-history.c" - GitgRepository* _tmp2_ = NULL; - GitgRepository* _tmp3_ = NULL; + if (_tmp0_ != _tmp1_) { +#line 6737 "gitg-history.c" + GitgRepository* _tmp2_ = NULL; + GitgRepository* _tmp3_ = NULL; #line 86 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp2_ = value; + _tmp2_ = value; #line 86 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp3_ = _g_object_ref0 (_tmp2_); #line 86 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _g_object_unref0 (self->priv->d_repository); + _g_object_unref0 (self->priv->d_repository); #line 86 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - self->priv->d_repository = _tmp3_; + self->priv->d_repository = _tmp3_; #line 87 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - gitg_history_activity_reload (self); -#line 6746 "gitg-history.c" - } -#line 82 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - g_object_notify ((GObject *) self, "repository"); + gitg_history_activity_reload (self); #line 6750 "gitg-history.c" + } +#line 82 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" + g_object_notify ((GObject *) self, "repository"); +#line 6754 "gitg-history.c" + } } @@ -6759,45 +6764,39 @@ result = TRUE; #line 337 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 6763 "gitg-history.c" +#line 6768 "gitg-history.c" } static gchar* gitg_history_activity_real_get_display_name (GitgExtUIElement* base) { gchar* result; GitgHistoryActivity* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 342 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" self = (GitgHistoryActivity*) base; #line 342 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp0_ = _ ("History"); + _tmp0_ = g_strdup (_ ("History")); #line 342 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 342 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - result = _tmp1_; + result = _tmp0_; #line 342 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 6782 "gitg-history.c" +#line 6784 "gitg-history.c" } static gchar* gitg_history_activity_real_get_description (GitgExtUIElement* base) { gchar* result; GitgHistoryActivity* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 347 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" self = (GitgHistoryActivity*) base; #line 347 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp0_ = _ ("Examine the history of the repository"); + _tmp0_ = g_strdup (_ ("Examine the history of the repository")); #line 347 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 347 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - result = _tmp1_; + result = _tmp0_; #line 347 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 6801 "gitg-history.c" +#line 6800 "gitg-history.c" } @@ -6813,7 +6812,7 @@ result = _tmp0_; #line 352 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 6817 "gitg-history.c" +#line 6816 "gitg-history.c" } @@ -6831,7 +6830,7 @@ if (_tmp0_ == NULL) { #line 361 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" gitg_history_activity_build_ui (self); -#line 6835 "gitg-history.c" +#line 6834 "gitg-history.c" } #line 364 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _tmp1_ = self->priv->d_main; @@ -6841,7 +6840,7 @@ result = _tmp2_; #line 364 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 6845 "gitg-history.c" +#line 6844 "gitg-history.c" } @@ -6854,7 +6853,7 @@ result = TRUE; #line 375 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 6858 "gitg-history.c" +#line 6857 "gitg-history.c" } @@ -6875,7 +6874,7 @@ result = _tmp2_; #line 472 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 6879 "gitg-history.c" +#line 6878 "gitg-history.c" } @@ -6888,7 +6887,7 @@ result = TRUE; #line 1022 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 6892 "gitg-history.c" +#line 6891 "gitg-history.c" } @@ -6929,7 +6928,7 @@ _tmp8_ = value; #line 1073 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" if (_tmp8_ != NULL) { -#line 6933 "gitg-history.c" +#line 6932 "gitg-history.c" GitgHistoryPaned* _tmp9_ = NULL; GitgCommitListView* _tmp10_ = NULL; GitgCommitListView* _tmp11_ = NULL; @@ -6941,7 +6940,7 @@ _tmp11_ = _tmp10_; #line 1075 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" gtk_tree_view_set_search_column ((GtkTreeView*) _tmp11_, 0); -#line 6945 "gitg-history.c" +#line 6944 "gitg-history.c" } else { GitgHistoryPaned* _tmp12_ = NULL; GitgCommitListView* _tmp13_ = NULL; @@ -6954,11 +6953,11 @@ _tmp14_ = _tmp13_; #line 1079 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" gtk_tree_view_set_search_column ((GtkTreeView*) _tmp14_, -1); -#line 6958 "gitg-history.c" +#line 6957 "gitg-history.c" } #line 1068 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" g_object_notify ((GObject *) self, "search-entry"); -#line 6962 "gitg-history.c" +#line 6961 "gitg-history.c" } @@ -6977,27 +6976,31 @@ result = _tmp1_; #line 1084 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 6981 "gitg-history.c" +#line 6980 "gitg-history.c" } static void gitg_history_activity_real_set_search_text (GitgExtSearchable* base, const gchar* value) { GitgHistoryActivity* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; #line 1084 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" self = (GitgHistoryActivity*) base; #line 1084 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp0_ = value; + if (g_strcmp0 (value, gitg_history_activity_real_get_search_text (self)) != 0) { +#line 6990 "gitg-history.c" + const gchar* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; #line 1084 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = value; #line 1084 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _g_free0 (self->priv->_search_text); + _tmp1_ = g_strdup (_tmp0_); +#line 1084 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" + _g_free0 (self->priv->_search_text); #line 1084 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - self->priv->_search_text = _tmp1_; + self->priv->_search_text = _tmp1_; #line 1084 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - g_object_notify ((GObject *) self, "search-text"); -#line 7001 "gitg-history.c" + g_object_notify ((GObject *) self, "search-text"); +#line 7003 "gitg-history.c" + } } @@ -7013,22 +7016,26 @@ result = _tmp0_; #line 1085 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return result; -#line 7017 "gitg-history.c" +#line 7020 "gitg-history.c" } static void gitg_history_activity_real_set_search_visible (GitgExtSearchable* base, gboolean value) { GitgHistoryActivity* self; - gboolean _tmp0_ = FALSE; #line 1085 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" self = (GitgHistoryActivity*) base; #line 1085 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - _tmp0_ = value; + if (gitg_history_activity_real_get_search_visible (self) != value) { +#line 7030 "gitg-history.c" + gboolean _tmp0_ = FALSE; #line 1085 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - self->priv->_search_visible = _tmp0_; + _tmp0_ = value; #line 1085 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - g_object_notify ((GObject *) self, "search-visible"); -#line 7032 "gitg-history.c" + self->priv->_search_visible = _tmp0_; +#line 1085 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" + g_object_notify ((GObject *) self, "search-visible"); +#line 7038 "gitg-history.c" + } } @@ -7039,14 +7046,14 @@ g_return_if_fail (k != NULL); #line 132 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" gitg_history_activity_update_sort_mode (self); -#line 7043 "gitg-history.c" +#line 7050 "gitg-history.c" } static void __gitg_history_activity___lambda159__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) { #line 131 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _gitg_history_activity___lambda159_ ((GitgHistoryActivity*) self, _sender, key); -#line 7050 "gitg-history.c" +#line 7057 "gitg-history.c" } @@ -7057,14 +7064,14 @@ g_return_if_fail (k != NULL); #line 136 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" gitg_history_activity_update_walker (self); -#line 7061 "gitg-history.c" +#line 7068 "gitg-history.c" } static void __gitg_history_activity___lambda160__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) { #line 135 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _gitg_history_activity___lambda160_ ((GitgHistoryActivity*) self, _sender, key); -#line 7068 "gitg-history.c" +#line 7075 "gitg-history.c" } @@ -7075,42 +7082,42 @@ g_return_if_fail (k != NULL); #line 140 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" gitg_history_activity_update_walker (self); -#line 7079 "gitg-history.c" +#line 7086 "gitg-history.c" } static void __gitg_history_activity___lambda161__g_settings_changed (GSettings* _sender, const gchar* key, gpointer self) { #line 139 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" _gitg_history_activity___lambda161_ ((GitgHistoryActivity*) self, _sender, key); -#line 7086 "gitg-history.c" +#line 7093 "gitg-history.c" } static void _gitg_history_activity_on_commit_model_started_gitg_commit_model_started (GitgCommitModel* _sender, gpointer self) { #line 147 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" gitg_history_activity_on_commit_model_started ((GitgHistoryActivity*) self, _sender); -#line 7093 "gitg-history.c" +#line 7100 "gitg-history.c" } static void _gitg_history_activity_on_commit_model_finished_gitg_commit_model_finished (GitgCommitModel* _sender, gpointer self) { #line 148 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" gitg_history_activity_on_commit_model_finished ((GitgHistoryActivity*) self, _sender); -#line 7100 "gitg-history.c" +#line 7107 "gitg-history.c" } static void _gitg_history_activity_repository_changed_externally_gitg_ext_application_repository_changed_externally (GitgExtApplication* _sender, GitgExtExternalChangeHint hint, gpointer self) { #line 159 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" gitg_history_activity_repository_changed_externally ((GitgHistoryActivity*) self, hint); -#line 7107 "gitg-history.c" +#line 7114 "gitg-history.c" } static void _gitg_history_activity_repository_commits_changed_gitg_ext_application_repository_commits_changed (GitgExtApplication* _sender, gpointer self) { #line 160 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" gitg_history_activity_repository_commits_changed ((GitgHistoryActivity*) self); -#line 7114 "gitg-history.c" +#line 7121 "gitg-history.c" } @@ -7264,7 +7271,7 @@ _g_object_unref0 (_tmp28_); #line 127 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" return obj; -#line 7268 "gitg-history.c" +#line 7275 "gitg-history.c" } @@ -7311,7 +7318,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_HISTORY_ACTIVITY_SEARCH_TEXT, g_param_spec_string ("search-text", "search-text", "search-text", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); #line 32 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_HISTORY_ACTIVITY_SEARCH_VISIBLE, g_param_spec_boolean ("search-visible", "search-visible", "search-visible", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); -#line 7315 "gitg-history.c" +#line 7322 "gitg-history.c" } @@ -7319,7 +7326,7 @@ #line 32 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" gitg_history_activity_gitg_ext_ui_element_parent_iface = g_type_interface_peek_parent (iface); #line 32 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - iface->negotiate_order = (gint (*)(GitgExtUIElement*, GitgExtUIElement*)) gitg_history_activity_real_negotiate_order; + iface->negotiate_order = (gint (*) (GitgExtUIElement *, GitgExtUIElement*)) gitg_history_activity_real_negotiate_order; #line 32 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" iface->get_application = gitg_history_activity_real_get_application; #line 32 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" @@ -7338,7 +7345,7 @@ iface->get_widget = gitg_history_activity_real_get_widget; #line 32 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" iface->get_enabled = gitg_history_activity_real_get_enabled; -#line 7342 "gitg-history.c" +#line 7349 "gitg-history.c" } @@ -7346,8 +7353,8 @@ #line 32 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" gitg_history_activity_gitg_ext_activity_parent_iface = g_type_interface_peek_parent (iface); #line 32 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - iface->is_default_for = (gboolean (*)(GitgExtActivity*, const gchar*)) gitg_history_activity_real_is_default_for; -#line 7351 "gitg-history.c" + iface->is_default_for = (gboolean (*) (GitgExtActivity *, const gchar*)) gitg_history_activity_real_is_default_for; +#line 7358 "gitg-history.c" } @@ -7366,7 +7373,7 @@ iface->get_search_visible = gitg_history_activity_real_get_search_visible; #line 32 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" iface->set_search_visible = gitg_history_activity_real_set_search_visible; -#line 7370 "gitg-history.c" +#line 7377 "gitg-history.c" } @@ -7374,10 +7381,10 @@ #line 32 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" gitg_history_activity_gitg_ext_history_parent_iface = g_type_interface_peek_parent (iface); #line 32 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - iface->foreach_selected = (void (*)(GitgExtHistory*, GitgExtForeachCommitSelectionFunc, void*)) gitg_history_activity_real_foreach_selected; + iface->foreach_selected = (void (*) (GitgExtHistory *, GitgExtForeachCommitSelectionFunc, void*)) gitg_history_activity_real_foreach_selected; #line 32 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" - iface->select = (void (*)(GitgExtHistory*, GitgCommit*)) gitg_history_activity_real_select; -#line 7381 "gitg-history.c" + iface->select = (void (*) (GitgExtHistory *, GitgCommit*)) gitg_history_activity_real_select; +#line 7388 "gitg-history.c" } @@ -7389,11 +7396,11 @@ _tmp0_ = g_strdup (""); #line 1084 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" self->priv->_search_text = _tmp0_; -#line 7393 "gitg-history.c" +#line 7400 "gitg-history.c" } -static void gitg_history_activity_finalize (GObject* obj) { +static void gitg_history_activity_finalize (GObject * obj) { GitgHistoryActivity * self; #line 32 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_HISTORY_TYPE_ACTIVITY, GitgHistoryActivity); @@ -7425,7 +7432,7 @@ _g_free0 (self->priv->_search_text); #line 32 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" G_OBJECT_CLASS (gitg_history_activity_parent_class)->finalize (obj); -#line 7429 "gitg-history.c" +#line 7436 "gitg-history.c" } @@ -7532,13 +7539,13 @@ g_value_set_boolean (value, gitg_ext_searchable_get_search_visible ((GitgExtSearchable*) self)); #line 32 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" break; -#line 7536 "gitg-history.c" +#line 7543 "gitg-history.c" default: #line 32 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 32 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" break; -#line 7542 "gitg-history.c" +#line 7549 "gitg-history.c" } } @@ -7578,13 +7585,13 @@ gitg_ext_searchable_set_search_visible ((GitgExtSearchable*) self, g_value_get_boolean (value)); #line 32 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" break; -#line 7582 "gitg-history.c" +#line 7589 "gitg-history.c" default: #line 32 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 32 "/home/jesse/dev/gitg/gitg/history/gitg-history.vala" break; -#line 7588 "gitg-history.c" +#line 7595 "gitg-history.c" } } diff -Nru gitg-3.22.0/gitg/history/gitg-history-command-line.c gitg-3.23.0/gitg/history/gitg-history-command-line.c --- gitg-3.22.0/gitg/history/gitg-history-command-line.c 2016-08-17 18:00:36.000000000 +0000 +++ gitg-3.23.0/gitg/history/gitg-history-command-line.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-history-command-line.c generated by valac 0.32.1, the Vala compiler +/* gitg-history-command-line.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-history-command-line.vala, do not modify */ /* @@ -95,7 +95,7 @@ static gboolean gitg_history_command_line_s_all_remotes = FALSE; static gboolean gitg_history_command_line_s_all_tags; static gboolean gitg_history_command_line_s_all_tags = FALSE; -static GitgExtCommandLineIface* gitg_history_command_line_gitg_ext_command_line_parent_iface = NULL; +static GitgExtCommandLineIface * gitg_history_command_line_gitg_ext_command_line_parent_iface = NULL; GType gitg_history_command_line_get_type (void) G_GNUC_CONST; #define GITG_HISTORY_COMMAND_LINE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_HISTORY_TYPE_COMMAND_LINE, GitgHistoryCommandLinePrivate)) @@ -116,7 +116,7 @@ gboolean gitg_history_refs_list_select_ref (GitgHistoryRefsList* self, GitgRef* reference); GitgHistoryCommandLine* gitg_history_command_line_new (void); GitgHistoryCommandLine* gitg_history_command_line_construct (GType object_type); -static void gitg_history_command_line_finalize (GObject* obj); +static void gitg_history_command_line_finalize (GObject * obj); static const GOptionEntry GITG_HISTORY_COMMAND_LINE_s_entries[6] = {{"all", 'a', (gint) G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &gitg_history_command_line_s_all_commits, "Select all commits by default in the history activity", NULL}, {"branches", 'b', (gint) G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &gitg_history_command_line_s_all_branches, "Select all branches by default in the history activity", NULL}, {"remotes", 'r', (gint) G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &gitg_history_command_line_s_all_remotes, "Select all remotes by default in the history activity", NULL}, {"tags", 't', (gint) G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &gitg_history_command_line_s_all_tags, "Select all tags by default in the history activity", NULL}, {"select-reference", 's', (gint) G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, &gitg_history_command_line_s_select_reference, "Select the specified reference by default in the history activity", "REFERENCE"}, {NULL}}; @@ -426,11 +426,11 @@ #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-command-line.vala" gitg_history_command_line_gitg_ext_command_line_parent_iface = g_type_interface_peek_parent (iface); #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-command-line.vala" - iface->get_option_group = (GOptionGroup* (*)(GitgExtCommandLine*)) gitg_history_command_line_real_get_option_group; + iface->get_option_group = (GOptionGroup* (*) (GitgExtCommandLine *)) gitg_history_command_line_real_get_option_group; #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-command-line.vala" - iface->parse_finished = (void (*)(GitgExtCommandLine*)) gitg_history_command_line_real_parse_finished; + iface->parse_finished = (void (*) (GitgExtCommandLine *)) gitg_history_command_line_real_parse_finished; #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-command-line.vala" - iface->apply = (void (*)(GitgExtCommandLine*, GitgExtApplication*)) gitg_history_command_line_real_apply; + iface->apply = (void (*) (GitgExtCommandLine *, GitgExtApplication*)) gitg_history_command_line_real_apply; #line 435 "gitg-history-command-line.c" } @@ -442,7 +442,7 @@ } -static void gitg_history_command_line_finalize (GObject* obj) { +static void gitg_history_command_line_finalize (GObject * obj) { GitgHistoryCommandLine * self; #line 23 "/home/jesse/dev/gitg/gitg/history/gitg-history-command-line.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_HISTORY_TYPE_COMMAND_LINE, GitgHistoryCommandLine); diff -Nru gitg-3.22.0/gitg/history/gitg-history-paned.c gitg-3.23.0/gitg/history/gitg-history-paned.c --- gitg-3.22.0/gitg/history/gitg-history-paned.c 2016-09-18 12:01:48.000000000 +0000 +++ gitg-3.23.0/gitg/history/gitg-history-paned.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-history-paned.c generated by valac 0.32.1, the Vala compiler +/* gitg-history-paned.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-history-paned.vala, do not modify */ /* @@ -134,7 +134,7 @@ static void __gitg_history_paned___lambda123__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); static void _gitg_history_paned___lambda124_ (Block72Data* _data72_); static void __gitg_history_paned___lambda124__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); -static void gitg_history_paned_finalize (GObject* obj); +static void gitg_history_paned_finalize (GObject * obj); static void _vala_gitg_history_paned_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_history_paned_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -523,124 +523,128 @@ void gitg_history_paned_set_inner_orientation (GitgHistoryPaned* self, GtkOrientation value) { - GitgAnimatedPaned* _tmp0_ = NULL; - GtkOrientation _tmp1_ = 0; - GtkOrientation _tmp2_ = 0; - GtkOrientation _tmp3_ = 0; #line 51 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" g_return_if_fail (self != NULL); +#line 51 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" + if (gitg_history_paned_get_inner_orientation (self) != value) { +#line 531 "gitg-history-paned.c" + GitgAnimatedPaned* _tmp0_ = NULL; + GtkOrientation _tmp1_ = 0; + GtkOrientation _tmp2_ = 0; + GtkOrientation _tmp3_ = 0; #line 53 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp0_ = self->priv->d_paned_panels; + _tmp0_ = self->priv->d_paned_panels; #line 53 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp1_ = gtk_orientable_get_orientation ((GtkOrientable*) _tmp0_); + _tmp1_ = gtk_orientable_get_orientation ((GtkOrientable*) _tmp0_); #line 53 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp2_ = _tmp1_; + _tmp2_ = _tmp1_; #line 53 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp3_ = value; + _tmp3_ = value; #line 53 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - if (_tmp2_ != _tmp3_) { -#line 543 "gitg-history-paned.c" - GitgAnimatedPaned* _tmp4_ = NULL; - GtkOrientation _tmp5_ = 0; - GitgAnimatedPaned* _tmp6_ = NULL; - GtkScrolledWindow* _tmp7_ = NULL; - GitgAnimatedPaned* _tmp8_ = NULL; - GtkStack* _tmp9_ = NULL; - GtkWidget* p1 = NULL; - GtkWidget* p2 = NULL; - GtkOrientation _tmp10_ = 0; - GitgAnimatedPaned* _tmp19_ = NULL; - GtkWidget* _tmp20_ = NULL; - GitgAnimatedPaned* _tmp21_ = NULL; - GtkWidget* _tmp22_ = NULL; + if (_tmp2_ != _tmp3_) { +#line 546 "gitg-history-paned.c" + GitgAnimatedPaned* _tmp4_ = NULL; + GtkOrientation _tmp5_ = 0; + GitgAnimatedPaned* _tmp6_ = NULL; + GtkScrolledWindow* _tmp7_ = NULL; + GitgAnimatedPaned* _tmp8_ = NULL; + GtkStack* _tmp9_ = NULL; + GtkWidget* p1 = NULL; + GtkWidget* p2 = NULL; + GtkOrientation _tmp10_ = 0; + GitgAnimatedPaned* _tmp19_ = NULL; + GtkWidget* _tmp20_ = NULL; + GitgAnimatedPaned* _tmp21_ = NULL; + GtkWidget* _tmp22_ = NULL; #line 55 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp4_ = self->priv->d_paned_panels; + _tmp4_ = self->priv->d_paned_panels; #line 55 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp5_ = value; + _tmp5_ = value; #line 55 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - gtk_orientable_set_orientation ((GtkOrientable*) _tmp4_, _tmp5_); + gtk_orientable_set_orientation ((GtkOrientable*) _tmp4_, _tmp5_); #line 58 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp6_ = self->priv->d_paned_panels; + _tmp6_ = self->priv->d_paned_panels; #line 58 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp7_ = self->priv->d_scrolled_window_commit_list; + _tmp7_ = self->priv->d_scrolled_window_commit_list; #line 58 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - gtk_container_remove ((GtkContainer*) _tmp6_, (GtkWidget*) _tmp7_); + gtk_container_remove ((GtkContainer*) _tmp6_, (GtkWidget*) _tmp7_); #line 59 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp8_ = self->priv->d_paned_panels; + _tmp8_ = self->priv->d_paned_panels; #line 59 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp9_ = self->priv->d_stack_panel; + _tmp9_ = self->priv->d_stack_panel; #line 59 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - gtk_container_remove ((GtkContainer*) _tmp8_, (GtkWidget*) _tmp9_); + gtk_container_remove ((GtkContainer*) _tmp8_, (GtkWidget*) _tmp9_); #line 64 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp10_ = value; + _tmp10_ = value; #line 64 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - if (_tmp10_ == GTK_ORIENTATION_HORIZONTAL) { -#line 579 "gitg-history-paned.c" - GtkStack* _tmp11_ = NULL; - GtkWidget* _tmp12_ = NULL; - GtkScrolledWindow* _tmp13_ = NULL; - GtkWidget* _tmp14_ = NULL; + if (_tmp10_ == GTK_ORIENTATION_HORIZONTAL) { +#line 582 "gitg-history-paned.c" + GtkStack* _tmp11_ = NULL; + GtkWidget* _tmp12_ = NULL; + GtkScrolledWindow* _tmp13_ = NULL; + GtkWidget* _tmp14_ = NULL; #line 66 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp11_ = self->priv->d_stack_panel; + _tmp11_ = self->priv->d_stack_panel; #line 66 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp12_ = _g_object_ref0 ((GtkWidget*) _tmp11_); + _tmp12_ = _g_object_ref0 ((GtkWidget*) _tmp11_); #line 66 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _g_object_unref0 (p1); + _g_object_unref0 (p1); #line 66 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - p1 = _tmp12_; + p1 = _tmp12_; #line 67 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp13_ = self->priv->d_scrolled_window_commit_list; + _tmp13_ = self->priv->d_scrolled_window_commit_list; #line 67 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp14_ = _g_object_ref0 ((GtkWidget*) _tmp13_); + _tmp14_ = _g_object_ref0 ((GtkWidget*) _tmp13_); #line 67 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _g_object_unref0 (p2); + _g_object_unref0 (p2); #line 67 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - p2 = _tmp14_; -#line 600 "gitg-history-paned.c" - } else { - GtkScrolledWindow* _tmp15_ = NULL; - GtkWidget* _tmp16_ = NULL; - GtkStack* _tmp17_ = NULL; - GtkWidget* _tmp18_ = NULL; + p2 = _tmp14_; +#line 603 "gitg-history-paned.c" + } else { + GtkScrolledWindow* _tmp15_ = NULL; + GtkWidget* _tmp16_ = NULL; + GtkStack* _tmp17_ = NULL; + GtkWidget* _tmp18_ = NULL; #line 71 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp15_ = self->priv->d_scrolled_window_commit_list; + _tmp15_ = self->priv->d_scrolled_window_commit_list; #line 71 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp16_ = _g_object_ref0 ((GtkWidget*) _tmp15_); + _tmp16_ = _g_object_ref0 ((GtkWidget*) _tmp15_); #line 71 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _g_object_unref0 (p1); + _g_object_unref0 (p1); #line 71 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - p1 = _tmp16_; + p1 = _tmp16_; #line 72 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp17_ = self->priv->d_stack_panel; + _tmp17_ = self->priv->d_stack_panel; #line 72 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp18_ = _g_object_ref0 ((GtkWidget*) _tmp17_); + _tmp18_ = _g_object_ref0 ((GtkWidget*) _tmp17_); #line 72 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _g_object_unref0 (p2); + _g_object_unref0 (p2); #line 72 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - p2 = _tmp18_; -#line 622 "gitg-history-paned.c" - } + p2 = _tmp18_; +#line 625 "gitg-history-paned.c" + } #line 75 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp19_ = self->priv->d_paned_panels; + _tmp19_ = self->priv->d_paned_panels; #line 75 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp20_ = p1; + _tmp20_ = p1; #line 75 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - gtk_paned_pack1 ((GtkPaned*) _tmp19_, _tmp20_, TRUE, TRUE); + gtk_paned_pack1 ((GtkPaned*) _tmp19_, _tmp20_, TRUE, TRUE); #line 76 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp21_ = self->priv->d_paned_panels; + _tmp21_ = self->priv->d_paned_panels; #line 76 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _tmp22_ = p2; + _tmp22_ = p2; #line 76 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - gtk_paned_pack2 ((GtkPaned*) _tmp21_, _tmp22_, FALSE, FALSE); + gtk_paned_pack2 ((GtkPaned*) _tmp21_, _tmp22_, FALSE, FALSE); #line 53 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _g_object_unref0 (p2); + _g_object_unref0 (p2); #line 53 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - _g_object_unref0 (p1); -#line 640 "gitg-history-paned.c" - } + _g_object_unref0 (p1); +#line 643 "gitg-history-paned.c" + } #line 51 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - g_object_notify ((GObject *) self, "inner-orientation"); -#line 644 "gitg-history-paned.c" + g_object_notify ((GObject *) self, "inner-orientation"); +#line 647 "gitg-history-paned.c" + } } @@ -655,7 +659,7 @@ result = _tmp0_; #line 164 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" return result; -#line 659 "gitg-history-paned.c" +#line 663 "gitg-history-paned.c" } @@ -670,7 +674,7 @@ result = _tmp0_; #line 169 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" return result; -#line 674 "gitg-history-paned.c" +#line 678 "gitg-history-paned.c" } @@ -685,7 +689,7 @@ result = (GtkPaned*) _tmp0_; #line 174 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" return result; -#line 689 "gitg-history-paned.c" +#line 693 "gitg-history-paned.c" } @@ -700,7 +704,7 @@ result = _tmp0_; #line 179 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" return result; -#line 704 "gitg-history-paned.c" +#line 708 "gitg-history-paned.c" } @@ -709,7 +713,7 @@ g_atomic_int_inc (&_data72_->_ref_count_); #line 132 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" return _data72_; -#line 713 "gitg-history-paned.c" +#line 717 "gitg-history-paned.c" } @@ -718,7 +722,7 @@ _data72_ = (Block72Data*) _userdata_; #line 132 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" if (g_atomic_int_dec_and_test (&_data72_->_ref_count_)) { -#line 722 "gitg-history-paned.c" +#line 726 "gitg-history-paned.c" GitgHistoryPaned* self; #line 132 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" self = _data72_->self; @@ -728,7 +732,7 @@ _g_object_unref0 (self); #line 132 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" g_slice_free (Block72Data, _data72_); -#line 732 "gitg-history-paned.c" +#line 736 "gitg-history-paned.c" } } @@ -742,14 +746,14 @@ _tmp0_ = _data72_->state_settings; #line 140 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" gitg_history_paned_store_paned_position (self, (GitgAnimatedPaned*) self, _tmp0_, "paned-sidebar-position"); -#line 746 "gitg-history-paned.c" +#line 750 "gitg-history-paned.c" } static void __gitg_history_paned___lambda123__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 139 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" _gitg_history_paned___lambda123_ (self); -#line 753 "gitg-history-paned.c" +#line 757 "gitg-history-paned.c" } @@ -765,14 +769,14 @@ _tmp1_ = _data72_->state_settings; #line 144 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" gitg_history_paned_store_paned_position (self, _tmp0_, _tmp1_, "paned-panels-position"); -#line 769 "gitg-history-paned.c" +#line 773 "gitg-history-paned.c" } static void __gitg_history_paned___lambda124__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 143 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" _gitg_history_paned___lambda124_ (self); -#line 776 "gitg-history-paned.c" +#line 780 "gitg-history-paned.c" } @@ -851,7 +855,7 @@ _data72_ = NULL; #line 132 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" return obj; -#line 855 "gitg-history-paned.c" +#line 859 "gitg-history-paned.c" } @@ -899,7 +903,7 @@ gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "d_stack_panel", FALSE, GitgHistoryPaned_private_offset + G_STRUCT_OFFSET (GitgHistoryPanedPrivate, d_stack_panel)); #line 24 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "d_scrolled_window_commit_list", FALSE, GitgHistoryPaned_private_offset + G_STRUCT_OFFSET (GitgHistoryPanedPrivate, d_scrolled_window_commit_list)); -#line 903 "gitg-history-paned.c" +#line 907 "gitg-history-paned.c" } @@ -907,16 +911,16 @@ #line 24 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" self->priv = GITG_HISTORY_PANED_GET_PRIVATE (self); #line 24 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" - g_type_ensure (GITG_HISTORY_TYPE_REFS_LIST); -#line 24 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" g_type_ensure (GITG_TYPE_ANIMATED_PANED); #line 24 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" + g_type_ensure (GITG_HISTORY_TYPE_REFS_LIST); +#line 24 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 916 "gitg-history-paned.c" +#line 920 "gitg-history-paned.c" } -static void gitg_history_paned_finalize (GObject* obj) { +static void gitg_history_paned_finalize (GObject * obj) { GitgHistoryPaned * self; #line 24 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_HISTORY_TYPE_PANED, GitgHistoryPaned); @@ -936,7 +940,7 @@ _g_object_unref0 (self->priv->d_scrolled_window_commit_list); #line 24 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" G_OBJECT_CLASS (gitg_history_paned_parent_class)->finalize (obj); -#line 940 "gitg-history-paned.c" +#line 944 "gitg-history-paned.c" } @@ -987,13 +991,13 @@ g_value_set_object (value, gitg_history_paned_get_stack_panel (self)); #line 24 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" break; -#line 991 "gitg-history-paned.c" +#line 995 "gitg-history-paned.c" default: #line 24 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 24 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" break; -#line 997 "gitg-history-paned.c" +#line 1001 "gitg-history-paned.c" } } @@ -1009,13 +1013,13 @@ gitg_history_paned_set_inner_orientation (self, g_value_get_enum (value)); #line 24 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" break; -#line 1013 "gitg-history-paned.c" +#line 1017 "gitg-history-paned.c" default: #line 24 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 24 "/home/jesse/dev/gitg/gitg/history/gitg-history-paned.vala" break; -#line 1019 "gitg-history-paned.c" +#line 1023 "gitg-history-paned.c" } } diff -Nru gitg-3.22.0/gitg/history/gitg-history-refs-list.c gitg-3.23.0/gitg/history/gitg-history-refs-list.c --- gitg-3.22.0/gitg/history/gitg-history-refs-list.c 2016-08-17 18:00:36.000000000 +0000 +++ gitg-3.23.0/gitg/history/gitg-history-refs-list.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-history-refs-list.c generated by valac 0.32.1, the Vala compiler +/* gitg-history-refs-list.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-history-refs-list.vala, do not modify */ /* @@ -111,6 +111,11 @@ #define GITG_HISTORY_TYPE_DEFAULT_SELECTION (gitg_history_default_selection_get_type ()) typedef struct _Block75Data Block75Data; typedef struct _GitgHistoryRefsListParamSpecRemoteHeader GitgHistoryRefsListParamSpecRemoteHeader; +enum { + GITG_HISTORY_REFS_LIST_CHANGED_SIGNAL, + GITG_HISTORY_REFS_LIST_LAST_SIGNAL +}; +static guint gitg_history_refs_list_signals[GITG_HISTORY_REFS_LIST_LAST_SIGNAL] = {0}; typedef enum { GITG_HISTORY_REF_ANIMATION_NONE, @@ -249,9 +254,9 @@ static gpointer gitg_history_ref_row_parent_class = NULL; -static GitgHistoryRefTypedIface* gitg_history_ref_row_gitg_history_ref_typed_parent_iface = NULL; +static GitgHistoryRefTypedIface * gitg_history_ref_row_gitg_history_ref_typed_parent_iface = NULL; static gpointer gitg_history_ref_header_parent_class = NULL; -static GitgHistoryRefTypedIface* gitg_history_ref_header_gitg_history_ref_typed_parent_iface = NULL; +static GitgHistoryRefTypedIface * gitg_history_ref_header_gitg_history_ref_typed_parent_iface = NULL; static gpointer gitg_history_refs_list_parent_class = NULL; static gpointer gitg_history_refs_list_remote_header_parent_class = NULL; @@ -295,7 +300,7 @@ static gboolean __lambda119_ (Block73Data* _data73_); static gboolean ___lambda119__gsource_func (gpointer self); void gitg_history_ref_row_unreveal (GitgHistoryRefRow* self); -static void gitg_history_ref_row_finalize (GObject* obj); +static void gitg_history_ref_row_finalize (GObject * obj); static void _vala_gitg_history_ref_row_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_history_ref_row_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); GType gitg_history_ref_header_get_type (void) G_GNUC_CONST; @@ -323,7 +328,7 @@ const gchar* gitg_history_ref_header_get_ref_name (GitgHistoryRefHeader* self); gboolean gitg_history_ref_header_get_is_sub_header_remote (GitgHistoryRefHeader* self); gchar* gitg_history_ref_header_get_icon_name (GitgHistoryRefHeader* self); -static void gitg_history_ref_header_finalize (GObject* obj); +static void gitg_history_ref_header_finalize (GObject * obj); static void _vala_gitg_history_ref_header_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_history_ref_header_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); GType gitg_history_refs_list_get_type (void) G_GNUC_CONST; @@ -351,7 +356,7 @@ GITG_HISTORY_REFS_LIST_IS_ALL, GITG_HISTORY_REFS_LIST_SELECTION }; -static void _vala_GitgHistoryRefsListHeaderState_array_free (GitgHistoryRefsListHeaderState* array, gint array_length); +static void _vala_GitgHistoryRefsListHeaderState_array_free (GitgHistoryRefsListHeaderState * array, gint array_length); static void gitg_history_refs_list_real_dispose (GObject* base); static void gitg_history_refs_list_on_tip_updated (GitgHistoryRefsList* self, GgitRemote* remote, const gchar* refname, GgitOId* a, GgitOId* b); static void _gitg_history_refs_list_on_tip_updated_gitg_remote_tip_updated (GitgRemote* _sender, const gchar* refname, GgitOId* a, GgitOId* b, gpointer self); @@ -370,7 +375,7 @@ gboolean gitg_history_refs_list_remove_ref (GitgHistoryRefsList* self, GitgRef* reference); static GitgHistoryRefHeader* gitg_history_refs_list_add_remote_header (GitgHistoryRefsList* self, const gchar* name); GitgExtRemoteLookup* gitg_history_refs_list_get_remote_lookup (GitgHistoryRefsList* self); -static void _vala_array_add21 (GitgRemote*** array, int* length, int* size, GitgRemote* value); +static void _vala_array_add21 (GitgRemote** * array, int* length, int* size, GitgRemote* value); static GitgHistoryRefsListRemoteHeader* gitg_history_refs_list_remote_header_new (GitgHistoryRefHeader* h); static GitgHistoryRefsListRemoteHeader* gitg_history_refs_list_remote_header_construct (GType object_type, GitgHistoryRefHeader* h); static GitgHistoryRefRow* gitg_history_refs_list_add_ref_row (GitgHistoryRefsList* self, GitgRef* reference, GitgHistoryRefAnimation animation); @@ -387,7 +392,7 @@ gboolean gitg_history_refs_list_select_ref (GitgHistoryRefsList* self, GitgRef* reference); static void gitg_history_refs_list_store_expanded_state (GitgHistoryRefsList* self); static void __lambda120_ (GitgHistoryRefsList* self, GtkWidget* child); -static void _vala_array_add22 (GitgHistoryRefsListHeaderState** array, int* length, int* size, const GitgHistoryRefsListHeaderState* value); +static void _vala_array_add22 (GitgHistoryRefsListHeaderState* * array, int* length, int* size, const GitgHistoryRefsListHeaderState* value); static void ___lambda120__gtk_callback (GtkWidget* widget, gpointer self); static void gitg_history_refs_list_refresh (GitgHistoryRefsList* self); static Block74Data* block74_data_ref (Block74Data* _data74_); @@ -423,8 +428,8 @@ enum { GITG_HISTORY_REFS_LIST_REMOTE_HEADER_DUMMY_PROPERTY }; -static void gitg_history_refs_list_remote_header_finalize (GitgHistoryRefsListRemoteHeader* obj); -static void gitg_history_refs_list_finalize (GObject* obj); +static void gitg_history_refs_list_remote_header_finalize (GitgHistoryRefsListRemoteHeader * obj); +static void gitg_history_refs_list_finalize (GObject * obj); static void _vala_gitg_history_refs_list_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_history_refs_list_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -440,54 +445,54 @@ switch (_tmp0_) { #line 25 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" case GITG_REF_TYPE_NONE: -#line 444 "gitg-history-refs-list.c" +#line 449 "gitg-history-refs-list.c" { #line 28 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = 0; #line 28 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 450 "gitg-history-refs-list.c" +#line 455 "gitg-history-refs-list.c" } #line 25 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" case GITG_REF_TYPE_BRANCH: -#line 454 "gitg-history-refs-list.c" +#line 459 "gitg-history-refs-list.c" { #line 30 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = 1; #line 30 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 460 "gitg-history-refs-list.c" +#line 465 "gitg-history-refs-list.c" } #line 25 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" case GITG_REF_TYPE_REMOTE: -#line 464 "gitg-history-refs-list.c" +#line 469 "gitg-history-refs-list.c" { #line 32 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = 2; #line 32 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 470 "gitg-history-refs-list.c" +#line 475 "gitg-history-refs-list.c" } #line 25 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" case GITG_REF_TYPE_TAG: -#line 474 "gitg-history-refs-list.c" +#line 479 "gitg-history-refs-list.c" { #line 34 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = 3; #line 34 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 480 "gitg-history-refs-list.c" +#line 485 "gitg-history-refs-list.c" } default: #line 25 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 485 "gitg-history-refs-list.c" +#line 490 "gitg-history-refs-list.c" } #line 37 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = 4; #line 37 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 491 "gitg-history-refs-list.c" +#line 496 "gitg-history-refs-list.c" } @@ -508,7 +513,7 @@ g_return_val_if_fail (self != NULL, 0); #line 48 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return GITG_HISTORY_REF_TYPED_GET_INTERFACE (self)->get_ref_type (self); -#line 512 "gitg-history-refs-list.c" +#line 517 "gitg-history-refs-list.c" } @@ -521,7 +526,7 @@ initialized = TRUE; #line 46 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_object_interface_install_property (iface, g_param_spec_enum ("ref-type", "ref-type", "ref-type", GITG_TYPE_REF_TYPE, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 525 "gitg-history-refs-list.c" +#line 530 "gitg-history-refs-list.c" } } @@ -554,21 +559,21 @@ static void _gitg_history_ref_row_on_child_revealed_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 143 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gitg_history_ref_row_on_child_revealed ((GitgHistoryRefRow*) self, _sender, pspec); -#line 558 "gitg-history-refs-list.c" +#line 563 "gitg-history-refs-list.c" } static gpointer _g_object_ref0 (gpointer self) { #line 147 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return self ? g_object_ref (self) : NULL; -#line 565 "gitg-history-refs-list.c" +#line 570 "gitg-history-refs-list.c" } static void _vala_GgitOId_free (GgitOId* self) { #line 156 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_boxed_free (ggit_oid_get_type (), self); -#line 572 "gitg-history-refs-list.c" +#line 577 "gitg-history-refs-list.c" } @@ -599,7 +604,7 @@ _tmp1_ = reference; #line 95 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp1_ != NULL) { -#line 603 "gitg-history-refs-list.c" +#line 608 "gitg-history-refs-list.c" { GgitRef* _tmp2_ = NULL; GitgRef* _tmp3_ = NULL; @@ -618,7 +623,7 @@ _tmp2_ = _tmp4_; #line 99 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 622 "gitg-history-refs-list.c" +#line 627 "gitg-history-refs-list.c" goto __catch117_g_error; } #line 99 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -639,14 +644,14 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 99 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (_tmp2_); -#line 643 "gitg-history-refs-list.c" +#line 648 "gitg-history-refs-list.c" goto __catch117_g_error; } #line 101 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp9_ = obj; #line 101 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, ggit_tag_get_type ())) { -#line 650 "gitg-history-refs-list.c" +#line 655 "gitg-history-refs-list.c" GgitObject* _tmp10_ = NULL; GgitSignature* _tmp11_ = NULL; #line 103 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -657,14 +662,14 @@ _g_object_unref0 (self->priv->d_updated); #line 103 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" self->priv->d_updated = _tmp11_; -#line 661 "gitg-history-refs-list.c" +#line 666 "gitg-history-refs-list.c" } else { GgitObject* _tmp12_ = NULL; #line 105 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp12_ = obj; #line 105 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, ggit_commit_get_type ())) { -#line 668 "gitg-history-refs-list.c" +#line 673 "gitg-history-refs-list.c" GgitObject* _tmp13_ = NULL; GgitSignature* _tmp14_ = NULL; #line 107 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -675,14 +680,14 @@ _g_object_unref0 (self->priv->d_updated); #line 107 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" self->priv->d_updated = _tmp14_; -#line 679 "gitg-history-refs-list.c" +#line 684 "gitg-history-refs-list.c" } } #line 97 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (obj); #line 97 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (_tmp2_); -#line 686 "gitg-history-refs-list.c" +#line 691 "gitg-history-refs-list.c" } goto __finally117; __catch117_g_error: @@ -705,7 +710,7 @@ fprintf (_tmp15_, "%s\n", _tmp17_); #line 97 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_error_free0 (e); -#line 709 "gitg-history-refs-list.c" +#line 714 "gitg-history-refs-list.c" } __finally117: #line 97 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -716,27 +721,27 @@ g_clear_error (&_inner_error_); #line 97 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return NULL; -#line 720 "gitg-history-refs-list.c" +#line 725 "gitg-history-refs-list.c" } } #line 116 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp18_ = animation; #line 116 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp18_ == GITG_HISTORY_REF_ANIMATION_ANIMATE) { -#line 727 "gitg-history-refs-list.c" +#line 732 "gitg-history-refs-list.c" GtkRevealer* _tmp19_ = NULL; #line 118 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp19_ = self->priv->d_revealer; #line 118 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gtk_revealer_set_transition_type (_tmp19_, GTK_REVEALER_TRANSITION_TYPE_SLIDE_DOWN); -#line 733 "gitg-history-refs-list.c" +#line 738 "gitg-history-refs-list.c" } else { GtkRevealer* _tmp20_ = NULL; #line 122 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp20_ = self->priv->d_revealer; #line 122 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gtk_revealer_set_reveal_child (_tmp20_, TRUE); -#line 740 "gitg-history-refs-list.c" +#line 745 "gitg-history-refs-list.c" } #line 125 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp21_ = self->priv->d_label; @@ -754,7 +759,7 @@ _tmp25_ = _tmp24_; #line 127 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp25_) { -#line 758 "gitg-history-refs-list.c" +#line 763 "gitg-history-refs-list.c" GtkImage* _tmp26_ = NULL; GtkImage* _tmp27_ = NULL; #line 129 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -765,13 +770,13 @@ _tmp27_ = self->priv->d_icon; #line 130 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gtk_widget_show ((GtkWidget*) _tmp27_); -#line 769 "gitg-history-refs-list.c" +#line 774 "gitg-history-refs-list.c" } #line 133 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp28_ = reference; #line 133 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp28_ != NULL) { -#line 775 "gitg-history-refs-list.c" +#line 780 "gitg-history-refs-list.c" GtkWidget* _tmp29_ = NULL; GtkWidget* _tmp30_ = NULL; gint _tmp31_ = 0; @@ -786,7 +791,7 @@ _tmp32_ = _tmp31_; #line 135 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gtk_widget_set_margin_start (_tmp30_, _tmp32_ + 12); -#line 790 "gitg-history-refs-list.c" +#line 795 "gitg-history-refs-list.c" } #line 138 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp33_ = gitg_history_ref_typed_get_ref_type ((GitgHistoryRefTyped*) self); @@ -794,7 +799,7 @@ _tmp34_ = _tmp33_; #line 138 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp34_ == GITG_REF_TYPE_REMOTE) { -#line 798 "gitg-history-refs-list.c" +#line 803 "gitg-history-refs-list.c" GtkWidget* _tmp35_ = NULL; GtkWidget* _tmp36_ = NULL; gint _tmp37_ = 0; @@ -809,7 +814,7 @@ _tmp38_ = _tmp37_; #line 140 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gtk_widget_set_margin_start (_tmp36_, _tmp38_ + 12); -#line 813 "gitg-history-refs-list.c" +#line 818 "gitg-history-refs-list.c" } #line 143 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp39_ = self->priv->d_revealer; @@ -819,7 +824,7 @@ _tmp41_ = reference; #line 145 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp41_ != NULL) { -#line 823 "gitg-history-refs-list.c" +#line 828 "gitg-history-refs-list.c" GitgRef* _tmp42_ = NULL; gboolean _tmp43_ = FALSE; #line 145 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -828,15 +833,15 @@ _tmp43_ = ggit_ref_is_branch ((GgitRef*) _tmp42_); #line 145 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp40_ = _tmp43_; -#line 832 "gitg-history-refs-list.c" +#line 837 "gitg-history-refs-list.c" } else { #line 145 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp40_ = FALSE; -#line 836 "gitg-history-refs-list.c" +#line 841 "gitg-history-refs-list.c" } #line 145 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp40_) { -#line 840 "gitg-history-refs-list.c" +#line 845 "gitg-history-refs-list.c" GitgBranch* branch = NULL; GitgRef* _tmp44_ = NULL; GitgBranch* _tmp45_ = NULL; @@ -846,7 +851,7 @@ _tmp45_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp44_, GITG_TYPE_BRANCH) ? ((GitgBranch*) _tmp44_) : NULL); #line 147 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" branch = _tmp45_; -#line 850 "gitg-history-refs-list.c" +#line 855 "gitg-history-refs-list.c" { GitgRef* upstream = NULL; GitgBranch* _tmp46_ = NULL; @@ -882,7 +887,7 @@ upstream = _tmp47_; #line 151 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 886 "gitg-history-refs-list.c" +#line 891 "gitg-history-refs-list.c" goto __catch118_g_error; } #line 153 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -899,7 +904,7 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 156 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (upstream); -#line 903 "gitg-history-refs-list.c" +#line 908 "gitg-history-refs-list.c" goto __catch118_g_error; } #line 157 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -914,7 +919,7 @@ _g_object_unref0 (_tmp48_); #line 157 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (upstream); -#line 918 "gitg-history-refs-list.c" +#line 923 "gitg-history-refs-list.c" goto __catch118_g_error; } #line 156 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -967,7 +972,7 @@ _g_object_unref0 (_tmp48_); #line 156 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (upstream); -#line 971 "gitg-history-refs-list.c" +#line 976 "gitg-history-refs-list.c" goto __catch118_g_error; } #line 161 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -976,110 +981,101 @@ if (_tmp68_ != ((gsize) 0)) { #line 161 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp67_ = TRUE; -#line 980 "gitg-history-refs-list.c" +#line 985 "gitg-history-refs-list.c" } else { gsize _tmp69_ = 0UL; #line 161 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp69_ = behind; #line 161 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp67_ = _tmp69_ != ((gsize) 0); -#line 987 "gitg-history-refs-list.c" +#line 992 "gitg-history-refs-list.c" } #line 161 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp67_) { -#line 991 "gitg-history-refs-list.c" +#line 996 "gitg-history-refs-list.c" gboolean _tmp70_ = FALSE; gsize _tmp71_ = 0UL; #line 163 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp71_ = ahead; #line 163 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp71_ != ((gsize) 0)) { -#line 998 "gitg-history-refs-list.c" +#line 1003 "gitg-history-refs-list.c" gsize _tmp72_ = 0UL; #line 163 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp72_ = behind; #line 163 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp70_ = _tmp72_ != ((gsize) 0); -#line 1004 "gitg-history-refs-list.c" +#line 1009 "gitg-history-refs-list.c" } else { #line 163 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp70_ = FALSE; -#line 1008 "gitg-history-refs-list.c" +#line 1013 "gitg-history-refs-list.c" } #line 163 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp70_) { -#line 1012 "gitg-history-refs-list.c" +#line 1017 "gitg-history-refs-list.c" GtkLabel* _tmp73_ = NULL; - const gchar* _tmp74_ = NULL; + gsize _tmp74_ = 0UL; gsize _tmp75_ = 0UL; - gsize _tmp76_ = 0UL; + gchar* _tmp76_ = NULL; gchar* _tmp77_ = NULL; - gchar* _tmp78_ = NULL; #line 165 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp73_ = self->priv->d_ahead_behind; #line 165 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp74_ = _ ("%d ahead, %d behind"); -#line 165 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp75_ = ahead; + _tmp74_ = ahead; #line 165 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp76_ = behind; + _tmp75_ = behind; #line 165 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp77_ = g_strdup_printf (_tmp74_, _tmp75_, _tmp76_); + _tmp76_ = g_strdup_printf (_ ("%zu ahead, %zu behind"), _tmp74_, _tmp75_); #line 165 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp78_ = _tmp77_; + _tmp77_ = _tmp76_; #line 165 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - gtk_label_set_label (_tmp73_, _tmp78_); + gtk_label_set_label (_tmp73_, _tmp77_); #line 165 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _g_free0 (_tmp78_); -#line 1035 "gitg-history-refs-list.c" + _g_free0 (_tmp77_); +#line 1037 "gitg-history-refs-list.c" } else { - gsize _tmp79_ = 0UL; + gsize _tmp78_ = 0UL; #line 167 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp79_ = ahead; + _tmp78_ = ahead; #line 167 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - if (_tmp79_ != ((gsize) 0)) { -#line 1042 "gitg-history-refs-list.c" - GtkLabel* _tmp80_ = NULL; - const gchar* _tmp81_ = NULL; - gsize _tmp82_ = 0UL; - gchar* _tmp83_ = NULL; - gchar* _tmp84_ = NULL; + if (_tmp78_ != ((gsize) 0)) { +#line 1044 "gitg-history-refs-list.c" + GtkLabel* _tmp79_ = NULL; + gsize _tmp80_ = 0UL; + gchar* _tmp81_ = NULL; + gchar* _tmp82_ = NULL; #line 169 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp80_ = self->priv->d_ahead_behind; + _tmp79_ = self->priv->d_ahead_behind; #line 169 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp81_ = _ ("%d ahead"); + _tmp80_ = ahead; #line 169 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp82_ = ahead; + _tmp81_ = g_strdup_printf (_ ("%zu ahead"), _tmp80_); #line 169 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp83_ = g_strdup_printf (_tmp81_, _tmp82_); + _tmp82_ = _tmp81_; #line 169 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp84_ = _tmp83_; + gtk_label_set_label (_tmp79_, _tmp82_); #line 169 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - gtk_label_set_label (_tmp80_, _tmp84_); -#line 169 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _g_free0 (_tmp84_); -#line 1062 "gitg-history-refs-list.c" + _g_free0 (_tmp82_); +#line 1061 "gitg-history-refs-list.c" } else { - GtkLabel* _tmp85_ = NULL; - const gchar* _tmp86_ = NULL; - gsize _tmp87_ = 0UL; - gchar* _tmp88_ = NULL; - gchar* _tmp89_ = NULL; -#line 173 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp85_ = self->priv->d_ahead_behind; + GtkLabel* _tmp83_ = NULL; + gsize _tmp84_ = 0UL; + gchar* _tmp85_ = NULL; + gchar* _tmp86_ = NULL; #line 173 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp86_ = _ ("%d behind"); + _tmp83_ = self->priv->d_ahead_behind; #line 173 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp87_ = behind; + _tmp84_ = behind; #line 173 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp88_ = g_strdup_printf (_tmp86_, _tmp87_); + _tmp85_ = g_strdup_printf (_ ("%zu behind"), _tmp84_); #line 173 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp89_ = _tmp88_; + _tmp86_ = _tmp85_; #line 173 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - gtk_label_set_label (_tmp85_, _tmp89_); + gtk_label_set_label (_tmp83_, _tmp86_); #line 173 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _g_free0 (_tmp89_); -#line 1083 "gitg-history-refs-list.c" + _g_free0 (_tmp86_); +#line 1079 "gitg-history-refs-list.c" } } } @@ -1089,7 +1085,7 @@ _g_object_unref0 (_tmp48_); #line 149 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (upstream); -#line 1093 "gitg-history-refs-list.c" +#line 1089 "gitg-history-refs-list.c" } goto __finally118; __catch118_g_error: @@ -1098,7 +1094,7 @@ g_clear_error (&_inner_error_); #line 149 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _inner_error_ = NULL; -#line 1102 "gitg-history-refs-list.c" +#line 1098 "gitg-history-refs-list.c" } __finally118: #line 149 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -1111,22 +1107,22 @@ g_clear_error (&_inner_error_); #line 149 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return NULL; -#line 1115 "gitg-history-refs-list.c" +#line 1111 "gitg-history-refs-list.c" } #line 145 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (branch); -#line 1119 "gitg-history-refs-list.c" +#line 1115 "gitg-history-refs-list.c" } #line 91 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return self; -#line 1123 "gitg-history-refs-list.c" +#line 1119 "gitg-history-refs-list.c" } GitgHistoryRefRow* gitg_history_ref_row_new (GitgRef* reference, GitgHistoryRefAnimation animation) { #line 91 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return gitg_history_ref_row_construct (GITG_HISTORY_TYPE_REF_ROW, reference, animation); -#line 1130 "gitg-history-refs-list.c" +#line 1126 "gitg-history-refs-list.c" } @@ -1148,7 +1144,7 @@ _tmp2_ = _tmp1_; #line 187 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (!_tmp2_) { -#line 1152 "gitg-history-refs-list.c" +#line 1148 "gitg-history-refs-list.c" GtkAllocation alloc = {0}; GtkRevealer* _tmp3_ = NULL; GtkAllocation _tmp4_ = {0}; @@ -1160,7 +1156,7 @@ alloc = _tmp4_; #line 192 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gtk_widget_destroy ((GtkWidget*) self); -#line 1164 "gitg-history-refs-list.c" +#line 1160 "gitg-history-refs-list.c" } } @@ -1176,7 +1172,7 @@ _tmp0_ = self->priv->d_revealer; #line 200 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gtk_revealer_set_reveal_child (_tmp0_, TRUE); -#line 1180 "gitg-history-refs-list.c" +#line 1176 "gitg-history-refs-list.c" } @@ -1184,81 +1180,78 @@ gchar* result = NULL; GitgRef* _tmp0_ = NULL; GitgParsedRefName* pn = NULL; - GitgRef* _tmp3_ = NULL; + GitgRef* _tmp2_ = NULL; + GitgParsedRefName* _tmp3_ = NULL; GitgParsedRefName* _tmp4_ = NULL; GitgParsedRefName* _tmp5_ = NULL; - GitgParsedRefName* _tmp6_ = NULL; + GitgRefType _tmp6_ = 0; GitgRefType _tmp7_ = 0; - GitgRefType _tmp8_ = 0; - GitgParsedRefName* _tmp12_ = NULL; + GitgParsedRefName* _tmp11_ = NULL; + gchar* _tmp12_ = NULL; gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; #line 203 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_return_val_if_fail (self != NULL, NULL); #line 205 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp0_ = self->priv->_reference; #line 205 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp0_ == NULL) { -#line 1203 "gitg-history-refs-list.c" - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; -#line 207 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp1_ = _ ("All commits"); +#line 1199 "gitg-history-refs-list.c" + gchar* _tmp1_ = NULL; #line 207 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp1_ = g_strdup (_ ("All commits")); #line 207 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - result = _tmp2_; + result = _tmp1_; #line 207 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 1214 "gitg-history-refs-list.c" +#line 1207 "gitg-history-refs-list.c" } #line 210 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp3_ = self->priv->_reference; + _tmp2_ = self->priv->_reference; #line 210 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp4_ = gitg_ref_get_parsed_name (_tmp3_); + _tmp3_ = gitg_ref_get_parsed_name (_tmp2_); #line 210 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 210 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - pn = _tmp5_; + pn = _tmp4_; #line 212 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp6_ = pn; + _tmp5_ = pn; #line 212 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp7_ = gitg_parsed_ref_name_get_rtype (_tmp6_); + _tmp6_ = gitg_parsed_ref_name_get_rtype (_tmp5_); #line 212 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 212 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - if (_tmp8_ == GITG_REF_TYPE_REMOTE) { -#line 1232 "gitg-history-refs-list.c" - GitgParsedRefName* _tmp9_ = NULL; + if (_tmp7_ == GITG_REF_TYPE_REMOTE) { +#line 1225 "gitg-history-refs-list.c" + GitgParsedRefName* _tmp8_ = NULL; + gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; #line 214 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp9_ = pn; + _tmp8_ = pn; #line 214 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp10_ = gitg_parsed_ref_name_get_remote_branch (_tmp9_); + _tmp9_ = gitg_parsed_ref_name_get_remote_branch (_tmp8_); #line 214 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 214 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - result = _tmp11_; + result = _tmp10_; #line 214 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (pn); #line 214 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 1248 "gitg-history-refs-list.c" +#line 1241 "gitg-history-refs-list.c" } #line 217 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp12_ = pn; + _tmp11_ = pn; #line 217 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp13_ = gitg_parsed_ref_name_get_shortname (_tmp12_); + _tmp12_ = gitg_parsed_ref_name_get_shortname (_tmp11_); #line 217 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 217 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - result = _tmp14_; + result = _tmp13_; #line 217 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (pn); #line 217 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 1262 "gitg-history-refs-list.c" +#line 1255 "gitg-history-refs-list.c" } @@ -1318,7 +1311,7 @@ _tmp12_ = _tmp11_; #line 248 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp9_ != _tmp12_) { -#line 1322 "gitg-history-refs-list.c" +#line 1315 "gitg-history-refs-list.c" gint i1 = 0; GitgParsedRefName* _tmp13_ = NULL; GitgRefType _tmp14_ = 0; @@ -1360,7 +1353,7 @@ if (_tmp22_ < _tmp23_) { #line 253 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp21_ = -1; -#line 1364 "gitg-history-refs-list.c" +#line 1357 "gitg-history-refs-list.c" } else { gint _tmp24_ = 0; gint _tmp25_ = 0; @@ -1373,15 +1366,15 @@ if (_tmp25_ > _tmp26_) { #line 253 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp24_ = 1; -#line 1377 "gitg-history-refs-list.c" +#line 1370 "gitg-history-refs-list.c" } else { #line 253 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp24_ = 0; -#line 1381 "gitg-history-refs-list.c" +#line 1374 "gitg-history-refs-list.c" } #line 253 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp21_ = _tmp24_; -#line 1385 "gitg-history-refs-list.c" +#line 1378 "gitg-history-refs-list.c" } #line 253 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = _tmp21_; @@ -1391,7 +1384,7 @@ _g_object_unref0 (pnme); #line 253 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 1395 "gitg-history-refs-list.c" +#line 1388 "gitg-history-refs-list.c" } #line 256 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp27_ = pnme; @@ -1401,7 +1394,7 @@ _tmp29_ = _tmp28_; #line 256 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp29_ == GITG_REF_TYPE_REMOTE) { -#line 1405 "gitg-history-refs-list.c" +#line 1398 "gitg-history-refs-list.c" GitgParsedRefName* _tmp30_ = NULL; gchar* _tmp31_ = NULL; gchar* _tmp32_ = NULL; @@ -1460,7 +1453,7 @@ _g_object_unref0 (pnme); #line 258 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 1464 "gitg-history-refs-list.c" +#line 1457 "gitg-history-refs-list.c" } #line 261 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = 0; @@ -1470,7 +1463,7 @@ _g_object_unref0 (pnme); #line 261 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 1474 "gitg-history-refs-list.c" +#line 1467 "gitg-history-refs-list.c" } @@ -1481,35 +1474,35 @@ gunichar _tmp1_ = 0U; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1007 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1023 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1024 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1024 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = c; -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1024 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_); -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1024 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1026 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1026 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1499 "gitg-history-refs-list.c" +#line 1492 "gitg-history-refs-list.c" gchar* _tmp4_ = NULL; -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1027 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1027 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1027 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1507 "gitg-history-refs-list.c" +#line 1500 "gitg-history-refs-list.c" } else { -#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1029 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = -1; -#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1029 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1513 "gitg-history-refs-list.c" +#line 1506 "gitg-history-refs-list.c" } } @@ -1557,7 +1550,7 @@ result = -1; #line 268 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 1561 "gitg-history-refs-list.c" +#line 1554 "gitg-history-refs-list.c" } #line 271 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp1_ = other; @@ -1569,7 +1562,7 @@ result = 1; #line 273 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 1573 "gitg-history-refs-list.c" +#line 1566 "gitg-history-refs-list.c" } #line 276 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp3_ = other; @@ -1585,20 +1578,20 @@ result = ct; #line 280 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 1589 "gitg-history-refs-list.c" +#line 1582 "gitg-history-refs-list.c" } #line 283 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp6_ = order; #line 283 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp6_ == GITG_HISTORY_REF_ROW_SORT_ORDER_LAST_ACTIVITY) { -#line 1595 "gitg-history-refs-list.c" +#line 1588 "gitg-history-refs-list.c" gboolean _tmp7_ = FALSE; GgitSignature* _tmp8_ = NULL; #line 285 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp8_ = self->priv->d_updated; #line 285 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp8_ != NULL) { -#line 1602 "gitg-history-refs-list.c" +#line 1595 "gitg-history-refs-list.c" GitgHistoryRefRow* _tmp9_ = NULL; GgitSignature* _tmp10_ = NULL; GgitSignature* _tmp11_ = NULL; @@ -1610,15 +1603,15 @@ _tmp11_ = _tmp10_; #line 285 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp7_ = _tmp11_ != NULL; -#line 1614 "gitg-history-refs-list.c" +#line 1607 "gitg-history-refs-list.c" } else { #line 285 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp7_ = FALSE; -#line 1618 "gitg-history-refs-list.c" +#line 1611 "gitg-history-refs-list.c" } #line 285 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp7_) { -#line 1622 "gitg-history-refs-list.c" +#line 1615 "gitg-history-refs-list.c" GgitSignature* c1 = NULL; GgitSignature* _tmp12_ = NULL; GgitSignature* _tmp13_ = NULL; @@ -1679,7 +1672,7 @@ _g_object_unref0 (c1); #line 290 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 1683 "gitg-history-refs-list.c" +#line 1676 "gitg-history-refs-list.c" } } #line 294 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -1710,7 +1703,7 @@ _tmp34_ = hassep2; #line 300 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if ((_tmp33_ >= 0) != (_tmp34_ >= 0)) { -#line 1714 "gitg-history-refs-list.c" +#line 1707 "gitg-history-refs-list.c" gint _tmp35_ = 0; gint _tmp36_ = 0; #line 302 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -1719,11 +1712,11 @@ if (_tmp36_ >= 0) { #line 302 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp35_ = 1; -#line 1723 "gitg-history-refs-list.c" +#line 1716 "gitg-history-refs-list.c" } else { #line 302 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp35_ = -1; -#line 1727 "gitg-history-refs-list.c" +#line 1720 "gitg-history-refs-list.c" } #line 302 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = _tmp35_; @@ -1733,7 +1726,7 @@ _g_free0 (t1); #line 302 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 1737 "gitg-history-refs-list.c" +#line 1730 "gitg-history-refs-list.c" } #line 305 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp37_ = t1; @@ -1763,7 +1756,7 @@ _g_free0 (t1); #line 305 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 1767 "gitg-history-refs-list.c" +#line 1760 "gitg-history-refs-list.c" } @@ -1772,7 +1765,7 @@ result = gitg_history_ref_row_on_editing_focus_out ((GitgHistoryRefRow*) self, _sender, event); #line 330 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 1776 "gitg-history-refs-list.c" +#line 1769 "gitg-history-refs-list.c" } @@ -1781,7 +1774,7 @@ result = gitg_history_ref_row_on_editing_key_press ((GitgHistoryRefRow*) self, _sender, event); #line 331 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 1785 "gitg-history-refs-list.c" +#line 1778 "gitg-history-refs-list.c" } @@ -1821,7 +1814,7 @@ done_target_destroy_notify = NULL; #line 312 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return; -#line 1825 "gitg-history-refs-list.c" +#line 1818 "gitg-history-refs-list.c" } #line 315 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp1_ = (GtkEntry*) gtk_entry_new (); @@ -1911,7 +1904,7 @@ done_target = NULL; #line 308 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" done_target_destroy_notify = NULL; -#line 1915 "gitg-history-refs-list.c" +#line 1908 "gitg-history-refs-list.c" } @@ -1924,7 +1917,7 @@ _tmp0_ = self->priv->d_idle_finish; #line 336 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp0_ != ((guint) 0)) { -#line 1928 "gitg-history-refs-list.c" +#line 1921 "gitg-history-refs-list.c" guint _tmp1_ = 0U; #line 338 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp1_ = self->priv->d_idle_finish; @@ -1932,11 +1925,11 @@ g_source_remove (_tmp1_); #line 339 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" self->priv->d_idle_finish = (guint) 0; -#line 1936 "gitg-history-refs-list.c" +#line 1929 "gitg-history-refs-list.c" } #line 342 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" G_OBJECT_CLASS (gitg_history_ref_row_parent_class)->dispose ((GObject*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_list_box_row_get_type (), GtkListBoxRow)); -#line 1940 "gitg-history-refs-list.c" +#line 1933 "gitg-history-refs-list.c" } @@ -1945,7 +1938,7 @@ g_atomic_int_inc (&_data73_->_ref_count_); #line 345 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return _data73_; -#line 1949 "gitg-history-refs-list.c" +#line 1942 "gitg-history-refs-list.c" } @@ -1954,7 +1947,7 @@ _data73_ = (Block73Data*) _userdata_; #line 345 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (g_atomic_int_dec_and_test (&_data73_->_ref_count_)) { -#line 1958 "gitg-history-refs-list.c" +#line 1951 "gitg-history-refs-list.c" GitgHistoryRefRow* self; #line 345 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" self = _data73_->self; @@ -1962,7 +1955,7 @@ _g_object_unref0 (self); #line 345 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_slice_free (Block73Data, _data73_); -#line 1966 "gitg-history-refs-list.c" +#line 1959 "gitg-history-refs-list.c" } } @@ -2034,7 +2027,7 @@ _g_free0 (new_text); #line 367 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 2038 "gitg-history-refs-list.c" +#line 2031 "gitg-history-refs-list.c" } @@ -2043,7 +2036,7 @@ result = __lambda119_ (self); #line 355 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 2047 "gitg-history-refs-list.c" +#line 2040 "gitg-history-refs-list.c" } @@ -2078,7 +2071,7 @@ _data73_ = NULL; #line 349 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return; -#line 2082 "gitg-history-refs-list.c" +#line 2075 "gitg-history-refs-list.c" } #line 352 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp2_ = self->priv->d_editing_entry; @@ -2100,7 +2093,7 @@ block73_data_unref (_data73_); #line 345 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _data73_ = NULL; -#line 2104 "gitg-history-refs-list.c" +#line 2097 "gitg-history-refs-list.c" } @@ -2118,7 +2111,7 @@ result = FALSE; #line 374 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 2122 "gitg-history-refs-list.c" +#line 2115 "gitg-history-refs-list.c" } @@ -2144,7 +2137,7 @@ result = TRUE; #line 382 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 2148 "gitg-history-refs-list.c" +#line 2141 "gitg-history-refs-list.c" } else { gboolean _tmp2_ = FALSE; GdkEventKey* _tmp3_ = NULL; @@ -2157,7 +2150,7 @@ if (_tmp4_ == ((guint) GDK_KEY_KP_Enter)) { #line 384 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp2_ = TRUE; -#line 2161 "gitg-history-refs-list.c" +#line 2154 "gitg-history-refs-list.c" } else { GdkEventKey* _tmp5_ = NULL; guint _tmp6_ = 0U; @@ -2167,7 +2160,7 @@ _tmp6_ = _tmp5_->keyval; #line 385 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp2_ = _tmp6_ == ((guint) GDK_KEY_Return); -#line 2171 "gitg-history-refs-list.c" +#line 2164 "gitg-history-refs-list.c" } #line 384 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp2_) { @@ -2177,14 +2170,14 @@ result = TRUE; #line 388 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 2181 "gitg-history-refs-list.c" +#line 2174 "gitg-history-refs-list.c" } } #line 391 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = FALSE; #line 391 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 2188 "gitg-history-refs-list.c" +#line 2181 "gitg-history-refs-list.c" } @@ -2201,7 +2194,7 @@ _tmp1_ = self->priv->d_revealer; #line 397 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gtk_revealer_set_reveal_child (_tmp1_, FALSE); -#line 2205 "gitg-history-refs-list.c" +#line 2198 "gitg-history-refs-list.c" } @@ -2216,26 +2209,30 @@ result = _tmp0_; #line 77 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 2220 "gitg-history-refs-list.c" +#line 2213 "gitg-history-refs-list.c" } void gitg_history_ref_row_set_reference (GitgHistoryRefRow* self, GitgRef* value) { - GitgRef* _tmp0_ = NULL; - GitgRef* _tmp1_ = NULL; #line 77 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_return_if_fail (self != NULL); #line 77 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp0_ = value; + if (gitg_history_ref_row_get_reference (self) != value) { +#line 2222 "gitg-history-refs-list.c" + GitgRef* _tmp0_ = NULL; + GitgRef* _tmp1_ = NULL; #line 77 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 77 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _g_object_unref0 (self->priv->_reference); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 77 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - self->priv->_reference = _tmp1_; + _g_object_unref0 (self->priv->_reference); #line 77 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - g_object_notify ((GObject *) self, "reference"); -#line 2239 "gitg-history-refs-list.c" + self->priv->_reference = _tmp1_; +#line 77 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" + g_object_notify ((GObject *) self, "reference"); +#line 2235 "gitg-history-refs-list.c" + } } @@ -2250,7 +2247,7 @@ _tmp1_ = self->priv->_reference; #line 88 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp1_ != NULL) { -#line 2254 "gitg-history-refs-list.c" +#line 2251 "gitg-history-refs-list.c" GitgRef* _tmp2_ = NULL; GitgParsedRefName* _tmp3_ = NULL; GitgParsedRefName* _tmp4_ = NULL; @@ -2273,17 +2270,17 @@ _tmp0_ = _tmp7_; #line 88 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (_tmp5_); -#line 2277 "gitg-history-refs-list.c" +#line 2274 "gitg-history-refs-list.c" } else { #line 88 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp0_ = GITG_REF_TYPE_NONE; -#line 2281 "gitg-history-refs-list.c" +#line 2278 "gitg-history-refs-list.c" } #line 88 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = _tmp0_; #line 88 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 2287 "gitg-history-refs-list.c" +#line 2284 "gitg-history-refs-list.c" } @@ -2298,7 +2295,7 @@ result = _tmp0_; #line 182 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 2302 "gitg-history-refs-list.c" +#line 2299 "gitg-history-refs-list.c" } @@ -2320,7 +2317,7 @@ result = FALSE; #line 226 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 2324 "gitg-history-refs-list.c" +#line 2321 "gitg-history-refs-list.c" } #line 229 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp1_ = self->priv->_reference; @@ -2332,7 +2329,7 @@ _tmp3_ = branch; #line 231 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp3_ != NULL) { -#line 2336 "gitg-history-refs-list.c" +#line 2333 "gitg-history-refs-list.c" { gboolean _tmp4_ = FALSE; GgitBranch* _tmp5_ = NULL; @@ -2345,7 +2342,7 @@ _tmp4_ = _tmp6_; #line 235 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2349 "gitg-history-refs-list.c" +#line 2346 "gitg-history-refs-list.c" goto __catch119_g_error; } #line 235 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -2354,7 +2351,7 @@ _g_object_unref0 (branch); #line 235 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 2358 "gitg-history-refs-list.c" +#line 2355 "gitg-history-refs-list.c" } goto __finally119; __catch119_g_error: @@ -2369,7 +2366,7 @@ _g_object_unref0 (branch); #line 236 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 2373 "gitg-history-refs-list.c" +#line 2370 "gitg-history-refs-list.c" } __finally119: #line 233 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -2380,7 +2377,7 @@ g_clear_error (&_inner_error_); #line 233 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return FALSE; -#line 2384 "gitg-history-refs-list.c" +#line 2381 "gitg-history-refs-list.c" } #line 239 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = FALSE; @@ -2388,7 +2385,7 @@ _g_object_unref0 (branch); #line 239 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 2392 "gitg-history-refs-list.c" +#line 2389 "gitg-history-refs-list.c" } @@ -2430,7 +2427,7 @@ gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "d_box", FALSE, GitgHistoryRefRow_private_offset + G_STRUCT_OFFSET (GitgHistoryRefRowPrivate, d_box)); #line 52 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "d_revealer", FALSE, GitgHistoryRefRow_private_offset + G_STRUCT_OFFSET (GitgHistoryRefRowPrivate, d_revealer)); -#line 2434 "gitg-history-refs-list.c" +#line 2431 "gitg-history-refs-list.c" } @@ -2439,7 +2436,7 @@ gitg_history_ref_row_gitg_history_ref_typed_parent_iface = g_type_interface_peek_parent (iface); #line 52 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" iface->get_ref_type = gitg_history_ref_row_real_get_ref_type; -#line 2443 "gitg-history-refs-list.c" +#line 2440 "gitg-history-refs-list.c" } @@ -2448,11 +2445,11 @@ self->priv = GITG_HISTORY_REF_ROW_GET_PRIVATE (self); #line 52 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 2452 "gitg-history-refs-list.c" +#line 2449 "gitg-history-refs-list.c" } -static void gitg_history_ref_row_finalize (GObject* obj) { +static void gitg_history_ref_row_finalize (GObject * obj) { GitgHistoryRefRow * self; #line 52 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_HISTORY_TYPE_REF_ROW, GitgHistoryRefRow); @@ -2482,7 +2479,7 @@ self->priv->d_edit_done_callback_target_destroy_notify = NULL; #line 52 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" G_OBJECT_CLASS (gitg_history_ref_row_parent_class)->finalize (obj); -#line 2486 "gitg-history-refs-list.c" +#line 2483 "gitg-history-refs-list.c" } @@ -2529,13 +2526,13 @@ g_value_set_boolean (value, gitg_history_ref_row_get_is_head (self)); #line 52 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 2533 "gitg-history-refs-list.c" +#line 2530 "gitg-history-refs-list.c" default: #line 52 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 52 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 2539 "gitg-history-refs-list.c" +#line 2536 "gitg-history-refs-list.c" } } @@ -2551,26 +2548,26 @@ gitg_history_ref_row_set_reference (self, g_value_get_object (value)); #line 52 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 2555 "gitg-history-refs-list.c" +#line 2552 "gitg-history-refs-list.c" default: #line 52 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 52 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 2561 "gitg-history-refs-list.c" +#line 2558 "gitg-history-refs-list.c" } } static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2574 "gitg-history-refs-list.c" +#line 2571 "gitg-history-refs-list.c" } @@ -2579,7 +2576,7 @@ result = gitg_history_ref_header_on_expander_pressed ((GitgHistoryRefHeader*) self, event); #line 463 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 2583 "gitg-history-refs-list.c" +#line 2580 "gitg-history-refs-list.c" } @@ -2643,14 +2640,14 @@ _g_free0 (escaped); #line 456 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return self; -#line 2647 "gitg-history-refs-list.c" +#line 2644 "gitg-history-refs-list.c" } GitgHistoryRefHeader* gitg_history_ref_header_new (GitgRefType rtype, const gchar* name) { #line 456 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return gitg_history_ref_header_construct (GITG_HISTORY_TYPE_REF_HEADER, rtype, name); -#line 2654 "gitg-history-refs-list.c" +#line 2651 "gitg-history-refs-list.c" } @@ -2678,7 +2675,7 @@ result = TRUE; #line 472 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 2682 "gitg-history-refs-list.c" +#line 2679 "gitg-history-refs-list.c" } @@ -2722,7 +2719,7 @@ _tmp7_ = self->priv->d_remote; #line 483 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp7_ != NULL) { -#line 2726 "gitg-history-refs-list.c" +#line 2723 "gitg-history-refs-list.c" GitgRemote* _tmp8_ = NULL; GitgRemote* _tmp9_ = NULL; GitgProgressBin* _tmp10_ = NULL; @@ -2736,18 +2733,18 @@ _tmp10_ = self->priv->d_progress_bin; #line 486 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_object_bind_property_with_closures ((GObject*) _tmp9_, "transfer-progress", (GObject*) _tmp10_, "fraction", G_BINDING_DEFAULT, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); -#line 2740 "gitg-history-refs-list.c" +#line 2737 "gitg-history-refs-list.c" } #line 475 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return self; -#line 2744 "gitg-history-refs-list.c" +#line 2741 "gitg-history-refs-list.c" } GitgHistoryRefHeader* gitg_history_ref_header_new_remote (const gchar* name, GitgRemote* remote) { #line 475 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return gitg_history_ref_header_construct_remote (GITG_HISTORY_TYPE_REF_HEADER, name, remote); -#line 2751 "gitg-history-refs-list.c" +#line 2748 "gitg-history-refs-list.c" } @@ -2777,7 +2774,7 @@ _tmp2_ = _tmp1_->priv->d_is_sub_header_remote; #line 498 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp0_ != _tmp2_) { -#line 2781 "gitg-history-refs-list.c" +#line 2778 "gitg-history-refs-list.c" gint _tmp3_ = 0; gboolean _tmp4_ = FALSE; #line 500 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -2786,17 +2783,17 @@ if (_tmp4_) { #line 500 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp3_ = 1; -#line 2790 "gitg-history-refs-list.c" +#line 2787 "gitg-history-refs-list.c" } else { #line 500 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp3_ = -1; -#line 2794 "gitg-history-refs-list.c" +#line 2791 "gitg-history-refs-list.c" } #line 500 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = _tmp3_; #line 500 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 2800 "gitg-history-refs-list.c" +#line 2797 "gitg-history-refs-list.c" } #line 503 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp5_ = self->priv->d_name; @@ -2824,7 +2821,7 @@ result = _tmp13_; #line 503 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 2828 "gitg-history-refs-list.c" +#line 2825 "gitg-history-refs-list.c" } @@ -2838,52 +2835,52 @@ switch (_tmp0_) { #line 412 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" case GITG_REMOTE_STATE_DISCONNECTED: -#line 2842 "gitg-history-refs-list.c" +#line 2839 "gitg-history-refs-list.c" { #line 415 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gitg_history_ref_header_set_icon_name (self, NULL); #line 416 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 2848 "gitg-history-refs-list.c" +#line 2845 "gitg-history-refs-list.c" } #line 412 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" case GITG_REMOTE_STATE_CONNECTING: -#line 2852 "gitg-history-refs-list.c" +#line 2849 "gitg-history-refs-list.c" { #line 418 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gitg_history_ref_header_set_icon_name (self, "network-wireless-acquiring-symbolic"); #line 419 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 2858 "gitg-history-refs-list.c" +#line 2855 "gitg-history-refs-list.c" } #line 412 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" case GITG_REMOTE_STATE_CONNECTED: -#line 2862 "gitg-history-refs-list.c" +#line 2859 "gitg-history-refs-list.c" { #line 421 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gitg_history_ref_header_set_icon_name (self, "network-idle-symbolic"); #line 422 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 2868 "gitg-history-refs-list.c" +#line 2865 "gitg-history-refs-list.c" } #line 412 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" case GITG_REMOTE_STATE_TRANSFERRING: -#line 2872 "gitg-history-refs-list.c" +#line 2869 "gitg-history-refs-list.c" { #line 424 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gitg_history_ref_header_set_icon_name (self, "network-transmit-receive-symbolic"); #line 425 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 2878 "gitg-history-refs-list.c" +#line 2875 "gitg-history-refs-list.c" } default: #line 412 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 2883 "gitg-history-refs-list.c" +#line 2880 "gitg-history-refs-list.c" } #line 410 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_object_notify ((GObject *) self, "remote-state"); -#line 2887 "gitg-history-refs-list.c" +#line 2884 "gitg-history-refs-list.c" } @@ -2898,21 +2895,25 @@ result = _tmp0_; #line 444 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 2902 "gitg-history-refs-list.c" +#line 2899 "gitg-history-refs-list.c" } void gitg_history_ref_header_set_expanded (GitgHistoryRefHeader* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 444 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_return_if_fail (self != NULL); #line 444 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp0_ = value; + if (gitg_history_ref_header_get_expanded (self) != value) { +#line 2908 "gitg-history-refs-list.c" + gboolean _tmp0_ = FALSE; +#line 444 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" + _tmp0_ = value; #line 444 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - self->priv->_expanded = _tmp0_; + self->priv->_expanded = _tmp0_; #line 444 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - g_object_notify ((GObject *) self, "expanded"); + g_object_notify ((GObject *) self, "expanded"); #line 2916 "gitg-history-refs-list.c" + } } @@ -2928,7 +2929,7 @@ result = _tmp0_; #line 448 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 2932 "gitg-history-refs-list.c" +#line 2933 "gitg-history-refs-list.c" } @@ -2943,7 +2944,7 @@ result = _tmp0_; #line 453 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 2947 "gitg-history-refs-list.c" +#line 2948 "gitg-history-refs-list.c" } @@ -2958,7 +2959,7 @@ result = _tmp0_; #line 492 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 2962 "gitg-history-refs-list.c" +#line 2963 "gitg-history-refs-list.c" } @@ -2979,32 +2980,36 @@ result = _tmp2_; #line 508 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 2983 "gitg-history-refs-list.c" +#line 2984 "gitg-history-refs-list.c" } void gitg_history_ref_header_set_icon_name (GitgHistoryRefHeader* self, const gchar* value) { - GtkImage* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - GtkImage* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; #line 509 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_return_if_fail (self != NULL); +#line 509 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" + if (g_strcmp0 (value, gitg_history_ref_header_get_icon_name (self)) != 0) { +#line 2993 "gitg-history-refs-list.c" + GtkImage* _tmp0_ = NULL; + const gchar* _tmp1_ = NULL; + GtkImage* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; #line 511 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp0_ = self->priv->d_icon; + _tmp0_ = self->priv->d_icon; #line 511 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp1_ = value; + _tmp1_ = value; #line 511 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - g_object_set (_tmp0_, "icon-name", _tmp1_, NULL); + g_object_set (_tmp0_, "icon-name", _tmp1_, NULL); #line 512 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp2_ = self->priv->d_icon; + _tmp2_ = self->priv->d_icon; #line 512 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp3_ = value; + _tmp3_ = value; #line 512 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - gtk_widget_set_visible ((GtkWidget*) _tmp2_, _tmp3_ != NULL); + gtk_widget_set_visible ((GtkWidget*) _tmp2_, _tmp3_ != NULL); #line 509 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - g_object_notify ((GObject *) self, "icon-name"); -#line 3008 "gitg-history-refs-list.c" + g_object_notify ((GObject *) self, "icon-name"); +#line 3012 "gitg-history-refs-list.c" + } } @@ -3044,7 +3049,7 @@ gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "label", FALSE, GitgHistoryRefHeader_private_offset + G_STRUCT_OFFSET (GitgHistoryRefHeaderPrivate, d_label)); #line 402 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "icon", FALSE, GitgHistoryRefHeader_private_offset + G_STRUCT_OFFSET (GitgHistoryRefHeaderPrivate, d_icon)); -#line 3048 "gitg-history-refs-list.c" +#line 3053 "gitg-history-refs-list.c" } @@ -3053,7 +3058,7 @@ gitg_history_ref_header_gitg_history_ref_typed_parent_iface = g_type_interface_peek_parent (iface); #line 402 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" iface->get_ref_type = gitg_history_ref_header_real_get_ref_type; -#line 3057 "gitg-history-refs-list.c" +#line 3062 "gitg-history-refs-list.c" } @@ -3064,11 +3069,11 @@ self->priv->_expanded = TRUE; #line 402 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 3068 "gitg-history-refs-list.c" +#line 3073 "gitg-history-refs-list.c" } -static void gitg_history_ref_header_finalize (GObject* obj) { +static void gitg_history_ref_header_finalize (GObject * obj) { GitgHistoryRefHeader * self; #line 402 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_HISTORY_TYPE_REF_HEADER, GitgHistoryRefHeader); @@ -3086,7 +3091,7 @@ _g_object_unref0 (self->priv->d_icon); #line 402 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" G_OBJECT_CLASS (gitg_history_ref_header_parent_class)->finalize (obj); -#line 3090 "gitg-history-refs-list.c" +#line 3095 "gitg-history-refs-list.c" } @@ -3139,13 +3144,13 @@ g_value_take_string (value, gitg_history_ref_header_get_icon_name (self)); #line 402 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 3143 "gitg-history-refs-list.c" +#line 3148 "gitg-history-refs-list.c" default: #line 402 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 402 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 3149 "gitg-history-refs-list.c" +#line 3154 "gitg-history-refs-list.c" } } @@ -3173,39 +3178,39 @@ gitg_history_ref_header_set_icon_name (self, g_value_get_string (value)); #line 402 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 3177 "gitg-history-refs-list.c" +#line 3182 "gitg-history-refs-list.c" default: #line 402 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 402 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 3183 "gitg-history-refs-list.c" +#line 3188 "gitg-history-refs-list.c" } } -static void _vala_GitgHistoryRefsListHeaderState_array_free (GitgHistoryRefsListHeaderState* array, gint array_length) { +static void _vala_GitgHistoryRefsListHeaderState_array_free (GitgHistoryRefsListHeaderState * array, gint array_length) { #line 535 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (array != NULL) { -#line 3191 "gitg-history-refs-list.c" +#line 3196 "gitg-history-refs-list.c" int i; #line 535 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" for (i = 0; i < array_length; i = i + 1) { #line 535 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gitg_history_refs_list_header_state_destroy (&array[i]); -#line 3197 "gitg-history-refs-list.c" +#line 3202 "gitg-history-refs-list.c" } } #line 535 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_free (array); -#line 3202 "gitg-history-refs-list.c" +#line 3207 "gitg-history-refs-list.c" } static void _gitg_history_refs_list_on_tip_updated_gitg_remote_tip_updated (GitgRemote* _sender, const gchar* refname, GgitOId* a, GgitOId* b, gpointer self) { #line 569 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gitg_history_refs_list_on_tip_updated ((GitgHistoryRefsList*) self, _sender, refname, a, b); -#line 3209 "gitg-history-refs-list.c" +#line 3214 "gitg-history-refs-list.c" } @@ -3220,7 +3225,7 @@ _tmp0_ = self->priv->d_remotes; #line 567 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp0__length1 = self->priv->d_remotes_length1; -#line 3224 "gitg-history-refs-list.c" +#line 3229 "gitg-history-refs-list.c" { GitgRemote** remote_collection = NULL; gint remote_collection_length1 = 0; @@ -3232,14 +3237,14 @@ remote_collection_length1 = _tmp0__length1; #line 567 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" for (remote_it = 0; remote_it < _tmp0__length1; remote_it = remote_it + 1) { -#line 3236 "gitg-history-refs-list.c" +#line 3241 "gitg-history-refs-list.c" GitgRemote* _tmp1_ = NULL; GitgRemote* remote = NULL; #line 567 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp1_ = _g_object_ref0 (remote_collection[remote_it]); #line 567 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" remote = _tmp1_; -#line 3243 "gitg-history-refs-list.c" +#line 3248 "gitg-history-refs-list.c" { GitgRemote* _tmp2_ = NULL; guint _tmp3_ = 0U; @@ -3251,7 +3256,7 @@ g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _gitg_history_refs_list_on_tip_updated_gitg_remote_tip_updated, self); #line 567 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (remote); -#line 3255 "gitg-history-refs-list.c" +#line 3260 "gitg-history-refs-list.c" } } } @@ -3267,7 +3272,7 @@ self->priv->_d_remotes_size_ = self->priv->d_remotes_length1; #line 574 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" G_OBJECT_CLASS (gitg_history_refs_list_parent_class)->dispose ((GObject*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_list_box_get_type (), GtkListBox)); -#line 3271 "gitg-history-refs-list.c" +#line 3276 "gitg-history-refs-list.c" } @@ -3306,11 +3311,11 @@ _g_list_free0 (children); #line 649 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 3310 "gitg-history-refs-list.c" +#line 3315 "gitg-history-refs-list.c" } #line 652 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" while (TRUE) { -#line 3314 "gitg-history-refs-list.c" +#line 3319 "gitg-history-refs-list.c" GList* _tmp5_ = NULL; GList* _tmp6_ = NULL; GList* _tmp7_ = NULL; @@ -3329,7 +3334,7 @@ if (!(_tmp6_ != NULL)) { #line 652 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 3333 "gitg-history-refs-list.c" +#line 3338 "gitg-history-refs-list.c" } #line 654 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp7_ = found; @@ -3357,11 +3362,11 @@ _g_list_free0 (children); #line 660 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 3361 "gitg-history-refs-list.c" +#line 3366 "gitg-history-refs-list.c" } #line 652 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (header); -#line 3365 "gitg-history-refs-list.c" +#line 3370 "gitg-history-refs-list.c" } #line 664 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = NULL; @@ -3369,7 +3374,7 @@ _g_list_free0 (children); #line 664 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 3373 "gitg-history-refs-list.c" +#line 3378 "gitg-history-refs-list.c" } @@ -3394,7 +3399,7 @@ _tmp2_ = header; #line 671 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp2_ != NULL) { -#line 3398 "gitg-history-refs-list.c" +#line 3403 "gitg-history-refs-list.c" GitgHistoryRefHeader* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; gboolean _tmp5_ = FALSE; @@ -3412,12 +3417,12 @@ _g_object_unref0 (header); #line 675 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 3416 "gitg-history-refs-list.c" +#line 3421 "gitg-history-refs-list.c" } else { GitgHistoryRefHeader* _tmp13_ = NULL; #line 679 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" while (TRUE) { -#line 3421 "gitg-history-refs-list.c" +#line 3426 "gitg-history-refs-list.c" gboolean _tmp6_ = FALSE; GitgHistoryRefHeader* _tmp7_ = NULL; GitgHistoryRefHeader* _tmp11_ = NULL; @@ -3426,7 +3431,7 @@ _tmp7_ = header; #line 679 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp7_ != NULL) { -#line 3430 "gitg-history-refs-list.c" +#line 3435 "gitg-history-refs-list.c" GitgHistoryRefHeader* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; gboolean _tmp10_ = FALSE; @@ -3438,17 +3443,17 @@ _tmp10_ = _tmp9_; #line 679 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp6_ = _tmp10_; -#line 3442 "gitg-history-refs-list.c" +#line 3447 "gitg-history-refs-list.c" } else { #line 679 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp6_ = FALSE; -#line 3446 "gitg-history-refs-list.c" +#line 3451 "gitg-history-refs-list.c" } #line 679 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (!_tmp6_) { #line 679 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 3452 "gitg-history-refs-list.c" +#line 3457 "gitg-history-refs-list.c" } #line 681 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp11_ = header; @@ -3458,7 +3463,7 @@ _g_object_unref0 (header); #line 681 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" header = _tmp12_; -#line 3462 "gitg-history-refs-list.c" +#line 3467 "gitg-history-refs-list.c" } #line 684 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp13_ = header; @@ -3470,7 +3475,7 @@ _g_object_unref0 (header); #line 686 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 3474 "gitg-history-refs-list.c" +#line 3479 "gitg-history-refs-list.c" } } } else { @@ -3484,7 +3489,7 @@ _g_object_unref0 (header); #line 692 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" header = _tmp15_; -#line 3488 "gitg-history-refs-list.c" +#line 3493 "gitg-history-refs-list.c" } #line 695 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp16_ = header; @@ -3496,7 +3501,7 @@ _g_object_unref0 (header); #line 697 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 3500 "gitg-history-refs-list.c" +#line 3505 "gitg-history-refs-list.c" } else { gboolean _tmp17_ = FALSE; GitgHistoryRefHeader* _tmp18_ = NULL; @@ -3512,7 +3517,7 @@ if (!_tmp20_) { #line 699 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp17_ = TRUE; -#line 3516 "gitg-history-refs-list.c" +#line 3521 "gitg-history-refs-list.c" } else { GitgHistoryRefHeader* _tmp21_ = NULL; gboolean _tmp22_ = FALSE; @@ -3525,11 +3530,11 @@ _tmp23_ = _tmp22_; #line 699 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp17_ = !_tmp23_; -#line 3529 "gitg-history-refs-list.c" +#line 3534 "gitg-history-refs-list.c" } #line 699 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp17_) { -#line 3533 "gitg-history-refs-list.c" +#line 3538 "gitg-history-refs-list.c" GitgHistoryRefHeader* _tmp24_ = NULL; gboolean _tmp25_ = FALSE; gboolean _tmp26_ = FALSE; @@ -3545,13 +3550,13 @@ _g_object_unref0 (header); #line 701 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 3549 "gitg-history-refs-list.c" +#line 3554 "gitg-history-refs-list.c" } else { gboolean _tmp34_ = FALSE; GitgHistoryRefHeader* _tmp35_ = NULL; #line 705 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" while (TRUE) { -#line 3555 "gitg-history-refs-list.c" +#line 3560 "gitg-history-refs-list.c" gboolean _tmp27_ = FALSE; GitgHistoryRefHeader* _tmp28_ = NULL; GitgHistoryRefHeader* _tmp32_ = NULL; @@ -3560,7 +3565,7 @@ _tmp28_ = header; #line 705 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp28_ != NULL) { -#line 3564 "gitg-history-refs-list.c" +#line 3569 "gitg-history-refs-list.c" GitgHistoryRefHeader* _tmp29_ = NULL; gboolean _tmp30_ = FALSE; gboolean _tmp31_ = FALSE; @@ -3572,17 +3577,17 @@ _tmp31_ = _tmp30_; #line 705 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp27_ = _tmp31_; -#line 3576 "gitg-history-refs-list.c" +#line 3581 "gitg-history-refs-list.c" } else { #line 705 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp27_ = FALSE; -#line 3580 "gitg-history-refs-list.c" +#line 3585 "gitg-history-refs-list.c" } #line 705 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (!_tmp27_) { #line 705 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 3586 "gitg-history-refs-list.c" +#line 3591 "gitg-history-refs-list.c" } #line 707 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp32_ = header; @@ -3592,7 +3597,7 @@ _g_object_unref0 (header); #line 707 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" header = _tmp33_; -#line 3596 "gitg-history-refs-list.c" +#line 3601 "gitg-history-refs-list.c" } #line 710 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp35_ = header; @@ -3600,7 +3605,7 @@ if (_tmp35_ == NULL) { #line 710 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp34_ = TRUE; -#line 3604 "gitg-history-refs-list.c" +#line 3609 "gitg-history-refs-list.c" } else { GitgHistoryRefHeader* _tmp36_ = NULL; gboolean _tmp37_ = FALSE; @@ -3613,7 +3618,7 @@ _tmp38_ = _tmp37_; #line 710 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp34_ = _tmp38_; -#line 3617 "gitg-history-refs-list.c" +#line 3622 "gitg-history-refs-list.c" } #line 710 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = _tmp34_; @@ -3621,12 +3626,12 @@ _g_object_unref0 (header); #line 710 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 3625 "gitg-history-refs-list.c" +#line 3630 "gitg-history-refs-list.c" } } #line 667 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (header); -#line 3630 "gitg-history-refs-list.c" +#line 3635 "gitg-history-refs-list.c" } @@ -3702,7 +3707,7 @@ _tmp11_ = rs2; #line 723 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp10_ != _tmp11_) { -#line 3706 "gitg-history-refs-list.c" +#line 3711 "gitg-history-refs-list.c" gint _tmp12_ = 0; gint _tmp13_ = 0; gint _tmp14_ = 0; @@ -3714,17 +3719,17 @@ if (_tmp13_ < _tmp14_) { #line 725 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp12_ = -1; -#line 3718 "gitg-history-refs-list.c" +#line 3723 "gitg-history-refs-list.c" } else { #line 725 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp12_ = 1; -#line 3722 "gitg-history-refs-list.c" +#line 3727 "gitg-history-refs-list.c" } #line 725 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = _tmp12_; #line 725 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 3728 "gitg-history-refs-list.c" +#line 3733 "gitg-history-refs-list.c" } #line 728 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp15_ = row1; @@ -3756,7 +3761,7 @@ _tmp24_ = head2; #line 734 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if ((_tmp23_ == NULL) != (_tmp24_ == NULL)) { -#line 3760 "gitg-history-refs-list.c" +#line 3765 "gitg-history-refs-list.c" GitgHistoryRefHeader* _tmp25_ = NULL; GitgHistoryRefHeader* _tmp26_ = NULL; GitgHistoryRefHeader* head = NULL; @@ -3768,20 +3773,20 @@ _tmp26_ = head1; #line 736 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp26_ != NULL) { -#line 3772 "gitg-history-refs-list.c" +#line 3777 "gitg-history-refs-list.c" GitgHistoryRefHeader* _tmp27_ = NULL; #line 736 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp27_ = head1; #line 736 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp25_ = _tmp27_; -#line 3778 "gitg-history-refs-list.c" +#line 3783 "gitg-history-refs-list.c" } else { GitgHistoryRefHeader* _tmp28_ = NULL; #line 736 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp28_ = head2; #line 736 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp25_ = _tmp28_; -#line 3785 "gitg-history-refs-list.c" +#line 3790 "gitg-history-refs-list.c" } #line 736 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp29_ = _g_object_ref0 (_tmp25_); @@ -3795,7 +3800,7 @@ _tmp32_ = _tmp31_; #line 739 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp32_) { -#line 3799 "gitg-history-refs-list.c" +#line 3804 "gitg-history-refs-list.c" GitgHistoryRefRow* _tmp33_ = NULL; GitgHistoryRefHeader* _tmp34_ = NULL; GitgHistoryRefRow* rref = NULL; @@ -3825,20 +3830,20 @@ _tmp34_ = head1; #line 742 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp34_ != NULL) { -#line 3829 "gitg-history-refs-list.c" +#line 3834 "gitg-history-refs-list.c" GitgHistoryRefRow* _tmp35_ = NULL; #line 742 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp35_ = ref2; #line 742 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp33_ = _tmp35_; -#line 3835 "gitg-history-refs-list.c" +#line 3840 "gitg-history-refs-list.c" } else { GitgHistoryRefRow* _tmp36_ = NULL; #line 742 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp36_ = ref1; #line 742 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp33_ = _tmp36_; -#line 3842 "gitg-history-refs-list.c" +#line 3847 "gitg-history-refs-list.c" } #line 742 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp37_ = _g_object_ref0 (_tmp33_); @@ -3894,20 +3899,20 @@ _tmp57_ = head1; #line 745 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp57_ != NULL) { -#line 3898 "gitg-history-refs-list.c" +#line 3903 "gitg-history-refs-list.c" gint _tmp58_ = 0; #line 745 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp58_ = cmp; #line 745 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp56_ = _tmp58_; -#line 3904 "gitg-history-refs-list.c" +#line 3909 "gitg-history-refs-list.c" } else { gint _tmp59_ = 0; #line 745 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp59_ = cmp; #line 745 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp56_ = -_tmp59_; -#line 3911 "gitg-history-refs-list.c" +#line 3916 "gitg-history-refs-list.c" } #line 745 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = _tmp56_; @@ -3925,7 +3930,7 @@ _g_object_unref0 (head1); #line 745 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 3929 "gitg-history-refs-list.c" +#line 3934 "gitg-history-refs-list.c" } else { gint _tmp60_ = 0; GitgHistoryRefHeader* _tmp61_ = NULL; @@ -3935,11 +3940,11 @@ if (_tmp61_ != NULL) { #line 749 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp60_ = -1; -#line 3939 "gitg-history-refs-list.c" +#line 3944 "gitg-history-refs-list.c" } else { #line 749 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp60_ = 1; -#line 3943 "gitg-history-refs-list.c" +#line 3948 "gitg-history-refs-list.c" } #line 749 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = _tmp60_; @@ -3955,11 +3960,11 @@ _g_object_unref0 (head1); #line 749 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 3959 "gitg-history-refs-list.c" +#line 3964 "gitg-history-refs-list.c" } #line 734 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (head); -#line 3963 "gitg-history-refs-list.c" +#line 3968 "gitg-history-refs-list.c" } else { gboolean _tmp62_ = FALSE; GitgHistoryRefHeader* _tmp63_ = NULL; @@ -3967,21 +3972,21 @@ _tmp63_ = head1; #line 752 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp63_ != NULL) { -#line 3971 "gitg-history-refs-list.c" +#line 3976 "gitg-history-refs-list.c" GitgHistoryRefHeader* _tmp64_ = NULL; #line 752 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp64_ = head2; #line 752 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp62_ = _tmp64_ != NULL; -#line 3977 "gitg-history-refs-list.c" +#line 3982 "gitg-history-refs-list.c" } else { #line 752 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp62_ = FALSE; -#line 3981 "gitg-history-refs-list.c" +#line 3986 "gitg-history-refs-list.c" } #line 752 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp62_) { -#line 3985 "gitg-history-refs-list.c" +#line 3990 "gitg-history-refs-list.c" GitgHistoryRefHeader* _tmp65_ = NULL; GitgHistoryRefHeader* _tmp66_ = NULL; gint _tmp67_ = 0; @@ -4003,7 +4008,7 @@ _g_object_unref0 (head1); #line 754 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 4007 "gitg-history-refs-list.c" +#line 4012 "gitg-history-refs-list.c" } else { GitgHistoryRefRow* _tmp68_ = NULL; GitgHistoryRefRow* _tmp69_ = NULL; @@ -4029,7 +4034,7 @@ _g_object_unref0 (head1); #line 758 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 4033 "gitg-history-refs-list.c" +#line 4038 "gitg-history-refs-list.c" } } #line 714 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -4040,7 +4045,7 @@ _g_object_unref0 (ref1); #line 714 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (head1); -#line 4044 "gitg-history-refs-list.c" +#line 4049 "gitg-history-refs-list.c" } @@ -4083,7 +4088,7 @@ self->priv->d_ref_map = _tmp1_; #line 772 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp2_ = gtk_container_get_children ((GtkContainer*) self); -#line 4087 "gitg-history-refs-list.c" +#line 4092 "gitg-history-refs-list.c" { GList* child_collection = NULL; GList* child_it = NULL; @@ -4091,29 +4096,29 @@ child_collection = _tmp2_; #line 772 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" for (child_it = child_collection; child_it != NULL; child_it = child_it->next) { -#line 4095 "gitg-history-refs-list.c" +#line 4100 "gitg-history-refs-list.c" GtkWidget* child = NULL; #line 772 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" child = (GtkWidget*) child_it->data; -#line 4099 "gitg-history-refs-list.c" +#line 4104 "gitg-history-refs-list.c" { GtkWidget* _tmp3_ = NULL; #line 774 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp3_ = child; #line 774 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gtk_widget_destroy (_tmp3_); -#line 4106 "gitg-history-refs-list.c" +#line 4111 "gitg-history-refs-list.c" } } #line 772 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_list_free0 (child_collection); -#line 4111 "gitg-history-refs-list.c" +#line 4116 "gitg-history-refs-list.c" } #line 777 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp4_ = self->priv->d_remotes; #line 777 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp4__length1 = self->priv->d_remotes_length1; -#line 4117 "gitg-history-refs-list.c" +#line 4122 "gitg-history-refs-list.c" { GitgRemote** remote_collection = NULL; gint remote_collection_length1 = 0; @@ -4125,14 +4130,14 @@ remote_collection_length1 = _tmp4__length1; #line 777 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" for (remote_it = 0; remote_it < _tmp4__length1; remote_it = remote_it + 1) { -#line 4129 "gitg-history-refs-list.c" +#line 4134 "gitg-history-refs-list.c" GitgRemote* _tmp5_ = NULL; GitgRemote* remote = NULL; #line 777 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp5_ = _g_object_ref0 (remote_collection[remote_it]); #line 777 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" remote = _tmp5_; -#line 4136 "gitg-history-refs-list.c" +#line 4141 "gitg-history-refs-list.c" { GitgRemote* _tmp6_ = NULL; guint _tmp7_ = 0U; @@ -4144,7 +4149,7 @@ g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _gitg_history_refs_list_on_tip_updated_gitg_remote_tip_updated, self); #line 777 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (remote); -#line 4148 "gitg-history-refs-list.c" +#line 4153 "gitg-history-refs-list.c" } } } @@ -4158,7 +4163,7 @@ self->priv->d_remotes_length1 = 0; #line 782 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" self->priv->_d_remotes_size_ = self->priv->d_remotes_length1; -#line 4162 "gitg-history-refs-list.c" +#line 4167 "gitg-history-refs-list.c" } @@ -4205,7 +4210,7 @@ if (_tmp0_ == NULL) { #line 789 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return; -#line 4209 "gitg-history-refs-list.c" +#line 4214 "gitg-history-refs-list.c" } #line 792 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp1_ = a; @@ -4231,13 +4236,13 @@ _g_object_unref0 (ah); #line 797 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return; -#line 4235 "gitg-history-refs-list.c" +#line 4240 "gitg-history-refs-list.c" } #line 800 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp7_ = ah; #line 800 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp7_ != NULL) { -#line 4241 "gitg-history-refs-list.c" +#line 4246 "gitg-history-refs-list.c" gboolean _tmp8_ = FALSE; GitgHistoryRefHeader* _tmp9_ = NULL; GitgRefType _tmp10_ = 0; @@ -4259,7 +4264,7 @@ _tmp14_ = _tmp13_; #line 802 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp11_ == _tmp14_) { -#line 4263 "gitg-history-refs-list.c" +#line 4268 "gitg-history-refs-list.c" GitgHistoryRefHeader* _tmp15_ = NULL; const gchar* _tmp16_ = NULL; const gchar* _tmp17_ = NULL; @@ -4280,15 +4285,15 @@ _tmp20_ = _tmp19_; #line 802 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp8_ = g_strcmp0 (_tmp17_, _tmp20_) == 0; -#line 4284 "gitg-history-refs-list.c" +#line 4289 "gitg-history-refs-list.c" } else { #line 802 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp8_ = FALSE; -#line 4288 "gitg-history-refs-list.c" +#line 4293 "gitg-history-refs-list.c" } #line 802 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp8_) { -#line 4292 "gitg-history-refs-list.c" +#line 4297 "gitg-history-refs-list.c" GtkListBoxRow* _tmp21_ = NULL; #line 804 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp21_ = a; @@ -4298,7 +4303,7 @@ _g_object_unref0 (self->priv->d_selected_row); #line 805 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" self->priv->d_selected_row = NULL; -#line 4302 "gitg-history-refs-list.c" +#line 4307 "gitg-history-refs-list.c" } #line 808 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (bh); @@ -4306,7 +4311,7 @@ _g_object_unref0 (ah); #line 808 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return; -#line 4310 "gitg-history-refs-list.c" +#line 4315 "gitg-history-refs-list.c" } #line 811 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp22_ = a; @@ -4328,7 +4333,7 @@ _tmp29_ = _tmp28_; #line 814 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp29_ == NULL) { -#line 4332 "gitg-history-refs-list.c" +#line 4337 "gitg-history-refs-list.c" GitgHistoryRefRow* _tmp30_ = NULL; GitgRef* _tmp31_ = NULL; GitgRef* _tmp32_ = NULL; @@ -4340,15 +4345,15 @@ _tmp32_ = _tmp31_; #line 814 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp26_ = _tmp32_ == NULL; -#line 4344 "gitg-history-refs-list.c" +#line 4349 "gitg-history-refs-list.c" } else { #line 814 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp26_ = FALSE; -#line 4348 "gitg-history-refs-list.c" +#line 4353 "gitg-history-refs-list.c" } #line 814 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp26_) { -#line 4352 "gitg-history-refs-list.c" +#line 4357 "gitg-history-refs-list.c" GtkListBoxRow* _tmp33_ = NULL; #line 816 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp33_ = a; @@ -4368,7 +4373,7 @@ _g_object_unref0 (ah); #line 818 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return; -#line 4372 "gitg-history-refs-list.c" +#line 4377 "gitg-history-refs-list.c" } #line 821 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp35_ = ar; @@ -4380,7 +4385,7 @@ if (_tmp37_ == NULL) { #line 821 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp34_ = TRUE; -#line 4384 "gitg-history-refs-list.c" +#line 4389 "gitg-history-refs-list.c" } else { GitgHistoryRefRow* _tmp38_ = NULL; GitgRef* _tmp39_ = NULL; @@ -4393,7 +4398,7 @@ _tmp40_ = _tmp39_; #line 821 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp34_ = _tmp40_ == NULL; -#line 4397 "gitg-history-refs-list.c" +#line 4402 "gitg-history-refs-list.c" } #line 821 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp34_) { @@ -4407,7 +4412,7 @@ _g_object_unref0 (ah); #line 823 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return; -#line 4411 "gitg-history-refs-list.c" +#line 4416 "gitg-history-refs-list.c" } #line 826 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp41_ = ar; @@ -4427,7 +4432,7 @@ _tmp48_ = ggit_ref_get_name ((GgitRef*) _tmp47_); #line 826 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (g_strcmp0 (_tmp44_, _tmp48_) == 0) { -#line 4431 "gitg-history-refs-list.c" +#line 4436 "gitg-history-refs-list.c" GtkListBoxRow* _tmp49_ = NULL; #line 828 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp49_ = a; @@ -4437,7 +4442,7 @@ _g_object_unref0 (self->priv->d_selected_row); #line 829 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" self->priv->d_selected_row = NULL; -#line 4441 "gitg-history-refs-list.c" +#line 4446 "gitg-history-refs-list.c" } #line 785 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (br); @@ -4447,7 +4452,7 @@ _g_object_unref0 (bh); #line 785 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (ah); -#line 4451 "gitg-history-refs-list.c" +#line 4456 "gitg-history-refs-list.c" } @@ -4466,7 +4471,7 @@ _tmp1_ = row; #line 836 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gitg_history_refs_list_reselect_row (self, _tmp1_); -#line 4470 "gitg-history-refs-list.c" +#line 4475 "gitg-history-refs-list.c" } @@ -4475,14 +4480,14 @@ g_return_if_fail (self != NULL); #line 841 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gtk_list_box_invalidate_filter ((GtkListBox*) self); -#line 4479 "gitg-history-refs-list.c" +#line 4484 "gitg-history-refs-list.c" } static void _gitg_history_refs_list_expanded_changed_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 847 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gitg_history_refs_list_expanded_changed ((GitgHistoryRefsList*) self); -#line 4486 "gitg-history-refs-list.c" +#line 4491 "gitg-history-refs-list.c" } @@ -4514,26 +4519,26 @@ _tmp4_ = _tmp3_; #line 849 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp4_ == GITG_REF_TYPE_TAG) { -#line 4518 "gitg-history-refs-list.c" +#line 4523 "gitg-history-refs-list.c" GitgHistoryRefHeader* _tmp5_ = NULL; #line 851 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp5_ = header; #line 851 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gitg_history_ref_header_set_expanded (_tmp5_, FALSE); -#line 4524 "gitg-history-refs-list.c" +#line 4529 "gitg-history-refs-list.c" } else { GitgHistoryRefHeader* _tmp6_ = NULL; #line 855 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp6_ = header; #line 855 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gitg_history_ref_header_set_expanded (_tmp6_, TRUE); -#line 4531 "gitg-history-refs-list.c" +#line 4536 "gitg-history-refs-list.c" } #line 858 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp7_ = self->priv->d_expanded; #line 858 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp7__length1 = self->priv->d_expanded_length1; -#line 4537 "gitg-history-refs-list.c" +#line 4542 "gitg-history-refs-list.c" { GitgHistoryRefsListHeaderState* state_collection = NULL; gint state_collection_length1 = 0; @@ -4545,14 +4550,14 @@ state_collection_length1 = _tmp7__length1; #line 858 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" for (state_it = 0; state_it < _tmp7__length1; state_it = state_it + 1) { -#line 4549 "gitg-history-refs-list.c" +#line 4554 "gitg-history-refs-list.c" GitgHistoryRefsListHeaderState _tmp8_ = {0}; GitgHistoryRefsListHeaderState state = {0}; #line 858 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gitg_history_refs_list_header_state_copy (&state_collection[state_it], &_tmp8_); #line 858 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" state = _tmp8_; -#line 4556 "gitg-history-refs-list.c" +#line 4561 "gitg-history-refs-list.c" { gboolean _tmp9_ = FALSE; GitgHistoryRefsListHeaderState _tmp10_ = {0}; @@ -4572,7 +4577,7 @@ _tmp14_ = _tmp13_; #line 860 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (g_strcmp0 (_tmp11_, _tmp14_) == 0) { -#line 4576 "gitg-history-refs-list.c" +#line 4581 "gitg-history-refs-list.c" GitgHistoryRefsListHeaderState _tmp15_ = {0}; GitgRefType _tmp16_ = 0; GitgHistoryRefHeader* _tmp17_ = NULL; @@ -4590,15 +4595,15 @@ _tmp19_ = _tmp18_; #line 860 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp9_ = _tmp16_ == _tmp19_; -#line 4594 "gitg-history-refs-list.c" +#line 4599 "gitg-history-refs-list.c" } else { #line 860 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp9_ = FALSE; -#line 4598 "gitg-history-refs-list.c" +#line 4603 "gitg-history-refs-list.c" } #line 860 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp9_) { -#line 4602 "gitg-history-refs-list.c" +#line 4607 "gitg-history-refs-list.c" GitgHistoryRefHeader* _tmp20_ = NULL; GitgHistoryRefsListHeaderState _tmp21_ = {0}; gboolean _tmp22_ = FALSE; @@ -4610,11 +4615,11 @@ _tmp22_ = _tmp21_.expanded; #line 862 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gitg_history_ref_header_set_expanded (_tmp20_, _tmp22_); -#line 4614 "gitg-history-refs-list.c" +#line 4619 "gitg-history-refs-list.c" } #line 858 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gitg_history_refs_list_header_state_destroy (&state); -#line 4618 "gitg-history-refs-list.c" +#line 4623 "gitg-history-refs-list.c" } } } @@ -4649,7 +4654,7 @@ result = header; #line 873 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 4653 "gitg-history-refs-list.c" +#line 4658 "gitg-history-refs-list.c" } @@ -4673,7 +4678,7 @@ _tmp1_ = ggit_oid_is_zero (_tmp0_); #line 881 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp1_) { -#line 4677 "gitg-history-refs-list.c" +#line 4682 "gitg-history-refs-list.c" GitgRef* reference = NULL; GitgRepository* _tmp2_ = NULL; GitgRepository* _tmp3_ = NULL; @@ -4684,7 +4689,7 @@ _tmp3_ = _tmp2_; #line 885 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gitg_repository_clear_refs_cache (_tmp3_); -#line 4688 "gitg-history-refs-list.c" +#line 4693 "gitg-history-refs-list.c" { GitgRef* _tmp4_ = NULL; GitgRepository* _tmp5_ = NULL; @@ -4704,7 +4709,7 @@ _tmp4_ = _tmp8_; #line 889 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4708 "gitg-history-refs-list.c" +#line 4713 "gitg-history-refs-list.c" goto __catch120_g_error; } #line 889 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -4717,7 +4722,7 @@ reference = _tmp9_; #line 887 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (_tmp4_); -#line 4721 "gitg-history-refs-list.c" +#line 4726 "gitg-history-refs-list.c" } goto __finally120; __catch120_g_error: @@ -4747,7 +4752,7 @@ _g_object_unref0 (reference); #line 894 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return; -#line 4751 "gitg-history-refs-list.c" +#line 4756 "gitg-history-refs-list.c" } __finally120: #line 887 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -4760,7 +4765,7 @@ g_clear_error (&_inner_error_); #line 887 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return; -#line 4764 "gitg-history-refs-list.c" +#line 4769 "gitg-history-refs-list.c" } #line 897 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp14_ = reference; @@ -4768,7 +4773,7 @@ gitg_history_refs_list_add_ref (self, _tmp14_); #line 881 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (reference); -#line 4772 "gitg-history-refs-list.c" +#line 4777 "gitg-history-refs-list.c" } else { GgitOId* _tmp15_ = NULL; gboolean _tmp16_ = FALSE; @@ -4778,7 +4783,7 @@ _tmp16_ = ggit_oid_is_zero (_tmp15_); #line 899 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp16_) { -#line 4782 "gitg-history-refs-list.c" +#line 4787 "gitg-history-refs-list.c" { GeeIterator* _reference_it = NULL; GeeHashMap* _tmp17_ = NULL; @@ -4805,7 +4810,7 @@ _reference_it = _tmp22_; #line 902 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" while (TRUE) { -#line 4809 "gitg-history-refs-list.c" +#line 4814 "gitg-history-refs-list.c" GeeIterator* _tmp23_ = NULL; gboolean _tmp24_ = FALSE; GitgRef* reference = NULL; @@ -4822,7 +4827,7 @@ if (!_tmp24_) { #line 902 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 4826 "gitg-history-refs-list.c" +#line 4831 "gitg-history-refs-list.c" } #line 902 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp25_ = _reference_it; @@ -4838,7 +4843,7 @@ _tmp29_ = refname; #line 904 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (g_strcmp0 (_tmp28_, _tmp29_) == 0) { -#line 4842 "gitg-history-refs-list.c" +#line 4847 "gitg-history-refs-list.c" GitgRepository* _tmp30_ = NULL; GitgRepository* _tmp31_ = NULL; GitgRef* _tmp32_ = NULL; @@ -4856,15 +4861,15 @@ _g_object_unref0 (reference); #line 908 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 4860 "gitg-history-refs-list.c" +#line 4865 "gitg-history-refs-list.c" } #line 902 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (reference); -#line 4864 "gitg-history-refs-list.c" +#line 4869 "gitg-history-refs-list.c" } #line 902 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (_reference_it); -#line 4868 "gitg-history-refs-list.c" +#line 4873 "gitg-history-refs-list.c" } } else { GitgRepository* _tmp33_ = NULL; @@ -4876,27 +4881,27 @@ #line 915 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gitg_repository_clear_refs_cache (_tmp34_); #line 916 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - g_signal_emit_by_name (self, "changed"); -#line 4881 "gitg-history-refs-list.c" + g_signal_emit (self, gitg_history_refs_list_signals[GITG_HISTORY_REFS_LIST_CHANGED_SIGNAL], 0); +#line 4886 "gitg-history-refs-list.c" } } } -static void _vala_array_add21 (GitgRemote*** array, int* length, int* size, GitgRemote* value) { +static void _vala_array_add21 (GitgRemote** * array, int* length, int* size, GitgRemote* value) { #line 931 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if ((*length) == (*size)) { #line 931 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" *size = (*size) ? (2 * (*size)) : 4; #line 931 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" *array = g_renew (GitgRemote*, *array, (*size) + 1); -#line 4894 "gitg-history-refs-list.c" +#line 4899 "gitg-history-refs-list.c" } #line 931 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" (*array)[(*length)++] = value; #line 931 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" (*array)[*length] = NULL; -#line 4900 "gitg-history-refs-list.c" +#line 4905 "gitg-history-refs-list.c" } @@ -4923,7 +4928,7 @@ _tmp0_ = self->priv->_remote_lookup; #line 924 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp0_ != NULL) { -#line 4927 "gitg-history-refs-list.c" +#line 4932 "gitg-history-refs-list.c" GitgExtRemoteLookup* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; GitgRemote* _tmp3_ = NULL; @@ -4937,13 +4942,13 @@ _g_object_unref0 (remote); #line 926 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" remote = _tmp3_; -#line 4941 "gitg-history-refs-list.c" +#line 4946 "gitg-history-refs-list.c" } #line 929 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp4_ = remote; #line 929 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp4_ != NULL) { -#line 4947 "gitg-history-refs-list.c" +#line 4952 "gitg-history-refs-list.c" GitgRemote** _tmp5_ = NULL; gint _tmp5__length1 = 0; GitgRemote* _tmp6_ = NULL; @@ -4963,7 +4968,7 @@ _tmp8_ = remote; #line 932 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_signal_connect_object (_tmp8_, "tip-updated", (GCallback) _gitg_history_refs_list_on_tip_updated_gitg_remote_tip_updated, self, 0); -#line 4967 "gitg-history-refs-list.c" +#line 4972 "gitg-history-refs-list.c" } #line 935 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp9_ = name; @@ -4997,7 +5002,7 @@ _g_object_unref0 (remote); #line 941 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 5001 "gitg-history-refs-list.c" +#line 5006 "gitg-history-refs-list.c" } @@ -5034,7 +5039,7 @@ _tmp5_ = reference; #line 951 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp5_ != NULL) { -#line 5038 "gitg-history-refs-list.c" +#line 5043 "gitg-history-refs-list.c" GeeHashMap* _tmp6_ = NULL; GitgRef* _tmp7_ = NULL; GitgHistoryRefRow* _tmp8_ = NULL; @@ -5046,13 +5051,13 @@ _tmp8_ = row; #line 953 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gee_abstract_map_set ((GeeAbstractMap*) _tmp6_, _tmp7_, _tmp8_); -#line 5050 "gitg-history-refs-list.c" +#line 5055 "gitg-history-refs-list.c" } #line 956 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = row; #line 956 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 5056 "gitg-history-refs-list.c" +#line 5061 "gitg-history-refs-list.c" } @@ -5087,7 +5092,7 @@ result = NULL; #line 963 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 5091 "gitg-history-refs-list.c" +#line 5096 "gitg-history-refs-list.c" } #line 966 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp3_ = reference; @@ -5107,7 +5112,7 @@ _g_object_unref0 (_tmp6_); #line 966 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp9_) { -#line 5111 "gitg-history-refs-list.c" +#line 5116 "gitg-history-refs-list.c" gchar* remote = NULL; GitgRef* _tmp10_ = NULL; GitgParsedRefName* _tmp11_ = NULL; @@ -5151,7 +5156,7 @@ _tmp19_ = gee_abstract_map_has_key ((GeeAbstractMap*) _tmp17_, _tmp18_); #line 970 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (!_tmp19_) { -#line 5155 "gitg-history-refs-list.c" +#line 5160 "gitg-history-refs-list.c" const gchar* _tmp20_ = NULL; GitgHistoryRefHeader* _tmp21_ = NULL; GitgHistoryRefHeader* _tmp22_ = NULL; @@ -5163,7 +5168,7 @@ _tmp22_ = _tmp21_; #line 972 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (_tmp22_); -#line 5167 "gitg-history-refs-list.c" +#line 5172 "gitg-history-refs-list.c" } #line 975 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp23_ = self->priv->d_header_map; @@ -5183,7 +5188,7 @@ _gitg_history_refs_list_remote_header_unref0 (_tmp26_); #line 966 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_free0 (remote); -#line 5187 "gitg-history-refs-list.c" +#line 5192 "gitg-history-refs-list.c" } #line 978 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp29_ = reference; @@ -5195,7 +5200,7 @@ result = _tmp31_; #line 978 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 5199 "gitg-history-refs-list.c" +#line 5204 "gitg-history-refs-list.c" } @@ -5222,18 +5227,18 @@ #line 983 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp3_) { #line 985 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - g_signal_emit_by_name (self, "changed"); + g_signal_emit (self, gitg_history_refs_list_signals[GITG_HISTORY_REFS_LIST_CHANGED_SIGNAL], 0); #line 986 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = TRUE; #line 986 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 5231 "gitg-history-refs-list.c" +#line 5236 "gitg-history-refs-list.c" } #line 989 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = FALSE; #line 989 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 5237 "gitg-history-refs-list.c" +#line 5242 "gitg-history-refs-list.c" } @@ -5267,7 +5272,7 @@ _tmp2_ = gee_abstract_map_has_key ((GeeAbstractMap*) _tmp0_, _tmp1_); #line 996 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp2_) { -#line 5271 "gitg-history-refs-list.c" +#line 5276 "gitg-history-refs-list.c" GtkListBoxRow* _tmp3_ = NULL; GeeHashMap* _tmp4_ = NULL; GitgRef* _tmp5_ = NULL; @@ -5287,7 +5292,7 @@ select = _tmp3_ == G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_list_box_row_get_type (), GtkListBoxRow); #line 998 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (_tmp7_); -#line 5291 "gitg-history-refs-list.c" +#line 5296 "gitg-history-refs-list.c" } #line 1001 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp8_ = old_ref; @@ -5305,13 +5310,13 @@ _tmp12_ = select; #line 1004 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp12_) { -#line 5309 "gitg-history-refs-list.c" +#line 5314 "gitg-history-refs-list.c" GitgHistoryRefRow* _tmp13_ = NULL; #line 1006 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp13_ = newrow; #line 1006 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gtk_list_box_select_row ((GtkListBox*) self, (GtkListBoxRow*) _tmp13_); -#line 5315 "gitg-history-refs-list.c" +#line 5320 "gitg-history-refs-list.c" } #line 1009 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp15_ = removed; @@ -5319,24 +5324,24 @@ if (_tmp15_) { #line 1009 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp14_ = TRUE; -#line 5323 "gitg-history-refs-list.c" +#line 5328 "gitg-history-refs-list.c" } else { GitgHistoryRefRow* _tmp16_ = NULL; #line 1009 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp16_ = newrow; #line 1009 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp14_ = _tmp16_ != NULL; -#line 5330 "gitg-history-refs-list.c" +#line 5335 "gitg-history-refs-list.c" } #line 1009 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp14_) { #line 1011 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - g_signal_emit_by_name (self, "changed"); -#line 5336 "gitg-history-refs-list.c" + g_signal_emit (self, gitg_history_refs_list_signals[GITG_HISTORY_REFS_LIST_CHANGED_SIGNAL], 0); +#line 5341 "gitg-history-refs-list.c" } #line 992 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (newrow); -#line 5340 "gitg-history-refs-list.c" +#line 5345 "gitg-history-refs-list.c" } @@ -5367,7 +5372,7 @@ result = FALSE; #line 1020 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 5371 "gitg-history-refs-list.c" +#line 5376 "gitg-history-refs-list.c" } #line 1025 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp2_ = reference; @@ -5387,7 +5392,7 @@ _g_object_unref0 (_tmp5_); #line 1025 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp8_) { -#line 5391 "gitg-history-refs-list.c" +#line 5396 "gitg-history-refs-list.c" GitgRef* _tmp9_ = NULL; GitgParsedRefName* _tmp10_ = NULL; GitgParsedRefName* _tmp11_ = NULL; @@ -5412,7 +5417,7 @@ name = _tmp14_; #line 1027 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (_tmp12_); -#line 5416 "gitg-history-refs-list.c" +#line 5421 "gitg-history-refs-list.c" } else { GitgRef* _tmp15_ = NULL; GitgParsedRefName* _tmp16_ = NULL; @@ -5438,7 +5443,7 @@ name = _tmp20_; #line 1031 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (_tmp18_); -#line 5442 "gitg-history-refs-list.c" +#line 5447 "gitg-history-refs-list.c" } #line 1034 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp21_ = name; @@ -5448,7 +5453,7 @@ _g_free0 (name); #line 1034 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 5452 "gitg-history-refs-list.c" +#line 5457 "gitg-history-refs-list.c" } @@ -5487,7 +5492,7 @@ result = FALSE; #line 1041 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 5491 "gitg-history-refs-list.c" +#line 5496 "gitg-history-refs-list.c" } #line 1044 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp3_ = self->priv->d_ref_map; @@ -5501,20 +5506,20 @@ _tmp6_ = animation; #line 1046 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp6_ == GITG_HISTORY_REF_ANIMATION_NONE) { -#line 5505 "gitg-history-refs-list.c" +#line 5510 "gitg-history-refs-list.c" GitgHistoryRefRow* _tmp7_ = NULL; #line 1048 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp7_ = row; #line 1048 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gtk_widget_destroy ((GtkWidget*) _tmp7_); -#line 5511 "gitg-history-refs-list.c" +#line 5516 "gitg-history-refs-list.c" } else { GitgHistoryRefRow* _tmp8_ = NULL; #line 1052 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp8_ = row; #line 1052 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gitg_history_ref_row_unreveal (_tmp8_); -#line 5518 "gitg-history-refs-list.c" +#line 5523 "gitg-history-refs-list.c" } #line 1055 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp9_ = self->priv->d_ref_map; @@ -5540,7 +5545,7 @@ _g_object_unref0 (_tmp14_); #line 1057 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp17_) { -#line 5544 "gitg-history-refs-list.c" +#line 5549 "gitg-history-refs-list.c" gchar* remote = NULL; GitgRef* _tmp18_ = NULL; GitgParsedRefName* _tmp19_ = NULL; @@ -5604,7 +5609,7 @@ _tmp34_ = _tmp33_; #line 1064 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp34_) { -#line 5608 "gitg-history-refs-list.c" +#line 5613 "gitg-history-refs-list.c" GitgHistoryRefsListRemoteHeader* _tmp35_ = NULL; GitgHistoryRefHeader* _tmp36_ = NULL; GeeHashMap* _tmp37_ = NULL; @@ -5621,13 +5626,13 @@ _tmp38_ = remote; #line 1067 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gee_abstract_map_unset ((GeeAbstractMap*) _tmp37_, _tmp38_, NULL); -#line 5625 "gitg-history-refs-list.c" +#line 5630 "gitg-history-refs-list.c" } #line 1057 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _gitg_history_refs_list_remote_header_unref0 (remote_header); #line 1057 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_free0 (remote); -#line 5631 "gitg-history-refs-list.c" +#line 5636 "gitg-history-refs-list.c" } #line 1071 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = TRUE; @@ -5635,7 +5640,7 @@ _g_object_unref0 (row); #line 1071 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 5639 "gitg-history-refs-list.c" +#line 5644 "gitg-history-refs-list.c" } @@ -5654,18 +5659,18 @@ #line 1076 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp1_) { #line 1078 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - g_signal_emit_by_name (self, "changed"); + g_signal_emit (self, gitg_history_refs_list_signals[GITG_HISTORY_REFS_LIST_CHANGED_SIGNAL], 0); #line 1079 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = TRUE; #line 1079 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 5663 "gitg-history-refs-list.c" +#line 5668 "gitg-history-refs-list.c" } #line 1082 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = FALSE; #line 1082 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 5669 "gitg-history-refs-list.c" +#line 5674 "gitg-history-refs-list.c" } @@ -5684,7 +5689,7 @@ result = FALSE; #line 1089 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 5688 "gitg-history-refs-list.c" +#line 5693 "gitg-history-refs-list.c" } #line 1092 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp1_ = row; @@ -5698,7 +5703,7 @@ result = TRUE; #line 1095 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 5702 "gitg-history-refs-list.c" +#line 5707 "gitg-history-refs-list.c" } @@ -5716,7 +5721,7 @@ result = _tmp1_; #line 1100 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 5720 "gitg-history-refs-list.c" +#line 5725 "gitg-history-refs-list.c" } @@ -5734,7 +5739,7 @@ result = _tmp1_; #line 1105 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 5738 "gitg-history-refs-list.c" +#line 5743 "gitg-history-refs-list.c" } @@ -5752,7 +5757,7 @@ result = _tmp1_; #line 1110 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 5756 "gitg-history-refs-list.c" +#line 5761 "gitg-history-refs-list.c" } @@ -5770,7 +5775,7 @@ result = _tmp1_; #line 1115 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 5774 "gitg-history-refs-list.c" +#line 5779 "gitg-history-refs-list.c" } @@ -5792,7 +5797,7 @@ _tmp2_ = g_strdup (_tmp1_); #line 1122 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" refname = _tmp2_; -#line 5796 "gitg-history-refs-list.c" +#line 5801 "gitg-history-refs-list.c" { GeeIterator* _ourref_it = NULL; GeeHashMap* _tmp3_ = NULL; @@ -5819,7 +5824,7 @@ _ourref_it = _tmp8_; #line 1124 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" while (TRUE) { -#line 5823 "gitg-history-refs-list.c" +#line 5828 "gitg-history-refs-list.c" GeeIterator* _tmp9_ = NULL; gboolean _tmp10_ = FALSE; GitgRef* ourref = NULL; @@ -5836,7 +5841,7 @@ if (!_tmp10_) { #line 1124 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 5840 "gitg-history-refs-list.c" +#line 5845 "gitg-history-refs-list.c" } #line 1124 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp11_ = _ourref_it; @@ -5852,7 +5857,7 @@ _tmp15_ = refname; #line 1126 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (g_strcmp0 (_tmp14_, _tmp15_) == 0) { -#line 5856 "gitg-history-refs-list.c" +#line 5861 "gitg-history-refs-list.c" GitgHistoryRefRow* row = NULL; GeeHashMap* _tmp16_ = NULL; GitgRef* _tmp17_ = NULL; @@ -5887,15 +5892,15 @@ _g_free0 (refname); #line 1132 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 5891 "gitg-history-refs-list.c" +#line 5896 "gitg-history-refs-list.c" } #line 1124 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (ourref); -#line 5895 "gitg-history-refs-list.c" +#line 5900 "gitg-history-refs-list.c" } #line 1124 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (_ourref_it); -#line 5899 "gitg-history-refs-list.c" +#line 5904 "gitg-history-refs-list.c" } #line 1136 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = FALSE; @@ -5903,22 +5908,22 @@ _g_free0 (refname); #line 1136 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 5907 "gitg-history-refs-list.c" +#line 5912 "gitg-history-refs-list.c" } -static void _vala_array_add22 (GitgHistoryRefsListHeaderState** array, int* length, int* size, const GitgHistoryRefsListHeaderState* value) { +static void _vala_array_add22 (GitgHistoryRefsListHeaderState* * array, int* length, int* size, const GitgHistoryRefsListHeaderState* value) { #line 1148 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if ((*length) == (*size)) { #line 1148 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1148 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" *array = g_renew (GitgHistoryRefsListHeaderState, *array, *size); -#line 5918 "gitg-history-refs-list.c" +#line 5923 "gitg-history-refs-list.c" } #line 1148 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" (*array)[(*length)++] = *value; -#line 5922 "gitg-history-refs-list.c" +#line 5927 "gitg-history-refs-list.c" } @@ -5939,7 +5944,7 @@ _tmp2_ = header; #line 1146 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp2_ != NULL) { -#line 5943 "gitg-history-refs-list.c" +#line 5948 "gitg-history-refs-list.c" GitgHistoryRefsListHeaderState* _tmp3_ = NULL; gint _tmp3__length1 = 0; GitgHistoryRefHeader* _tmp4_ = NULL; @@ -5989,18 +5994,18 @@ _tmp14_.expanded = _tmp13_; #line 1148 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _vala_array_add22 (&self->priv->d_expanded, &self->priv->d_expanded_length1, &self->priv->_d_expanded_size_, &_tmp14_); -#line 5993 "gitg-history-refs-list.c" +#line 5998 "gitg-history-refs-list.c" } #line 1143 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (header); -#line 5997 "gitg-history-refs-list.c" +#line 6002 "gitg-history-refs-list.c" } static void ___lambda120__gtk_callback (GtkWidget* widget, gpointer self) { #line 1143 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" __lambda120_ ((GitgHistoryRefsList*) self, widget); -#line 6004 "gitg-history-refs-list.c" +#line 6009 "gitg-history-refs-list.c" } @@ -6020,7 +6025,7 @@ self->priv->_d_expanded_size_ = self->priv->d_expanded_length1; #line 1143 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gtk_container_foreach ((GtkContainer*) self, ___lambda120__gtk_callback, self); -#line 6024 "gitg-history-refs-list.c" +#line 6029 "gitg-history-refs-list.c" } @@ -6029,7 +6034,7 @@ g_atomic_int_inc (&_data74_->_ref_count_); #line 1157 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return _data74_; -#line 6033 "gitg-history-refs-list.c" +#line 6038 "gitg-history-refs-list.c" } @@ -6038,7 +6043,7 @@ _data74_ = (Block74Data*) _userdata_; #line 1157 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (g_atomic_int_dec_and_test (&_data74_->_ref_count_)) { -#line 6042 "gitg-history-refs-list.c" +#line 6047 "gitg-history-refs-list.c" GitgHistoryRefsList* self; #line 1157 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" self = _data74_->self; @@ -6048,7 +6053,7 @@ _g_object_unref0 (self); #line 1157 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_slice_free (Block74Data, _data74_); -#line 6052 "gitg-history-refs-list.c" +#line 6057 "gitg-history-refs-list.c" } } @@ -6069,7 +6074,7 @@ self = _data74_->self; #line 1191 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_return_val_if_fail (nm != NULL, 0); -#line 6073 "gitg-history-refs-list.c" +#line 6078 "gitg-history-refs-list.c" { GitgRef* _tmp0_ = NULL; GitgRepository* _tmp1_ = NULL; @@ -6086,7 +6091,7 @@ _tmp0_ = _tmp3_; #line 1196 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6090 "gitg-history-refs-list.c" +#line 6095 "gitg-history-refs-list.c" goto __catch123_g_error; } #line 1196 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -6099,7 +6104,7 @@ r = _tmp4_; #line 1194 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (_tmp0_); -#line 6103 "gitg-history-refs-list.c" +#line 6108 "gitg-history-refs-list.c" } goto __finally123; __catch123_g_error: @@ -6114,7 +6119,7 @@ _g_object_unref0 (r); #line 1197 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 6118 "gitg-history-refs-list.c" +#line 6123 "gitg-history-refs-list.c" } __finally123: #line 1194 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -6127,7 +6132,7 @@ g_clear_error (&_inner_error_); #line 1194 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return 0; -#line 6131 "gitg-history-refs-list.c" +#line 6136 "gitg-history-refs-list.c" } #line 1201 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp5_ = r; @@ -6141,7 +6146,7 @@ _g_object_unref0 (r); #line 1203 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 6145 "gitg-history-refs-list.c" +#line 6150 "gitg-history-refs-list.c" } #line 1206 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp7_ = r; @@ -6153,7 +6158,7 @@ _tmp10_ = row; #line 1208 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp10_ != NULL) { -#line 6157 "gitg-history-refs-list.c" +#line 6162 "gitg-history-refs-list.c" GitgHistoryRefRow* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; gboolean _tmp13_ = FALSE; @@ -6165,15 +6170,15 @@ _tmp13_ = _tmp12_; #line 1208 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp9_ = _tmp13_; -#line 6169 "gitg-history-refs-list.c" +#line 6174 "gitg-history-refs-list.c" } else { #line 1208 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp9_ = FALSE; -#line 6173 "gitg-history-refs-list.c" +#line 6178 "gitg-history-refs-list.c" } #line 1208 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp9_) { -#line 6177 "gitg-history-refs-list.c" +#line 6182 "gitg-history-refs-list.c" GitgHistoryRefRow* _tmp14_ = NULL; GitgHistoryRefRow* _tmp15_ = NULL; #line 1210 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -6184,7 +6189,7 @@ _g_object_unref0 (_data74_->head); #line 1210 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _data74_->head = _tmp15_; -#line 6188 "gitg-history-refs-list.c" +#line 6193 "gitg-history-refs-list.c" } #line 1212 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = 0; @@ -6194,7 +6199,7 @@ _g_object_unref0 (r); #line 1212 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 6198 "gitg-history-refs-list.c" +#line 6203 "gitg-history-refs-list.c" } @@ -6203,7 +6208,7 @@ result = ___lambda121_ (self, name); #line 1191 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 6207 "gitg-history-refs-list.c" +#line 6212 "gitg-history-refs-list.c" } @@ -6213,16 +6218,13 @@ GtkListBoxRow* _tmp1_ = NULL; GitgRepository* _tmp2_ = NULL; GitgHistoryRefRow* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; + GitgHistoryRefHeader* _tmp4_ = NULL; GitgHistoryRefHeader* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - GitgHistoryRefHeader* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - GitgHistoryRefHeader* _tmp9_ = NULL; + GitgHistoryRefHeader* _tmp6_ = NULL; GtkListBoxRow* sel = NULL; - GtkListBoxRow* _tmp18_ = NULL; - GtkListBoxRow* _tmp19_ = NULL; - GtkListBoxRow* _tmp20_ = NULL; + GtkListBoxRow* _tmp15_ = NULL; + GtkListBoxRow* _tmp16_ = NULL; + GtkListBoxRow* _tmp17_ = NULL; GError * _inner_error_ = NULL; #line 1157 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_return_if_fail (self != NULL); @@ -6262,7 +6264,7 @@ _data74_ = NULL; #line 1170 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return; -#line 6266 "gitg-history-refs-list.c" +#line 6268 "gitg-history-refs-list.c" } #line 1173 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp3_ = gitg_history_refs_list_add_ref_row (self, NULL, GITG_HISTORY_REF_ANIMATION_NONE); @@ -6271,74 +6273,68 @@ #line 1173 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" self->priv->d_all_commits = _tmp3_; #line 1174 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp4_ = _ ("Branches"); -#line 1174 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp5_ = gitg_history_refs_list_add_header (self, GITG_REF_TYPE_BRANCH, _tmp4_); + _tmp4_ = gitg_history_refs_list_add_header (self, GITG_REF_TYPE_BRANCH, _ ("Branches")); #line 1174 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (self->priv->d_all_branches); #line 1174 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - self->priv->d_all_branches = _tmp5_; + self->priv->d_all_branches = _tmp4_; #line 1175 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp6_ = _ ("Remotes"); -#line 1175 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp7_ = gitg_history_refs_list_add_header (self, GITG_REF_TYPE_REMOTE, _tmp6_); + _tmp5_ = gitg_history_refs_list_add_header (self, GITG_REF_TYPE_REMOTE, _ ("Remotes")); #line 1175 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (self->priv->d_all_remotes); #line 1175 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - self->priv->d_all_remotes = _tmp7_; -#line 1176 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp8_ = _ ("Tags"); + self->priv->d_all_remotes = _tmp5_; #line 1176 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp9_ = gitg_history_refs_list_add_header (self, GITG_REF_TYPE_TAG, _tmp8_); + _tmp6_ = gitg_history_refs_list_add_header (self, GITG_REF_TYPE_TAG, _ ("Tags")); #line 1176 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (self->priv->d_all_tags); #line 1176 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - self->priv->d_all_tags = _tmp9_; + self->priv->d_all_tags = _tmp6_; #line 1178 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _data74_->head = NULL; -#line 6300 "gitg-history-refs-list.c" +#line 6296 "gitg-history-refs-list.c" { - gboolean _tmp10_ = FALSE; - GitgRepository* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; + gboolean _tmp7_ = FALSE; + GitgRepository* _tmp8_ = NULL; + gboolean _tmp9_ = FALSE; #line 1182 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp11_ = self->priv->d_repository; + _tmp8_ = self->priv->d_repository; #line 1182 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp12_ = ggit_repository_is_head_detached ((GgitRepository*) _tmp11_, &_inner_error_); + _tmp9_ = ggit_repository_is_head_detached ((GgitRepository*) _tmp8_, &_inner_error_); #line 1182 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp10_ = _tmp12_; + _tmp7_ = _tmp9_; #line 1182 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6313 "gitg-history-refs-list.c" +#line 6309 "gitg-history-refs-list.c" goto __catch121_g_error; } #line 1182 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - if (_tmp10_) { -#line 6318 "gitg-history-refs-list.c" - GitgRef* _tmp13_ = NULL; - GitgRepository* _tmp14_ = NULL; - GitgRef* _tmp15_ = NULL; - GitgHistoryRefRow* _tmp16_ = NULL; + if (_tmp7_) { +#line 6314 "gitg-history-refs-list.c" + GitgRef* _tmp10_ = NULL; + GitgRepository* _tmp11_ = NULL; + GitgRef* _tmp12_ = NULL; + GitgHistoryRefRow* _tmp13_ = NULL; #line 1184 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp14_ = self->priv->d_repository; + _tmp11_ = self->priv->d_repository; #line 1184 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp15_ = gitg_repository_lookup_reference (_tmp14_, "HEAD", &_inner_error_); + _tmp12_ = gitg_repository_lookup_reference (_tmp11_, "HEAD", &_inner_error_); #line 1184 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp13_ = _tmp15_; + _tmp10_ = _tmp12_; #line 1184 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6331 "gitg-history-refs-list.c" +#line 6327 "gitg-history-refs-list.c" goto __catch121_g_error; } #line 1184 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp16_ = gitg_history_refs_list_add_ref_internal (self, _tmp13_, GITG_HISTORY_REF_ANIMATION_NONE); + _tmp13_ = gitg_history_refs_list_add_ref_internal (self, _tmp10_, GITG_HISTORY_REF_ANIMATION_NONE); #line 1184 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (_data74_->head); #line 1184 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _data74_->head = _tmp16_; + _data74_->head = _tmp13_; #line 1182 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _g_object_unref0 (_tmp13_); -#line 6342 "gitg-history-refs-list.c" + _g_object_unref0 (_tmp10_); +#line 6338 "gitg-history-refs-list.c" } } goto __finally121; @@ -6348,7 +6344,7 @@ g_clear_error (&_inner_error_); #line 1180 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _inner_error_ = NULL; -#line 6352 "gitg-history-refs-list.c" +#line 6348 "gitg-history-refs-list.c" } __finally121: #line 1180 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -6363,17 +6359,17 @@ g_clear_error (&_inner_error_); #line 1180 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return; -#line 6367 "gitg-history-refs-list.c" +#line 6363 "gitg-history-refs-list.c" } { - GitgRepository* _tmp17_ = NULL; + GitgRepository* _tmp14_ = NULL; #line 1191 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp17_ = self->priv->d_repository; + _tmp14_ = self->priv->d_repository; #line 1191 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - ggit_repository_references_foreach_name ((GgitRepository*) _tmp17_, ____lambda121__ggit_references_name_callback, _data74_, &_inner_error_); + ggit_repository_references_foreach_name ((GgitRepository*) _tmp14_, ____lambda121__ggit_references_name_callback, _data74_, &_inner_error_); #line 1191 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6377 "gitg-history-refs-list.c" +#line 6373 "gitg-history-refs-list.c" goto __catch122_g_error; } } @@ -6384,7 +6380,7 @@ g_clear_error (&_inner_error_); #line 1189 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _inner_error_ = NULL; -#line 6388 "gitg-history-refs-list.c" +#line 6384 "gitg-history-refs-list.c" } __finally122: #line 1189 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -6399,130 +6395,130 @@ g_clear_error (&_inner_error_); #line 1189 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return; -#line 6403 "gitg-history-refs-list.c" +#line 6399 "gitg-history-refs-list.c" } #line 1216 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (self->priv->d_selected_row); #line 1216 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" self->priv->d_selected_row = NULL; #line 1218 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp18_ = gtk_list_box_get_selected_row ((GtkListBox*) self); + _tmp15_ = gtk_list_box_get_selected_row ((GtkListBox*) self); #line 1218 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp19_ = _g_object_ref0 (_tmp18_); + _tmp16_ = _g_object_ref0 (_tmp15_); #line 1218 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - sel = _tmp19_; + sel = _tmp16_; #line 1220 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp20_ = sel; + _tmp17_ = sel; #line 1220 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - if (_tmp20_ == NULL) { -#line 6419 "gitg-history-refs-list.c" + if (_tmp17_ == NULL) { +#line 6415 "gitg-history-refs-list.c" GSettings* settings = NULL; - GSettings* _tmp21_ = NULL; + GSettings* _tmp18_ = NULL; GitgHistoryDefaultSelection default_selection = 0; - GSettings* _tmp22_ = NULL; - gint _tmp23_ = 0; + GSettings* _tmp19_ = NULL; + gint _tmp20_ = 0; GtkListBoxRow* srow = NULL; - GitgHistoryDefaultSelection _tmp24_ = 0; - GtkListBoxRow* _tmp31_ = NULL; + GitgHistoryDefaultSelection _tmp21_ = 0; + GtkListBoxRow* _tmp28_ = NULL; #line 1222 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp21_ = g_settings_new ("org.gnome.gitg.preferences.history"); + _tmp18_ = g_settings_new ("org.gnome.gitg.preferences.history"); #line 1222 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - settings = _tmp21_; + settings = _tmp18_; #line 1223 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp22_ = settings; + _tmp19_ = settings; #line 1223 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp23_ = g_settings_get_enum (_tmp22_, "default-selection"); + _tmp20_ = g_settings_get_enum (_tmp19_, "default-selection"); #line 1223 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - default_selection = (GitgHistoryDefaultSelection) _tmp23_; + default_selection = (GitgHistoryDefaultSelection) _tmp20_; #line 1224 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" srow = NULL; #line 1226 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp24_ = default_selection; + _tmp21_ = default_selection; #line 1226 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - switch (_tmp24_) { + switch (_tmp21_) { #line 1226 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" case GITG_HISTORY_DEFAULT_SELECTION_CURRENT_BRANCH: -#line 6446 "gitg-history-refs-list.c" +#line 6442 "gitg-history-refs-list.c" { - GitgHistoryRefRow* _tmp25_ = NULL; - GtkListBoxRow* _tmp26_ = NULL; + GitgHistoryRefRow* _tmp22_ = NULL; + GtkListBoxRow* _tmp23_ = NULL; #line 1229 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp25_ = _data74_->head; + _tmp22_ = _data74_->head; #line 1229 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp26_ = _g_object_ref0 ((GtkListBoxRow*) _tmp25_); + _tmp23_ = _g_object_ref0 ((GtkListBoxRow*) _tmp22_); #line 1229 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (srow); #line 1229 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - srow = _tmp26_; + srow = _tmp23_; #line 1230 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 6460 "gitg-history-refs-list.c" +#line 6456 "gitg-history-refs-list.c" } #line 1226 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" case GITG_HISTORY_DEFAULT_SELECTION_ALL_BRANCHES: -#line 6464 "gitg-history-refs-list.c" +#line 6460 "gitg-history-refs-list.c" { - GitgHistoryRefHeader* _tmp27_ = NULL; - GtkListBoxRow* _tmp28_ = NULL; + GitgHistoryRefHeader* _tmp24_ = NULL; + GtkListBoxRow* _tmp25_ = NULL; #line 1232 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp27_ = self->priv->d_all_branches; + _tmp24_ = self->priv->d_all_branches; #line 1232 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp28_ = _g_object_ref0 ((GtkListBoxRow*) _tmp27_); + _tmp25_ = _g_object_ref0 ((GtkListBoxRow*) _tmp24_); #line 1232 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (srow); #line 1232 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - srow = _tmp28_; + srow = _tmp25_; #line 1233 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 6478 "gitg-history-refs-list.c" +#line 6474 "gitg-history-refs-list.c" } #line 1226 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" case GITG_HISTORY_DEFAULT_SELECTION_ALL_COMMITS: -#line 6482 "gitg-history-refs-list.c" +#line 6478 "gitg-history-refs-list.c" { - GitgHistoryRefRow* _tmp29_ = NULL; - GtkListBoxRow* _tmp30_ = NULL; + GitgHistoryRefRow* _tmp26_ = NULL; + GtkListBoxRow* _tmp27_ = NULL; #line 1235 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp29_ = self->priv->d_all_commits; + _tmp26_ = self->priv->d_all_commits; #line 1235 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp30_ = _g_object_ref0 ((GtkListBoxRow*) _tmp29_); + _tmp27_ = _g_object_ref0 ((GtkListBoxRow*) _tmp26_); #line 1235 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (srow); #line 1235 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - srow = _tmp30_; + srow = _tmp27_; #line 1236 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 6496 "gitg-history-refs-list.c" +#line 6492 "gitg-history-refs-list.c" } default: #line 1226 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 6501 "gitg-history-refs-list.c" +#line 6497 "gitg-history-refs-list.c" } #line 1239 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp31_ = srow; + _tmp28_ = srow; #line 1239 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - if (_tmp31_ != NULL) { -#line 6507 "gitg-history-refs-list.c" - GtkListBoxRow* _tmp32_ = NULL; + if (_tmp28_ != NULL) { +#line 6503 "gitg-history-refs-list.c" + GtkListBoxRow* _tmp29_ = NULL; #line 1242 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp32_ = srow; + _tmp29_ = srow; #line 1242 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - gtk_list_box_select_row ((GtkListBox*) self, _tmp32_); -#line 6513 "gitg-history-refs-list.c" + gtk_list_box_select_row ((GtkListBox*) self, _tmp29_); +#line 6509 "gitg-history-refs-list.c" } else { - GitgHistoryRefRow* _tmp33_ = NULL; + GitgHistoryRefRow* _tmp30_ = NULL; #line 1247 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp33_ = self->priv->d_all_commits; + _tmp30_ = self->priv->d_all_commits; #line 1247 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - gtk_list_box_select_row ((GtkListBox*) self, (GtkListBoxRow*) _tmp33_); -#line 6520 "gitg-history-refs-list.c" + gtk_list_box_select_row ((GtkListBox*) self, (GtkListBoxRow*) _tmp30_); +#line 6516 "gitg-history-refs-list.c" } #line 1220 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (srow); #line 1220 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (settings); -#line 6526 "gitg-history-refs-list.c" +#line 6522 "gitg-history-refs-list.c" } #line 1251 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_object_thaw_notify ((GObject*) self); @@ -6532,7 +6528,7 @@ block74_data_unref (_data74_); #line 1157 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _data74_ = NULL; -#line 6536 "gitg-history-refs-list.c" +#line 6532 "gitg-history-refs-list.c" } @@ -6551,7 +6547,7 @@ result = NULL; #line 1258 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 6555 "gitg-history-refs-list.c" +#line 6551 "gitg-history-refs-list.c" } #line 1261 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp1_ = row; @@ -6561,7 +6557,7 @@ result = _tmp2_; #line 1261 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 6565 "gitg-history-refs-list.c" +#line 6561 "gitg-history-refs-list.c" } @@ -6581,7 +6577,7 @@ result = _tmp1_; #line 1266 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 6585 "gitg-history-refs-list.c" +#line 6581 "gitg-history-refs-list.c" } @@ -6591,7 +6587,7 @@ self = (GitgHistoryRefsList*) base; #line 1384 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_object_notify ((GObject*) self, "selection"); -#line 6595 "gitg-history-refs-list.c" +#line 6591 "gitg-history-refs-list.c" } @@ -6626,11 +6622,11 @@ if (_tmp4_ != _tmp5_) { #line 1394 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_object_notify ((GObject*) self, "selection"); -#line 6630 "gitg-history-refs-list.c" +#line 6626 "gitg-history-refs-list.c" } #line 1387 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (selrow); -#line 6634 "gitg-history-refs-list.c" +#line 6630 "gitg-history-refs-list.c" } @@ -6658,7 +6654,7 @@ _tmp2_ = gee_abstract_map_has_key ((GeeAbstractMap*) _tmp0_, _tmp1_); #line 1400 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (!_tmp2_) { -#line 6662 "gitg-history-refs-list.c" +#line 6658 "gitg-history-refs-list.c" GitgExtRefNameEditingDone _tmp3_ = NULL; void* _tmp3__target = NULL; #line 1402 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -6677,7 +6673,7 @@ done_target_destroy_notify = NULL; #line 1403 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return; -#line 6681 "gitg-history-refs-list.c" +#line 6677 "gitg-history-refs-list.c" } #line 1406 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp4_ = self->priv->d_ref_map; @@ -6709,7 +6705,7 @@ done_target = NULL; #line 1398 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" done_target_destroy_notify = NULL; -#line 6713 "gitg-history-refs-list.c" +#line 6709 "gitg-history-refs-list.c" } @@ -6722,7 +6718,7 @@ g_return_val_if_fail (origin != NULL, 0); #line 1412 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" while (TRUE) { -#line 6726 "gitg-history-refs-list.c" +#line 6722 "gitg-history-refs-list.c" GdkWindow* _tmp0_ = NULL; GdkWindow* _tmp1_ = NULL; gint wx = 0; @@ -6742,7 +6738,7 @@ if (!(_tmp0_ != _tmp1_)) { #line 1412 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 6746 "gitg-history-refs-list.c" +#line 6742 "gitg-history-refs-list.c" } #line 1417 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp2_ = origin; @@ -6764,7 +6760,7 @@ _tmp8_ = gdk_window_get_parent (_tmp7_); #line 1421 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" origin = _tmp8_; -#line 6768 "gitg-history-refs-list.c" +#line 6764 "gitg-history-refs-list.c" } #line 1424 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp9_ = y; @@ -6772,7 +6768,7 @@ result = _tmp9_; #line 1424 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 6776 "gitg-history-refs-list.c" +#line 6772 "gitg-history-refs-list.c" } @@ -6828,7 +6824,7 @@ _tmp11_ = row; #line 1434 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp11_ != NULL) { -#line 6832 "gitg-history-refs-list.c" +#line 6828 "gitg-history-refs-list.c" GtkListBoxRow* _tmp12_ = NULL; GtkListBoxRow* _tmp13_ = NULL; #line 1434 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -6837,21 +6833,21 @@ _tmp13_ = gtk_list_box_get_selected_row ((GtkListBox*) self); #line 1434 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp10_ = _tmp12_ != _tmp13_; -#line 6841 "gitg-history-refs-list.c" +#line 6837 "gitg-history-refs-list.c" } else { #line 1434 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp10_ = FALSE; -#line 6845 "gitg-history-refs-list.c" +#line 6841 "gitg-history-refs-list.c" } #line 1434 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp10_) { -#line 6849 "gitg-history-refs-list.c" +#line 6845 "gitg-history-refs-list.c" GtkListBoxRow* _tmp14_ = NULL; #line 1436 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp14_ = row; #line 1436 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gtk_list_box_select_row ((GtkListBox*) self, _tmp14_); -#line 6855 "gitg-history-refs-list.c" +#line 6851 "gitg-history-refs-list.c" } #line 1439 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = ret; @@ -6859,7 +6855,7 @@ _g_object_unref0 (row); #line 1439 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 6863 "gitg-history-refs-list.c" +#line 6859 "gitg-history-refs-list.c" } @@ -6915,7 +6911,7 @@ _tmp10_ = v; #line 1452 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (((gdouble) _tmp9_) < _tmp10_) { -#line 6919 "gitg-history-refs-list.c" +#line 6915 "gitg-history-refs-list.c" GtkAdjustment* _tmp11_ = NULL; GtkAllocation _tmp12_ = {0}; gint _tmp13_ = 0; @@ -6927,7 +6923,7 @@ _tmp13_ = _tmp12_.y; #line 1454 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gtk_adjustment_set_value (_tmp11_, (gdouble) _tmp13_); -#line 6931 "gitg-history-refs-list.c" +#line 6927 "gitg-history-refs-list.c" } else { GtkAllocation _tmp14_ = {0}; gint _tmp15_ = 0; @@ -6949,7 +6945,7 @@ _tmp19_ = s; #line 1456 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (((gdouble) (_tmp15_ + _tmp17_)) > (_tmp18_ + _tmp19_)) { -#line 6953 "gitg-history-refs-list.c" +#line 6949 "gitg-history-refs-list.c" GtkAdjustment* _tmp20_ = NULL; GtkAllocation _tmp21_ = {0}; gint _tmp22_ = 0; @@ -6970,12 +6966,12 @@ _tmp25_ = s; #line 1458 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gtk_adjustment_set_value (_tmp20_, (_tmp22_ + _tmp24_) - _tmp25_); -#line 6974 "gitg-history-refs-list.c" +#line 6970 "gitg-history-refs-list.c" } } #line 1442 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (adj); -#line 6979 "gitg-history-refs-list.c" +#line 6975 "gitg-history-refs-list.c" } @@ -6985,14 +6981,14 @@ self = (GitgHistoryRefsList*) g_object_new (object_type, NULL); #line 517 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return self; -#line 6989 "gitg-history-refs-list.c" +#line 6985 "gitg-history-refs-list.c" } GitgHistoryRefsList* gitg_history_refs_list_new (void) { #line 517 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return gitg_history_refs_list_construct (GITG_HISTORY_TYPE_REFS_LIST); -#line 6996 "gitg-history-refs-list.c" +#line 6992 "gitg-history-refs-list.c" } @@ -7007,26 +7003,30 @@ result = _tmp0_; #line 553 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 7011 "gitg-history-refs-list.c" +#line 7007 "gitg-history-refs-list.c" } void gitg_history_refs_list_set_remote_lookup (GitgHistoryRefsList* self, GitgExtRemoteLookup* value) { - GitgExtRemoteLookup* _tmp0_ = NULL; - GitgExtRemoteLookup* _tmp1_ = NULL; #line 553 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_return_if_fail (self != NULL); #line 553 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp0_ = value; + if (gitg_history_refs_list_get_remote_lookup (self) != value) { +#line 7016 "gitg-history-refs-list.c" + GitgExtRemoteLookup* _tmp0_ = NULL; + GitgExtRemoteLookup* _tmp1_ = NULL; #line 553 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 553 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _g_object_unref0 (self->priv->_remote_lookup); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 553 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - self->priv->_remote_lookup = _tmp1_; + _g_object_unref0 (self->priv->_remote_lookup); #line 553 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - g_object_notify ((GObject *) self, "remote-lookup"); -#line 7030 "gitg-history-refs-list.c" + self->priv->_remote_lookup = _tmp1_; +#line 553 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" + g_object_notify ((GObject *) self, "remote-lookup"); +#line 7029 "gitg-history-refs-list.c" + } } @@ -7046,23 +7046,27 @@ void gitg_history_refs_list_set_repository (GitgHistoryRefsList* self, GitgRepository* value) { - GitgRepository* _tmp0_ = NULL; - GitgRepository* _tmp1_ = NULL; #line 558 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_return_if_fail (self != NULL); +#line 558 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" + if (gitg_history_refs_list_get_repository (self) != value) { +#line 7054 "gitg-history-refs-list.c" + GitgRepository* _tmp0_ = NULL; + GitgRepository* _tmp1_ = NULL; #line 560 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp0_ = value; + _tmp0_ = value; #line 560 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 560 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _g_object_unref0 (self->priv->d_repository); + _g_object_unref0 (self->priv->d_repository); #line 560 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - self->priv->d_repository = _tmp1_; + self->priv->d_repository = _tmp1_; #line 561 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - gitg_history_refs_list_refresh (self); + gitg_history_refs_list_refresh (self); #line 558 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - g_object_notify ((GObject *) self, "repository"); -#line 7066 "gitg-history-refs-list.c" + g_object_notify ((GObject *) self, "repository"); +#line 7069 "gitg-history-refs-list.c" + } } @@ -7071,7 +7075,7 @@ g_atomic_int_inc (&_data75_->_ref_count_); #line 597 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return _data75_; -#line 7075 "gitg-history-refs-list.c" +#line 7079 "gitg-history-refs-list.c" } @@ -7080,7 +7084,7 @@ _data75_ = (Block75Data*) _userdata_; #line 597 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (g_atomic_int_dec_and_test (&_data75_->_ref_count_)) { -#line 7084 "gitg-history-refs-list.c" +#line 7088 "gitg-history-refs-list.c" GitgHistoryRefsList* self; #line 597 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" self = _data75_->self; @@ -7090,7 +7094,7 @@ _g_object_unref0 (self); #line 597 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_slice_free (Block75Data, _data75_); -#line 7094 "gitg-history-refs-list.c" +#line 7098 "gitg-history-refs-list.c" } } @@ -7116,7 +7120,7 @@ _tmp3_ = row; #line 604 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp3_ != NULL) { -#line 7120 "gitg-history-refs-list.c" +#line 7124 "gitg-history-refs-list.c" GitgHistoryRefRow* _tmp4_ = NULL; GitgRef* _tmp5_ = NULL; GitgRef* _tmp6_ = NULL; @@ -7128,15 +7132,15 @@ _tmp6_ = _tmp5_; #line 604 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp2_ = _tmp6_ != NULL; -#line 7132 "gitg-history-refs-list.c" +#line 7136 "gitg-history-refs-list.c" } else { #line 604 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp2_ = FALSE; -#line 7136 "gitg-history-refs-list.c" +#line 7140 "gitg-history-refs-list.c" } #line 604 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp2_) { -#line 7140 "gitg-history-refs-list.c" +#line 7144 "gitg-history-refs-list.c" GitgHistoryRefRow* _tmp7_ = NULL; GitgRef* _tmp8_ = NULL; GitgRef* _tmp9_ = NULL; @@ -7148,18 +7152,18 @@ _tmp9_ = _tmp8_; #line 606 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _data75_->ret, _tmp9_); -#line 7152 "gitg-history-refs-list.c" +#line 7156 "gitg-history-refs-list.c" } #line 601 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (row); -#line 7156 "gitg-history-refs-list.c" +#line 7160 "gitg-history-refs-list.c" } static void __gitg_history_refs_list_references___lambda122__gtk_callback (GtkWidget* widget, gpointer self) { #line 601 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _gitg_history_refs_list_references___lambda122_ (self, widget); -#line 7163 "gitg-history-refs-list.c" +#line 7167 "gitg-history-refs-list.c" } @@ -7192,7 +7196,7 @@ _data75_ = NULL; #line 610 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 7196 "gitg-history-refs-list.c" +#line 7200 "gitg-history-refs-list.c" } @@ -7209,38 +7213,42 @@ result = "last-activity"; #line 620 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 7213 "gitg-history-refs-list.c" +#line 7217 "gitg-history-refs-list.c" } else { #line 624 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = "name"; #line 624 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 7219 "gitg-history-refs-list.c" +#line 7223 "gitg-history-refs-list.c" } } void gitg_history_refs_list_set_reference_sort_order (GitgHistoryRefsList* self, const gchar* value) { - const gchar* _tmp0_ = NULL; #line 627 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_return_if_fail (self != NULL); +#line 627 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" + if (g_strcmp0 (value, gitg_history_refs_list_get_reference_sort_order (self)) != 0) { +#line 7233 "gitg-history-refs-list.c" + const gchar* _tmp0_ = NULL; #line 629 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - _tmp0_ = value; + _tmp0_ = value; #line 629 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - if (g_strcmp0 (_tmp0_, "last-activity") == 0) { + if (g_strcmp0 (_tmp0_, "last-activity") == 0) { #line 631 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - self->priv->d_ref_sort_order = GITG_HISTORY_REF_ROW_SORT_ORDER_LAST_ACTIVITY; -#line 7234 "gitg-history-refs-list.c" - } else { + self->priv->d_ref_sort_order = GITG_HISTORY_REF_ROW_SORT_ORDER_LAST_ACTIVITY; +#line 7241 "gitg-history-refs-list.c" + } else { #line 635 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - self->priv->d_ref_sort_order = GITG_HISTORY_REF_ROW_SORT_ORDER_NAME; -#line 7238 "gitg-history-refs-list.c" - } + self->priv->d_ref_sort_order = GITG_HISTORY_REF_ROW_SORT_ORDER_NAME; +#line 7245 "gitg-history-refs-list.c" + } #line 638 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - gtk_list_box_invalidate_sort ((GtkListBox*) self); + gtk_list_box_invalidate_sort ((GtkListBox*) self); #line 627 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - g_object_notify ((GObject *) self, "reference-sort-order"); -#line 7244 "gitg-history-refs-list.c" + g_object_notify ((GObject *) self, "reference-sort-order"); +#line 7251 "gitg-history-refs-list.c" + } } @@ -7258,7 +7266,7 @@ ret = _tmp0_; #line 1275 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp1_ = gtk_container_get_children ((GtkContainer*) self); -#line 7262 "gitg-history-refs-list.c" +#line 7270 "gitg-history-refs-list.c" { GList* child_collection = NULL; GList* child_it = NULL; @@ -7266,11 +7274,11 @@ child_collection = _tmp1_; #line 1275 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" for (child_it = child_collection; child_it != NULL; child_it = child_it->next) { -#line 7270 "gitg-history-refs-list.c" +#line 7278 "gitg-history-refs-list.c" GtkWidget* child = NULL; #line 1275 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" child = (GtkWidget*) child_it->data; -#line 7274 "gitg-history-refs-list.c" +#line 7282 "gitg-history-refs-list.c" { GitgHistoryRefRow* r = NULL; GtkWidget* _tmp2_ = NULL; @@ -7287,7 +7295,7 @@ _tmp5_ = r; #line 1279 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp5_ != NULL) { -#line 7291 "gitg-history-refs-list.c" +#line 7299 "gitg-history-refs-list.c" GitgHistoryRefRow* _tmp6_ = NULL; GitgRef* _tmp7_ = NULL; GitgRef* _tmp8_ = NULL; @@ -7299,15 +7307,15 @@ _tmp8_ = _tmp7_; #line 1279 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp4_ = _tmp8_ != NULL; -#line 7303 "gitg-history-refs-list.c" +#line 7311 "gitg-history-refs-list.c" } else { #line 1279 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp4_ = FALSE; -#line 7307 "gitg-history-refs-list.c" +#line 7315 "gitg-history-refs-list.c" } #line 1279 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp4_) { -#line 7311 "gitg-history-refs-list.c" +#line 7319 "gitg-history-refs-list.c" GeeLinkedList* _tmp9_ = NULL; GitgHistoryRefRow* _tmp10_ = NULL; GitgRef* _tmp11_ = NULL; @@ -7322,16 +7330,16 @@ _tmp12_ = _tmp11_; #line 1281 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _tmp9_, _tmp12_); -#line 7326 "gitg-history-refs-list.c" +#line 7334 "gitg-history-refs-list.c" } #line 1275 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (r); -#line 7330 "gitg-history-refs-list.c" +#line 7338 "gitg-history-refs-list.c" } } #line 1275 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_list_free0 (child_collection); -#line 7335 "gitg-history-refs-list.c" +#line 7343 "gitg-history-refs-list.c" } { gboolean _tmp13_ = FALSE; @@ -7340,7 +7348,7 @@ _tmp14_ = self->priv->d_repository; #line 1287 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp14_ != NULL) { -#line 7344 "gitg-history-refs-list.c" +#line 7352 "gitg-history-refs-list.c" gboolean _tmp15_ = FALSE; GitgRepository* _tmp16_ = NULL; gboolean _tmp17_ = FALSE; @@ -7352,20 +7360,20 @@ _tmp15_ = _tmp17_; #line 1287 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7356 "gitg-history-refs-list.c" +#line 7364 "gitg-history-refs-list.c" goto __catch124_g_error; } #line 1287 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp13_ = _tmp15_; -#line 7361 "gitg-history-refs-list.c" +#line 7369 "gitg-history-refs-list.c" } else { #line 1287 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp13_ = FALSE; -#line 7365 "gitg-history-refs-list.c" +#line 7373 "gitg-history-refs-list.c" } #line 1287 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp13_) { -#line 7369 "gitg-history-refs-list.c" +#line 7377 "gitg-history-refs-list.c" GitgRef* _tmp18_ = NULL; GitgRepository* _tmp19_ = NULL; GitgRef* _tmp20_ = NULL; @@ -7378,7 +7386,7 @@ _tmp18_ = _tmp20_; #line 1289 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7382 "gitg-history-refs-list.c" +#line 7390 "gitg-history-refs-list.c" goto __catch124_g_error; } #line 1289 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -7387,7 +7395,7 @@ gee_abstract_collection_add ((GeeAbstractCollection*) _tmp21_, _tmp18_); #line 1287 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (_tmp18_); -#line 7391 "gitg-history-refs-list.c" +#line 7399 "gitg-history-refs-list.c" } } goto __finally124; @@ -7397,7 +7405,7 @@ g_clear_error (&_inner_error_); #line 1285 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _inner_error_ = NULL; -#line 7401 "gitg-history-refs-list.c" +#line 7409 "gitg-history-refs-list.c" } __finally124: #line 1285 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -7410,13 +7418,13 @@ g_clear_error (&_inner_error_); #line 1285 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return NULL; -#line 7414 "gitg-history-refs-list.c" +#line 7422 "gitg-history-refs-list.c" } #line 1293 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = (GeeList*) ret; #line 1293 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 7420 "gitg-history-refs-list.c" +#line 7428 "gitg-history-refs-list.c" } @@ -7431,7 +7439,7 @@ result = (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, GITG_HISTORY_TYPE_REF_HEADER) ? ((GitgHistoryRefHeader*) _tmp0_) : NULL) != NULL; #line 1299 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 7435 "gitg-history-refs-list.c" +#line 7443 "gitg-history-refs-list.c" } @@ -7464,7 +7472,7 @@ _g_object_unref0 (row); #line 1310 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 7468 "gitg-history-refs-list.c" +#line 7476 "gitg-history-refs-list.c" } #line 1313 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp3_ = row; @@ -7476,7 +7484,7 @@ _tmp6_ = ref_row; #line 1315 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp6_ != NULL) { -#line 7480 "gitg-history-refs-list.c" +#line 7488 "gitg-history-refs-list.c" GitgHistoryRefRow* _tmp7_ = NULL; GitgRef* _tmp8_ = NULL; GitgRef* _tmp9_ = NULL; @@ -7488,11 +7496,11 @@ _tmp9_ = _tmp8_; #line 1315 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp5_ = _tmp9_ == NULL; -#line 7492 "gitg-history-refs-list.c" +#line 7500 "gitg-history-refs-list.c" } else { #line 1315 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp5_ = FALSE; -#line 7496 "gitg-history-refs-list.c" +#line 7504 "gitg-history-refs-list.c" } #line 1315 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = _tmp5_; @@ -7502,7 +7510,7 @@ _g_object_unref0 (row); #line 1315 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 7506 "gitg-history-refs-list.c" +#line 7514 "gitg-history-refs-list.c" } @@ -7530,7 +7538,7 @@ _tmp2_ = row; #line 1325 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp2_ == NULL) { -#line 7534 "gitg-history-refs-list.c" +#line 7542 "gitg-history-refs-list.c" GeeList* _tmp3_ = NULL; GeeList* _tmp4_ = NULL; #line 1327 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -7543,7 +7551,7 @@ _g_object_unref0 (row); #line 1327 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 7547 "gitg-history-refs-list.c" +#line 7555 "gitg-history-refs-list.c" } #line 1330 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp5_ = row; @@ -7559,7 +7567,7 @@ _tmp8_ = ref_row; #line 1333 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp8_ != NULL) { -#line 7563 "gitg-history-refs-list.c" +#line 7571 "gitg-history-refs-list.c" GitgHistoryRefRow* _tmp9_ = NULL; GitgRef* _tmp10_ = NULL; GitgRef* _tmp11_ = NULL; @@ -7571,7 +7579,7 @@ _tmp11_ = _tmp10_; #line 1335 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp11_ == NULL) { -#line 7575 "gitg-history-refs-list.c" +#line 7583 "gitg-history-refs-list.c" GeeList* _tmp12_ = NULL; GeeList* _tmp13_ = NULL; #line 1337 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -7588,7 +7596,7 @@ _g_object_unref0 (row); #line 1337 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 7592 "gitg-history-refs-list.c" +#line 7600 "gitg-history-refs-list.c" } else { GeeLinkedList* _tmp14_ = NULL; GitgHistoryRefRow* _tmp15_ = NULL; @@ -7604,7 +7612,7 @@ _tmp17_ = _tmp16_; #line 1341 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _tmp14_, _tmp17_); -#line 7608 "gitg-history-refs-list.c" +#line 7616 "gitg-history-refs-list.c" } } else { GitgHistoryRefHeader* ref_header = NULL; @@ -7622,7 +7630,7 @@ found = FALSE; #line 1349 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp20_ = gtk_container_get_children ((GtkContainer*) self); -#line 7626 "gitg-history-refs-list.c" +#line 7634 "gitg-history-refs-list.c" { GList* child_collection = NULL; GList* child_it = NULL; @@ -7630,18 +7638,18 @@ child_collection = _tmp20_; #line 1349 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" for (child_it = child_collection; child_it != NULL; child_it = child_it->next) { -#line 7634 "gitg-history-refs-list.c" +#line 7642 "gitg-history-refs-list.c" GtkWidget* child = NULL; #line 1349 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" child = (GtkWidget*) child_it->data; -#line 7638 "gitg-history-refs-list.c" +#line 7646 "gitg-history-refs-list.c" { gboolean _tmp21_ = FALSE; #line 1351 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp21_ = found; #line 1351 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp21_) { -#line 7645 "gitg-history-refs-list.c" +#line 7653 "gitg-history-refs-list.c" GtkListBoxRow* nrow = NULL; GtkWidget* _tmp22_ = NULL; GtkListBoxRow* _tmp23_ = NULL; @@ -7665,7 +7673,7 @@ _tmp26_ = nref_row; #line 1356 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp26_ == NULL) { -#line 7669 "gitg-history-refs-list.c" +#line 7677 "gitg-history-refs-list.c" GitgHistoryRefHeader* nref_header = NULL; GtkListBoxRow* _tmp27_ = NULL; GitgHistoryRefHeader* _tmp28_ = NULL; @@ -7689,7 +7697,7 @@ if (_tmp32_) { #line 1360 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp29_ = TRUE; -#line 7693 "gitg-history-refs-list.c" +#line 7701 "gitg-history-refs-list.c" } else { GitgHistoryRefHeader* _tmp33_ = NULL; GitgRefType _tmp34_ = 0; @@ -7711,7 +7719,7 @@ _tmp38_ = _tmp37_; #line 1361 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _tmp29_ = _tmp35_ != _tmp38_; -#line 7715 "gitg-history-refs-list.c" +#line 7723 "gitg-history-refs-list.c" } #line 1360 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (_tmp29_) { @@ -7723,11 +7731,11 @@ _g_object_unref0 (nrow); #line 1363 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 7727 "gitg-history-refs-list.c" +#line 7735 "gitg-history-refs-list.c" } #line 1356 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (nref_header); -#line 7731 "gitg-history-refs-list.c" +#line 7739 "gitg-history-refs-list.c" } else { GeeLinkedList* _tmp39_ = NULL; GitgHistoryRefRow* _tmp40_ = NULL; @@ -7743,13 +7751,13 @@ _tmp42_ = _tmp41_; #line 1368 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _tmp39_, _tmp42_); -#line 7747 "gitg-history-refs-list.c" +#line 7755 "gitg-history-refs-list.c" } #line 1351 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (nref_row); #line 1351 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (nrow); -#line 7753 "gitg-history-refs-list.c" +#line 7761 "gitg-history-refs-list.c" } else { GtkWidget* _tmp43_ = NULL; GtkListBoxRow* _tmp44_ = NULL; @@ -7761,18 +7769,18 @@ if (_tmp43_ == G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget)) { #line 1373 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" found = TRUE; -#line 7765 "gitg-history-refs-list.c" +#line 7773 "gitg-history-refs-list.c" } } } } #line 1349 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_list_free0 (child_collection); -#line 7772 "gitg-history-refs-list.c" +#line 7780 "gitg-history-refs-list.c" } #line 1333 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (ref_header); -#line 7776 "gitg-history-refs-list.c" +#line 7784 "gitg-history-refs-list.c" } #line 1378 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" result = (GeeList*) ret; @@ -7782,7 +7790,7 @@ _g_object_unref0 (row); #line 1378 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 7786 "gitg-history-refs-list.c" +#line 7794 "gitg-history-refs-list.c" } @@ -7791,7 +7799,7 @@ result = gitg_history_refs_list_sort_rows ((GitgHistoryRefsList*) self, row1, row2); #line 584 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 7795 "gitg-history-refs-list.c" +#line 7803 "gitg-history-refs-list.c" } @@ -7800,7 +7808,7 @@ result = gitg_history_refs_list_filter_func ((GitgHistoryRefsList*) self, row); #line 585 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return result; -#line 7804 "gitg-history-refs-list.c" +#line 7812 "gitg-history-refs-list.c" } @@ -7860,7 +7868,7 @@ _g_object_unref0 (settings); #line 577 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return obj; -#line 7864 "gitg-history-refs-list.c" +#line 7872 "gitg-history-refs-list.c" } @@ -7889,21 +7897,21 @@ self->references = _tmp2_; #line 544 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return self; -#line 7893 "gitg-history-refs-list.c" +#line 7901 "gitg-history-refs-list.c" } static GitgHistoryRefsListRemoteHeader* gitg_history_refs_list_remote_header_new (GitgHistoryRefHeader* h) { #line 544 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return gitg_history_refs_list_remote_header_construct (GITG_HISTORY_REFS_LIST_TYPE_REMOTE_HEADER, h); -#line 7900 "gitg-history-refs-list.c" +#line 7908 "gitg-history-refs-list.c" } static void gitg_history_refs_list_value_remote_header_init (GValue* value) { #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" value->data[0].v_pointer = NULL; -#line 7907 "gitg-history-refs-list.c" +#line 7915 "gitg-history-refs-list.c" } @@ -7912,7 +7920,7 @@ if (value->data[0].v_pointer) { #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gitg_history_refs_list_remote_header_unref (value->data[0].v_pointer); -#line 7916 "gitg-history-refs-list.c" +#line 7924 "gitg-history-refs-list.c" } } @@ -7922,11 +7930,11 @@ if (src_value->data[0].v_pointer) { #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" dest_value->data[0].v_pointer = gitg_history_refs_list_remote_header_ref (src_value->data[0].v_pointer); -#line 7926 "gitg-history-refs-list.c" +#line 7934 "gitg-history-refs-list.c" } else { #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" dest_value->data[0].v_pointer = NULL; -#line 7930 "gitg-history-refs-list.c" +#line 7938 "gitg-history-refs-list.c" } } @@ -7934,66 +7942,66 @@ static gpointer gitg_history_refs_list_value_remote_header_peek_pointer (const GValue* value) { #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return value->data[0].v_pointer; -#line 7938 "gitg-history-refs-list.c" +#line 7946 "gitg-history-refs-list.c" } static gchar* gitg_history_refs_list_value_remote_header_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (collect_values[0].v_pointer) { -#line 7945 "gitg-history-refs-list.c" - GitgHistoryRefsListRemoteHeader* object; +#line 7953 "gitg-history-refs-list.c" + GitgHistoryRefsListRemoteHeader * object; object = collect_values[0].v_pointer; #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (object->parent_instance.g_class == NULL) { #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 7952 "gitg-history-refs-list.c" +#line 7960 "gitg-history-refs-list.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 7956 "gitg-history-refs-list.c" +#line 7964 "gitg-history-refs-list.c" } #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" value->data[0].v_pointer = gitg_history_refs_list_remote_header_ref (object); -#line 7960 "gitg-history-refs-list.c" +#line 7968 "gitg-history-refs-list.c" } else { #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" value->data[0].v_pointer = NULL; -#line 7964 "gitg-history-refs-list.c" +#line 7972 "gitg-history-refs-list.c" } #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return NULL; -#line 7968 "gitg-history-refs-list.c" +#line 7976 "gitg-history-refs-list.c" } static gchar* gitg_history_refs_list_value_remote_header_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GitgHistoryRefsListRemoteHeader** object_p; + GitgHistoryRefsListRemoteHeader ** object_p; object_p = collect_values[0].v_pointer; #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (!object_p) { #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 7979 "gitg-history-refs-list.c" +#line 7987 "gitg-history-refs-list.c" } #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (!value->data[0].v_pointer) { #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" *object_p = NULL; -#line 7985 "gitg-history-refs-list.c" +#line 7993 "gitg-history-refs-list.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" *object_p = value->data[0].v_pointer; -#line 7989 "gitg-history-refs-list.c" +#line 7997 "gitg-history-refs-list.c" } else { #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" *object_p = gitg_history_refs_list_remote_header_ref (value->data[0].v_pointer); -#line 7993 "gitg-history-refs-list.c" +#line 8001 "gitg-history-refs-list.c" } #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return NULL; -#line 7997 "gitg-history-refs-list.c" +#line 8005 "gitg-history-refs-list.c" } @@ -8007,7 +8015,7 @@ G_PARAM_SPEC (spec)->value_type = object_type; #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return G_PARAM_SPEC (spec); -#line 8011 "gitg-history-refs-list.c" +#line 8019 "gitg-history-refs-list.c" } @@ -8016,12 +8024,12 @@ g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_HISTORY_REFS_LIST_TYPE_REMOTE_HEADER), NULL); #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return value->data[0].v_pointer; -#line 8020 "gitg-history-refs-list.c" +#line 8028 "gitg-history-refs-list.c" } static void gitg_history_refs_list_value_set_remote_header (GValue* value, gpointer v_object) { - GitgHistoryRefsListRemoteHeader* old; + GitgHistoryRefsListRemoteHeader * old; #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_HISTORY_REFS_LIST_TYPE_REMOTE_HEADER)); #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -8036,23 +8044,23 @@ value->data[0].v_pointer = v_object; #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gitg_history_refs_list_remote_header_ref (value->data[0].v_pointer); -#line 8040 "gitg-history-refs-list.c" +#line 8048 "gitg-history-refs-list.c" } else { #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" value->data[0].v_pointer = NULL; -#line 8044 "gitg-history-refs-list.c" +#line 8052 "gitg-history-refs-list.c" } #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (old) { #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gitg_history_refs_list_remote_header_unref (old); -#line 8050 "gitg-history-refs-list.c" +#line 8058 "gitg-history-refs-list.c" } } static void gitg_history_refs_list_value_take_remote_header (GValue* value, gpointer v_object) { - GitgHistoryRefsListRemoteHeader* old; + GitgHistoryRefsListRemoteHeader * old; #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_HISTORY_REFS_LIST_TYPE_REMOTE_HEADER)); #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" @@ -8065,17 +8073,17 @@ g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" value->data[0].v_pointer = v_object; -#line 8069 "gitg-history-refs-list.c" +#line 8077 "gitg-history-refs-list.c" } else { #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" value->data[0].v_pointer = NULL; -#line 8073 "gitg-history-refs-list.c" +#line 8081 "gitg-history-refs-list.c" } #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (old) { #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" gitg_history_refs_list_remote_header_unref (old); -#line 8079 "gitg-history-refs-list.c" +#line 8087 "gitg-history-refs-list.c" } } @@ -8085,18 +8093,18 @@ gitg_history_refs_list_remote_header_parent_class = g_type_class_peek_parent (klass); #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" ((GitgHistoryRefsListRemoteHeaderClass *) klass)->finalize = gitg_history_refs_list_remote_header_finalize; -#line 8089 "gitg-history-refs-list.c" +#line 8097 "gitg-history-refs-list.c" } static void gitg_history_refs_list_remote_header_instance_init (GitgHistoryRefsListRemoteHeader * self) { #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" self->ref_count = 1; -#line 8096 "gitg-history-refs-list.c" +#line 8104 "gitg-history-refs-list.c" } -static void gitg_history_refs_list_remote_header_finalize (GitgHistoryRefsListRemoteHeader* obj) { +static void gitg_history_refs_list_remote_header_finalize (GitgHistoryRefsListRemoteHeader * obj) { GitgHistoryRefsListRemoteHeader * self; #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_HISTORY_REFS_LIST_TYPE_REMOTE_HEADER, GitgHistoryRefsListRemoteHeader); @@ -8106,7 +8114,7 @@ _g_object_unref0 (self->header); #line 542 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_object_unref0 (self->references); -#line 8110 "gitg-history-refs-list.c" +#line 8118 "gitg-history-refs-list.c" } @@ -8125,18 +8133,18 @@ static gpointer gitg_history_refs_list_remote_header_ref (gpointer instance) { - GitgHistoryRefsListRemoteHeader* self; + GitgHistoryRefsListRemoteHeader * self; self = instance; #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_atomic_int_inc (&self->ref_count); #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return instance; -#line 8135 "gitg-history-refs-list.c" +#line 8143 "gitg-history-refs-list.c" } static void gitg_history_refs_list_remote_header_unref (gpointer instance) { - GitgHistoryRefsListRemoteHeader* self; + GitgHistoryRefsListRemoteHeader * self; self = instance; #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -8144,7 +8152,7 @@ GITG_HISTORY_REFS_LIST_REMOTE_HEADER_GET_CLASS (self)->finalize (self); #line 539 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_type_free_instance ((GTypeInstance *) self); -#line 8148 "gitg-history-refs-list.c" +#line 8156 "gitg-history-refs-list.c" } } @@ -8170,14 +8178,14 @@ _tmp3_ = (*self).expanded; #line 519 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" (*dest).expanded = _tmp3_; -#line 8174 "gitg-history-refs-list.c" +#line 8182 "gitg-history-refs-list.c" } static void gitg_history_refs_list_header_state_destroy (GitgHistoryRefsListHeaderState* self) { #line 522 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" _g_free0 ((*self).name); -#line 8181 "gitg-history-refs-list.c" +#line 8189 "gitg-history-refs-list.c" } @@ -8189,7 +8197,7 @@ gitg_history_refs_list_header_state_copy (self, dup); #line 519 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" return dup; -#line 8193 "gitg-history-refs-list.c" +#line 8201 "gitg-history-refs-list.c" } @@ -8198,7 +8206,7 @@ gitg_history_refs_list_header_state_destroy (self); #line 519 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_free (self); -#line 8202 "gitg-history-refs-list.c" +#line 8210 "gitg-history-refs-list.c" } @@ -8251,19 +8259,19 @@ #line 517 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_HISTORY_REFS_LIST_SELECTION, g_param_spec_object ("selection", "selection", "selection", GEE_TYPE_LIST, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 517 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" - g_signal_new ("changed", GITG_HISTORY_TYPE_REFS_LIST, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 8256 "gitg-history-refs-list.c" + gitg_history_refs_list_signals[GITG_HISTORY_REFS_LIST_CHANGED_SIGNAL] = g_signal_new ("changed", GITG_HISTORY_TYPE_REFS_LIST, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 8264 "gitg-history-refs-list.c" } static void gitg_history_refs_list_instance_init (GitgHistoryRefsList * self) { #line 517 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" self->priv = GITG_HISTORY_REFS_LIST_GET_PRIVATE (self); -#line 8263 "gitg-history-refs-list.c" +#line 8271 "gitg-history-refs-list.c" } -static void gitg_history_refs_list_finalize (GObject* obj) { +static void gitg_history_refs_list_finalize (GObject * obj) { GitgHistoryRefsList * self; #line 517 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_HISTORY_TYPE_REFS_LIST, GitgHistoryRefsList); @@ -8291,7 +8299,7 @@ _g_object_unref0 (self->priv->_remote_lookup); #line 517 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" G_OBJECT_CLASS (gitg_history_refs_list_parent_class)->finalize (obj); -#line 8295 "gitg-history-refs-list.c" +#line 8303 "gitg-history-refs-list.c" } @@ -8360,13 +8368,13 @@ g_value_take_object (value, gitg_history_refs_list_get_selection (self)); #line 517 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 8364 "gitg-history-refs-list.c" +#line 8372 "gitg-history-refs-list.c" default: #line 517 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 517 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 8370 "gitg-history-refs-list.c" +#line 8378 "gitg-history-refs-list.c" } } @@ -8394,13 +8402,13 @@ gitg_history_refs_list_set_reference_sort_order (self, g_value_get_string (value)); #line 517 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 8398 "gitg-history-refs-list.c" +#line 8406 "gitg-history-refs-list.c" default: #line 517 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 517 "/home/jesse/dev/gitg/gitg/history/gitg-history-refs-list.vala" break; -#line 8404 "gitg-history-refs-list.c" +#line 8412 "gitg-history-refs-list.c" } } diff -Nru gitg-3.22.0/gitg/history/gitg-history-refs-list.vala gitg-3.23.0/gitg/history/gitg-history-refs-list.vala --- gitg-3.22.0/gitg/history/gitg-history-refs-list.vala 2016-08-09 09:43:09.000000000 +0000 +++ gitg-3.23.0/gitg/history/gitg-history-refs-list.vala 2016-11-26 08:32:35.000000000 +0000 @@ -162,15 +162,15 @@ { if (ahead != 0 && behind != 0) { - d_ahead_behind.label = _("%d ahead, %d behind").printf(ahead, behind); + d_ahead_behind.label = _("%zu ahead, %zu behind").printf(ahead, behind); } else if (ahead != 0) { - d_ahead_behind.label = _("%d ahead").printf(ahead); + d_ahead_behind.label = _("%zu ahead").printf(ahead); } else { - d_ahead_behind.label = _("%d behind").printf(behind); + d_ahead_behind.label = _("%zu behind").printf(behind); } } } catch {} diff -Nru gitg-3.22.0/gitg/preferences/gitg-preferences-commit.c gitg-3.23.0/gitg/preferences/gitg-preferences-commit.c --- gitg-3.22.0/gitg/preferences/gitg-preferences-commit.c 2016-08-09 09:50:55.000000000 +0000 +++ gitg-3.23.0/gitg/preferences/gitg-preferences-commit.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-preferences-commit.c generated by valac 0.32.1, the Vala compiler +/* gitg-preferences-commit.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-preferences-commit.vala, do not modify */ /* @@ -66,7 +66,7 @@ static gpointer gitg_preferences_commit_parent_class = NULL; -static GitgExtPreferencesIface* gitg_preferences_commit_gitg_ext_preferences_parent_iface = NULL; +static GitgExtPreferencesIface * gitg_preferences_commit_gitg_ext_preferences_parent_iface = NULL; GType gitg_preferences_commit_get_type (void) G_GNUC_CONST; #define GITG_PREFERENCES_COMMIT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_PREFERENCES_COMMIT, GitgPreferencesCommitPrivate)) @@ -80,7 +80,7 @@ GitgPreferencesCommit* gitg_preferences_commit_new (void); GitgPreferencesCommit* gitg_preferences_commit_construct (GType object_type); static GObject * gitg_preferences_commit_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); -static void gitg_preferences_commit_finalize (GObject* obj); +static void gitg_preferences_commit_finalize (GObject * obj); static void _vala_gitg_preferences_commit_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); @@ -143,19 +143,16 @@ static gchar* gitg_preferences_commit_real_get_display_name (GitgExtPreferences* base) { gchar* result; GitgPreferencesCommit* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 119 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-commit.vala" self = (GitgPreferencesCommit*) base; #line 119 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-commit.vala" - _tmp0_ = C_ ("Preferences", "Commit"); -#line 119 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-commit.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (C_ ("Preferences", "Commit")); #line 119 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-commit.vala" - result = _tmp1_; + result = _tmp0_; #line 119 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-commit.vala" return result; -#line 159 "gitg-preferences-commit.c" +#line 156 "gitg-preferences-commit.c" } @@ -251,7 +248,7 @@ _g_object_unref0 (settings); #line 54 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-commit.vala" return obj; -#line 255 "gitg-preferences-commit.c" +#line 252 "gitg-preferences-commit.c" } @@ -295,7 +292,7 @@ gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "spin_button_right_margin", FALSE, GitgPreferencesCommit_private_offset + G_STRUCT_OFFSET (GitgPreferencesCommitPrivate, d_spin_button_right_margin)); #line 24 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-commit.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "enable_spell_checking", FALSE, GitgPreferencesCommit_private_offset + G_STRUCT_OFFSET (GitgPreferencesCommitPrivate, d_enable_spell_checking)); -#line 299 "gitg-preferences-commit.c" +#line 296 "gitg-preferences-commit.c" } @@ -308,7 +305,7 @@ iface->get_id = gitg_preferences_commit_real_get_id; #line 24 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-commit.vala" iface->get_display_name = gitg_preferences_commit_real_get_display_name; -#line 312 "gitg-preferences-commit.c" +#line 309 "gitg-preferences-commit.c" } @@ -317,11 +314,11 @@ self->priv = GITG_PREFERENCES_COMMIT_GET_PRIVATE (self); #line 24 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-commit.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 321 "gitg-preferences-commit.c" +#line 318 "gitg-preferences-commit.c" } -static void gitg_preferences_commit_finalize (GObject* obj) { +static void gitg_preferences_commit_finalize (GObject * obj) { GitgPreferencesCommit * self; #line 24 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-commit.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_PREFERENCES_COMMIT, GitgPreferencesCommit); @@ -345,7 +342,7 @@ _g_object_unref0 (self->priv->d_enable_spell_checking); #line 24 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-commit.vala" G_OBJECT_CLASS (gitg_preferences_commit_parent_class)->finalize (obj); -#line 349 "gitg-preferences-commit.c" +#line 346 "gitg-preferences-commit.c" } @@ -386,13 +383,13 @@ g_value_take_string (value, gitg_ext_preferences_get_display_name ((GitgExtPreferences*) self)); #line 24 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-commit.vala" break; -#line 390 "gitg-preferences-commit.c" +#line 387 "gitg-preferences-commit.c" default: #line 24 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-commit.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 24 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-commit.vala" break; -#line 396 "gitg-preferences-commit.c" +#line 393 "gitg-preferences-commit.c" } } diff -Nru gitg-3.22.0/gitg/preferences/gitg-preferences-dialog.c gitg-3.23.0/gitg/preferences/gitg-preferences-dialog.c --- gitg-3.22.0/gitg/preferences/gitg-preferences-dialog.c 2016-08-09 09:50:55.000000000 +0000 +++ gitg-3.23.0/gitg/preferences/gitg-preferences-dialog.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-preferences-dialog.c generated by valac 0.32.1, the Vala compiler +/* gitg-preferences-dialog.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-preferences-dialog.vala, do not modify */ /* @@ -105,7 +105,7 @@ static gpointer gitg_preferences_dialog_parent_class = NULL; -static GtkBuildableIface* gitg_preferences_dialog_gtk_buildable_parent_iface = NULL; +static GtkBuildableIface * gitg_preferences_dialog_gtk_buildable_parent_iface = NULL; GType gitg_preferences_dialog_get_type (void) G_GNUC_CONST; #define GITG_PREFERENCES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_PREFERENCES_DIALOG, GitgPreferencesDialogPrivate)) @@ -134,7 +134,7 @@ static void ___lambda87__peas_extension_set_foreach_func (PeasExtensionSet* set, PeasPluginInfo* info, PeasExtension* exten, gpointer self); GitgPreferencesDialog* gitg_preferences_dialog_new (void); GitgPreferencesDialog* gitg_preferences_dialog_construct (GType object_type); -static void gitg_preferences_dialog_finalize (GObject* obj); +static void gitg_preferences_dialog_finalize (GObject * obj); static gpointer _g_object_ref0 (gpointer self) { @@ -519,7 +519,7 @@ #line 23 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-dialog.vala" gitg_preferences_dialog_gtk_buildable_parent_iface = g_type_interface_peek_parent (iface); #line 23 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-dialog.vala" - iface->parser_finished = (void (*)(GtkBuildable*, GtkBuilder*)) gitg_preferences_dialog_real_parser_finished; + iface->parser_finished = (void (*) (GtkBuildable *, GtkBuilder*)) gitg_preferences_dialog_real_parser_finished; #line 524 "gitg-preferences-dialog.c" } @@ -531,7 +531,7 @@ } -static void gitg_preferences_dialog_finalize (GObject* obj) { +static void gitg_preferences_dialog_finalize (GObject * obj) { GitgPreferencesDialog * self; #line 23 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-dialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_PREFERENCES_DIALOG, GitgPreferencesDialog); diff -Nru gitg-3.22.0/gitg/preferences/gitg-preferences-history.c gitg-3.23.0/gitg/preferences/gitg-preferences-history.c --- gitg-3.22.0/gitg/preferences/gitg-preferences-history.c 2016-08-09 09:50:55.000000000 +0000 +++ gitg-3.23.0/gitg/preferences/gitg-preferences-history.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-preferences-history.c generated by valac 0.32.1, the Vala compiler +/* gitg-preferences-history.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-preferences-history.vala, do not modify */ /* @@ -84,7 +84,7 @@ static gpointer gitg_preferences_history_parent_class = NULL; -static GitgExtPreferencesIface* gitg_preferences_history_gitg_ext_preferences_parent_iface = NULL; +static GitgExtPreferencesIface * gitg_preferences_history_gitg_ext_preferences_parent_iface = NULL; GType gitg_preferences_history_get_type (void) G_GNUC_CONST; #define GITG_PREFERENCES_HISTORY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_PREFERENCES_HISTORY, GitgPreferencesHistoryPrivate)) @@ -117,7 +117,7 @@ static gboolean __gitg_preferences_history___lambda85__gsettings_bind_get_mapping (GValue* value, GVariant* variant, void* user_data); static GVariant* _gitg_preferences_history___lambda86_ (GValue* value, const GVariantType* expected_type); static GVariant* __gitg_preferences_history___lambda86__gsettings_bind_set_mapping (GValue* value, const GVariantType* expected_type, void* user_data); -static void gitg_preferences_history_finalize (GObject* obj); +static void gitg_preferences_history_finalize (GObject * obj); static void _vala_gitg_preferences_history_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_preferences_history_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -314,95 +314,98 @@ void gitg_preferences_history_set_default_selection (GitgPreferencesHistory* self, const gchar* value) { #line 179 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" g_return_if_fail (self != NULL); -#line 318 "gitg-preferences-history.c" - { - gint i = 0; -#line 181 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - i = 0; -#line 323 "gitg-preferences-history.c" +#line 179 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" + if (g_strcmp0 (value, gitg_preferences_history_get_default_selection (self)) != 0) { +#line 320 "gitg-preferences-history.c" { - gboolean _tmp0_ = FALSE; + gint i = 0; #line 181 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - _tmp0_ = TRUE; + i = 0; +#line 325 "gitg-preferences-history.c" + { + gboolean _tmp0_ = FALSE; #line 181 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - while (TRUE) { -#line 330 "gitg-preferences-history.c" - gint _tmp2_ = 0; - GtkRadioButton** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - gint _tmp5_ = 0; - const gchar* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; + _tmp0_ = TRUE; #line 181 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - if (!_tmp0_) { -#line 341 "gitg-preferences-history.c" - gint _tmp1_ = 0; + while (TRUE) { +#line 332 "gitg-preferences-history.c" + gint _tmp2_ = 0; + GtkRadioButton** _tmp3_ = NULL; + gint _tmp3__length1 = 0; + gchar** _tmp4_ = NULL; + gint _tmp4__length1 = 0; + gint _tmp5_ = 0; + const gchar* _tmp6_ = NULL; + const gchar* _tmp7_ = NULL; #line 181 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - _tmp1_ = i; + if (!_tmp0_) { +#line 343 "gitg-preferences-history.c" + gint _tmp1_ = 0; #line 181 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - i = _tmp1_ + 1; -#line 347 "gitg-preferences-history.c" - } + _tmp1_ = i; #line 181 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - _tmp0_ = FALSE; + i = _tmp1_ + 1; +#line 349 "gitg-preferences-history.c" + } #line 181 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - _tmp2_ = i; + _tmp0_ = FALSE; #line 181 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - _tmp3_ = self->priv->d_select_buttons; + _tmp2_ = i; #line 181 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - _tmp3__length1 = self->priv->d_select_buttons_length1; + _tmp3_ = self->priv->d_select_buttons; #line 181 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - if (!(_tmp2_ < _tmp3__length1)) { + _tmp3__length1 = self->priv->d_select_buttons_length1; #line 181 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - break; -#line 361 "gitg-preferences-history.c" - } + if (!(_tmp2_ < _tmp3__length1)) { +#line 181 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" + break; +#line 363 "gitg-preferences-history.c" + } #line 183 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - _tmp4_ = self->priv->d_select_names; + _tmp4_ = self->priv->d_select_names; #line 183 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - _tmp4__length1 = self->priv->d_select_names_length1; + _tmp4__length1 = self->priv->d_select_names_length1; #line 183 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - _tmp5_ = i; + _tmp5_ = i; #line 183 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - _tmp6_ = _tmp4_[_tmp5_]; + _tmp6_ = _tmp4_[_tmp5_]; #line 183 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - _tmp7_ = value; + _tmp7_ = value; #line 183 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - if (g_strcmp0 (_tmp6_, _tmp7_) == 0) { -#line 375 "gitg-preferences-history.c" - GtkRadioButton** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - gint _tmp9_ = 0; - GtkRadioButton* _tmp10_ = NULL; + if (g_strcmp0 (_tmp6_, _tmp7_) == 0) { +#line 377 "gitg-preferences-history.c" + GtkRadioButton** _tmp8_ = NULL; + gint _tmp8__length1 = 0; + gint _tmp9_ = 0; + GtkRadioButton* _tmp10_ = NULL; #line 185 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - _tmp8_ = self->priv->d_select_buttons; + _tmp8_ = self->priv->d_select_buttons; #line 185 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - _tmp8__length1 = self->priv->d_select_buttons_length1; + _tmp8__length1 = self->priv->d_select_buttons_length1; #line 185 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - _tmp9_ = i; + _tmp9_ = i; #line 185 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - _tmp10_ = _tmp8_[_tmp9_]; + _tmp10_ = _tmp8_[_tmp9_]; #line 185 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - gtk_toggle_button_set_active ((GtkToggleButton*) _tmp10_, TRUE); + gtk_toggle_button_set_active ((GtkToggleButton*) _tmp10_, TRUE); #line 186 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - return; -#line 392 "gitg-preferences-history.c" + return; +#line 394 "gitg-preferences-history.c" + } } } } - } #line 179 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - g_object_notify ((GObject *) self, "default-selection"); -#line 399 "gitg-preferences-history.c" + g_object_notify ((GObject *) self, "default-selection"); +#line 401 "gitg-preferences-history.c" + } } static gpointer _g_object_ref0 (gpointer self) { #line 207 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" return self ? g_object_ref (self) : NULL; -#line 406 "gitg-preferences-history.c" +#line 409 "gitg-preferences-history.c" } @@ -418,7 +421,7 @@ result = _tmp0_; #line 207 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" return result; -#line 422 "gitg-preferences-history.c" +#line 425 "gitg-preferences-history.c" } @@ -434,23 +437,20 @@ result = _tmp0_; #line 213 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" return result; -#line 438 "gitg-preferences-history.c" +#line 441 "gitg-preferences-history.c" } static gchar* gitg_preferences_history_real_get_display_name (GitgExtPreferences* base) { gchar* result; GitgPreferencesHistory* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 218 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" self = (GitgPreferencesHistory*) base; #line 218 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - _tmp0_ = _ ("History"); + _tmp0_ = g_strdup (_ ("History")); #line 218 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 218 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" - result = _tmp1_; + result = _tmp0_; #line 218 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" return result; #line 457 "gitg-preferences-history.c" @@ -992,7 +992,7 @@ } -static void gitg_preferences_history_finalize (GObject* obj) { +static void gitg_preferences_history_finalize (GObject * obj) { GitgPreferencesHistory * self; #line 24 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-history.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_PREFERENCES_HISTORY, GitgPreferencesHistory); diff -Nru gitg-3.22.0/gitg/preferences/gitg-preferences-interface.c gitg-3.23.0/gitg/preferences/gitg-preferences-interface.c --- gitg-3.22.0/gitg/preferences/gitg-preferences-interface.c 2016-08-09 09:50:55.000000000 +0000 +++ gitg-3.23.0/gitg/preferences/gitg-preferences-interface.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-preferences-interface.c generated by valac 0.32.1, the Vala compiler +/* gitg-preferences-interface.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-preferences-interface.vala, do not modify */ /* @@ -64,7 +64,7 @@ static gpointer gitg_preferences_interface_parent_class = NULL; -static GitgExtPreferencesIface* gitg_preferences_interface_gitg_ext_preferences_parent_iface = NULL; +static GitgExtPreferencesIface * gitg_preferences_interface_gitg_ext_preferences_parent_iface = NULL; GType gitg_preferences_interface_get_type (void) G_GNUC_CONST; #define GITG_PREFERENCES_INTERFACE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_PREFERENCES_INTERFACE, GitgPreferencesInterfacePrivate)) @@ -83,7 +83,7 @@ static GObject * gitg_preferences_interface_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); static void _gitg_preferences_interface___lambda80_ (GitgPreferencesInterface* self, GObject* obj, GParamSpec* spec); static void __gitg_preferences_interface___lambda80__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); -static void gitg_preferences_interface_finalize (GObject* obj); +static void gitg_preferences_interface_finalize (GObject * obj); static void _vala_gitg_preferences_interface_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); @@ -110,7 +110,7 @@ #line 91 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" _tmp1_ = self->priv->d_settings; #line 91 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" - g_signal_parse_name ("changed::orientation", G_TYPE_SETTINGS, &_tmp2_, &_tmp3_, TRUE); + g_signal_parse_name ("changed::orientation", g_settings_get_type (), &_tmp2_, &_tmp3_, TRUE); #line 91 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DETAIL | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, _tmp3_, NULL, (GCallback) _gitg_preferences_interface_orientation_changed_g_settings_changed, self); #line 92 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" @@ -213,19 +213,16 @@ static gchar* gitg_preferences_interface_real_get_display_name (GitgExtPreferences* base) { gchar* result; GitgPreferencesInterface* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 120 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" self = (GitgPreferencesInterface*) base; #line 120 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" - _tmp0_ = _ ("Interface"); -#line 120 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (_ ("Interface")); #line 120 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" - result = _tmp1_; + result = _tmp0_; #line 120 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" return result; -#line 229 "gitg-preferences-interface.c" +#line 226 "gitg-preferences-interface.c" } @@ -247,7 +244,7 @@ if (_tmp0_) { #line 55 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" return; -#line 251 "gitg-preferences-interface.c" +#line 248 "gitg-preferences-interface.c" } #line 58 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" _tmp2_ = self->priv->d_horizontal_layout_enabled; @@ -259,11 +256,11 @@ if (_tmp4_) { #line 58 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" _tmp1_ = 0; -#line 263 "gitg-preferences-interface.c" +#line 260 "gitg-preferences-interface.c" } else { #line 58 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" _tmp1_ = 1; -#line 267 "gitg-preferences-interface.c" +#line 264 "gitg-preferences-interface.c" } #line 58 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" _tmp5_ = self->priv->d_settings; @@ -271,7 +268,7 @@ _tmp6_ = g_settings_set_enum (_tmp5_, "orientation", _tmp1_); #line 58 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" if (!_tmp6_) { -#line 275 "gitg-preferences-interface.c" +#line 272 "gitg-preferences-interface.c" GtkCheckButton* _tmp7_ = NULL; GSettings* _tmp8_ = NULL; gint _tmp9_ = 0; @@ -283,7 +280,7 @@ _tmp9_ = g_settings_get_enum (_tmp8_, "orientation"); #line 60 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" gtk_toggle_button_set_active ((GtkToggleButton*) _tmp7_, _tmp9_ == 0); -#line 287 "gitg-preferences-interface.c" +#line 284 "gitg-preferences-interface.c" } } @@ -291,7 +288,7 @@ static void __gitg_preferences_interface___lambda80__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 52 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" _gitg_preferences_interface___lambda80_ ((GitgPreferencesInterface*) self, _sender, pspec); -#line 295 "gitg-preferences-interface.c" +#line 292 "gitg-preferences-interface.c" } @@ -367,7 +364,7 @@ g_settings_bind (_tmp12_, "enable-diff-highlighting", (GObject*) _tmp13_, "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); #line 46 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" return obj; -#line 371 "gitg-preferences-interface.c" +#line 368 "gitg-preferences-interface.c" } @@ -405,7 +402,7 @@ gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "monitoring_enabled", FALSE, GitgPreferencesInterface_private_offset + G_STRUCT_OFFSET (GitgPreferencesInterfacePrivate, d_monitoring_enabled)); #line 24 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "diff_highlighting_enabled", FALSE, GitgPreferencesInterface_private_offset + G_STRUCT_OFFSET (GitgPreferencesInterfacePrivate, d_diff_highlighting_enabled)); -#line 409 "gitg-preferences-interface.c" +#line 406 "gitg-preferences-interface.c" } @@ -418,7 +415,7 @@ iface->get_id = gitg_preferences_interface_real_get_id; #line 24 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" iface->get_display_name = gitg_preferences_interface_real_get_display_name; -#line 422 "gitg-preferences-interface.c" +#line 419 "gitg-preferences-interface.c" } @@ -427,11 +424,11 @@ self->priv = GITG_PREFERENCES_INTERFACE_GET_PRIVATE (self); #line 24 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 431 "gitg-preferences-interface.c" +#line 428 "gitg-preferences-interface.c" } -static void gitg_preferences_interface_finalize (GObject* obj) { +static void gitg_preferences_interface_finalize (GObject * obj) { GitgPreferencesInterface * self; #line 24 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_PREFERENCES_INTERFACE, GitgPreferencesInterface); @@ -449,7 +446,7 @@ _g_object_unref0 (self->priv->d_diff_highlighting_enabled); #line 24 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" G_OBJECT_CLASS (gitg_preferences_interface_parent_class)->finalize (obj); -#line 453 "gitg-preferences-interface.c" +#line 450 "gitg-preferences-interface.c" } @@ -490,13 +487,13 @@ g_value_take_string (value, gitg_ext_preferences_get_display_name ((GitgExtPreferences*) self)); #line 24 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" break; -#line 494 "gitg-preferences-interface.c" +#line 491 "gitg-preferences-interface.c" default: #line 24 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 24 "/home/jesse/dev/gitg/gitg/preferences/gitg-preferences-interface.vala" break; -#line 500 "gitg-preferences-interface.c" +#line 497 "gitg-preferences-interface.c" } } diff -Nru gitg-3.22.0/Gitg-1.0.gir gitg-3.23.0/Gitg-1.0.gir --- gitg-3.22.0/Gitg-1.0.gir 2016-09-18 12:01:42.000000000 +0000 +++ gitg-3.23.0/Gitg-1.0.gir 2016-11-26 12:23:16.000000000 +0000 @@ -14,8 +14,8 @@ - - + + @@ -181,7 +181,7 @@ - + @@ -1118,7 +1118,7 @@ - + @@ -1471,7 +1471,7 @@ - + @@ -2510,7 +2510,7 @@ - + @@ -3070,7 +3070,7 @@ - + diff -Nru gitg-3.22.0/GitgExt-1.0.gir gitg-3.23.0/GitgExt-1.0.gir --- gitg-3.22.0/GitgExt-1.0.gir 2016-09-18 12:01:42.000000000 +0000 +++ gitg-3.23.0/GitgExt-1.0.gir 2016-11-26 12:23:17.000000000 +0000 @@ -10,8 +10,8 @@ - - + + diff -Nru gitg-3.22.0/libgitg/gitg-assembly-info.c gitg-3.23.0/libgitg/gitg-assembly-info.c --- gitg-3.22.0/libgitg/gitg-assembly-info.c 2016-08-09 09:50:21.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-assembly-info.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-assembly-info.c generated by valac 0.32.1, the Vala compiler +/* gitg-assembly-info.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-assembly-info.vala, do not modify */ /* diff -Nru gitg-3.22.0/libgitg/gitg-async.c gitg-3.23.0/libgitg/gitg-async.c --- gitg-3.22.0/libgitg/gitg-async.c 2016-08-09 09:50:21.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-async.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-async.c generated by valac 0.32.1, the Vala compiler +/* gitg-async.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-async.vala, do not modify */ /* @@ -131,7 +131,7 @@ static void gitg_async_thread_try_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); GitgAsync* gitg_async_new (void); GitgAsync* gitg_async_construct (GType object_type); -static void gitg_async_finalize (GitgAsync* obj); +static void gitg_async_finalize (GitgAsync * obj); static void gitg_async_thread_data_free (gpointer _data) { @@ -670,7 +670,7 @@ #line 23 "/home/jesse/dev/gitg/libgitg/gitg-async.vala" if (collect_values[0].v_pointer) { #line 673 "gitg-async.c" - GitgAsync* object; + GitgAsync * object; object = collect_values[0].v_pointer; #line 23 "/home/jesse/dev/gitg/libgitg/gitg-async.vala" if (object->parent_instance.g_class == NULL) { @@ -697,7 +697,7 @@ static gchar* gitg_value_async_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GitgAsync** object_p; + GitgAsync ** object_p; object_p = collect_values[0].v_pointer; #line 23 "/home/jesse/dev/gitg/libgitg/gitg-async.vala" if (!object_p) { @@ -749,7 +749,7 @@ void gitg_value_set_async (GValue* value, gpointer v_object) { - GitgAsync* old; + GitgAsync * old; #line 23 "/home/jesse/dev/gitg/libgitg/gitg-async.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_ASYNC)); #line 23 "/home/jesse/dev/gitg/libgitg/gitg-async.vala" @@ -780,7 +780,7 @@ void gitg_value_take_async (GValue* value, gpointer v_object) { - GitgAsync* old; + GitgAsync * old; #line 23 "/home/jesse/dev/gitg/libgitg/gitg-async.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_ASYNC)); #line 23 "/home/jesse/dev/gitg/libgitg/gitg-async.vala" @@ -824,7 +824,7 @@ } -static void gitg_async_finalize (GitgAsync* obj) { +static void gitg_async_finalize (GitgAsync * obj) { GitgAsync * self; #line 23 "/home/jesse/dev/gitg/libgitg/gitg-async.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_ASYNC, GitgAsync); @@ -849,7 +849,7 @@ gpointer gitg_async_ref (gpointer instance) { - GitgAsync* self; + GitgAsync * self; self = instance; #line 23 "/home/jesse/dev/gitg/libgitg/gitg-async.vala" g_atomic_int_inc (&self->ref_count); @@ -860,7 +860,7 @@ void gitg_async_unref (gpointer instance) { - GitgAsync* self; + GitgAsync * self; self = instance; #line 23 "/home/jesse/dev/gitg/libgitg/gitg-async.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { diff -Nru gitg-3.22.0/libgitg/gitg-authentication-dialog.c gitg-3.23.0/libgitg/gitg-authentication-dialog.c --- gitg-3.22.0/libgitg/gitg-authentication-dialog.c 2016-08-09 09:50:21.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-authentication-dialog.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-authentication-dialog.c generated by valac 0.32.1, the Vala compiler +/* gitg-authentication-dialog.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-authentication-dialog.vala, do not modify */ /* @@ -87,7 +87,7 @@ const gchar* gitg_authentication_dialog_get_username (GitgAuthenticationDialog* self); const gchar* gitg_authentication_dialog_get_password (GitgAuthenticationDialog* self); GitgAuthenticationLifeTime gitg_authentication_dialog_get_life_time (GitgAuthenticationDialog* self); -static void gitg_authentication_dialog_finalize (GObject* obj); +static void gitg_authentication_dialog_finalize (GObject * obj); static void _vala_gitg_authentication_dialog_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); @@ -107,13 +107,12 @@ GitgAuthenticationDialog * self = NULL; GtkLabel* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GtkLabel* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - const gchar* _tmp7_ = NULL; - GitgAuthenticationLifeTime _tmp11_ = 0; + GtkLabel* _tmp4_ = NULL; + gboolean _tmp5_ = FALSE; + const gchar* _tmp6_ = NULL; + GitgAuthenticationLifeTime _tmp10_ = 0; #line 61 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" g_return_val_if_fail (url != NULL, NULL); #line 63 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" @@ -123,101 +122,99 @@ #line 69 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" _tmp0_ = self->priv->d_label_title; #line 69 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - _tmp1_ = _ ("Password required for %s"); -#line 69 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - _tmp2_ = url; + _tmp1_ = url; #line 69 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - _tmp3_ = g_strdup_printf (_tmp1_, _tmp2_); + _tmp2_ = g_strdup_printf (_ ("Password required for %s"), _tmp1_); #line 69 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 69 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - gtk_label_set_label (_tmp0_, _tmp4_); + gtk_label_set_label (_tmp0_, _tmp3_); #line 69 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 70 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - _tmp5_ = self->priv->d_label_failed; + _tmp4_ = self->priv->d_label_failed; #line 70 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - _tmp6_ = failed; + _tmp5_ = failed; #line 70 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - gtk_widget_set_visible ((GtkWidget*) _tmp5_, _tmp6_); + gtk_widget_set_visible ((GtkWidget*) _tmp4_, _tmp5_); #line 72 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - _tmp7_ = username; + _tmp6_ = username; #line 72 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - if (_tmp7_ != NULL) { -#line 148 "gitg-authentication-dialog.c" - GtkEntry* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - GtkEntry* _tmp10_ = NULL; + if (_tmp6_ != NULL) { +#line 145 "gitg-authentication-dialog.c" + GtkEntry* _tmp7_ = NULL; + const gchar* _tmp8_ = NULL; + GtkEntry* _tmp9_ = NULL; #line 74 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - _tmp8_ = self->priv->d_entry_username; + _tmp7_ = self->priv->d_entry_username; #line 74 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - _tmp9_ = username; + _tmp8_ = username; #line 74 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - gtk_entry_set_text (_tmp8_, _tmp9_); + gtk_entry_set_text (_tmp7_, _tmp8_); #line 75 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - _tmp10_ = self->priv->d_entry_password; + _tmp9_ = self->priv->d_entry_password; #line 75 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - gtk_widget_grab_focus ((GtkWidget*) _tmp10_); -#line 162 "gitg-authentication-dialog.c" + gtk_widget_grab_focus ((GtkWidget*) _tmp9_); +#line 159 "gitg-authentication-dialog.c" } #line 78 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - _tmp11_ = gitg_authentication_dialog_s_last_lifetime; + _tmp10_ = gitg_authentication_dialog_s_last_lifetime; #line 78 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - switch (_tmp11_) { + switch (_tmp10_) { #line 78 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" case GITG_AUTHENTICATION_LIFE_TIME_FORGET: -#line 170 "gitg-authentication-dialog.c" +#line 167 "gitg-authentication-dialog.c" { - GtkRadioButton* _tmp12_ = NULL; + GtkRadioButton* _tmp11_ = NULL; #line 81 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - _tmp12_ = self->priv->d_radio_button_forget; + _tmp11_ = self->priv->d_radio_button_forget; #line 81 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - gtk_toggle_button_set_active ((GtkToggleButton*) _tmp12_, TRUE); + gtk_toggle_button_set_active ((GtkToggleButton*) _tmp11_, TRUE); #line 82 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" break; -#line 179 "gitg-authentication-dialog.c" +#line 176 "gitg-authentication-dialog.c" } #line 78 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" case GITG_AUTHENTICATION_LIFE_TIME_SESSION: -#line 183 "gitg-authentication-dialog.c" +#line 180 "gitg-authentication-dialog.c" { - GtkRadioButton* _tmp13_ = NULL; + GtkRadioButton* _tmp12_ = NULL; #line 84 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - _tmp13_ = self->priv->d_radio_button_session; + _tmp12_ = self->priv->d_radio_button_session; #line 84 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - gtk_toggle_button_set_active ((GtkToggleButton*) _tmp13_, TRUE); + gtk_toggle_button_set_active ((GtkToggleButton*) _tmp12_, TRUE); #line 85 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" break; -#line 192 "gitg-authentication-dialog.c" +#line 189 "gitg-authentication-dialog.c" } #line 78 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" case GITG_AUTHENTICATION_LIFE_TIME_FOREVER: -#line 196 "gitg-authentication-dialog.c" +#line 193 "gitg-authentication-dialog.c" { - GtkRadioButton* _tmp14_ = NULL; + GtkRadioButton* _tmp13_ = NULL; #line 87 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - _tmp14_ = self->priv->d_radio_button_forever; + _tmp13_ = self->priv->d_radio_button_forever; #line 87 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" - gtk_toggle_button_set_active ((GtkToggleButton*) _tmp14_, TRUE); + gtk_toggle_button_set_active ((GtkToggleButton*) _tmp13_, TRUE); #line 88 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" break; -#line 205 "gitg-authentication-dialog.c" +#line 202 "gitg-authentication-dialog.c" } default: #line 78 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" break; -#line 210 "gitg-authentication-dialog.c" +#line 207 "gitg-authentication-dialog.c" } #line 61 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" return self; -#line 214 "gitg-authentication-dialog.c" +#line 211 "gitg-authentication-dialog.c" } GitgAuthenticationDialog* gitg_authentication_dialog_new (const gchar* url, const gchar* username, gboolean failed) { #line 61 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" return gitg_authentication_dialog_construct (GITG_TYPE_AUTHENTICATION_DIALOG, url, username, failed); -#line 221 "gitg-authentication-dialog.c" +#line 218 "gitg-authentication-dialog.c" } @@ -238,7 +235,7 @@ result = _tmp2_; #line 94 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" return result; -#line 242 "gitg-authentication-dialog.c" +#line 239 "gitg-authentication-dialog.c" } @@ -259,7 +256,7 @@ result = _tmp2_; #line 99 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" return result; -#line 263 "gitg-authentication-dialog.c" +#line 260 "gitg-authentication-dialog.c" } @@ -282,7 +279,7 @@ result = GITG_AUTHENTICATION_LIFE_TIME_FORGET; #line 108 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" return result; -#line 286 "gitg-authentication-dialog.c" +#line 283 "gitg-authentication-dialog.c" } else { GtkRadioButton* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; @@ -299,13 +296,13 @@ result = GITG_AUTHENTICATION_LIFE_TIME_SESSION; #line 112 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" return result; -#line 303 "gitg-authentication-dialog.c" +#line 300 "gitg-authentication-dialog.c" } else { #line 116 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" result = GITG_AUTHENTICATION_LIFE_TIME_FOREVER; #line 116 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" return result; -#line 309 "gitg-authentication-dialog.c" +#line 306 "gitg-authentication-dialog.c" } } } @@ -347,7 +344,7 @@ gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "radio_button_forever", FALSE, GitgAuthenticationDialog_private_offset + G_STRUCT_OFFSET (GitgAuthenticationDialogPrivate, d_radio_button_forever)); #line 58 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" gitg_authentication_dialog_s_last_lifetime = GITG_AUTHENTICATION_LIFE_TIME_SESSION; -#line 351 "gitg-authentication-dialog.c" +#line 348 "gitg-authentication-dialog.c" } @@ -356,11 +353,11 @@ self->priv = GITG_AUTHENTICATION_DIALOG_GET_PRIVATE (self); #line 31 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 360 "gitg-authentication-dialog.c" +#line 357 "gitg-authentication-dialog.c" } -static void gitg_authentication_dialog_finalize (GObject* obj) { +static void gitg_authentication_dialog_finalize (GObject * obj) { GitgAuthenticationDialog * self; #line 31 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_AUTHENTICATION_DIALOG, GitgAuthenticationDialog); @@ -380,7 +377,7 @@ _g_object_unref0 (self->priv->d_radio_button_forever); #line 31 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" G_OBJECT_CLASS (gitg_authentication_dialog_parent_class)->finalize (obj); -#line 384 "gitg-authentication-dialog.c" +#line 381 "gitg-authentication-dialog.c" } @@ -419,13 +416,13 @@ g_value_set_enum (value, gitg_authentication_dialog_get_life_time (self)); #line 31 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" break; -#line 423 "gitg-authentication-dialog.c" +#line 420 "gitg-authentication-dialog.c" default: #line 31 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 31 "/home/jesse/dev/gitg/libgitg/gitg-authentication-dialog.vala" break; -#line 429 "gitg-authentication-dialog.c" +#line 426 "gitg-authentication-dialog.c" } } diff -Nru gitg-3.22.0/libgitg/gitg-avatar-cache.c gitg-3.23.0/libgitg/gitg-avatar-cache.c --- gitg-3.22.0/libgitg/gitg-avatar-cache.c 2016-08-09 09:50:21.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-avatar-cache.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-avatar-cache.c generated by valac 0.32.1, the Vala compiler +/* gitg-avatar-cache.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-avatar-cache.vala, do not modify */ /* @@ -215,7 +215,7 @@ static gboolean gitg_avatar_cache_read_avatar_co (GitgAvatarCacheReadAvatarData* _data_); static void gitg_avatar_cache_read_avatar_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); static GObject * gitg_avatar_cache_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); -static void gitg_avatar_cache_finalize (GObject* obj); +static void gitg_avatar_cache_finalize (GObject * obj); static GitgAvatarCache* gitg_avatar_cache_construct (GType object_type) { @@ -351,11 +351,11 @@ static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 361 "gitg-avatar-cache.c" } @@ -1402,7 +1402,7 @@ #line 25 "/home/jesse/dev/gitg/libgitg/gitg-avatar-cache.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_AVATAR_CACHE, GitgAvatarCache); #line 27 "/home/jesse/dev/gitg/libgitg/gitg-avatar-cache.vala" - _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GDK_TYPE_PIXBUF, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 27 "/home/jesse/dev/gitg/libgitg/gitg-avatar-cache.vala" _g_object_unref0 (self->priv->d_cache); #line 27 "/home/jesse/dev/gitg/libgitg/gitg-avatar-cache.vala" @@ -1433,7 +1433,7 @@ } -static void gitg_avatar_cache_finalize (GObject* obj) { +static void gitg_avatar_cache_finalize (GObject * obj) { GitgAvatarCache * self; #line 20 "/home/jesse/dev/gitg/libgitg/gitg-avatar-cache.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_AVATAR_CACHE, GitgAvatarCache); diff -Nru gitg-3.22.0/libgitg/gitg-branch-base.c gitg-3.23.0/libgitg/gitg-branch-base.c --- gitg-3.22.0/libgitg/gitg-branch-base.c 2016-08-09 09:50:21.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-branch-base.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-branch-base.c generated by valac 0.32.1, the Vala compiler +/* gitg-branch-base.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-branch-base.vala, do not modify */ /* @@ -118,8 +118,8 @@ static gpointer gitg_branch_base_parent_class = NULL; -static GitgRefIface* gitg_branch_base_gitg_ref_parent_iface = NULL; -static GitgBranchIface* gitg_branch_base_gitg_branch_parent_iface = NULL; +static GitgRefIface * gitg_branch_base_gitg_ref_parent_iface = NULL; +static GitgBranchIface * gitg_branch_base_gitg_branch_parent_iface = NULL; GType gitg_repository_get_type (void) G_GNUC_CONST; GType gitg_parsed_ref_name_get_type (void) G_GNUC_CONST; @@ -141,7 +141,7 @@ static GitgRef* gitg_branch_base_real_get_upstream (GitgBranch* base, GError** error); GitgBranchBase* gitg_branch_base_new (void); GitgBranchBase* gitg_branch_base_construct (GType object_type); -static void gitg_branch_base_finalize (GObject* obj); +static void gitg_branch_base_finalize (GObject * obj); GitgParsedRefName* gitg_ref_get_d_parsed_name (GitgRef* self); GList* gitg_ref_get_d_pushes (GitgRef* self); GitgRefState gitg_ref_get_state (GitgRef* self); @@ -263,21 +263,25 @@ static void gitg_branch_base_real_set_d_parsed_name (GitgRef* base, GitgParsedRefName* value) { GitgBranchBase* self; - GitgParsedRefName* _tmp0_ = NULL; - GitgParsedRefName* _tmp1_ = NULL; #line 24 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" self = (GitgBranchBase*) base; #line 24 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" - _tmp0_ = value; + if (gitg_branch_base_real_get_d_parsed_name (self) != value) { +#line 271 "gitg-branch-base.c" + GitgParsedRefName* _tmp0_ = NULL; + GitgParsedRefName* _tmp1_ = NULL; #line 24 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 24 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" - _g_object_unref0 (self->priv->_d_parsed_name); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 24 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" - self->priv->_d_parsed_name = _tmp1_; + _g_object_unref0 (self->priv->_d_parsed_name); #line 24 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" - g_object_notify ((GObject *) self, "d-parsed-name"); -#line 281 "gitg-branch-base.c" + self->priv->_d_parsed_name = _tmp1_; +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" + g_object_notify ((GObject *) self, "d-parsed-name"); +#line 284 "gitg-branch-base.c" + } } @@ -293,28 +297,32 @@ result = _tmp0_; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" return result; -#line 297 "gitg-branch-base.c" +#line 301 "gitg-branch-base.c" } static void gitg_branch_base_real_set_d_pushes (GitgRef* base, GList* value) { GitgBranchBase* self; - GList* _tmp0_ = NULL; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" self = (GitgBranchBase*) base; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" - _tmp0_ = value; + if (gitg_branch_base_real_get_d_pushes (self) != value) { +#line 311 "gitg-branch-base.c" + GList* _tmp0_ = NULL; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" - value = NULL; + _tmp0_ = value; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" - __g_list_free__g_object_unref0_0 (self->priv->_d_pushes); + value = NULL; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" - self->priv->_d_pushes = _tmp0_; + __g_list_free__g_object_unref0_0 (self->priv->_d_pushes); #line 26 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" - __g_list_free__g_object_unref0_0 (value); + self->priv->_d_pushes = _tmp0_; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" - g_object_notify ((GObject *) self, "d-pushes"); -#line 318 "gitg-branch-base.c" + __g_list_free__g_object_unref0_0 (value); +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" + g_object_notify ((GObject *) self, "d-pushes"); +#line 325 "gitg-branch-base.c" + } } @@ -330,22 +338,26 @@ result = _tmp0_; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" return result; -#line 334 "gitg-branch-base.c" +#line 342 "gitg-branch-base.c" } static void gitg_branch_base_real_set_state (GitgRef* base, GitgRefState value) { GitgBranchBase* self; - GitgRefState _tmp0_ = 0; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" self = (GitgBranchBase*) base; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" - _tmp0_ = value; + if (gitg_branch_base_real_get_state (self) != value) { +#line 352 "gitg-branch-base.c" + GitgRefState _tmp0_ = 0; +#line 28 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" - self->priv->_state = _tmp0_; + self->priv->_state = _tmp0_; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" - g_object_notify ((GObject *) self, "state"); -#line 349 "gitg-branch-base.c" + g_object_notify ((GObject *) self, "state"); +#line 360 "gitg-branch-base.c" + } } @@ -361,22 +373,26 @@ result = _tmp0_; #line 29 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" return result; -#line 365 "gitg-branch-base.c" +#line 377 "gitg-branch-base.c" } static void gitg_branch_base_real_set_working (GitgRef* base, gboolean value) { GitgBranchBase* self; - gboolean _tmp0_ = FALSE; #line 29 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" self = (GitgBranchBase*) base; #line 29 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" - _tmp0_ = value; + if (gitg_branch_base_real_get_working (self) != value) { +#line 387 "gitg-branch-base.c" + gboolean _tmp0_ = FALSE; #line 29 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" - self->priv->_working = _tmp0_; + _tmp0_ = value; #line 29 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" - g_object_notify ((GObject *) self, "working"); -#line 380 "gitg-branch-base.c" + self->priv->_working = _tmp0_; +#line 29 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" + g_object_notify ((GObject *) self, "working"); +#line 395 "gitg-branch-base.c" + } } @@ -399,7 +415,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_BRANCH_BASE_STATE, g_param_spec_enum ("state", "state", "state", GITG_TYPE_REF_STATE, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_BRANCH_BASE_WORKING, g_param_spec_boolean ("working", "working", "working", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); -#line 403 "gitg-branch-base.c" +#line 419 "gitg-branch-base.c" } @@ -407,7 +423,7 @@ #line 22 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" gitg_branch_base_gitg_ref_parent_iface = g_type_interface_peek_parent (iface); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" - iface->get_owner = (GitgRepository* (*)(GitgRef*)) gitg_branch_base_real_get_owner; + iface->get_owner = (GitgRepository* (*) (GitgRef *)) gitg_branch_base_real_get_owner; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" iface->get_d_parsed_name = gitg_branch_base_real_get_d_parsed_name; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" @@ -424,7 +440,7 @@ iface->get_working = gitg_branch_base_real_get_working; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" iface->set_working = gitg_branch_base_real_set_working; -#line 428 "gitg-branch-base.c" +#line 444 "gitg-branch-base.c" } @@ -432,19 +448,19 @@ #line 22 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" gitg_branch_base_gitg_branch_parent_iface = g_type_interface_peek_parent (iface); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" - iface->get_upstream = (GitgRef* (*)(GitgBranch*, GError**)) gitg_branch_base_real_get_upstream; -#line 437 "gitg-branch-base.c" + iface->get_upstream = (GitgRef* (*) (GitgBranch *, GError**)) gitg_branch_base_real_get_upstream; +#line 453 "gitg-branch-base.c" } static void gitg_branch_base_instance_init (GitgBranchBase * self) { #line 22 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" self->priv = GITG_BRANCH_BASE_GET_PRIVATE (self); -#line 444 "gitg-branch-base.c" +#line 460 "gitg-branch-base.c" } -static void gitg_branch_base_finalize (GObject* obj) { +static void gitg_branch_base_finalize (GObject * obj) { GitgBranchBase * self; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_BRANCH_BASE, GitgBranchBase); @@ -454,7 +470,7 @@ __g_list_free__g_object_unref0_0 (self->priv->_d_pushes); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" G_OBJECT_CLASS (gitg_branch_base_parent_class)->finalize (obj); -#line 458 "gitg-branch-base.c" +#line 474 "gitg-branch-base.c" } @@ -503,13 +519,13 @@ g_value_set_boolean (value, gitg_ref_get_working ((GitgRef*) self)); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" break; -#line 507 "gitg-branch-base.c" +#line 523 "gitg-branch-base.c" default: #line 22 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" break; -#line 513 "gitg-branch-base.c" +#line 529 "gitg-branch-base.c" } } @@ -543,13 +559,13 @@ gitg_ref_set_working ((GitgRef*) self, g_value_get_boolean (value)); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" break; -#line 547 "gitg-branch-base.c" +#line 563 "gitg-branch-base.c" default: #line 22 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-branch-base.vala" break; -#line 553 "gitg-branch-base.c" +#line 569 "gitg-branch-base.c" } } diff -Nru gitg-3.22.0/libgitg/gitg-branch.c gitg-3.23.0/libgitg/gitg-branch.c --- gitg-3.22.0/libgitg/gitg-branch.c 2016-08-09 09:50:21.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-branch.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-branch.c generated by valac 0.32.1, the Vala compiler +/* gitg-branch.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-branch.vala, do not modify */ /* diff -Nru gitg-3.22.0/libgitg/gitg-cell-renderer-lanes.c gitg-3.23.0/libgitg/gitg-cell-renderer-lanes.c --- gitg-3.22.0/libgitg/gitg-cell-renderer-lanes.c 2016-08-09 09:50:21.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-cell-renderer-lanes.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-cell-renderer-lanes.c generated by valac 0.32.1, the Vala compiler +/* gitg-cell-renderer-lanes.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-cell-renderer-lanes.vala, do not modify */ /* @@ -230,7 +230,7 @@ void gitg_cell_renderer_lanes_set_lane_width (GitgCellRendererLanes* self, guint value); void gitg_cell_renderer_lanes_set_dot_width (GitgCellRendererLanes* self, guint value); void gitg_cell_renderer_lanes_set_labels (GitgCellRendererLanes* self, GSList* value); -static void gitg_cell_renderer_lanes_finalize (GObject* obj); +static void gitg_cell_renderer_lanes_finalize (GObject * obj); static void _vala_gitg_cell_renderer_lanes_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_cell_renderer_lanes_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -1850,21 +1850,25 @@ void gitg_cell_renderer_lanes_set_commit (GitgCellRendererLanes* self, GitgCommit* value) { - GitgCommit* _tmp0_ = NULL; - GitgCommit* _tmp1_ = NULL; #line 24 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" g_return_if_fail (self != NULL); #line 24 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" - _tmp0_ = value; + if (gitg_cell_renderer_lanes_get_commit (self) != value) { +#line 1858 "gitg-cell-renderer-lanes.c" + GitgCommit* _tmp0_ = NULL; + GitgCommit* _tmp1_ = NULL; #line 24 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 24 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" - _g_object_unref0 (self->priv->_commit); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" + _g_object_unref0 (self->priv->_commit); #line 24 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" - self->priv->_commit = _tmp1_; + self->priv->_commit = _tmp1_; #line 24 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" - g_object_notify ((GObject *) self, "commit"); -#line 1868 "gitg-cell-renderer-lanes.c" + g_object_notify ((GObject *) self, "commit"); +#line 1871 "gitg-cell-renderer-lanes.c" + } } @@ -1879,26 +1883,30 @@ result = _tmp0_; #line 25 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" return result; -#line 1883 "gitg-cell-renderer-lanes.c" +#line 1887 "gitg-cell-renderer-lanes.c" } void gitg_cell_renderer_lanes_set_next_commit (GitgCellRendererLanes* self, GitgCommit* value) { - GitgCommit* _tmp0_ = NULL; - GitgCommit* _tmp1_ = NULL; #line 25 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" g_return_if_fail (self != NULL); #line 25 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" - _tmp0_ = value; + if (gitg_cell_renderer_lanes_get_next_commit (self) != value) { +#line 1896 "gitg-cell-renderer-lanes.c" + GitgCommit* _tmp0_ = NULL; + GitgCommit* _tmp1_ = NULL; #line 25 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 25 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" - _g_object_unref0 (self->priv->_next_commit); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 25 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" - self->priv->_next_commit = _tmp1_; + _g_object_unref0 (self->priv->_next_commit); #line 25 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" - g_object_notify ((GObject *) self, "next-commit"); -#line 1902 "gitg-cell-renderer-lanes.c" + self->priv->_next_commit = _tmp1_; +#line 25 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" + g_object_notify ((GObject *) self, "next-commit"); +#line 1909 "gitg-cell-renderer-lanes.c" + } } @@ -1913,21 +1921,25 @@ result = _tmp0_; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" return result; -#line 1917 "gitg-cell-renderer-lanes.c" +#line 1925 "gitg-cell-renderer-lanes.c" } void gitg_cell_renderer_lanes_set_lane_width (GitgCellRendererLanes* self, guint value) { - guint _tmp0_ = 0U; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" g_return_if_fail (self != NULL); #line 26 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" - _tmp0_ = value; + if (gitg_cell_renderer_lanes_get_lane_width (self) != value) { +#line 1934 "gitg-cell-renderer-lanes.c" + guint _tmp0_ = 0U; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" - self->priv->_lane_width = _tmp0_; + _tmp0_ = value; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" - g_object_notify ((GObject *) self, "lane-width"); -#line 1931 "gitg-cell-renderer-lanes.c" + self->priv->_lane_width = _tmp0_; +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" + g_object_notify ((GObject *) self, "lane-width"); +#line 1942 "gitg-cell-renderer-lanes.c" + } } @@ -1942,21 +1954,25 @@ result = _tmp0_; #line 27 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" return result; -#line 1946 "gitg-cell-renderer-lanes.c" +#line 1958 "gitg-cell-renderer-lanes.c" } void gitg_cell_renderer_lanes_set_dot_width (GitgCellRendererLanes* self, guint value) { - guint _tmp0_ = 0U; #line 27 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" g_return_if_fail (self != NULL); #line 27 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" - _tmp0_ = value; + if (gitg_cell_renderer_lanes_get_dot_width (self) != value) { +#line 1967 "gitg-cell-renderer-lanes.c" + guint _tmp0_ = 0U; +#line 27 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" + _tmp0_ = value; #line 27 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" - self->priv->_dot_width = _tmp0_; + self->priv->_dot_width = _tmp0_; #line 27 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" - g_object_notify ((GObject *) self, "dot-width"); -#line 1960 "gitg-cell-renderer-lanes.c" + g_object_notify ((GObject *) self, "dot-width"); +#line 1975 "gitg-cell-renderer-lanes.c" + } } @@ -1971,21 +1987,25 @@ result = _tmp0_; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" return result; -#line 1975 "gitg-cell-renderer-lanes.c" +#line 1991 "gitg-cell-renderer-lanes.c" } void gitg_cell_renderer_lanes_set_labels (GitgCellRendererLanes* self, GSList* value) { - GSList* _tmp0_ = NULL; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" g_return_if_fail (self != NULL); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" - _tmp0_ = value; + if (gitg_cell_renderer_lanes_get_labels (self) != value) { +#line 2000 "gitg-cell-renderer-lanes.c" + GSList* _tmp0_ = NULL; +#line 28 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" - self->priv->_labels = _tmp0_; + self->priv->_labels = _tmp0_; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" - g_object_notify ((GObject *) self, "labels"); -#line 1989 "gitg-cell-renderer-lanes.c" + g_object_notify ((GObject *) self, "labels"); +#line 2008 "gitg-cell-renderer-lanes.c" + } } @@ -2007,7 +2027,7 @@ _tmp0_ = self->priv->_commit; #line 41 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" _tmp1_ = gitg_commit_get_lanes (_tmp0_); -#line 2011 "gitg-cell-renderer-lanes.c" +#line 2031 "gitg-cell-renderer-lanes.c" { GSList* lane_collection = NULL; GSList* lane_it = NULL; @@ -2015,14 +2035,14 @@ lane_collection = _tmp1_; #line 41 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" for (lane_it = lane_collection; lane_it != NULL; lane_it = lane_it->next) { -#line 2019 "gitg-cell-renderer-lanes.c" +#line 2039 "gitg-cell-renderer-lanes.c" GitgLane* _tmp2_ = NULL; GitgLane* lane = NULL; #line 41 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" _tmp2_ = _g_object_ref0 ((GitgLane*) lane_it->data); #line 41 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" lane = _tmp2_; -#line 2026 "gitg-cell-renderer-lanes.c" +#line 2046 "gitg-cell-renderer-lanes.c" { gint _tmp3_ = 0; GitgLane* _tmp4_ = NULL; @@ -2037,21 +2057,21 @@ _tmp5_ = _tmp4_->tag; #line 45 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" if ((_tmp5_ & GITG_LANE_TAG_HIDDEN) != 0) { -#line 2041 "gitg-cell-renderer-lanes.c" +#line 2061 "gitg-cell-renderer-lanes.c" gint _tmp6_ = 0; #line 47 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" _tmp6_ = trailing_hidden; #line 47 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" trailing_hidden = _tmp6_ + 1; -#line 2047 "gitg-cell-renderer-lanes.c" +#line 2067 "gitg-cell-renderer-lanes.c" } else { #line 51 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" trailing_hidden = 0; -#line 2051 "gitg-cell-renderer-lanes.c" +#line 2071 "gitg-cell-renderer-lanes.c" } #line 41 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" _g_object_unref0 (lane); -#line 2055 "gitg-cell-renderer-lanes.c" +#line 2075 "gitg-cell-renderer-lanes.c" } } } @@ -2063,7 +2083,7 @@ result = (guint) (_tmp7_ - _tmp8_); #line 55 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" return result; -#line 2067 "gitg-cell-renderer-lanes.c" +#line 2087 "gitg-cell-renderer-lanes.c" } @@ -2092,7 +2112,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_CELL_RENDERER_LANES_DOT_WIDTH, g_param_spec_uint ("dot-width", "dot-width", "dot-width", 0, G_MAXUINT, (guint) 10, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_CELL_RENDERER_LANES_LABELS, g_param_spec_pointer ("labels", "labels", "labels", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); -#line 2096 "gitg-cell-renderer-lanes.c" +#line 2116 "gitg-cell-renderer-lanes.c" } @@ -2103,11 +2123,11 @@ self->priv->_lane_width = (guint) 16; #line 27 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" self->priv->_dot_width = (guint) 10; -#line 2107 "gitg-cell-renderer-lanes.c" +#line 2127 "gitg-cell-renderer-lanes.c" } -static void gitg_cell_renderer_lanes_finalize (GObject* obj) { +static void gitg_cell_renderer_lanes_finalize (GObject * obj) { GitgCellRendererLanes * self; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_CELL_RENDERER_LANES, GitgCellRendererLanes); @@ -2117,7 +2137,7 @@ _g_object_unref0 (self->priv->_next_commit); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" G_OBJECT_CLASS (gitg_cell_renderer_lanes_parent_class)->finalize (obj); -#line 2121 "gitg-cell-renderer-lanes.c" +#line 2141 "gitg-cell-renderer-lanes.c" } @@ -2168,13 +2188,13 @@ g_value_set_pointer (value, gitg_cell_renderer_lanes_get_labels (self)); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" break; -#line 2172 "gitg-cell-renderer-lanes.c" +#line 2192 "gitg-cell-renderer-lanes.c" default: #line 22 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" break; -#line 2178 "gitg-cell-renderer-lanes.c" +#line 2198 "gitg-cell-renderer-lanes.c" } } @@ -2214,13 +2234,13 @@ gitg_cell_renderer_lanes_set_labels (self, g_value_get_pointer (value)); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" break; -#line 2218 "gitg-cell-renderer-lanes.c" +#line 2238 "gitg-cell-renderer-lanes.c" default: #line 22 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-cell-renderer-lanes.vala" break; -#line 2224 "gitg-cell-renderer-lanes.c" +#line 2244 "gitg-cell-renderer-lanes.c" } } diff -Nru gitg-3.22.0/libgitg/gitg-color.c gitg-3.23.0/libgitg/gitg-color.c --- gitg-3.22.0/libgitg/gitg-color.c 2016-08-09 09:50:21.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-color.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-color.c generated by valac 0.32.1, the Vala compiler +/* gitg-color.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-color.vala, do not modify */ /* @@ -84,7 +84,7 @@ GitgColor* gitg_color_construct (GType object_type); GitgColor* gitg_color_next_index (GitgColor* self); GitgColor* gitg_color_copy (GitgColor* self); -static void gitg_color_finalize (GObject* obj); +static void gitg_color_finalize (GObject * obj); static void _vala_gitg_color_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static const GitgColorRgb GITG_COLOR_palette[14] = {{(gushort) 196, (gushort) 160, (gushort) 0}, {(gushort) 78, (gushort) 154, (gushort) 6}, {(gushort) 206, (gushort) 92, (gushort) 0}, {(gushort) 32, (gushort) 74, (gushort) 135}, {(gushort) 108, (gushort) 53, (gushort) 102}, {(gushort) 164, (gushort) 0, (gushort) 0}, {(gushort) 138, (gushort) 226, (gushort) 52}, {(gushort) 252, (gushort) 175, (gushort) 62}, {(gushort) 114, (gushort) 159, (gushort) 207}, {(gushort) 252, (gushort) 233, (gushort) 79}, {(gushort) 136, (gushort) 138, (gushort) 133}, {(gushort) 173, (gushort) 127, (gushort) 168}, {(gushort) 233, (gushort) 185, (gushort) 110}, {(gushort) 239, (gushort) 41, (gushort) 41}}; @@ -379,7 +379,7 @@ } -static void gitg_color_finalize (GObject* obj) { +static void gitg_color_finalize (GObject * obj) { GitgColor * self; #line 23 "/home/jesse/dev/gitg/libgitg/gitg-color.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_COLOR, GitgColor); diff -Nru gitg-3.22.0/libgitg/gitg-commit.c gitg-3.23.0/libgitg/gitg-commit.c --- gitg-3.22.0/libgitg/gitg-commit.c 2016-08-10 18:39:33.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-commit.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-commit.c generated by valac 0.32.1, the Vala compiler +/* gitg-commit.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-commit.vala, do not modify */ /* @@ -159,7 +159,7 @@ GType gitg_date_get_type (void) G_GNUC_CONST; gchar* gitg_date_for_display (GitgDate* self); gchar* gitg_commit_get_author_date_for_display (GitgCommit* self); -static void gitg_commit_finalize (GObject* obj); +static void gitg_commit_finalize (GObject * obj); static void _vala_gitg_commit_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_commit_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -720,16 +720,20 @@ void gitg_commit_set_tag (GitgCommit* self, GitgLaneTag value) { - GitgLaneTag _tmp0_ = 0; #line 25 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" g_return_if_fail (self != NULL); #line 25 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" - _tmp0_ = value; + if (gitg_commit_get_tag (self) != value) { +#line 728 "gitg-commit.c" + GitgLaneTag _tmp0_ = 0; +#line 25 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" + _tmp0_ = value; #line 25 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" - self->priv->_tag = _tmp0_; + self->priv->_tag = _tmp0_; #line 25 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" - g_object_notify ((GObject *) self, "tag"); -#line 733 "gitg-commit.c" + g_object_notify ((GObject *) self, "tag"); +#line 736 "gitg-commit.c" + } } @@ -744,23 +748,27 @@ result = _tmp0_; #line 37 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" return result; -#line 748 "gitg-commit.c" +#line 752 "gitg-commit.c" } void gitg_commit_set_mylane (GitgCommit* self, guint value) { - guint _tmp0_ = 0U; #line 38 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" g_return_if_fail (self != NULL); +#line 38 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" + if (gitg_commit_get_mylane (self) != value) { +#line 761 "gitg-commit.c" + guint _tmp0_ = 0U; #line 40 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" - _tmp0_ = value; + _tmp0_ = value; #line 40 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" - self->priv->d_mylane = _tmp0_; + self->priv->d_mylane = _tmp0_; #line 41 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" - gitg_commit_update_lane_tag (self); + gitg_commit_update_lane_tag (self); #line 38 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" - g_object_notify ((GObject *) self, "mylane"); -#line 764 "gitg-commit.c" + g_object_notify ((GObject *) self, "mylane"); +#line 771 "gitg-commit.c" + } } @@ -781,126 +789,168 @@ result = (GitgLane*) _tmp2_; #line 47 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" return result; -#line 785 "gitg-commit.c" +#line 793 "gitg-commit.c" } static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1399 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1399 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1399 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 798 "gitg-commit.c" +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + if ((*((gchar*) self)) == '\0') { +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = TRUE; +#line 812 "gitg-commit.c" + } else { + const gchar* _tmp2_ = NULL; +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp2_ = old; +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; +#line 819 "gitg-commit.c" + } +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + if (_tmp1_) { +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp0_ = TRUE; +#line 825 "gitg-commit.c" + } else { + const gchar* _tmp3_ = NULL; + const gchar* _tmp4_ = NULL; +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp3_ = old; +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp4_ = replacement; +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; +#line 835 "gitg-commit.c" + } +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + if (_tmp0_) { +#line 839 "gitg-commit.c" + gchar* _tmp5_ = NULL; +#line 1401 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp5_ = g_strdup (self); +#line 1401 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp5_; +#line 1401 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + return result; +#line 847 "gitg-commit.c" + } { GRegex* regex = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - GRegex* _tmp3_ = NULL; - GRegex* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - GRegex* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; + const gchar* _tmp6_ = NULL; + gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp0_ = old; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp2_ = _tmp1_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - regex = _tmp4_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" + GRegex* _tmp9_ = NULL; + GRegex* _tmp10_ = NULL; + gchar* _tmp11_ = NULL; + GRegex* _tmp12_ = NULL; + const gchar* _tmp13_ = NULL; + gchar* _tmp14_ = NULL; + gchar* _tmp15_ = NULL; +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp6_ = old; +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp7_ = g_regex_escape_string (_tmp6_, -1); +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp8_ = _tmp7_; +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp10_ = _tmp9_; +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp8_); +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + regex = _tmp10_; +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 829 "gitg-commit.c" +#line 879 "gitg-commit.c" goto __catch24_g_regex_error; } -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1404 "/home/jesse/.local/share/vala-0.36/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 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 838 "gitg-commit.c" +#line 888 "gitg-commit.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp7_ = replacement; -#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 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp12_ = regex; +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp13_ = replacement; +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = _tmp14_; +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 854 "gitg-commit.c" +#line 904 "gitg-commit.c" goto __catch24_g_regex_error; } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/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 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 865 "gitg-commit.c" +#line 915 "gitg-commit.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - result = _tmp9_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp15_ = _tmp11_; +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = NULL; +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp15_; +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp11_); +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 879 "gitg-commit.c" +#line 929 "gitg-commit.c" } goto __finally24; __catch24_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1403 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1403 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1407 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1403 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 893 "gitg-commit.c" +#line 943 "gitg-commit.c" } __finally24: -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1403 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1403 "/home/jesse/.local/share/vala-0.36/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 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1403 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1403 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 904 "gitg-commit.c" +#line 954 "gitg-commit.c" } } @@ -930,7 +980,7 @@ result = _tmp4_; #line 92 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" return result; -#line 934 "gitg-commit.c" +#line 984 "gitg-commit.c" } @@ -975,7 +1025,7 @@ _g_date_time_unref0 (dt); #line 101 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" return result; -#line 979 "gitg-commit.c" +#line 1029 "gitg-commit.c" } @@ -1020,7 +1070,7 @@ _g_date_time_unref0 (dt); #line 110 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" return result; -#line 1024 "gitg-commit.c" +#line 1074 "gitg-commit.c" } @@ -1047,18 +1097,18 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_COMMIT_COMMITTER_DATE_FOR_DISPLAY, g_param_spec_string ("committer-date-for-display", "committer-date-for-display", "committer-date-for-display", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 23 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_COMMIT_AUTHOR_DATE_FOR_DISPLAY, g_param_spec_string ("author-date-for-display", "author-date-for-display", "author-date-for-display", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1051 "gitg-commit.c" +#line 1101 "gitg-commit.c" } static void gitg_commit_instance_init (GitgCommit * self) { #line 23 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" self->priv = GITG_COMMIT_GET_PRIVATE (self); -#line 1058 "gitg-commit.c" +#line 1108 "gitg-commit.c" } -static void gitg_commit_finalize (GObject* obj) { +static void gitg_commit_finalize (GObject * obj) { GitgCommit * self; #line 23 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_COMMIT, GitgCommit); @@ -1066,7 +1116,7 @@ __g_slist_free__g_object_unref0_0 (self->priv->d_lanes); #line 23 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" G_OBJECT_CLASS (gitg_commit_parent_class)->finalize (obj); -#line 1070 "gitg-commit.c" +#line 1120 "gitg-commit.c" } @@ -1123,13 +1173,13 @@ g_value_take_string (value, gitg_commit_get_author_date_for_display (self)); #line 23 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" break; -#line 1127 "gitg-commit.c" +#line 1177 "gitg-commit.c" default: #line 23 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" break; -#line 1133 "gitg-commit.c" +#line 1183 "gitg-commit.c" } } @@ -1151,13 +1201,13 @@ gitg_commit_set_mylane (self, g_value_get_uint (value)); #line 23 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" break; -#line 1155 "gitg-commit.c" +#line 1205 "gitg-commit.c" default: #line 23 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/libgitg/gitg-commit.vala" break; -#line 1161 "gitg-commit.c" +#line 1211 "gitg-commit.c" } } diff -Nru gitg-3.22.0/libgitg/gitg-commit-list-view.c gitg-3.23.0/libgitg/gitg-commit-list-view.c --- gitg-3.22.0/libgitg/gitg-commit-list-view.c 2016-08-09 09:50:21.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-commit-list-view.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-commit-list-view.c generated by valac 0.32.1, the Vala compiler +/* gitg-commit-list-view.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-commit-list-view.vala, do not modify */ /* @@ -130,7 +130,7 @@ static gpointer gitg_commit_list_view_parent_class = NULL; -static GtkBuildableIface* gitg_commit_list_view_gtk_buildable_parent_iface = NULL; +static GtkBuildableIface * gitg_commit_list_view_gtk_buildable_parent_iface = NULL; GType gitg_commit_list_view_get_type (void) G_GNUC_CONST; enum { @@ -668,7 +668,7 @@ #line 22 "/home/jesse/dev/gitg/libgitg/gitg-commit-list-view.vala" gitg_commit_list_view_gtk_buildable_parent_iface = g_type_interface_peek_parent (iface); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-commit-list-view.vala" - iface->parser_finished = (void (*)(GtkBuildable*, GtkBuilder*)) gitg_commit_list_view_real_parser_finished; + iface->parser_finished = (void (*) (GtkBuildable *, GtkBuilder*)) gitg_commit_list_view_real_parser_finished; #line 673 "gitg-commit-list-view.c" } diff -Nru gitg-3.22.0/libgitg/gitg-commit-model.c gitg-3.23.0/libgitg/gitg-commit-model.c --- gitg-3.22.0/libgitg/gitg-commit-model.c 2016-08-19 07:21:35.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-commit-model.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-commit-model.c generated by valac 0.32.1, the Vala compiler +/* gitg-commit-model.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-commit-model.vala, do not modify */ /* @@ -95,6 +95,15 @@ typedef struct _GitgCommitModelWalkData GitgCommitModelWalkData; #define _gtk_tree_path_free0(var) ((var == NULL) ? NULL : (var = (gtk_tree_path_free (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) +enum { + GITG_COMMIT_MODEL_STARTED_SIGNAL, + GITG_COMMIT_MODEL_UPDATE_SIGNAL, + GITG_COMMIT_MODEL_FINISHED_SIGNAL, + GITG_COMMIT_MODEL_BEGIN_CLEAR_SIGNAL, + GITG_COMMIT_MODEL_END_CLEAR_SIGNAL, + GITG_COMMIT_MODEL_LAST_SIGNAL +}; +static guint gitg_commit_model_signals[GITG_COMMIT_MODEL_LAST_SIGNAL] = {0}; typedef enum { GITG_COMMIT_MODEL_COLUMNS_SHA1, @@ -230,7 +239,7 @@ static gpointer gitg_commit_model_parent_class = NULL; -static GtkTreeModelIface* gitg_commit_model_gtk_tree_model_parent_iface = NULL; +static GtkTreeModelIface * gitg_commit_model_gtk_tree_model_parent_iface = NULL; GType gitg_commit_model_columns_get_type (void) G_GNUC_CONST; GType gitg_commit_model_columns_type (GitgCommitModelColumns self); @@ -283,7 +292,7 @@ GgitOId** gitg_commit_model_get_permanent_lanes (GitgCommitModel* self, int* result_length1); static GgitOId** _vala_array_dup5 (GgitOId** self, int length); static void* __lambda34_ (Block4Data* _data4_); -static void _vala_array_add1 (GgitOId*** array, int* length, int* size, GgitOId* value); +static void _vala_array_add1 (GgitOId** * array, int* length, int* size, GgitOId* value); void gitg_lanes_reset (GitgLanes* self, GgitOId** reserved, int reserved_length1, GeeHashSet* roots); static guint ____lambda36_ (GitgCommitModel* self, GgitOId* i); static guint _____lambda36__gee_hash_data_func (gconstpointer v, gpointer self); @@ -291,7 +300,7 @@ static gboolean _____lambda37__gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); gpointer gitg_repository_lookup (GitgRepository* self, GType t_type, GBoxedCopyFunc t_dup_func, GDestroyNotify t_destroy_func, GgitOId* id, GError** error); GType gitg_lane_get_type (void) G_GNUC_CONST; -gboolean gitg_lanes_next (GitgLanes* self, GitgCommit* next, GSList** lanes, gint* nextpos); +gboolean gitg_lanes_next (GitgLanes* self, GitgCommit* next, GSList* * lanes, gint* nextpos); static void _g_object_unref0_ (gpointer var); static void _g_slist_free__g_object_unref0_ (GSList* self); void gitg_commit_update_lanes (GitgCommit* self, GSList* lanes, gint mylane); @@ -325,7 +334,7 @@ static GObject * gitg_commit_model_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); GitgLanes* gitg_lanes_new (void); GitgLanes* gitg_lanes_construct (GType object_type); -static void gitg_commit_model_finalize (GObject* obj); +static void gitg_commit_model_finalize (GObject * obj); static void _vala_gitg_commit_model_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_commit_model_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -358,36 +367,36 @@ case GITG_COMMIT_MODEL_COLUMNS_AUTHOR_EMAIL: #line 40 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" case GITG_COMMIT_MODEL_COLUMNS_AUTHOR_DATE: -#line 362 "gitg-commit-model.c" +#line 371 "gitg-commit-model.c" { #line 53 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" result = G_TYPE_STRING; #line 53 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 368 "gitg-commit-model.c" +#line 377 "gitg-commit-model.c" } #line 40 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" case GITG_COMMIT_MODEL_COLUMNS_COMMIT: -#line 372 "gitg-commit-model.c" +#line 381 "gitg-commit-model.c" { #line 55 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" result = GITG_TYPE_COMMIT; #line 55 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 378 "gitg-commit-model.c" +#line 387 "gitg-commit-model.c" } default: { #line 57 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 384 "gitg-commit-model.c" +#line 393 "gitg-commit-model.c" } } #line 60 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" result = G_TYPE_INVALID; #line 60 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 391 "gitg-commit-model.c" +#line 400 "gitg-commit-model.c" } @@ -406,7 +415,7 @@ static void _vala_GgitOId_free (GgitOId* self) { #line 78 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_boxed_free (ggit_oid_get_type (), self); -#line 410 "gitg-commit-model.c" +#line 419 "gitg-commit-model.c" } @@ -419,14 +428,14 @@ self = (GitgCommitModel*) g_object_new (object_type, "repository", _tmp0_, NULL); #line 125 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return self; -#line 423 "gitg-commit-model.c" +#line 432 "gitg-commit-model.c" } GitgCommitModel* gitg_commit_model_new (GitgRepository* repository) { #line 125 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return gitg_commit_model_construct (GITG_TYPE_COMMIT_MODEL, repository); -#line 430 "gitg-commit-model.c" +#line 439 "gitg-commit-model.c" } @@ -436,28 +445,28 @@ self = (GitgCommitModel*) base; #line 138 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" gitg_commit_model_cancel (self); -#line 440 "gitg-commit-model.c" +#line 449 "gitg-commit-model.c" } static gpointer _g_object_ref0 (gpointer self) { #line 145 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return self ? g_object_ref (self) : NULL; -#line 447 "gitg-commit-model.c" +#line 456 "gitg-commit-model.c" } static gpointer _g_thread_ref0 (gpointer self) { #line 150 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return self ? g_thread_ref (self) : NULL; -#line 454 "gitg-commit-model.c" +#line 463 "gitg-commit-model.c" } static GgitOId* _vala_GgitOId_copy (GgitOId* self) { #line 169 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return g_boxed_copy (ggit_oid_get_type (), self); -#line 461 "gitg-commit-model.c" +#line 470 "gitg-commit-model.c" } @@ -473,7 +482,7 @@ _tmp0_ = self->priv->d_cancellable; #line 143 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (_tmp0_ != NULL) { -#line 477 "gitg-commit-model.c" +#line 486 "gitg-commit-model.c" GCancellable* cancellable = NULL; GCancellable* _tmp1_ = NULL; GCancellable* _tmp2_ = NULL; @@ -506,7 +515,7 @@ self->priv->d_thread = NULL; #line 143 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _g_object_unref0 (cancellable); -#line 510 "gitg-commit-model.c" +#line 519 "gitg-commit-model.c" } { guint _tmp6_ = 0U; @@ -514,14 +523,14 @@ _tmp6_ = self->priv->d_idleid; #line 154 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_rec_mutex_lock (&self->priv->__lock_d_idleid); -#line 518 "gitg-commit-model.c" +#line 527 "gitg-commit-model.c" { guint _tmp7_ = 0U; #line 156 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp7_ = self->priv->d_idleid; #line 156 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (_tmp7_ != ((guint) 0)) { -#line 525 "gitg-commit-model.c" +#line 534 "gitg-commit-model.c" guint _tmp8_ = 0U; #line 158 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp8_ = self->priv->d_idleid; @@ -529,7 +538,7 @@ g_source_remove (_tmp8_); #line 159 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" self->priv->d_idleid = (guint) 0; -#line 533 "gitg-commit-model.c" +#line 542 "gitg-commit-model.c" } } __finally6: @@ -539,7 +548,7 @@ _tmp9_ = self->priv->d_idleid; #line 154 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_rec_mutex_unlock (&self->priv->__lock_d_idleid); -#line 543 "gitg-commit-model.c" +#line 552 "gitg-commit-model.c" } #line 154 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -549,7 +558,7 @@ g_clear_error (&_inner_error_); #line 154 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return; -#line 553 "gitg-commit-model.c" +#line 562 "gitg-commit-model.c" } } #line 163 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -582,7 +591,7 @@ _g_object_unref0 (self->priv->d_id_hash); #line 169 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" self->priv->d_id_hash = _tmp12_; -#line 586 "gitg-commit-model.c" +#line 595 "gitg-commit-model.c" } @@ -607,12 +616,12 @@ #line 190 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" self->priv->d_thread = NULL; #line 192 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - g_signal_emit_by_name (self, "finished"); + g_signal_emit (self, gitg_commit_model_signals[GITG_COMMIT_MODEL_FINISHED_SIGNAL], 0); #line 193 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _g_object_unref0 (self->priv->d_cancellable); #line 193 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" self->priv->d_cancellable = NULL; -#line 616 "gitg-commit-model.c" +#line 625 "gitg-commit-model.c" } @@ -621,7 +630,7 @@ __lambda38_ ((GitgCommitModel*) self, source_object, res); #line 186 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_object_unref (self); -#line 625 "gitg-commit-model.c" +#line 634 "gitg-commit-model.c" } @@ -643,7 +652,7 @@ if (_tmp1_ == NULL) { #line 176 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp0_ = TRUE; -#line 647 "gitg-commit-model.c" +#line 656 "gitg-commit-model.c" } else { GgitOId** _tmp2_ = NULL; gint _tmp2__length1 = 0; @@ -653,13 +662,13 @@ _tmp2__length1 = self->priv->d_include_length1; #line 176 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp0_ = _tmp2__length1 == 0; -#line 657 "gitg-commit-model.c" +#line 666 "gitg-commit-model.c" } #line 176 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (_tmp0_) { #line 178 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return; -#line 663 "gitg-commit-model.c" +#line 672 "gitg-commit-model.c" } #line 181 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp3_ = g_cancellable_new (); @@ -674,14 +683,14 @@ #line 182 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" self->priv->d_cancellable = _tmp5_; #line 184 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - g_signal_emit_by_name (self, "started"); + g_signal_emit (self, gitg_commit_model_signals[GITG_COMMIT_MODEL_STARTED_SIGNAL], 0); #line 186 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp6_ = cancellable; #line 186 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" gitg_commit_model_walk (self, _tmp6_, ___lambda38__gasync_ready_callback, g_object_ref (self)); #line 172 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _g_object_unref0 (cancellable); -#line 685 "gitg-commit-model.c" +#line 694 "gitg-commit-model.c" } @@ -696,7 +705,7 @@ result = _tmp0_; #line 199 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 700 "gitg-commit-model.c" +#line 709 "gitg-commit-model.c" } @@ -720,7 +729,7 @@ _g_object_unref0 (ret); #line 208 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 724 "gitg-commit-model.c" +#line 733 "gitg-commit-model.c" } { GitgCommit** _tmp2_ = NULL; @@ -731,7 +740,7 @@ _tmp2__length1 = self->priv->d_ids_length1; #line 211 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_rec_mutex_lock (&self->priv->__lock_d_ids); -#line 735 "gitg-commit-model.c" +#line 744 "gitg-commit-model.c" { GitgCommit** _tmp3_ = NULL; gint _tmp3__length1 = 0; @@ -752,7 +761,7 @@ _g_object_unref0 (ret); #line 213 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" ret = _tmp6_; -#line 756 "gitg-commit-model.c" +#line 765 "gitg-commit-model.c" } __finally7: { @@ -764,7 +773,7 @@ _tmp7__length1 = self->priv->d_ids_length1; #line 211 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_rec_mutex_unlock (&self->priv->__lock_d_ids); -#line 768 "gitg-commit-model.c" +#line 777 "gitg-commit-model.c" } #line 211 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -776,21 +785,21 @@ g_clear_error (&_inner_error_); #line 211 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return NULL; -#line 780 "gitg-commit-model.c" +#line 789 "gitg-commit-model.c" } } #line 216 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" result = ret; #line 216 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 787 "gitg-commit-model.c" +#line 796 "gitg-commit-model.c" } static gpointer __vala_GgitOId_copy0 (gpointer self) { #line 221 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return self ? _vala_GgitOId_copy (self) : NULL; -#line 794 "gitg-commit-model.c" +#line 803 "gitg-commit-model.c" } @@ -801,17 +810,17 @@ result = g_new0 (GgitOId*, length + 1); #line 221 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" for (i = 0; i < length; i++) { -#line 805 "gitg-commit-model.c" +#line 814 "gitg-commit-model.c" GgitOId* _tmp0_ = NULL; #line 221 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp0_ = __vala_GgitOId_copy0 (self[i]); #line 221 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" result[i] = _tmp0_; -#line 811 "gitg-commit-model.c" +#line 820 "gitg-commit-model.c" } #line 221 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 815 "gitg-commit-model.c" +#line 824 "gitg-commit-model.c" } @@ -838,7 +847,7 @@ self->priv->d_include_length1 = _tmp1__length1; #line 221 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" self->priv->_d_include_size_ = self->priv->d_include_length1; -#line 842 "gitg-commit-model.c" +#line 851 "gitg-commit-model.c" } @@ -849,17 +858,17 @@ result = g_new0 (GgitOId*, length + 1); #line 226 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" for (i = 0; i < length; i++) { -#line 853 "gitg-commit-model.c" +#line 862 "gitg-commit-model.c" GgitOId* _tmp0_ = NULL; #line 226 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp0_ = __vala_GgitOId_copy0 (self[i]); #line 226 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" result[i] = _tmp0_; -#line 859 "gitg-commit-model.c" +#line 868 "gitg-commit-model.c" } #line 226 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 863 "gitg-commit-model.c" +#line 872 "gitg-commit-model.c" } @@ -886,7 +895,7 @@ self->priv->d_exclude_length1 = _tmp1__length1; #line 226 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" self->priv->_d_exclude_size_ = self->priv->d_exclude_length1; -#line 890 "gitg-commit-model.c" +#line 899 "gitg-commit-model.c" } @@ -895,7 +904,7 @@ g_atomic_int_inc (&_data2_->_ref_count_); #line 229 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return _data2_; -#line 899 "gitg-commit-model.c" +#line 908 "gitg-commit-model.c" } @@ -904,7 +913,7 @@ _data2_ = (Block2Data*) _userdata_; #line 229 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { -#line 908 "gitg-commit-model.c" +#line 917 "gitg-commit-model.c" GitgCommitModel* self; #line 229 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" self = _data2_->self; @@ -920,7 +929,7 @@ _g_object_unref0 (self); #line 229 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_slice_free (Block2Data, _data2_); -#line 924 "gitg-commit-model.c" +#line 933 "gitg-commit-model.c" } } @@ -930,7 +939,7 @@ g_atomic_int_inc (&_data3_->_ref_count_); #line 231 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return _data3_; -#line 934 "gitg-commit-model.c" +#line 943 "gitg-commit-model.c" } @@ -939,7 +948,7 @@ _data3_ = (Block3Data*) _userdata_; #line 231 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) { -#line 943 "gitg-commit-model.c" +#line 952 "gitg-commit-model.c" GitgCommitModel* self; #line 231 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" self = _data3_->_data2_->self; @@ -949,7 +958,7 @@ _data3_->_data2_ = NULL; #line 231 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_slice_free (Block3Data, _data3_); -#line 953 "gitg-commit-model.c" +#line 962 "gitg-commit-model.c" } } @@ -963,14 +972,14 @@ _data2_ = _data3_->_data2_; #line 241 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" self = _data2_->self; -#line 967 "gitg-commit-model.c" +#line 976 "gitg-commit-model.c" { guint _tmp0_ = 0U; #line 242 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp0_ = self->priv->d_idleid; #line 242 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_rec_mutex_lock (&self->priv->__lock_d_idleid); -#line 974 "gitg-commit-model.c" +#line 983 "gitg-commit-model.c" { guint _tmp1_ = 0U; guint added = 0U; @@ -984,18 +993,18 @@ if (_tmp1_ == ((guint) 0)) { #line 246 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" result = FALSE; -#line 988 "gitg-commit-model.c" +#line 997 "gitg-commit-model.c" { guint _tmp2_ = 0U; #line 242 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp2_ = self->priv->d_idleid; #line 242 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_rec_mutex_unlock (&self->priv->__lock_d_idleid); -#line 995 "gitg-commit-model.c" +#line 1004 "gitg-commit-model.c" } #line 246 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 999 "gitg-commit-model.c" +#line 1008 "gitg-commit-model.c" } #line 249 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" self->priv->d_idleid = (guint) 0; @@ -1015,7 +1024,7 @@ _tmp5__target = _data2_->finishedcb_target; #line 256 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (_tmp5_ != NULL) { -#line 1019 "gitg-commit-model.c" +#line 1028 "gitg-commit-model.c" GSourceFunc _tmp6_ = NULL; void* _tmp6__target = NULL; #line 258 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -1024,7 +1033,7 @@ _tmp6__target = _data2_->finishedcb_target; #line 258 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp6_ (_tmp6__target); -#line 1028 "gitg-commit-model.c" +#line 1037 "gitg-commit-model.c" } } __finally9: @@ -1034,7 +1043,7 @@ _tmp7_ = self->priv->d_idleid; #line 242 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_rec_mutex_unlock (&self->priv->__lock_d_idleid); -#line 1038 "gitg-commit-model.c" +#line 1047 "gitg-commit-model.c" } #line 242 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -1044,14 +1053,14 @@ g_clear_error (&_inner_error_); #line 242 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return FALSE; -#line 1048 "gitg-commit-model.c" +#line 1057 "gitg-commit-model.c" } } #line 262 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" result = FALSE; #line 262 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 1055 "gitg-commit-model.c" +#line 1064 "gitg-commit-model.c" } @@ -1060,7 +1069,7 @@ result = ____lambda35_ (self); #line 241 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 1064 "gitg-commit-model.c" +#line 1073 "gitg-commit-model.c" } @@ -1095,14 +1104,14 @@ _data2_->finishedcb_target = _tmp0__target; #line 229 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _data2_->finishedcb_target_destroy_notify = finishedcb_target_destroy_notify; -#line 1099 "gitg-commit-model.c" +#line 1108 "gitg-commit-model.c" { guint _tmp1_ = 0U; #line 231 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp1_ = self->priv->d_idleid; #line 231 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_rec_mutex_lock (&self->priv->__lock_d_idleid); -#line 1106 "gitg-commit-model.c" +#line 1115 "gitg-commit-model.c" { Block3Data* _data3_; guint _tmp2_ = 0U; @@ -1119,7 +1128,7 @@ _tmp2_ = self->priv->d_idleid; #line 233 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (_tmp2_ != ((guint) 0)) { -#line 1123 "gitg-commit-model.c" +#line 1132 "gitg-commit-model.c" guint _tmp3_ = 0U; #line 235 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp3_ = self->priv->d_idleid; @@ -1127,7 +1136,7 @@ g_source_remove (_tmp3_); #line 236 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" self->priv->d_idleid = (guint) 0; -#line 1131 "gitg-commit-model.c" +#line 1140 "gitg-commit-model.c" } #line 239 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp4_ = self->priv->d_ids; @@ -1143,7 +1152,7 @@ block3_data_unref (_data3_); #line 231 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _data3_ = NULL; -#line 1147 "gitg-commit-model.c" +#line 1156 "gitg-commit-model.c" } __finally8: { @@ -1152,7 +1161,7 @@ _tmp6_ = self->priv->d_idleid; #line 231 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_rec_mutex_unlock (&self->priv->__lock_d_idleid); -#line 1156 "gitg-commit-model.c" +#line 1165 "gitg-commit-model.c" } #line 231 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -1166,14 +1175,14 @@ g_clear_error (&_inner_error_); #line 231 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return; -#line 1170 "gitg-commit-model.c" +#line 1179 "gitg-commit-model.c" } } #line 229 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" block2_data_unref (_data2_); #line 229 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _data2_ = NULL; -#line 1177 "gitg-commit-model.c" +#line 1186 "gitg-commit-model.c" } @@ -1198,7 +1207,7 @@ result = FALSE; #line 271 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 1202 "gitg-commit-model.c" +#line 1211 "gitg-commit-model.c" } #line 274 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp2_ = ids; @@ -1206,26 +1215,26 @@ _tmp2__length1 = ids_length1; #line 274 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (_tmp2__length1 < 20000) { -#line 1210 "gitg-commit-model.c" +#line 1219 "gitg-commit-model.c" guint _tmp3_ = 0U; #line 276 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp3_ = *size; #line 276 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" *size = _tmp3_ * 2; -#line 1216 "gitg-commit-model.c" +#line 1225 "gitg-commit-model.c" } else { guint _tmp4_ = 0U; #line 280 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp4_ = *size; #line 280 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" *size = (guint) (((gdouble) _tmp4_) * 1.2); -#line 1223 "gitg-commit-model.c" +#line 1232 "gitg-commit-model.c" } #line 283 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" result = TRUE; #line 283 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 1229 "gitg-commit-model.c" +#line 1238 "gitg-commit-model.c" } @@ -1236,7 +1245,7 @@ _g_object_unref0 (_data_->self); #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_slice_free (GitgCommitModelWalkData, _data_); -#line 1240 "gitg-commit-model.c" +#line 1249 "gitg-commit-model.c" } @@ -1265,7 +1274,7 @@ _data_->cancellable = _tmp2_; #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" gitg_commit_model_walk_co (_data_); -#line 1269 "gitg-commit-model.c" +#line 1278 "gitg-commit-model.c" } @@ -1273,7 +1282,7 @@ GitgCommitModelWalkData* _data_; #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 1277 "gitg-commit-model.c" +#line 1286 "gitg-commit-model.c" } @@ -1282,7 +1291,7 @@ g_atomic_int_inc (&_data4_->_ref_count_); #line 286 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return _data4_; -#line 1286 "gitg-commit-model.c" +#line 1295 "gitg-commit-model.c" } @@ -1291,7 +1300,7 @@ _data4_ = (Block4Data*) _userdata_; #line 286 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) { -#line 1295 "gitg-commit-model.c" +#line 1304 "gitg-commit-model.c" GitgCommitModel* self; #line 286 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" self = _data4_->self; @@ -1315,7 +1324,7 @@ _g_object_unref0 (self); #line 286 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_slice_free (Block4Data, _data4_); -#line 1319 "gitg-commit-model.c" +#line 1328 "gitg-commit-model.c" } } @@ -1327,17 +1336,17 @@ result = g_new0 (GgitOId*, length + 1); #line 288 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" for (i = 0; i < length; i++) { -#line 1331 "gitg-commit-model.c" +#line 1340 "gitg-commit-model.c" GgitOId* _tmp0_ = NULL; #line 288 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp0_ = __vala_GgitOId_copy0 (self[i]); #line 288 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" result[i] = _tmp0_; -#line 1337 "gitg-commit-model.c" +#line 1346 "gitg-commit-model.c" } #line 288 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 1341 "gitg-commit-model.c" +#line 1350 "gitg-commit-model.c" } @@ -1348,17 +1357,17 @@ result = g_new0 (GgitOId*, length + 1); #line 289 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" for (i = 0; i < length; i++) { -#line 1352 "gitg-commit-model.c" +#line 1361 "gitg-commit-model.c" GgitOId* _tmp0_ = NULL; #line 289 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp0_ = __vala_GgitOId_copy0 (self[i]); #line 289 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" result[i] = _tmp0_; -#line 1358 "gitg-commit-model.c" +#line 1367 "gitg-commit-model.c" } #line 289 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 1362 "gitg-commit-model.c" +#line 1371 "gitg-commit-model.c" } @@ -1367,7 +1376,7 @@ result = gitg_commit_model_walk_co (self); #line 293 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 1371 "gitg-commit-model.c" +#line 1380 "gitg-commit-model.c" } @@ -1378,34 +1387,34 @@ result = g_new0 (GgitOId*, length + 1); #line 305 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" for (i = 0; i < length; i++) { -#line 1382 "gitg-commit-model.c" +#line 1391 "gitg-commit-model.c" GgitOId* _tmp0_ = NULL; #line 305 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp0_ = __vala_GgitOId_copy0 (self[i]); #line 305 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" result[i] = _tmp0_; -#line 1388 "gitg-commit-model.c" +#line 1397 "gitg-commit-model.c" } #line 305 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 1392 "gitg-commit-model.c" +#line 1401 "gitg-commit-model.c" } -static void _vala_array_add1 (GgitOId*** array, int* length, int* size, GgitOId* value) { +static void _vala_array_add1 (GgitOId** * array, int* length, int* size, GgitOId* value) { #line 352 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if ((*length) == (*size)) { #line 352 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" *size = (*size) ? (2 * (*size)) : 4; #line 352 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" *array = g_renew (GgitOId*, *array, (*size) + 1); -#line 1403 "gitg-commit-model.c" +#line 1412 "gitg-commit-model.c" } #line 352 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" (*array)[(*length)++] = value; #line 352 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" (*array)[*length] = NULL; -#line 1409 "gitg-commit-model.c" +#line 1418 "gitg-commit-model.c" } @@ -1423,7 +1432,7 @@ result = _tmp1_; #line 380 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 1427 "gitg-commit-model.c" +#line 1436 "gitg-commit-model.c" } @@ -1432,7 +1441,7 @@ result = ____lambda36_ ((GitgCommitModel*) self, (GgitOId*) v); #line 380 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 1436 "gitg-commit-model.c" +#line 1445 "gitg-commit-model.c" } @@ -1455,7 +1464,7 @@ result = _tmp2_; #line 380 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 1459 "gitg-commit-model.c" +#line 1468 "gitg-commit-model.c" } @@ -1464,14 +1473,14 @@ result = ____lambda37_ ((GitgCommitModel*) self, (GgitOId*) a, (GgitOId*) b); #line 380 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 1468 "gitg-commit-model.c" +#line 1477 "gitg-commit-model.c" } static void _g_object_unref0_ (gpointer var) { #line 408 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" (var == NULL) ? NULL : (var = (g_object_unref (var), NULL)); -#line 1475 "gitg-commit-model.c" +#line 1484 "gitg-commit-model.c" } @@ -1480,7 +1489,7 @@ g_slist_foreach (self, (GFunc) _g_object_unref0_, NULL); #line 408 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_slist_free (self); -#line 1484 "gitg-commit-model.c" +#line 1493 "gitg-commit-model.c" } @@ -1521,7 +1530,7 @@ _tmp0_ = self->priv->d_walker; #line 308 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (_tmp0_ == NULL) { -#line 1525 "gitg-commit-model.c" +#line 1534 "gitg-commit-model.c" { GgitRevisionWalker* _tmp1_ = NULL; GitgRepository* _tmp2_ = NULL; @@ -1535,7 +1544,7 @@ _tmp1_ = _tmp3_; #line 312 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1539 "gitg-commit-model.c" +#line 1548 "gitg-commit-model.c" goto __catch10_g_error; } #line 312 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -1548,7 +1557,7 @@ self->priv->d_walker = _tmp4_; #line 310 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _g_object_unref0 (_tmp1_); -#line 1552 "gitg-commit-model.c" +#line 1561 "gitg-commit-model.c" } goto __finally10; __catch10_g_error: @@ -1574,7 +1583,7 @@ result = NULL; #line 317 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 1578 "gitg-commit-model.c" +#line 1587 "gitg-commit-model.c" } __finally10: #line 310 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -1585,7 +1594,7 @@ g_clear_error (&_inner_error_); #line 310 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return NULL; -#line 1589 "gitg-commit-model.c" +#line 1598 "gitg-commit-model.c" } } #line 321 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -1606,7 +1615,7 @@ _tmp10_ = _data4_->included; #line 327 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp10__length1 = _data4_->included_length1; -#line 1610 "gitg-commit-model.c" +#line 1619 "gitg-commit-model.c" { GgitOId** oid_collection = NULL; gint oid_collection_length1 = 0; @@ -1618,14 +1627,14 @@ oid_collection_length1 = _tmp10__length1; #line 327 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" for (oid_it = 0; oid_it < _tmp10__length1; oid_it = oid_it + 1) { -#line 1622 "gitg-commit-model.c" +#line 1631 "gitg-commit-model.c" GgitOId* _tmp11_ = NULL; GgitOId* oid = NULL; #line 327 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp11_ = __vala_GgitOId_copy0 (oid_collection[oid_it]); #line 327 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" oid = _tmp11_; -#line 1629 "gitg-commit-model.c" +#line 1638 "gitg-commit-model.c" { { GgitRevisionWalker* _tmp12_ = NULL; @@ -1640,7 +1649,7 @@ ggit_revision_walker_push (_tmp12_, _tmp13_, &_inner_error_); #line 331 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1644 "gitg-commit-model.c" +#line 1653 "gitg-commit-model.c" goto __catch11_g_error; } #line 332 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -1649,7 +1658,7 @@ _tmp15_ = oid; #line 332 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _tmp14_, _tmp15_); -#line 1653 "gitg-commit-model.c" +#line 1662 "gitg-commit-model.c" } goto __finally11; __catch11_g_error: @@ -1658,7 +1667,7 @@ g_clear_error (&_inner_error_); #line 329 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _inner_error_ = NULL; -#line 1662 "gitg-commit-model.c" +#line 1671 "gitg-commit-model.c" } __finally11: #line 329 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -1673,11 +1682,11 @@ g_clear_error (&_inner_error_); #line 329 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return NULL; -#line 1677 "gitg-commit-model.c" +#line 1686 "gitg-commit-model.c" } #line 327 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" __vala_GgitOId_free0 (oid); -#line 1681 "gitg-commit-model.c" +#line 1690 "gitg-commit-model.c" } } } @@ -1685,7 +1694,7 @@ _tmp16_ = _data4_->excluded; #line 336 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp16__length1 = _data4_->excluded_length1; -#line 1689 "gitg-commit-model.c" +#line 1698 "gitg-commit-model.c" { GgitOId** oid_collection = NULL; gint oid_collection_length1 = 0; @@ -1697,14 +1706,14 @@ oid_collection_length1 = _tmp16__length1; #line 336 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" for (oid_it = 0; oid_it < _tmp16__length1; oid_it = oid_it + 1) { -#line 1701 "gitg-commit-model.c" +#line 1710 "gitg-commit-model.c" GgitOId* _tmp17_ = NULL; GgitOId* oid = NULL; #line 336 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp17_ = __vala_GgitOId_copy0 (oid_collection[oid_it]); #line 336 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" oid = _tmp17_; -#line 1708 "gitg-commit-model.c" +#line 1717 "gitg-commit-model.c" { { GgitRevisionWalker* _tmp18_ = NULL; @@ -1719,7 +1728,7 @@ ggit_revision_walker_hide (_tmp18_, _tmp19_, &_inner_error_); #line 340 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1723 "gitg-commit-model.c" +#line 1732 "gitg-commit-model.c" goto __catch12_g_error; } #line 341 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -1728,7 +1737,7 @@ _tmp21_ = oid; #line 341 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" gee_abstract_collection_remove ((GeeAbstractCollection*) _tmp20_, _tmp21_); -#line 1732 "gitg-commit-model.c" +#line 1741 "gitg-commit-model.c" } goto __finally12; __catch12_g_error: @@ -1737,7 +1746,7 @@ g_clear_error (&_inner_error_); #line 338 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _inner_error_ = NULL; -#line 1741 "gitg-commit-model.c" +#line 1750 "gitg-commit-model.c" } __finally12: #line 338 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -1752,11 +1761,11 @@ g_clear_error (&_inner_error_); #line 338 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return NULL; -#line 1756 "gitg-commit-model.c" +#line 1765 "gitg-commit-model.c" } #line 336 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" __vala_GgitOId_free0 (oid); -#line 1760 "gitg-commit-model.c" +#line 1769 "gitg-commit-model.c" } } } @@ -1772,7 +1781,7 @@ _tmp23_ = _data4_->permlanes; #line 347 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp23__length1 = _data4_->permlanes_length1; -#line 1776 "gitg-commit-model.c" +#line 1785 "gitg-commit-model.c" { GgitOId** oid_collection = NULL; gint oid_collection_length1 = 0; @@ -1784,14 +1793,14 @@ oid_collection_length1 = _tmp23__length1; #line 347 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" for (oid_it = 0; oid_it < _tmp23__length1; oid_it = oid_it + 1) { -#line 1788 "gitg-commit-model.c" +#line 1797 "gitg-commit-model.c" GgitOId* _tmp24_ = NULL; GgitOId* oid = NULL; #line 347 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp24_ = __vala_GgitOId_copy0 (oid_collection[oid_it]); #line 347 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" oid = _tmp24_; -#line 1795 "gitg-commit-model.c" +#line 1804 "gitg-commit-model.c" { { GgitRevisionWalker* _tmp25_ = NULL; @@ -1808,7 +1817,7 @@ ggit_revision_walker_push (_tmp25_, _tmp26_, &_inner_error_); #line 351 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1812 "gitg-commit-model.c" +#line 1821 "gitg-commit-model.c" goto __catch13_g_error; } #line 352 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -1821,7 +1830,7 @@ _tmp29_ = __vala_GgitOId_copy0 (_tmp28_); #line 352 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _vala_array_add1 (&permanent, &permanent_length1, &_permanent_size_, _tmp29_); -#line 1825 "gitg-commit-model.c" +#line 1834 "gitg-commit-model.c" } goto __finally13; __catch13_g_error: @@ -1830,7 +1839,7 @@ g_clear_error (&_inner_error_); #line 349 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _inner_error_ = NULL; -#line 1834 "gitg-commit-model.c" +#line 1843 "gitg-commit-model.c" } __finally13: #line 349 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -1847,11 +1856,11 @@ g_clear_error (&_inner_error_); #line 349 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return NULL; -#line 1851 "gitg-commit-model.c" +#line 1860 "gitg-commit-model.c" } #line 347 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" __vala_GgitOId_free0 (oid); -#line 1855 "gitg-commit-model.c" +#line 1864 "gitg-commit-model.c" } } } @@ -1865,7 +1874,7 @@ _tmp32_ = incset; #line 356 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" gitg_lanes_reset (_tmp30_, _tmp31_, _tmp31__length1, _tmp32_); -#line 1869 "gitg-commit-model.c" +#line 1878 "gitg-commit-model.c" { GitgCommit** _tmp33_ = NULL; gint _tmp33__length1 = 0; @@ -1875,7 +1884,7 @@ _tmp33__length1 = self->priv->d_ids_length1; #line 362 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_rec_mutex_lock (&self->priv->__lock_d_ids); -#line 1879 "gitg-commit-model.c" +#line 1888 "gitg-commit-model.c" { GitgCommit** _tmp34_ = NULL; GitgCommit** _tmp35_ = NULL; @@ -1927,7 +1936,7 @@ _tmp39_ = self->priv->d_hidden_ids_length1; #line 373 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" self->priv->d_advertized_size = (guint) 0; -#line 1931 "gitg-commit-model.c" +#line 1940 "gitg-commit-model.c" } __finally14: { @@ -1939,7 +1948,7 @@ _tmp40__length1 = self->priv->d_ids_length1; #line 362 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_rec_mutex_unlock (&self->priv->__lock_d_ids); -#line 1943 "gitg-commit-model.c" +#line 1952 "gitg-commit-model.c" } #line 362 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -1953,21 +1962,21 @@ g_clear_error (&_inner_error_); #line 362 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return NULL; -#line 1957 "gitg-commit-model.c" +#line 1966 "gitg-commit-model.c" } } #line 376 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp41_ = g_timer_new (); #line 376 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" timer = _tmp41_; -#line 1964 "gitg-commit-model.c" +#line 1973 "gitg-commit-model.c" { GeeHashMap* _tmp42_ = NULL; #line 378 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp42_ = self->priv->d_id_hash; #line 378 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_rec_mutex_lock (&self->priv->__lock_d_id_hash); -#line 1971 "gitg-commit-model.c" +#line 1980 "gitg-commit-model.c" { GeeHashMap* _tmp43_ = NULL; #line 380 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -1976,7 +1985,7 @@ _g_object_unref0 (self->priv->d_id_hash); #line 380 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" self->priv->d_id_hash = _tmp43_; -#line 1980 "gitg-commit-model.c" +#line 1989 "gitg-commit-model.c" } __finally15: { @@ -1985,7 +1994,7 @@ _tmp44_ = self->priv->d_id_hash; #line 378 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_rec_mutex_unlock (&self->priv->__lock_d_id_hash); -#line 1989 "gitg-commit-model.c" +#line 1998 "gitg-commit-model.c" } #line 378 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -2001,12 +2010,12 @@ g_clear_error (&_inner_error_); #line 378 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return NULL; -#line 2005 "gitg-commit-model.c" +#line 2014 "gitg-commit-model.c" } } #line 383 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" while (TRUE) { -#line 2010 "gitg-commit-model.c" +#line 2019 "gitg-commit-model.c" GgitOId* id = NULL; GitgCommit* commit = NULL; GCancellable* _tmp45_ = NULL; @@ -2043,7 +2052,7 @@ _g_object_unref0 (incset); #line 390 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 2047 "gitg-commit-model.c" +#line 2056 "gitg-commit-model.c" } { GgitOId* _tmp47_ = NULL; @@ -2064,7 +2073,7 @@ _tmp47_ = _tmp49_; #line 395 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2068 "gitg-commit-model.c" +#line 2077 "gitg-commit-model.c" goto __catch16_g_error; } #line 395 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -2087,7 +2096,7 @@ __vala_GgitOId_free0 (id); #line 399 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 2091 "gitg-commit-model.c" +#line 2100 "gitg-commit-model.c" } #line 402 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp53_ = self->priv->d_repository; @@ -2101,7 +2110,7 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 402 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" __vala_GgitOId_free0 (_tmp47_); -#line 2105 "gitg-commit-model.c" +#line 2114 "gitg-commit-model.c" goto __catch16_g_error; } #line 402 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -2116,7 +2125,7 @@ _g_object_unref0 (_tmp52_); #line 393 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" __vala_GgitOId_free0 (_tmp47_); -#line 2120 "gitg-commit-model.c" +#line 2129 "gitg-commit-model.c" } goto __finally16; __catch16_g_error: @@ -2131,7 +2140,7 @@ __vala_GgitOId_free0 (id); #line 403 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 2135 "gitg-commit-model.c" +#line 2144 "gitg-commit-model.c" } __finally16: #line 393 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -2152,7 +2161,7 @@ g_clear_error (&_inner_error_); #line 393 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return NULL; -#line 2156 "gitg-commit-model.c" +#line 2165 "gitg-commit-model.c" } #line 408 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp57_ = self->priv->d_lanes; @@ -2168,7 +2177,7 @@ mylane = _tmp60_; #line 408 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (_tmp61_) { -#line 2172 "gitg-commit-model.c" +#line 2181 "gitg-commit-model.c" GitgCommit* _tmp62_ = NULL; GSList* _tmp63_ = NULL; gint _tmp64_ = 0; @@ -2191,14 +2200,14 @@ _tmp64_ = mylane; #line 410 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" gitg_commit_update_lanes (_tmp62_, _tmp63_, _tmp64_); -#line 2195 "gitg-commit-model.c" +#line 2204 "gitg-commit-model.c" { GeeHashMap* _tmp65_ = NULL; #line 412 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp65_ = self->priv->d_id_hash; #line 412 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_rec_mutex_lock (&self->priv->__lock_d_id_hash); -#line 2202 "gitg-commit-model.c" +#line 2211 "gitg-commit-model.c" { GeeHashMap* _tmp66_ = NULL; GgitOId* _tmp67_ = NULL; @@ -2214,7 +2223,7 @@ _tmp68__length1 = self->priv->d_ids_length1; #line 414 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" gee_abstract_map_set ((GeeAbstractMap*) _tmp66_, _tmp67_, (gpointer) ((gintptr) _tmp68__length1)); -#line 2218 "gitg-commit-model.c" +#line 2227 "gitg-commit-model.c" } __finally17: { @@ -2223,7 +2232,7 @@ _tmp69_ = self->priv->d_id_hash; #line 412 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_rec_mutex_unlock (&self->priv->__lock_d_id_hash); -#line 2227 "gitg-commit-model.c" +#line 2236 "gitg-commit-model.c" } #line 412 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -2245,7 +2254,7 @@ g_clear_error (&_inner_error_); #line 412 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return NULL; -#line 2249 "gitg-commit-model.c" +#line 2258 "gitg-commit-model.c" } } #line 417 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -2256,7 +2265,7 @@ _tmp71_ = gitg_commit_model_needs_resize (self, _tmp70_, _tmp70__length1, &size); #line 417 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (_tmp71_) { -#line 2260 "gitg-commit-model.c" +#line 2269 "gitg-commit-model.c" gint l = 0; GitgCommit** _tmp72_ = NULL; gint _tmp72__length1 = 0; @@ -2266,7 +2275,7 @@ _tmp72__length1 = self->priv->d_ids_length1; #line 419 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" l = _tmp72__length1; -#line 2270 "gitg-commit-model.c" +#line 2279 "gitg-commit-model.c" { GitgCommit** _tmp73_ = NULL; gint _tmp73__length1 = 0; @@ -2276,7 +2285,7 @@ _tmp73__length1 = self->priv->d_ids_length1; #line 421 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_rec_mutex_lock (&self->priv->__lock_d_ids); -#line 2280 "gitg-commit-model.c" +#line 2289 "gitg-commit-model.c" { guint _tmp74_ = 0U; gint _tmp75_ = 0; @@ -2300,7 +2309,7 @@ self->priv->d_ids_length1 = _tmp76_; #line 424 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp77_ = self->priv->d_ids_length1; -#line 2304 "gitg-commit-model.c" +#line 2313 "gitg-commit-model.c" } __finally18: { @@ -2312,7 +2321,7 @@ _tmp78__length1 = self->priv->d_ids_length1; #line 421 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_rec_mutex_unlock (&self->priv->__lock_d_ids); -#line 2316 "gitg-commit-model.c" +#line 2325 "gitg-commit-model.c" } #line 421 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -2334,7 +2343,7 @@ g_clear_error (&_inner_error_); #line 421 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return NULL; -#line 2338 "gitg-commit-model.c" +#line 2347 "gitg-commit-model.c" } } } @@ -2356,7 +2365,7 @@ _tmp79_[_tmp80_] = _tmp82_; #line 428 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp83_ = _tmp79_[_tmp80_]; -#line 2360 "gitg-commit-model.c" +#line 2369 "gitg-commit-model.c" } else { GitgCommit** _tmp84_ = NULL; gint _tmp84__length1 = 0; @@ -2375,7 +2384,7 @@ _tmp85_ = gitg_commit_model_needs_resize (self, _tmp84_, _tmp84__length1, &hidden_size); #line 432 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (_tmp85_) { -#line 2379 "gitg-commit-model.c" +#line 2388 "gitg-commit-model.c" gint l = 0; GitgCommit** _tmp86_ = NULL; gint _tmp86__length1 = 0; @@ -2407,7 +2416,7 @@ self->priv->d_hidden_ids_length1 = _tmp89_; #line 437 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp90_ = self->priv->d_hidden_ids_length1; -#line 2411 "gitg-commit-model.c" +#line 2420 "gitg-commit-model.c" } #line 440 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp91_ = self->priv->d_hidden_ids; @@ -2427,7 +2436,7 @@ _tmp91_[_tmp92_] = _tmp94_; #line 440 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp95_ = _tmp91_[_tmp92_]; -#line 2431 "gitg-commit-model.c" +#line 2440 "gitg-commit-model.c" } #line 443 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp96_ = timer; @@ -2437,7 +2446,7 @@ _tmp98_ = _data4_->wait_elapsed; #line 443 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (_tmp97_ >= _tmp98_) { -#line 2441 "gitg-commit-model.c" +#line 2450 "gitg-commit-model.c" GTimer* _tmp99_ = NULL; gdouble _tmp100_ = 0.0; #line 445 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -2450,13 +2459,13 @@ _tmp100_ = _data4_->wait_elapsed_incremental; #line 448 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _data4_->wait_elapsed = _tmp100_; -#line 2454 "gitg-commit-model.c" +#line 2463 "gitg-commit-model.c" } #line 451 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp102_ = _data4_->limit; #line 451 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (_tmp102_ > ((guint) 0)) { -#line 2460 "gitg-commit-model.c" +#line 2469 "gitg-commit-model.c" GitgCommit** _tmp103_ = NULL; gint _tmp103__length1 = 0; guint _tmp104_ = 0U; @@ -2468,11 +2477,11 @@ _tmp104_ = _data4_->limit; #line 451 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp101_ = ((guint) _tmp103__length1) == _tmp104_; -#line 2472 "gitg-commit-model.c" +#line 2481 "gitg-commit-model.c" } else { #line 451 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp101_ = FALSE; -#line 2476 "gitg-commit-model.c" +#line 2485 "gitg-commit-model.c" } #line 451 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (_tmp101_) { @@ -2484,7 +2493,7 @@ __vala_GgitOId_free0 (id); #line 453 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 2488 "gitg-commit-model.c" +#line 2497 "gitg-commit-model.c" } #line 383 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" __g_slist_free__g_object_unref0_0 (lanes); @@ -2492,7 +2501,7 @@ _g_object_unref0 (commit); #line 383 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" __vala_GgitOId_free0 (id); -#line 2496 "gitg-commit-model.c" +#line 2505 "gitg-commit-model.c" } #line 457 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp105_ = _data4_->cb; @@ -2514,7 +2523,7 @@ _g_object_unref0 (incset); #line 458 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 2518 "gitg-commit-model.c" +#line 2527 "gitg-commit-model.c" } @@ -2525,7 +2534,7 @@ block4_data_unref (self); #line 307 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 2529 "gitg-commit-model.c" +#line 2538 "gitg-commit-model.c" } @@ -2534,16 +2543,16 @@ switch (_data_->_state_) { #line 286 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" case 0: -#line 2538 "gitg-commit-model.c" +#line 2547 "gitg-commit-model.c" goto _state_0; #line 286 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" case 1: -#line 2542 "gitg-commit-model.c" +#line 2551 "gitg-commit-model.c" goto _state_1; default: #line 286 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_assert_not_reached (); -#line 2547 "gitg-commit-model.c" +#line 2556 "gitg-commit-model.c" } _state_0: #line 286 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -2666,7 +2675,7 @@ _data_->run_target = block4_data_ref (_data_->_data4_); #line 307 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _data_->run_target_destroy_notify = block4_data_unref; -#line 2670 "gitg-commit-model.c" +#line 2679 "gitg-commit-model.c" { #line 463 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _data_->_tmp11_ = NULL; @@ -2690,7 +2699,7 @@ _data_->_tmp10_ = _data_->_tmp12_; #line 463 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 2694 "gitg-commit-model.c" +#line 2703 "gitg-commit-model.c" goto __catch19_g_error; } #line 463 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -2705,7 +2714,7 @@ _data_->self->priv->d_thread = _data_->_tmp13_; #line 461 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _g_thread_unref0 (_data_->_tmp10_); -#line 2709 "gitg-commit-model.c" +#line 2718 "gitg-commit-model.c" } goto __finally19; __catch19_g_error: @@ -2726,17 +2735,17 @@ if (_data_->_state_ == 0) { #line 468 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2730 "gitg-commit-model.c" +#line 2739 "gitg-commit-model.c" } else { #line 468 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2734 "gitg-commit-model.c" +#line 2743 "gitg-commit-model.c" } #line 468 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_object_unref (_data_->_async_result); #line 468 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return FALSE; -#line 2740 "gitg-commit-model.c" +#line 2749 "gitg-commit-model.c" } __finally19: #line 461 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -2751,13 +2760,13 @@ g_clear_error (&_data_->_inner_error_); #line 461 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return FALSE; -#line 2755 "gitg-commit-model.c" +#line 2764 "gitg-commit-model.c" } #line 471 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _data_->_state_ = 1; #line 471 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return FALSE; -#line 2761 "gitg-commit-model.c" +#line 2770 "gitg-commit-model.c" _state_1: ; #line 286 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -2768,17 +2777,17 @@ if (_data_->_state_ == 0) { #line 286 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2772 "gitg-commit-model.c" +#line 2781 "gitg-commit-model.c" } else { #line 286 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2776 "gitg-commit-model.c" +#line 2785 "gitg-commit-model.c" } #line 286 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_object_unref (_data_->_async_result); #line 286 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return FALSE; -#line 2782 "gitg-commit-model.c" +#line 2791 "gitg-commit-model.c" } @@ -2790,7 +2799,7 @@ #line 474 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_return_if_fail (self != NULL); #line 476 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - g_signal_emit_by_name (self, "begin-clear"); + g_signal_emit (self, gitg_commit_model_signals[GITG_COMMIT_MODEL_BEGIN_CLEAR_SIGNAL], 0); #line 479 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp0_ = self->priv->d_size; #line 479 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -2799,7 +2808,7 @@ path = _tmp1_; #line 481 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" while (TRUE) { -#line 2803 "gitg-commit-model.c" +#line 2812 "gitg-commit-model.c" guint _tmp2_ = 0U; GtkTreePath* _tmp3_ = NULL; guint _tmp4_ = 0U; @@ -2812,7 +2821,7 @@ if (!(_tmp2_ > ((guint) 0))) { #line 481 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 2816 "gitg-commit-model.c" +#line 2825 "gitg-commit-model.c" } #line 483 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp3_ = path; @@ -2832,17 +2841,17 @@ gtk_tree_model_row_deleted ((GtkTreeModel*) self, _tmp7_); #line 486 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _gtk_tree_path_free0 (_tmp7_); -#line 2836 "gitg-commit-model.c" +#line 2845 "gitg-commit-model.c" } #line 489 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp8_ = self->priv->d_stamp; #line 489 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" self->priv->d_stamp = _tmp8_ + 1; #line 491 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - g_signal_emit_by_name (self, "end-clear"); + g_signal_emit (self, gitg_commit_model_signals[GITG_COMMIT_MODEL_END_CLEAR_SIGNAL], 0); #line 474 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _gtk_tree_path_free0 (path); -#line 2846 "gitg-commit-model.c" +#line 2855 "gitg-commit-model.c" } @@ -2867,19 +2876,19 @@ _tmp2_ = self->priv->d_stamp; #line 499 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" iter.stamp = _tmp2_; -#line 2871 "gitg-commit-model.c" +#line 2880 "gitg-commit-model.c" { guint i = 0U; #line 501 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" i = (guint) 0; -#line 2876 "gitg-commit-model.c" +#line 2885 "gitg-commit-model.c" { gboolean _tmp3_ = FALSE; #line 501 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp3_ = TRUE; #line 501 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" while (TRUE) { -#line 2883 "gitg-commit-model.c" +#line 2892 "gitg-commit-model.c" guint _tmp5_ = 0U; guint _tmp6_ = 0U; guint _tmp7_ = 0U; @@ -2891,13 +2900,13 @@ GtkTreePath* _tmp13_ = NULL; #line 501 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (!_tmp3_) { -#line 2895 "gitg-commit-model.c" +#line 2904 "gitg-commit-model.c" guint _tmp4_ = 0U; #line 501 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp4_ = i; #line 501 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" i = _tmp4_ + 1; -#line 2901 "gitg-commit-model.c" +#line 2910 "gitg-commit-model.c" } #line 501 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp3_ = FALSE; @@ -2909,7 +2918,7 @@ if (!(_tmp5_ < _tmp6_)) { #line 501 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 2913 "gitg-commit-model.c" +#line 2922 "gitg-commit-model.c" } #line 503 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp7_ = self->priv->d_size; @@ -2935,17 +2944,17 @@ _tmp13_ = path; #line 508 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" gtk_tree_path_next (_tmp13_); -#line 2939 "gitg-commit-model.c" +#line 2948 "gitg-commit-model.c" } } } #line 511 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp14_ = added; #line 511 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - g_signal_emit_by_name (self, "update", _tmp14_); + g_signal_emit (self, gitg_commit_model_signals[GITG_COMMIT_MODEL_UPDATE_SIGNAL], 0, _tmp14_); #line 494 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _gtk_tree_path_free0 (path); -#line 2949 "gitg-commit-model.c" +#line 2958 "gitg-commit-model.c" } @@ -2964,7 +2973,7 @@ result = _tmp1_; #line 516 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 2968 "gitg-commit-model.c" +#line 2977 "gitg-commit-model.c" } @@ -2977,14 +2986,14 @@ result = GTK_TREE_MODEL_LIST_ONLY | GTK_TREE_MODEL_ITERS_PERSIST; #line 521 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 2981 "gitg-commit-model.c" +#line 2990 "gitg-commit-model.c" } static gint* _vala_array_dup6 (gint* self, int length) { #line 529 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return g_memdup (self, length * sizeof (gint)); -#line 2988 "gitg-commit-model.c" +#line 2997 "gitg-commit-model.c" } @@ -3045,11 +3054,11 @@ if (iter) { #line 533 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" *iter = _vala_iter; -#line 3049 "gitg-commit-model.c" +#line 3058 "gitg-commit-model.c" } #line 533 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 3053 "gitg-commit-model.c" +#line 3062 "gitg-commit-model.c" } #line 536 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp6_ = indices; @@ -3073,11 +3082,11 @@ if (iter) { #line 540 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" *iter = _vala_iter; -#line 3077 "gitg-commit-model.c" +#line 3086 "gitg-commit-model.c" } #line 540 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 3081 "gitg-commit-model.c" +#line 3090 "gitg-commit-model.c" } #line 543 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp10_ = index; @@ -3095,11 +3104,11 @@ if (iter) { #line 546 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" *iter = _vala_iter; -#line 3099 "gitg-commit-model.c" +#line 3108 "gitg-commit-model.c" } #line 546 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 3103 "gitg-commit-model.c" +#line 3112 "gitg-commit-model.c" } @@ -3112,7 +3121,7 @@ result = (gint) GITG_COMMIT_MODEL_COLUMNS_NUM; #line 551 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 3116 "gitg-commit-model.c" +#line 3125 "gitg-commit-model.c" } @@ -3150,7 +3159,7 @@ result = _tmp5_; #line 560 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 3154 "gitg-commit-model.c" +#line 3163 "gitg-commit-model.c" } @@ -3215,15 +3224,15 @@ if (val) { #line 576 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" *val = _vala_val; -#line 3219 "gitg-commit-model.c" +#line 3228 "gitg-commit-model.c" } else { #line 576 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" G_IS_VALUE (&_vala_val) ? (g_value_unset (&_vala_val), NULL) : NULL; -#line 3223 "gitg-commit-model.c" +#line 3232 "gitg-commit-model.c" } #line 576 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return; -#line 3227 "gitg-commit-model.c" +#line 3236 "gitg-commit-model.c" } #line 579 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp11_ = column; @@ -3231,7 +3240,7 @@ switch (_tmp11_) { #line 579 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" case GITG_COMMIT_MODEL_COLUMNS_SHA1: -#line 3235 "gitg-commit-model.c" +#line 3244 "gitg-commit-model.c" { GitgCommit* _tmp12_ = NULL; GgitOId* _tmp13_ = NULL; @@ -3256,11 +3265,11 @@ __vala_GgitOId_free0 (_tmp14_); #line 583 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 3260 "gitg-commit-model.c" +#line 3269 "gitg-commit-model.c" } #line 579 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" case GITG_COMMIT_MODEL_COLUMNS_SUBJECT: -#line 3264 "gitg-commit-model.c" +#line 3273 "gitg-commit-model.c" { GitgCommit* _tmp17_ = NULL; const gchar* _tmp18_ = NULL; @@ -3272,11 +3281,11 @@ g_value_set_string (&_vala_val, _tmp18_); #line 586 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 3276 "gitg-commit-model.c" +#line 3285 "gitg-commit-model.c" } #line 579 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" case GITG_COMMIT_MODEL_COLUMNS_MESSAGE: -#line 3280 "gitg-commit-model.c" +#line 3289 "gitg-commit-model.c" { GitgCommit* _tmp19_ = NULL; const gchar* _tmp20_ = NULL; @@ -3288,11 +3297,11 @@ g_value_set_string (&_vala_val, _tmp20_); #line 589 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 3292 "gitg-commit-model.c" +#line 3301 "gitg-commit-model.c" } #line 579 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" case GITG_COMMIT_MODEL_COLUMNS_COMMITTER: -#line 3296 "gitg-commit-model.c" +#line 3305 "gitg-commit-model.c" { GitgCommit* _tmp21_ = NULL; GgitSignature* _tmp22_ = NULL; @@ -3334,11 +3343,11 @@ _g_object_unref0 (_tmp23_); #line 593 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 3338 "gitg-commit-model.c" +#line 3347 "gitg-commit-model.c" } #line 579 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" case GITG_COMMIT_MODEL_COLUMNS_COMMITTER_NAME: -#line 3342 "gitg-commit-model.c" +#line 3351 "gitg-commit-model.c" { GitgCommit* _tmp31_ = NULL; GgitSignature* _tmp32_ = NULL; @@ -3358,11 +3367,11 @@ _g_object_unref0 (_tmp33_); #line 596 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 3362 "gitg-commit-model.c" +#line 3371 "gitg-commit-model.c" } #line 579 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" case GITG_COMMIT_MODEL_COLUMNS_COMMITTER_EMAIL: -#line 3366 "gitg-commit-model.c" +#line 3375 "gitg-commit-model.c" { GitgCommit* _tmp35_ = NULL; GgitSignature* _tmp36_ = NULL; @@ -3382,11 +3391,11 @@ _g_object_unref0 (_tmp37_); #line 599 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 3386 "gitg-commit-model.c" +#line 3395 "gitg-commit-model.c" } #line 579 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" case GITG_COMMIT_MODEL_COLUMNS_COMMITTER_DATE: -#line 3390 "gitg-commit-model.c" +#line 3399 "gitg-commit-model.c" { GitgCommit* _tmp39_ = NULL; gchar* _tmp40_ = NULL; @@ -3406,11 +3415,11 @@ _g_free0 (_tmp42_); #line 602 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 3410 "gitg-commit-model.c" +#line 3419 "gitg-commit-model.c" } #line 579 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" case GITG_COMMIT_MODEL_COLUMNS_AUTHOR: -#line 3414 "gitg-commit-model.c" +#line 3423 "gitg-commit-model.c" { GitgCommit* _tmp43_ = NULL; GgitSignature* _tmp44_ = NULL; @@ -3452,11 +3461,11 @@ _g_object_unref0 (_tmp45_); #line 606 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 3456 "gitg-commit-model.c" +#line 3465 "gitg-commit-model.c" } #line 579 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" case GITG_COMMIT_MODEL_COLUMNS_AUTHOR_NAME: -#line 3460 "gitg-commit-model.c" +#line 3469 "gitg-commit-model.c" { GitgCommit* _tmp53_ = NULL; GgitSignature* _tmp54_ = NULL; @@ -3476,11 +3485,11 @@ _g_object_unref0 (_tmp55_); #line 609 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 3480 "gitg-commit-model.c" +#line 3489 "gitg-commit-model.c" } #line 579 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" case GITG_COMMIT_MODEL_COLUMNS_AUTHOR_EMAIL: -#line 3484 "gitg-commit-model.c" +#line 3493 "gitg-commit-model.c" { GitgCommit* _tmp57_ = NULL; GgitSignature* _tmp58_ = NULL; @@ -3500,11 +3509,11 @@ _g_object_unref0 (_tmp59_); #line 612 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 3504 "gitg-commit-model.c" +#line 3513 "gitg-commit-model.c" } #line 579 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" case GITG_COMMIT_MODEL_COLUMNS_AUTHOR_DATE: -#line 3508 "gitg-commit-model.c" +#line 3517 "gitg-commit-model.c" { GitgCommit* _tmp61_ = NULL; gchar* _tmp62_ = NULL; @@ -3524,11 +3533,11 @@ _g_free0 (_tmp64_); #line 615 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 3528 "gitg-commit-model.c" +#line 3537 "gitg-commit-model.c" } #line 579 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" case GITG_COMMIT_MODEL_COLUMNS_COMMIT: -#line 3532 "gitg-commit-model.c" +#line 3541 "gitg-commit-model.c" { GitgCommit* _tmp65_ = NULL; #line 617 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -3537,12 +3546,12 @@ g_value_set_object (&_vala_val, (GObject*) _tmp65_); #line 618 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 3541 "gitg-commit-model.c" +#line 3550 "gitg-commit-model.c" } default: #line 579 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 3546 "gitg-commit-model.c" +#line 3555 "gitg-commit-model.c" } #line 563 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _g_object_unref0 (commit); @@ -3550,11 +3559,11 @@ if (val) { #line 563 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" *val = _vala_val; -#line 3554 "gitg-commit-model.c" +#line 3563 "gitg-commit-model.c" } else { #line 563 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" G_IS_VALUE (&_vala_val) ? (g_value_unset (&_vala_val), NULL) : NULL; -#line 3558 "gitg-commit-model.c" +#line 3567 "gitg-commit-model.c" } } @@ -3592,7 +3601,7 @@ result = _tmp5_; #line 628 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 3596 "gitg-commit-model.c" +#line 3605 "gitg-commit-model.c" } @@ -3603,14 +3612,14 @@ g_return_val_if_fail (self != NULL, NULL); #line 631 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_return_val_if_fail (commit != NULL, NULL); -#line 3607 "gitg-commit-model.c" +#line 3616 "gitg-commit-model.c" { GeeHashMap* _tmp0_ = NULL; #line 633 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp0_ = self->priv->d_id_hash; #line 633 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_rec_mutex_lock (&self->priv->__lock_d_id_hash); -#line 3614 "gitg-commit-model.c" +#line 3623 "gitg-commit-model.c" { GgitOId* id = NULL; GitgCommit* _tmp1_ = NULL; @@ -3643,18 +3652,18 @@ result = NULL; #line 639 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" __vala_GgitOId_free0 (id); -#line 3647 "gitg-commit-model.c" +#line 3656 "gitg-commit-model.c" { GeeHashMap* _tmp6_ = NULL; #line 633 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp6_ = self->priv->d_id_hash; #line 633 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_rec_mutex_unlock (&self->priv->__lock_d_id_hash); -#line 3654 "gitg-commit-model.c" +#line 3663 "gitg-commit-model.c" } #line 639 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 3658 "gitg-commit-model.c" +#line 3667 "gitg-commit-model.c" } #line 642 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp7_ = self->priv->d_id_hash; @@ -3676,18 +3685,18 @@ result = _tmp13_; #line 642 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" __vala_GgitOId_free0 (id); -#line 3680 "gitg-commit-model.c" +#line 3689 "gitg-commit-model.c" { GeeHashMap* _tmp14_ = NULL; #line 633 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp14_ = self->priv->d_id_hash; #line 633 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_rec_mutex_unlock (&self->priv->__lock_d_id_hash); -#line 3687 "gitg-commit-model.c" +#line 3696 "gitg-commit-model.c" } #line 642 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 3691 "gitg-commit-model.c" +#line 3700 "gitg-commit-model.c" } __finally20: { @@ -3696,7 +3705,7 @@ _tmp15_ = self->priv->d_id_hash; #line 633 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_rec_mutex_unlock (&self->priv->__lock_d_id_hash); -#line 3700 "gitg-commit-model.c" +#line 3709 "gitg-commit-model.c" } #line 633 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.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); @@ -3704,7 +3713,7 @@ g_clear_error (&_inner_error_); #line 633 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return NULL; -#line 3708 "gitg-commit-model.c" +#line 3717 "gitg-commit-model.c" } } @@ -3712,7 +3721,7 @@ static gint* _vala_array_dup7 (gint* self, int length) { #line 648 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return g_memdup (self, length * sizeof (gint)); -#line 3716 "gitg-commit-model.c" +#line 3725 "gitg-commit-model.c" } @@ -3762,7 +3771,7 @@ indices = (g_free (indices), NULL); #line 652 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 3766 "gitg-commit-model.c" +#line 3775 "gitg-commit-model.c" } #line 655 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp5_ = indices; @@ -3778,7 +3787,7 @@ indices = (g_free (indices), NULL); #line 655 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 3782 "gitg-commit-model.c" +#line 3791 "gitg-commit-model.c" } @@ -3796,7 +3805,7 @@ _tmp1_ = parent; #line 662 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (_tmp1_ == NULL) { -#line 3800 "gitg-commit-model.c" +#line 3809 "gitg-commit-model.c" gint _tmp2_ = 0; #line 664 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _vala_iter.user_data = (void*) ((gulong) 0); @@ -3810,11 +3819,11 @@ if (iter) { #line 667 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" *iter = _vala_iter; -#line 3814 "gitg-commit-model.c" +#line 3823 "gitg-commit-model.c" } #line 667 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 3818 "gitg-commit-model.c" +#line 3827 "gitg-commit-model.c" } else { GtkTreeIter* _tmp3_ = NULL; gint _tmp4_ = 0; @@ -3833,17 +3842,17 @@ if (iter) { #line 672 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" *iter = _vala_iter; -#line 3837 "gitg-commit-model.c" +#line 3846 "gitg-commit-model.c" } #line 672 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 3841 "gitg-commit-model.c" +#line 3850 "gitg-commit-model.c" } #line 658 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (iter) { #line 658 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" *iter = _vala_iter; -#line 3847 "gitg-commit-model.c" +#line 3856 "gitg-commit-model.c" } } @@ -3859,7 +3868,7 @@ result = FALSE; #line 678 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 3863 "gitg-commit-model.c" +#line 3872 "gitg-commit-model.c" } @@ -3873,7 +3882,7 @@ _tmp0_ = iter; #line 683 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (_tmp0_ == NULL) { -#line 3877 "gitg-commit-model.c" +#line 3886 "gitg-commit-model.c" guint _tmp1_ = 0U; #line 685 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp1_ = self->priv->d_size; @@ -3881,7 +3890,7 @@ result = (gint) _tmp1_; #line 685 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 3885 "gitg-commit-model.c" +#line 3894 "gitg-commit-model.c" } else { GtkTreeIter* _tmp2_ = NULL; gint _tmp3_ = 0; @@ -3898,7 +3907,7 @@ result = 0; #line 690 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 3902 "gitg-commit-model.c" +#line 3911 "gitg-commit-model.c" } } @@ -3947,7 +3956,7 @@ result = FALSE; #line 703 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 3951 "gitg-commit-model.c" +#line 3960 "gitg-commit-model.c" } else { guint _tmp8_ = 0U; #line 707 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" @@ -3958,7 +3967,7 @@ result = TRUE; #line 708 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 3962 "gitg-commit-model.c" +#line 3971 "gitg-commit-model.c" } } @@ -3982,7 +3991,7 @@ if (_tmp2_ != NULL) { #line 716 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp1_ = TRUE; -#line 3986 "gitg-commit-model.c" +#line 3995 "gitg-commit-model.c" } else { gint _tmp3_ = 0; guint _tmp4_ = 0U; @@ -3992,7 +4001,7 @@ _tmp4_ = self->priv->d_size; #line 716 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp1_ = ((guint) _tmp3_) >= _tmp4_; -#line 3996 "gitg-commit-model.c" +#line 4005 "gitg-commit-model.c" } #line 716 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" if (_tmp1_) { @@ -4002,11 +4011,11 @@ if (iter) { #line 718 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" *iter = _vala_iter; -#line 4006 "gitg-commit-model.c" +#line 4015 "gitg-commit-model.c" } #line 718 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 4010 "gitg-commit-model.c" +#line 4019 "gitg-commit-model.c" } #line 721 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp5_ = n; @@ -4022,11 +4031,11 @@ if (iter) { #line 724 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" *iter = _vala_iter; -#line 4026 "gitg-commit-model.c" +#line 4035 "gitg-commit-model.c" } #line 724 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 4030 "gitg-commit-model.c" +#line 4039 "gitg-commit-model.c" } @@ -4058,11 +4067,11 @@ if (parent) { #line 733 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" *parent = _vala_parent; -#line 4062 "gitg-commit-model.c" +#line 4071 "gitg-commit-model.c" } #line 733 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 4066 "gitg-commit-model.c" +#line 4075 "gitg-commit-model.c" } @@ -4077,21 +4086,25 @@ result = _tmp0_; #line 84 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 4081 "gitg-commit-model.c" +#line 4090 "gitg-commit-model.c" } void gitg_commit_model_set_limit (GitgCommitModel* self, guint value) { - guint _tmp0_ = 0U; #line 84 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_return_if_fail (self != NULL); #line 84 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - _tmp0_ = value; + if (gitg_commit_model_get_limit (self) != value) { +#line 4099 "gitg-commit-model.c" + guint _tmp0_ = 0U; #line 84 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - self->priv->_limit = _tmp0_; + _tmp0_ = value; #line 84 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - g_object_notify ((GObject *) self, "limit"); -#line 4095 "gitg-commit-model.c" + self->priv->_limit = _tmp0_; +#line 84 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" + g_object_notify ((GObject *) self, "limit"); +#line 4107 "gitg-commit-model.c" + } } @@ -4106,34 +4119,38 @@ result = _tmp0_; #line 88 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 4110 "gitg-commit-model.c" +#line 4123 "gitg-commit-model.c" } void gitg_commit_model_set_sort_mode (GitgCommitModel* self, GgitSortMode value) { - GgitSortMode _tmp0_ = 0; - GgitSortMode _tmp1_ = 0; #line 89 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_return_if_fail (self != NULL); +#line 89 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" + if (gitg_commit_model_get_sort_mode (self) != value) { +#line 4132 "gitg-commit-model.c" + GgitSortMode _tmp0_ = 0; + GgitSortMode _tmp1_ = 0; #line 91 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - _tmp0_ = self->priv->d_sortmode; + _tmp0_ = self->priv->d_sortmode; #line 91 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - _tmp1_ = value; + _tmp1_ = value; #line 91 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - if (_tmp0_ != _tmp1_) { -#line 4125 "gitg-commit-model.c" - GgitSortMode _tmp2_ = 0; + if (_tmp0_ != _tmp1_) { +#line 4141 "gitg-commit-model.c" + GgitSortMode _tmp2_ = 0; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - _tmp2_ = value; + _tmp2_ = value; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - self->priv->d_sortmode = _tmp2_; + self->priv->d_sortmode = _tmp2_; #line 94 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - gitg_commit_model_reload (self); -#line 4133 "gitg-commit-model.c" - } + gitg_commit_model_reload (self); +#line 4149 "gitg-commit-model.c" + } #line 89 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - g_object_notify ((GObject *) self, "sort-mode"); -#line 4137 "gitg-commit-model.c" + g_object_notify ((GObject *) self, "sort-mode"); +#line 4153 "gitg-commit-model.c" + } } @@ -4148,44 +4165,48 @@ result = _tmp0_; #line 101 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 4152 "gitg-commit-model.c" +#line 4169 "gitg-commit-model.c" } void gitg_commit_model_set_repository (GitgCommitModel* self, GitgRepository* value) { - GitgRepository* _tmp0_ = NULL; - GitgRepository* _tmp1_ = NULL; - GitgRepository* _tmp2_ = NULL; - GitgRepository* _tmp3_ = NULL; #line 102 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_return_if_fail (self != NULL); +#line 102 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" + if (gitg_commit_model_get_repository (self) != value) { +#line 4178 "gitg-commit-model.c" + GitgRepository* _tmp0_ = NULL; + GitgRepository* _tmp1_ = NULL; + GitgRepository* _tmp2_ = NULL; + GitgRepository* _tmp3_ = NULL; #line 104 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - _tmp0_ = self->priv->d_repository; + _tmp0_ = self->priv->d_repository; #line 104 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - _tmp1_ = value; + _tmp1_ = value; #line 104 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - if (_tmp0_ == _tmp1_) { + if (_tmp0_ == _tmp1_) { #line 106 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - return; -#line 4171 "gitg-commit-model.c" - } + return; +#line 4191 "gitg-commit-model.c" + } #line 109 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - gitg_commit_model_cancel (self); + gitg_commit_model_cancel (self); #line 111 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - _g_object_unref0 (self->priv->d_walker); + _g_object_unref0 (self->priv->d_walker); #line 111 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - self->priv->d_walker = NULL; + self->priv->d_walker = NULL; #line 112 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - _tmp2_ = value; + _tmp2_ = value; #line 112 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp3_ = _g_object_ref0 (_tmp2_); #line 112 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - _g_object_unref0 (self->priv->d_repository); + _g_object_unref0 (self->priv->d_repository); #line 112 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - self->priv->d_repository = _tmp3_; + self->priv->d_repository = _tmp3_; #line 102 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - g_object_notify ((GObject *) self, "repository"); -#line 4189 "gitg-commit-model.c" + g_object_notify ((GObject *) self, "repository"); +#line 4209 "gitg-commit-model.c" + } } @@ -4209,13 +4230,13 @@ if (result_length1) { #line 116 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" *result_length1 = _tmp1__length1; -#line 4213 "gitg-commit-model.c" +#line 4234 "gitg-commit-model.c" } #line 116 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" result = _tmp1_; #line 116 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 4219 "gitg-commit-model.c" +#line 4240 "gitg-commit-model.c" } @@ -4226,17 +4247,17 @@ result = g_new0 (GgitOId*, length + 1); #line 116 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" for (i = 0; i < length; i++) { -#line 4230 "gitg-commit-model.c" +#line 4251 "gitg-commit-model.c" GgitOId* _tmp0_ = NULL; #line 116 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" _tmp0_ = __vala_GgitOId_copy0 (self[i]); #line 116 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" result[i] = _tmp0_; -#line 4236 "gitg-commit-model.c" +#line 4257 "gitg-commit-model.c" } #line 116 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return result; -#line 4240 "gitg-commit-model.c" +#line 4261 "gitg-commit-model.c" } @@ -4263,7 +4284,7 @@ self->priv->_permanent_lanes_length1 = _tmp1__length1; #line 116 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" self->priv->__permanent_lanes_size_ = self->priv->_permanent_lanes_length1; -#line 4267 "gitg-commit-model.c" +#line 4288 "gitg-commit-model.c" } @@ -4288,7 +4309,7 @@ self->priv->d_sortmode = GGIT_SORT_TIME | GGIT_SORT_TOPOLOGICAL; #line 130 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" return obj; -#line 4292 "gitg-commit-model.c" +#line 4313 "gitg-commit-model.c" } @@ -4314,16 +4335,16 @@ #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_COMMIT_MODEL_REPOSITORY, g_param_spec_object ("repository", "repository", "repository", GITG_TYPE_REPOSITORY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - g_signal_new ("started", GITG_TYPE_COMMIT_MODEL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_commit_model_signals[GITG_COMMIT_MODEL_STARTED_SIGNAL] = g_signal_new ("started", GITG_TYPE_COMMIT_MODEL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - g_signal_new ("update", GITG_TYPE_COMMIT_MODEL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT); + gitg_commit_model_signals[GITG_COMMIT_MODEL_UPDATE_SIGNAL] = g_signal_new ("update", GITG_TYPE_COMMIT_MODEL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT); #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - g_signal_new ("finished", GITG_TYPE_COMMIT_MODEL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_commit_model_signals[GITG_COMMIT_MODEL_FINISHED_SIGNAL] = g_signal_new ("finished", GITG_TYPE_COMMIT_MODEL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - g_signal_new ("begin_clear", GITG_TYPE_COMMIT_MODEL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_commit_model_signals[GITG_COMMIT_MODEL_BEGIN_CLEAR_SIGNAL] = g_signal_new ("begin_clear", GITG_TYPE_COMMIT_MODEL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - g_signal_new ("end_clear", GITG_TYPE_COMMIT_MODEL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 4327 "gitg-commit-model.c" + gitg_commit_model_signals[GITG_COMMIT_MODEL_END_CLEAR_SIGNAL] = g_signal_new ("end_clear", GITG_TYPE_COMMIT_MODEL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 4348 "gitg-commit-model.c" } @@ -4331,30 +4352,30 @@ #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" gitg_commit_model_gtk_tree_model_parent_iface = g_type_interface_peek_parent (iface); #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - iface->get_column_type = (GType (*)(GtkTreeModel*, gint)) gitg_commit_model_real_get_column_type; + iface->get_column_type = (GType (*) (GtkTreeModel *, gint)) gitg_commit_model_real_get_column_type; #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - iface->get_flags = (GtkTreeModelFlags (*)(GtkTreeModel*)) gitg_commit_model_real_get_flags; + iface->get_flags = (GtkTreeModelFlags (*) (GtkTreeModel *)) gitg_commit_model_real_get_flags; #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - iface->get_iter = (gboolean (*)(GtkTreeModel*, GtkTreeIter*, GtkTreePath*)) gitg_commit_model_real_get_iter; + iface->get_iter = (gboolean (*) (GtkTreeModel *, GtkTreeIter*, GtkTreePath*)) gitg_commit_model_real_get_iter; #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - iface->get_n_columns = (gint (*)(GtkTreeModel*)) gitg_commit_model_real_get_n_columns; + iface->get_n_columns = (gint (*) (GtkTreeModel *)) gitg_commit_model_real_get_n_columns; #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - iface->get_path = (GtkTreePath* (*)(GtkTreeModel*, GtkTreeIter*)) gitg_commit_model_real_get_path; + iface->get_path = (GtkTreePath* (*) (GtkTreeModel *, GtkTreeIter*)) gitg_commit_model_real_get_path; #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - iface->get_value = (void (*)(GtkTreeModel*, GtkTreeIter*, gint, GValue*)) gitg_commit_model_real_get_value; + iface->get_value = (void (*) (GtkTreeModel *, GtkTreeIter*, gint, GValue*)) gitg_commit_model_real_get_value; #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - iface->iter_children = (gboolean (*)(GtkTreeModel*, GtkTreeIter*, GtkTreeIter*)) gitg_commit_model_real_iter_children; + iface->iter_children = (gboolean (*) (GtkTreeModel *, GtkTreeIter*, GtkTreeIter*)) gitg_commit_model_real_iter_children; #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - iface->iter_has_child = (gboolean (*)(GtkTreeModel*, GtkTreeIter*)) gitg_commit_model_real_iter_has_child; + iface->iter_has_child = (gboolean (*) (GtkTreeModel *, GtkTreeIter*)) gitg_commit_model_real_iter_has_child; #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - iface->iter_n_children = (gint (*)(GtkTreeModel*, GtkTreeIter*)) gitg_commit_model_real_iter_n_children; + iface->iter_n_children = (gint (*) (GtkTreeModel *, GtkTreeIter*)) gitg_commit_model_real_iter_n_children; #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - iface->iter_next = (gboolean (*)(GtkTreeModel*, GtkTreeIter*)) gitg_commit_model_real_iter_next; + iface->iter_next = (gboolean (*) (GtkTreeModel *, GtkTreeIter*)) gitg_commit_model_real_iter_next; #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - iface->iter_nth_child = (gboolean (*)(GtkTreeModel*, GtkTreeIter*, GtkTreeIter*, gint)) gitg_commit_model_real_iter_nth_child; + iface->iter_nth_child = (gboolean (*) (GtkTreeModel *, GtkTreeIter*, GtkTreeIter*, gint)) gitg_commit_model_real_iter_nth_child; #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" - iface->iter_parent = (gboolean (*)(GtkTreeModel*, GtkTreeIter*, GtkTreeIter*)) gitg_commit_model_real_iter_parent; -#line 4358 "gitg-commit-model.c" + iface->iter_parent = (gboolean (*) (GtkTreeModel *, GtkTreeIter*, GtkTreeIter*)) gitg_commit_model_real_iter_parent; +#line 4379 "gitg-commit-model.c" } @@ -4367,11 +4388,11 @@ g_rec_mutex_init (&self->priv->__lock_d_idleid); #line 76 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" g_rec_mutex_init (&self->priv->__lock_d_id_hash); -#line 4371 "gitg-commit-model.c" +#line 4392 "gitg-commit-model.c" } -static void gitg_commit_model_finalize (GObject* obj) { +static void gitg_commit_model_finalize (GObject * obj) { GitgCommitModel * self; #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_COMMIT_MODEL, GitgCommitModel); @@ -4405,7 +4426,7 @@ self->priv->_permanent_lanes = (_vala_array_free (self->priv->_permanent_lanes, self->priv->_permanent_lanes_length1, (GDestroyNotify) _vala_GgitOId_free), NULL); #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" G_OBJECT_CLASS (gitg_commit_model_parent_class)->finalize (obj); -#line 4409 "gitg-commit-model.c" +#line 4430 "gitg-commit-model.c" } @@ -4446,13 +4467,13 @@ g_value_set_object (value, gitg_commit_model_get_repository (self)); #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 4450 "gitg-commit-model.c" +#line 4471 "gitg-commit-model.c" default: #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 4456 "gitg-commit-model.c" +#line 4477 "gitg-commit-model.c" } } @@ -4480,13 +4501,13 @@ gitg_commit_model_set_repository (self, g_value_get_object (value)); #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 4484 "gitg-commit-model.c" +#line 4505 "gitg-commit-model.c" default: #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 64 "/home/jesse/dev/gitg/libgitg/gitg-commit-model.vala" break; -#line 4490 "gitg-commit-model.c" +#line 4511 "gitg-commit-model.c" } } diff -Nru gitg-3.22.0/libgitg/gitg-credentials-manager.c gitg-3.23.0/libgitg/gitg-credentials-manager.c --- gitg-3.22.0/libgitg/gitg-credentials-manager.c 2016-08-18 08:33:12.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-credentials-manager.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-credentials-manager.c generated by valac 0.32.1, the Vala compiler +/* gitg-credentials-manager.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-credentials-manager.vala, do not modify */ /* @@ -159,7 +159,7 @@ static GgitCred* gitg_credentials_manager_query_user_pass (GitgCredentialsManager* self, const gchar* url, const gchar* username, GError** error); static void _vala_SoupURI_free (SoupURI* self); GgitCred* gitg_credentials_manager_credentials (GitgCredentialsManager* self, const gchar* url, const gchar* username, GgitCredtype allowed_types, GError** error); -static void gitg_credentials_manager_finalize (GitgCredentialsManager* obj); +static void gitg_credentials_manager_finalize (GitgCredentialsManager * obj); static void _vala_clear_GMutex (GMutex * mutex); static void _vala_clear_GRecMutex (GRecMutex * mutex); static void _vala_clear_GRWLock (GRWLock * mutex); @@ -580,11 +580,11 @@ static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 590 "gitg-credentials-manager.c" } @@ -1171,17 +1171,17 @@ gboolean result = FALSE; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1395 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1395 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1396 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = needle; -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1396 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1396 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_ != NULL; -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1396 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 1187 "gitg-credentials-manager.c" } @@ -1979,7 +1979,7 @@ #line 28 "/home/jesse/dev/gitg/libgitg/gitg-credentials-manager.vala" if (collect_values[0].v_pointer) { #line 1982 "gitg-credentials-manager.c" - GitgCredentialsManager* object; + GitgCredentialsManager * object; object = collect_values[0].v_pointer; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-credentials-manager.vala" if (object->parent_instance.g_class == NULL) { @@ -2006,7 +2006,7 @@ static gchar* gitg_value_credentials_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GitgCredentialsManager** object_p; + GitgCredentialsManager ** object_p; object_p = collect_values[0].v_pointer; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-credentials-manager.vala" if (!object_p) { @@ -2058,7 +2058,7 @@ void gitg_value_set_credentials_manager (GValue* value, gpointer v_object) { - GitgCredentialsManager* old; + GitgCredentialsManager * old; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-credentials-manager.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_CREDENTIALS_MANAGER)); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-credentials-manager.vala" @@ -2089,7 +2089,7 @@ void gitg_value_take_credentials_manager (GValue* value, gpointer v_object) { - GitgCredentialsManager* old; + GitgCredentialsManager * old; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-credentials-manager.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_CREDENTIALS_MANAGER)); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-credentials-manager.vala" @@ -2202,7 +2202,7 @@ } -static void gitg_credentials_manager_finalize (GitgCredentialsManager* obj) { +static void gitg_credentials_manager_finalize (GitgCredentialsManager * obj) { GitgCredentialsManager * self; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-credentials-manager.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_CREDENTIALS_MANAGER, GitgCredentialsManager); @@ -2237,7 +2237,7 @@ gpointer gitg_credentials_manager_ref (gpointer instance) { - GitgCredentialsManager* self; + GitgCredentialsManager * self; self = instance; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-credentials-manager.vala" g_atomic_int_inc (&self->ref_count); @@ -2248,7 +2248,7 @@ void gitg_credentials_manager_unref (gpointer instance) { - GitgCredentialsManager* self; + GitgCredentialsManager * self; self = instance; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-credentials-manager.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { diff -Nru gitg-3.22.0/libgitg/gitg-date.c gitg-3.23.0/libgitg/gitg-date.c --- gitg-3.22.0/libgitg/gitg-date.c 2016-08-18 08:27:58.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-date.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-date.c generated by valac 0.32.1, the Vala compiler +/* gitg-date.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-date.vala, do not modify */ /* @@ -86,7 +86,7 @@ static gchar** gitg_date_s_months = NULL; static gint gitg_date_s_months_length1 = 0; static gint _gitg_date_s_months_size_ = 0; -static GInitableIface* gitg_date_g_initable_parent_iface = NULL; +static GInitableIface * gitg_date_g_initable_parent_iface = NULL; GQuark gitg_date_error_quark (void); GType gitg_date_get_type (void) G_GNUC_CONST; @@ -112,7 +112,7 @@ GDateTime* gitg_date_parse (const gchar* date, GError** error); GDateTime* gitg_date_get_date (GitgDate* self); void gitg_date_set_date_string (GitgDate* self, const gchar* value); -static void gitg_date_finalize (GObject* obj); +static void gitg_date_finalize (GObject * obj); static void _vala_gitg_date_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_date_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -175,15 +175,15 @@ gdouble result = 0.0; const gchar* _tmp0_ = NULL; gdouble _tmp1_ = 0.0; -#line 869 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 869 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (str != NULL, 0.0); -#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 870 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 870 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = g_ascii_strtod (_tmp0_, NULL); -#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 870 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_; -#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 870 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 189 "gitg-date.c" } @@ -242,15 +242,15 @@ gint64 result = 0LL; const gchar* _tmp0_ = NULL; gint64 _tmp1_ = 0LL; -#line 679 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 679 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (str != NULL, 0LL); -#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 680 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 680 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0); -#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 680 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_; -#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 680 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 256 "gitg-date.c" } @@ -933,7 +933,7 @@ #line 304 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" self = (GitgDate*) g_object_new (object_type, "date-string", _tmp0_, NULL); #line 305 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - g_initable_init (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_INITABLE, GInitable), NULL, &_inner_error_); + g_initable_init (G_TYPE_CHECK_INSTANCE_CAST (self, g_initable_get_type (), GInitable), NULL, &_inner_error_); #line 305 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 305 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" @@ -1018,240 +1018,213 @@ #line 344 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" if (_tmp10_ == 0) { #line 1021 "gitg-date.c" - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; + gchar* _tmp11_ = NULL; #line 346 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp11_ = _ ("Now"); + _tmp11_ = g_strdup (_ ("Now")); #line 346 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp12_ = g_strdup (_tmp11_); -#line 346 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - result = _tmp12_; + result = _tmp11_; #line 346 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _g_date_time_unref0 (dt); #line 346 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" return result; -#line 1034 "gitg-date.c" +#line 1031 "gitg-date.c" } else { + gint _tmp12_ = 0; gint _tmp13_ = 0; - const gchar* _tmp14_ = NULL; - gint _tmp15_ = 0; - gchar* _tmp16_ = NULL; + gchar* _tmp14_ = NULL; #line 350 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp13_ = rounded_minutes; + _tmp12_ = rounded_minutes; #line 350 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp14_ = ngettext ("A minute ago", "%d minutes ago", (gulong) _tmp13_); + _tmp13_ = rounded_minutes; #line 350 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp15_ = rounded_minutes; + _tmp14_ = g_strdup_printf (ngettext ("A minute ago", "%d minutes ago", (gulong) _tmp12_), _tmp13_); #line 350 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp16_ = g_strdup_printf (_tmp14_, _tmp15_); -#line 350 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - result = _tmp16_; + result = _tmp14_; #line 350 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _g_date_time_unref0 (dt); #line 350 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" return result; -#line 1054 "gitg-date.c" +#line 1048 "gitg-date.c" } } else { - GTimeSpan _tmp17_ = 0LL; + GTimeSpan _tmp15_ = 0LL; #line 353 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp17_ = t; + _tmp15_ = t; #line 353 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - if (_tmp17_ < (G_TIME_SPAN_MINUTE * 45)) { -#line 1062 "gitg-date.c" - const gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; -#line 355 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp18_ = _ ("Half an hour ago"); + if (_tmp15_ < (G_TIME_SPAN_MINUTE * 45)) { +#line 1056 "gitg-date.c" + gchar* _tmp16_ = NULL; #line 355 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp19_ = g_strdup (_tmp18_); + _tmp16_ = g_strdup (_ ("Half an hour ago")); #line 355 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - result = _tmp19_; + result = _tmp16_; #line 355 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _g_date_time_unref0 (dt); #line 355 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" return result; -#line 1075 "gitg-date.c" +#line 1066 "gitg-date.c" } else { - GTimeSpan _tmp20_ = 0LL; + GTimeSpan _tmp17_ = 0LL; #line 357 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp20_ = t; + _tmp17_ = t; #line 357 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - if (((gdouble) _tmp20_) < (G_TIME_SPAN_HOUR * 23.5)) { -#line 1082 "gitg-date.c" + if (((gdouble) _tmp17_) < (G_TIME_SPAN_HOUR * 23.5)) { +#line 1073 "gitg-date.c" gint rounded_hours = 0; - GTimeSpan _tmp21_ = 0LL; - gdouble _tmp22_ = 0.0; - gint _tmp23_ = 0; - const gchar* _tmp24_ = NULL; - gint _tmp25_ = 0; - gchar* _tmp26_ = NULL; + GTimeSpan _tmp18_ = 0LL; + gdouble _tmp19_ = 0.0; + gint _tmp20_ = 0; + gint _tmp21_ = 0; + gchar* _tmp22_ = NULL; #line 359 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp21_ = t; + _tmp18_ = t; #line 359 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp22_ = round ((gdouble) (((gfloat) _tmp21_) / G_TIME_SPAN_HOUR)); + _tmp19_ = round ((gdouble) (((gfloat) _tmp18_) / G_TIME_SPAN_HOUR)); #line 359 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - rounded_hours = (gint) _tmp22_; + rounded_hours = (gint) _tmp19_; #line 360 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp23_ = rounded_hours; + _tmp20_ = rounded_hours; #line 360 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp24_ = ngettext ("An hour ago", "%d hours ago", (gulong) _tmp23_); + _tmp21_ = rounded_hours; #line 360 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp25_ = rounded_hours; + _tmp22_ = g_strdup_printf (ngettext ("An hour ago", "%d hours ago", (gulong) _tmp20_), _tmp21_); #line 360 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp26_ = g_strdup_printf (_tmp24_, _tmp25_); -#line 360 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - result = _tmp26_; + result = _tmp22_; #line 360 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _g_date_time_unref0 (dt); #line 360 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" return result; -#line 1110 "gitg-date.c" +#line 1098 "gitg-date.c" } else { - GTimeSpan _tmp27_ = 0LL; + GTimeSpan _tmp23_ = 0LL; #line 362 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp27_ = t; + _tmp23_ = t; #line 362 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - if (_tmp27_ < (G_TIME_SPAN_DAY * 7)) { -#line 1117 "gitg-date.c" + if (_tmp23_ < (G_TIME_SPAN_DAY * 7)) { +#line 1105 "gitg-date.c" gint rounded_days = 0; - GTimeSpan _tmp28_ = 0LL; - gdouble _tmp29_ = 0.0; - gint _tmp30_ = 0; - const gchar* _tmp31_ = NULL; - gint _tmp32_ = 0; - gchar* _tmp33_ = NULL; + GTimeSpan _tmp24_ = 0LL; + gdouble _tmp25_ = 0.0; + gint _tmp26_ = 0; + gint _tmp27_ = 0; + gchar* _tmp28_ = NULL; #line 364 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp28_ = t; + _tmp24_ = t; #line 364 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp29_ = round ((gdouble) (((gfloat) _tmp28_) / G_TIME_SPAN_DAY)); + _tmp25_ = round ((gdouble) (((gfloat) _tmp24_) / G_TIME_SPAN_DAY)); #line 364 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - rounded_days = (gint) _tmp29_; + rounded_days = (gint) _tmp25_; #line 365 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp30_ = rounded_days; + _tmp26_ = rounded_days; #line 365 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp31_ = ngettext ("A day ago", "%d days ago", (gulong) _tmp30_); + _tmp27_ = rounded_days; #line 365 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp32_ = rounded_days; + _tmp28_ = g_strdup_printf (ngettext ("A day ago", "%d days ago", (gulong) _tmp26_), _tmp27_); #line 365 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp33_ = g_strdup_printf (_tmp31_, _tmp32_); -#line 365 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - result = _tmp33_; + result = _tmp28_; #line 365 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _g_date_time_unref0 (dt); #line 365 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" return result; -#line 1145 "gitg-date.c" +#line 1130 "gitg-date.c" } else { - GDateTime* _tmp34_ = NULL; - gint _tmp35_ = 0; - GDateTime* _tmp36_ = NULL; - GDateTime* _tmp37_ = NULL; - gint _tmp38_ = 0; - gboolean _tmp39_ = FALSE; + GDateTime* _tmp29_ = NULL; + gint _tmp30_ = 0; + GDateTime* _tmp31_ = NULL; + GDateTime* _tmp32_ = NULL; + gint _tmp33_ = 0; + gboolean _tmp34_ = FALSE; #line 367 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp34_ = dt; + _tmp29_ = dt; #line 367 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp35_ = g_date_time_get_year (_tmp34_); + _tmp30_ = g_date_time_get_year (_tmp29_); #line 367 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp36_ = g_date_time_new_now_local (); + _tmp31_ = g_date_time_new_now_local (); #line 367 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp37_ = _tmp36_; + _tmp32_ = _tmp31_; #line 367 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp38_ = g_date_time_get_year (_tmp37_); + _tmp33_ = g_date_time_get_year (_tmp32_); #line 367 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp39_ = _tmp35_ == _tmp38_; + _tmp34_ = _tmp30_ == _tmp33_; #line 367 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _g_date_time_unref0 (_tmp37_); + _g_date_time_unref0 (_tmp32_); #line 367 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - if (_tmp39_) { -#line 1169 "gitg-date.c" - gboolean _tmp40_ = FALSE; - gboolean _tmp41_ = FALSE; + if (_tmp34_) { +#line 1154 "gitg-date.c" + gboolean _tmp35_ = FALSE; + gboolean _tmp36_ = FALSE; #line 369 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp40_ = gitg_date_get_is_24h (self); + _tmp35_ = gitg_date_get_is_24h (self); #line 369 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp41_ = _tmp40_; + _tmp36_ = _tmp35_; #line 369 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - if (_tmp41_) { -#line 1178 "gitg-date.c" - GDateTime* _tmp42_ = NULL; - const gchar* _tmp43_ = NULL; - gchar* _tmp44_ = NULL; + if (_tmp36_) { +#line 1163 "gitg-date.c" + GDateTime* _tmp37_ = NULL; + gchar* _tmp38_ = NULL; #line 374 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp42_ = dt; + _tmp37_ = dt; #line 374 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp43_ = _ ("%b %e, %H:%M"); + _tmp38_ = g_date_time_format (_tmp37_, _ ("%b %e, %H:%M")); #line 374 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp44_ = g_date_time_format (_tmp42_, _tmp43_); -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - result = _tmp44_; + result = _tmp38_; #line 374 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _g_date_time_unref0 (dt); #line 374 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" return result; -#line 1194 "gitg-date.c" +#line 1176 "gitg-date.c" } else { - GDateTime* _tmp45_ = NULL; - const gchar* _tmp46_ = NULL; - gchar* _tmp47_ = NULL; -#line 381 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp45_ = dt; + GDateTime* _tmp39_ = NULL; + gchar* _tmp40_ = NULL; #line 381 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp46_ = _ ("%b %e, %I:%M %p"); + _tmp39_ = dt; #line 381 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp47_ = g_date_time_format (_tmp45_, _tmp46_); + _tmp40_ = g_date_time_format (_tmp39_, _ ("%b %e, %I:%M %p")); #line 381 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - result = _tmp47_; + result = _tmp40_; #line 381 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _g_date_time_unref0 (dt); #line 381 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" return result; -#line 1211 "gitg-date.c" +#line 1190 "gitg-date.c" } } else { - gboolean _tmp48_ = FALSE; - gboolean _tmp49_ = FALSE; + gboolean _tmp41_ = FALSE; + gboolean _tmp42_ = FALSE; #line 386 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp48_ = gitg_date_get_is_24h (self); + _tmp41_ = gitg_date_get_is_24h (self); #line 386 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp49_ = _tmp48_; + _tmp42_ = _tmp41_; #line 386 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - if (_tmp49_) { -#line 1222 "gitg-date.c" - GDateTime* _tmp50_ = NULL; - const gchar* _tmp51_ = NULL; - gchar* _tmp52_ = NULL; -#line 391 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp50_ = dt; + if (_tmp42_) { +#line 1201 "gitg-date.c" + GDateTime* _tmp43_ = NULL; + gchar* _tmp44_ = NULL; #line 391 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp51_ = _ ("%b %e %Y, %H:%M"); + _tmp43_ = dt; #line 391 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp52_ = g_date_time_format (_tmp50_, _tmp51_); + _tmp44_ = g_date_time_format (_tmp43_, _ ("%b %e %Y, %H:%M")); #line 391 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - result = _tmp52_; + result = _tmp44_; #line 391 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _g_date_time_unref0 (dt); #line 391 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" return result; -#line 1238 "gitg-date.c" +#line 1214 "gitg-date.c" } else { - GDateTime* _tmp53_ = NULL; - const gchar* _tmp54_ = NULL; - gchar* _tmp55_ = NULL; -#line 398 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp53_ = dt; + GDateTime* _tmp45_ = NULL; + gchar* _tmp46_ = NULL; #line 398 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp54_ = _ ("%b %e %Y, %I:%M %p"); + _tmp45_ = dt; #line 398 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp55_ = g_date_time_format (_tmp53_, _tmp54_); + _tmp46_ = g_date_time_format (_tmp45_, _ ("%b %e %Y, %I:%M %p")); #line 398 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - result = _tmp55_; + result = _tmp46_; #line 398 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _g_date_time_unref0 (dt); #line 398 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" return result; -#line 1255 "gitg-date.c" +#line 1228 "gitg-date.c" } } } @@ -1260,7 +1233,7 @@ } #line 335 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _g_date_time_unref0 (dt); -#line 1264 "gitg-date.c" +#line 1237 "gitg-date.c" } @@ -1282,14 +1255,14 @@ self->priv->d_datetime = _tmp1_; #line 403 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" return self; -#line 1286 "gitg-date.c" +#line 1259 "gitg-date.c" } GitgDate* gitg_date_new_for_date_time (GDateTime* dt) { #line 403 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" return gitg_date_construct_for_date_time (GITG_TYPE_DATE, dt); -#line 1293 "gitg-date.c" +#line 1266 "gitg-date.c" } @@ -1319,7 +1292,7 @@ g_propagate_error (error, _inner_error_); #line 410 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" return NULL; -#line 1323 "gitg-date.c" +#line 1296 "gitg-date.c" } #line 410 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _tmp3_ = _tmp0_; @@ -1343,7 +1316,7 @@ _g_object_unref0 (_tmp0_); #line 410 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" return result; -#line 1347 "gitg-date.c" +#line 1320 "gitg-date.c" } @@ -1358,26 +1331,30 @@ result = _tmp0_; #line 266 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" return result; -#line 1362 "gitg-date.c" +#line 1335 "gitg-date.c" } void gitg_date_set_date_string (GitgDate* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; #line 266 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" g_return_if_fail (self != NULL); #line 266 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp0_ = value; + if (g_strcmp0 (value, gitg_date_get_date_string (self)) != 0) { +#line 1344 "gitg-date.c" + const gchar* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; #line 266 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = value; #line 266 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - _g_free0 (self->priv->_date_string); + _tmp1_ = g_strdup (_tmp0_); #line 266 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - self->priv->_date_string = _tmp1_; + _g_free0 (self->priv->_date_string); #line 266 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - g_object_notify ((GObject *) self, "date-string"); -#line 1381 "gitg-date.c" + self->priv->_date_string = _tmp1_; +#line 266 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" + g_object_notify ((GObject *) self, "date-string"); +#line 1357 "gitg-date.c" + } } @@ -1392,14 +1369,14 @@ result = _tmp0_; #line 271 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" return result; -#line 1396 "gitg-date.c" +#line 1373 "gitg-date.c" } static gpointer _g_settings_schema_source_ref0 (gpointer self) { #line 314 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" return self ? g_settings_schema_source_ref (self) : NULL; -#line 1403 "gitg-date.c" +#line 1380 "gitg-date.c" } @@ -1416,21 +1393,21 @@ _tmp1_ = gitg_date_s_gnome_interface_settings; #line 312 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" if (_tmp1_ == NULL) { -#line 1420 "gitg-date.c" +#line 1397 "gitg-date.c" gboolean _tmp2_ = FALSE; #line 312 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _tmp2_ = gitg_date_s_tried_gnome_interface_settings; #line 312 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _tmp0_ = !_tmp2_; -#line 1426 "gitg-date.c" +#line 1403 "gitg-date.c" } else { #line 312 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _tmp0_ = FALSE; -#line 1430 "gitg-date.c" +#line 1407 "gitg-date.c" } #line 312 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" if (_tmp0_) { -#line 1434 "gitg-date.c" +#line 1411 "gitg-date.c" GSettingsSchemaSource* source = NULL; GSettingsSchemaSource* _tmp3_ = NULL; GSettingsSchemaSource* _tmp4_ = NULL; @@ -1454,7 +1431,7 @@ _tmp7_ = source; #line 320 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" if (_tmp7_ != NULL) { -#line 1458 "gitg-date.c" +#line 1435 "gitg-date.c" GSettingsSchemaSource* _tmp8_ = NULL; const gchar* _tmp9_ = NULL; GSettingsSchema* _tmp10_ = NULL; @@ -1471,15 +1448,15 @@ _tmp6_ = _tmp11_ != NULL; #line 320 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _g_settings_schema_unref0 (_tmp11_); -#line 1475 "gitg-date.c" +#line 1452 "gitg-date.c" } else { #line 320 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _tmp6_ = FALSE; -#line 1479 "gitg-date.c" +#line 1456 "gitg-date.c" } #line 320 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" if (_tmp6_) { -#line 1483 "gitg-date.c" +#line 1460 "gitg-date.c" const gchar* _tmp12_ = NULL; GSettings* _tmp13_ = NULL; #line 322 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" @@ -1490,13 +1467,13 @@ _g_object_unref0 (gitg_date_s_gnome_interface_settings); #line 322 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" gitg_date_s_gnome_interface_settings = _tmp13_; -#line 1494 "gitg-date.c" +#line 1471 "gitg-date.c" } #line 312 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _g_free0 (schema_id); #line 312 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _g_settings_schema_source_unref0 (source); -#line 1500 "gitg-date.c" +#line 1477 "gitg-date.c" } #line 326 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _tmp14_ = gitg_date_s_gnome_interface_settings; @@ -1506,7 +1483,7 @@ result = FALSE; #line 328 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" return result; -#line 1510 "gitg-date.c" +#line 1487 "gitg-date.c" } #line 331 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _tmp15_ = gitg_date_s_gnome_interface_settings; @@ -1516,19 +1493,19 @@ result = _tmp16_ == ((gint) G_DESKTOP_CLOCK_FORMAT_24H); #line 331 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" return result; -#line 1520 "gitg-date.c" +#line 1497 "gitg-date.c" } static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1532 "gitg-date.c" +#line 1509 "gitg-date.c" } @@ -1617,7 +1594,7 @@ gitg_date_s_months = _tmp12_; #line 37 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" gitg_date_s_months_length1 = 13; -#line 1621 "gitg-date.c" +#line 1598 "gitg-date.c" { GRegex* _tmp13_ = NULL; gchar* _tmp14_ = NULL; @@ -1685,7 +1662,7 @@ _tmp13_ = _tmp17_; #line 58 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1655 "gitg-date.c" +#line 1632 "gitg-date.c" goto __catch32_g_error; } #line 58 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" @@ -1736,7 +1713,7 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 94 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _g_regex_unref0 (_tmp13_); -#line 1682 "gitg-date.c" +#line 1659 "gitg-date.c" goto __catch32_g_error; } #line 94 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" @@ -1775,7 +1752,7 @@ _g_regex_unref0 (_tmp19_); #line 120 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _g_regex_unref0 (_tmp13_); -#line 1711 "gitg-date.c" +#line 1688 "gitg-date.c" goto __catch32_g_error; } #line 120 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" @@ -1792,7 +1769,7 @@ _g_regex_unref0 (_tmp19_); #line 55 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _g_regex_unref0 (_tmp13_); -#line 1728 "gitg-date.c" +#line 1705 "gitg-date.c" } goto __finally32; __catch32_g_error: @@ -1823,7 +1800,7 @@ _g_free0 (_tmp35_); #line 55 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" _g_error_free0 (e); -#line 1759 "gitg-date.c" +#line 1736 "gitg-date.c" } __finally32: #line 55 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" @@ -1832,7 +1809,7 @@ 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 55 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" g_clear_error (&_inner_error_); -#line 1768 "gitg-date.c" +#line 1745 "gitg-date.c" } } @@ -1841,19 +1818,19 @@ #line 28 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" gitg_date_g_initable_parent_iface = g_type_interface_peek_parent (iface); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" - iface->init = (gboolean (*)(GInitable*, GCancellable*, GError**)) gitg_date_real_init; -#line 1778 "gitg-date.c" + iface->init = (gboolean (*) (GInitable *, GCancellable*, GError**)) gitg_date_real_init; +#line 1755 "gitg-date.c" } static void gitg_date_instance_init (GitgDate * self) { #line 28 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" self->priv = GITG_DATE_GET_PRIVATE (self); -#line 1785 "gitg-date.c" +#line 1762 "gitg-date.c" } -static void gitg_date_finalize (GObject* obj) { +static void gitg_date_finalize (GObject * obj) { GitgDate * self; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_DATE, GitgDate); @@ -1863,7 +1840,7 @@ _g_free0 (self->priv->_date_string); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" G_OBJECT_CLASS (gitg_date_parent_class)->finalize (obj); -#line 1799 "gitg-date.c" +#line 1776 "gitg-date.c" } @@ -1874,7 +1851,7 @@ static const GInterfaceInfo g_initable_info = { (GInterfaceInitFunc) gitg_date_g_initable_interface_init, (GInterfaceFinalizeFunc) NULL, NULL}; GType gitg_date_type_id; gitg_date_type_id = g_type_register_static (G_TYPE_OBJECT, "GitgDate", &g_define_type_info, 0); - g_type_add_interface_static (gitg_date_type_id, G_TYPE_INITABLE, &g_initable_info); + g_type_add_interface_static (gitg_date_type_id, g_initable_get_type (), &g_initable_info); g_once_init_leave (&gitg_date_type_id__volatile, gitg_date_type_id); } return gitg_date_type_id__volatile; @@ -1898,13 +1875,13 @@ g_value_set_boxed (value, gitg_date_get_date (self)); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" break; -#line 1834 "gitg-date.c" +#line 1811 "gitg-date.c" default: #line 28 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" break; -#line 1840 "gitg-date.c" +#line 1817 "gitg-date.c" } } @@ -1920,13 +1897,13 @@ gitg_date_set_date_string (self, g_value_get_string (value)); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" break; -#line 1856 "gitg-date.c" +#line 1833 "gitg-date.c" default: #line 28 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-date.vala" break; -#line 1862 "gitg-date.c" +#line 1839 "gitg-date.c" } } diff -Nru gitg-3.22.0/libgitg/gitg-diff-image-composite.c gitg-3.23.0/libgitg/gitg-diff-image-composite.c --- gitg-3.22.0/libgitg/gitg-diff-image-composite.c 1970-01-01 00:00:00.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-image-composite.c 2016-11-26 12:23:15.000000000 +0000 @@ -0,0 +1,615 @@ +/* gitg-diff-image-composite.c generated by valac 0.34.0.108-f56ac, the Vala compiler + * generated from gitg-diff-image-composite.vala, do not modify */ + +/* + * This file is part of gitg + * + * Copyright (C) 2016 - Jesse van den Kieboom + * + * gitg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * gitg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gitg. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include + + +#define GITG_TYPE_DIFF_IMAGE_COMPOSITE (gitg_diff_image_composite_get_type ()) +#define GITG_DIFF_IMAGE_COMPOSITE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageComposite)) +#define GITG_DIFF_IMAGE_COMPOSITE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageCompositeClass)) +#define GITG_IS_DIFF_IMAGE_COMPOSITE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_IMAGE_COMPOSITE)) +#define GITG_IS_DIFF_IMAGE_COMPOSITE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GITG_TYPE_DIFF_IMAGE_COMPOSITE)) +#define GITG_DIFF_IMAGE_COMPOSITE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageCompositeClass)) + +typedef struct _GitgDiffImageComposite GitgDiffImageComposite; +typedef struct _GitgDiffImageCompositeClass GitgDiffImageCompositeClass; +typedef struct _GitgDiffImageCompositePrivate GitgDiffImageCompositePrivate; + +#define GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE (gitg_diff_image_surface_cache_get_type ()) +#define GITG_DIFF_IMAGE_SURFACE_CACHE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE, GitgDiffImageSurfaceCache)) +#define GITG_IS_DIFF_IMAGE_SURFACE_CACHE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE)) +#define GITG_DIFF_IMAGE_SURFACE_CACHE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE, GitgDiffImageSurfaceCacheIface)) + +typedef struct _GitgDiffImageSurfaceCache GitgDiffImageSurfaceCache; +typedef struct _GitgDiffImageSurfaceCacheIface GitgDiffImageSurfaceCacheIface; +#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) +#define _cairo_surface_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_surface_destroy (var), NULL))) + +struct _GitgDiffImageComposite { + GtkDrawingArea parent_instance; + GitgDiffImageCompositePrivate * priv; +}; + +struct _GitgDiffImageCompositeClass { + GtkDrawingAreaClass parent_class; +}; + +struct _GitgDiffImageSurfaceCacheIface { + GTypeInterface parent_iface; + cairo_surface_t* (*get_old_surface) (GitgDiffImageSurfaceCache* self, GdkWindow* window); + cairo_surface_t* (*get_new_surface) (GitgDiffImageSurfaceCache* self, GdkWindow* window); + GdkPixbuf* (*get_old_pixbuf) (GitgDiffImageSurfaceCache* self); + void (*set_old_pixbuf) (GitgDiffImageSurfaceCache* self, GdkPixbuf* value); + GdkPixbuf* (*get_new_pixbuf) (GitgDiffImageSurfaceCache* self); + void (*set_new_pixbuf) (GitgDiffImageSurfaceCache* self, GdkPixbuf* value); + GdkWindow* (*get_window) (GitgDiffImageSurfaceCache* self); + void (*set_window) (GitgDiffImageSurfaceCache* self, GdkWindow* value); +}; + +struct _GitgDiffImageCompositePrivate { + GitgDiffImageSurfaceCache* _cache; +}; + + +static gpointer gitg_diff_image_composite_parent_class = NULL; + +GType gitg_diff_image_composite_get_type (void) G_GNUC_CONST; +GType gitg_diff_image_surface_cache_get_type (void) G_GNUC_CONST; +#define GITG_DIFF_IMAGE_COMPOSITE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageCompositePrivate)) +enum { + GITG_DIFF_IMAGE_COMPOSITE_DUMMY_PROPERTY, + GITG_DIFF_IMAGE_COMPOSITE_CACHE +}; +static void gitg_diff_image_composite_get_natural_size (GitgDiffImageComposite* self, gint* image_width, gint* image_height); +GitgDiffImageSurfaceCache* gitg_diff_image_composite_get_cache (GitgDiffImageComposite* self); +GdkPixbuf* gitg_diff_image_surface_cache_get_old_pixbuf (GitgDiffImageSurfaceCache* self); +cairo_surface_t* gitg_diff_image_surface_cache_get_old_surface (GitgDiffImageSurfaceCache* self, GdkWindow* window); +void gitg_diff_image_composite_get_sizing (GitgDiffImageComposite* self, gint width, gint* image_width, gint* image_height); +static void gitg_diff_image_composite_real_get_preferred_width (GtkWidget* base, gint* minimum_width, gint* natural_width); +static void gitg_diff_image_composite_real_get_preferred_height_for_width (GtkWidget* base, gint width, gint* minimum_height, gint* natural_height); +static GtkSizeRequestMode gitg_diff_image_composite_real_get_request_mode (GtkWidget* base); +static gboolean gitg_diff_image_composite_real_draw (GtkWidget* base, cairo_t* cr); +static void gitg_diff_image_composite_real_realize (GtkWidget* base); +GitgDiffImageComposite* gitg_diff_image_composite_new (void); +GitgDiffImageComposite* gitg_diff_image_composite_construct (GType object_type); +void gitg_diff_image_composite_set_cache (GitgDiffImageComposite* self, GitgDiffImageSurfaceCache* value); +static void gitg_diff_image_composite_finalize (GObject * obj); +static void _vala_gitg_diff_image_composite_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); +static void _vala_gitg_diff_image_composite_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); + + +static gpointer _g_object_ref0 (gpointer self) { +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + return self ? g_object_ref (self) : NULL; +#line 111 "gitg-diff-image-composite.c" +} + + +static void gitg_diff_image_composite_get_natural_size (GitgDiffImageComposite* self, gint* image_width, gint* image_height) { + gint _vala_image_width = 0; + gint _vala_image_height = 0; + GdkPixbuf* pixbuf = NULL; + GitgDiffImageSurfaceCache* _tmp0_ = NULL; + GdkPixbuf* _tmp1_ = NULL; + GdkPixbuf* _tmp2_ = NULL; + GdkPixbuf* _tmp3_ = NULL; + GdkPixbuf* _tmp4_ = NULL; + GdkWindow* window = NULL; + GdkWindow* _tmp5_ = NULL; + GdkWindow* _tmp6_ = NULL; + gdouble xscale = 0.0; + gdouble yscale = 0.0; + GdkWindow* _tmp7_ = NULL; + GdkPixbuf* _tmp14_ = NULL; + gint _tmp15_ = 0; + gdouble _tmp16_ = 0.0; + GdkPixbuf* _tmp17_ = NULL; + gint _tmp18_ = 0; + gdouble _tmp19_ = 0.0; +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + g_return_if_fail (self != NULL); +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp0_ = self->priv->_cache; +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp1_ = gitg_diff_image_surface_cache_get_old_pixbuf (_tmp0_); +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp2_ = _tmp1_; +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp3_ = _g_object_ref0 (_tmp2_); +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + pixbuf = _tmp3_; +#line 28 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp4_ = pixbuf; +#line 28 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + if (_tmp4_ == NULL) { +#line 30 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _vala_image_width = 0; +#line 31 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _vala_image_height = 0; +#line 33 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _g_object_unref0 (pixbuf); +#line 33 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + if (image_width) { +#line 33 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + *image_width = _vala_image_width; +#line 162 "gitg-diff-image-composite.c" + } +#line 33 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + if (image_height) { +#line 33 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + *image_height = _vala_image_height; +#line 168 "gitg-diff-image-composite.c" + } +#line 33 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + return; +#line 172 "gitg-diff-image-composite.c" + } +#line 36 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp5_ = gtk_widget_get_window ((GtkWidget*) self); +#line 36 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp6_ = _g_object_ref0 (_tmp5_); +#line 36 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + window = _tmp6_; +#line 38 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + xscale = (gdouble) 1; +#line 38 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + yscale = (gdouble) 1; +#line 40 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp7_ = window; +#line 40 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + if (_tmp7_ != NULL) { +#line 188 "gitg-diff-image-composite.c" + GitgDiffImageSurfaceCache* _tmp8_ = NULL; + GdkWindow* _tmp9_ = NULL; + cairo_surface_t* _tmp10_ = NULL; + cairo_surface_t* _tmp11_ = NULL; + gdouble _tmp12_ = 0.0; + gdouble _tmp13_ = 0.0; +#line 42 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp8_ = self->priv->_cache; +#line 42 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp9_ = gtk_widget_get_window ((GtkWidget*) self); +#line 42 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp10_ = gitg_diff_image_surface_cache_get_old_surface (_tmp8_, _tmp9_); +#line 42 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp11_ = _tmp10_; +#line 42 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + cairo_surface_get_device_scale (_tmp11_, &_tmp12_, &_tmp13_); +#line 42 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + xscale = _tmp12_; +#line 42 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + yscale = _tmp13_; +#line 42 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _cairo_surface_destroy0 (_tmp11_); +#line 211 "gitg-diff-image-composite.c" + } +#line 45 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp14_ = pixbuf; +#line 45 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp15_ = gdk_pixbuf_get_width (_tmp14_); +#line 45 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp16_ = xscale; +#line 45 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _vala_image_width = (gint) (_tmp15_ / _tmp16_); +#line 46 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp17_ = pixbuf; +#line 46 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp18_ = gdk_pixbuf_get_height (_tmp17_); +#line 46 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp19_ = yscale; +#line 46 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _vala_image_height = (gint) (_tmp18_ / _tmp19_); +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _g_object_unref0 (window); +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _g_object_unref0 (pixbuf); +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + if (image_width) { +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + *image_width = _vala_image_width; +#line 237 "gitg-diff-image-composite.c" + } +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + if (image_height) { +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + *image_height = _vala_image_height; +#line 243 "gitg-diff-image-composite.c" + } +} + + +void gitg_diff_image_composite_get_sizing (GitgDiffImageComposite* self, gint width, gint* image_width, gint* image_height) { + gint _vala_image_width = 0; + gint _vala_image_height = 0; + gint _tmp0_ = 0; + gint _tmp1_ = 0; + gint _tmp2_ = 0; + gint _tmp3_ = 0; +#line 49 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + g_return_if_fail (self != NULL); +#line 51 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + gitg_diff_image_composite_get_natural_size (self, &_tmp0_, &_tmp1_); +#line 51 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _vala_image_width = _tmp0_; +#line 51 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _vala_image_height = _tmp1_; +#line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp2_ = _vala_image_width; +#line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp3_ = width; +#line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + if (_tmp2_ > _tmp3_) { +#line 269 "gitg-diff-image-composite.c" + gint _tmp4_ = 0; + gint _tmp5_ = 0; + gint _tmp6_ = 0; + gint _tmp7_ = 0; +#line 56 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp4_ = _vala_image_height; +#line 56 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp5_ = width; +#line 56 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp6_ = _vala_image_width; +#line 56 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _vala_image_height = _tmp4_ * (_tmp5_ / _tmp6_); +#line 57 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp7_ = width; +#line 57 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _vala_image_width = _tmp7_; +#line 286 "gitg-diff-image-composite.c" + } +#line 49 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + if (image_width) { +#line 49 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + *image_width = _vala_image_width; +#line 292 "gitg-diff-image-composite.c" + } +#line 49 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + if (image_height) { +#line 49 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + *image_height = _vala_image_height; +#line 298 "gitg-diff-image-composite.c" + } +} + + +static void gitg_diff_image_composite_real_get_preferred_width (GtkWidget* base, gint* minimum_width, gint* natural_width) { + GitgDiffImageComposite * self; + gint _vala_minimum_width = 0; + gint _vala_natural_width = 0; + gint natural_height = 0; + gint _tmp0_ = 0; + gint _tmp1_ = 0; +#line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + self = (GitgDiffImageComposite*) base; +#line 65 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + gitg_diff_image_composite_get_natural_size (self, &_tmp0_, &_tmp1_); +#line 65 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _vala_natural_width = _tmp0_; +#line 65 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + natural_height = _tmp1_; +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _vala_minimum_width = 0; +#line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + if (minimum_width) { +#line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + *minimum_width = _vala_minimum_width; +#line 324 "gitg-diff-image-composite.c" + } +#line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + if (natural_width) { +#line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + *natural_width = _vala_natural_width; +#line 330 "gitg-diff-image-composite.c" + } +} + + +static void gitg_diff_image_composite_real_get_preferred_height_for_width (GtkWidget* base, gint width, gint* minimum_height, gint* natural_height) { + GitgDiffImageComposite * self; + gint _vala_minimum_height = 0; + gint _vala_natural_height = 0; + gint image_width = 0; + gint image_height = 0; + gint _tmp0_ = 0; + gint _tmp1_ = 0; + gint _tmp2_ = 0; +#line 69 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + self = (GitgDiffImageComposite*) base; +#line 73 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp0_ = width; +#line 73 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + gitg_diff_image_composite_get_sizing (self, _tmp0_, &_tmp1_, &_tmp2_); +#line 73 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + image_width = _tmp1_; +#line 73 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + image_height = _tmp2_; +#line 75 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _vala_minimum_height = image_height; +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _vala_natural_height = image_height; +#line 69 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + if (minimum_height) { +#line 69 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + *minimum_height = _vala_minimum_height; +#line 362 "gitg-diff-image-composite.c" + } +#line 69 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + if (natural_height) { +#line 69 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + *natural_height = _vala_natural_height; +#line 368 "gitg-diff-image-composite.c" + } +} + + +static GtkSizeRequestMode gitg_diff_image_composite_real_get_request_mode (GtkWidget* base) { + GitgDiffImageComposite * self; + GtkSizeRequestMode result = 0; +#line 79 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + self = (GitgDiffImageComposite*) base; +#line 81 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + result = GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH; +#line 81 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + return result; +#line 382 "gitg-diff-image-composite.c" +} + + +static gboolean gitg_diff_image_composite_real_draw (GtkWidget* base, cairo_t* cr) { + GitgDiffImageComposite * self; + gboolean result = FALSE; + GtkAllocation alloc = {0}; + GtkAllocation _tmp0_ = {0}; + GtkStyleContext* ctx = NULL; + GtkStyleContext* _tmp1_ = NULL; + GtkStyleContext* _tmp2_ = NULL; + cairo_t* _tmp3_ = NULL; + GtkAllocation _tmp4_ = {0}; + gint _tmp5_ = 0; + GtkAllocation _tmp6_ = {0}; + gint _tmp7_ = 0; + GtkAllocation _tmp8_ = {0}; + gint _tmp9_ = 0; + GtkAllocation _tmp10_ = {0}; + gint _tmp11_ = 0; +#line 84 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + self = (GitgDiffImageComposite*) base; +#line 84 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + g_return_val_if_fail (cr != NULL, FALSE); +#line 87 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + gtk_widget_get_allocation ((GtkWidget*) self, &_tmp0_); +#line 87 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + alloc = _tmp0_; +#line 89 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp1_ = gtk_widget_get_style_context ((GtkWidget*) self); +#line 89 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp2_ = _g_object_ref0 (_tmp1_); +#line 89 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + ctx = _tmp2_; +#line 91 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp3_ = cr; +#line 91 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp4_ = alloc; +#line 91 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp5_ = _tmp4_.x; +#line 91 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp6_ = alloc; +#line 91 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp7_ = _tmp6_.y; +#line 91 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp8_ = alloc; +#line 91 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp9_ = _tmp8_.width; +#line 91 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp10_ = alloc; +#line 91 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp11_ = _tmp10_.height; +#line 91 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + gtk_render_background (ctx, _tmp3_, (gdouble) _tmp5_, (gdouble) _tmp7_, (gdouble) _tmp9_, (gdouble) _tmp11_); +#line 92 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + result = TRUE; +#line 92 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _g_object_unref0 (ctx); +#line 92 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + return result; +#line 443 "gitg-diff-image-composite.c" +} + + +static void gitg_diff_image_composite_real_realize (GtkWidget* base) { + GitgDiffImageComposite * self; +#line 95 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + self = (GitgDiffImageComposite*) base; +#line 97 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + GTK_WIDGET_CLASS (gitg_diff_image_composite_parent_class)->realize ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea)); +#line 98 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + gtk_widget_queue_resize ((GtkWidget*) self); +#line 455 "gitg-diff-image-composite.c" +} + + +GitgDiffImageComposite* gitg_diff_image_composite_construct (GType object_type) { + GitgDiffImageComposite * self = NULL; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + self = (GitgDiffImageComposite*) g_object_new (object_type, NULL); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + return self; +#line 465 "gitg-diff-image-composite.c" +} + + +GitgDiffImageComposite* gitg_diff_image_composite_new (void) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + return gitg_diff_image_composite_construct (GITG_TYPE_DIFF_IMAGE_COMPOSITE); +#line 472 "gitg-diff-image-composite.c" +} + + +GitgDiffImageSurfaceCache* gitg_diff_image_composite_get_cache (GitgDiffImageComposite* self) { + GitgDiffImageSurfaceCache* result; + GitgDiffImageSurfaceCache* _tmp0_ = NULL; +#line 22 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + g_return_val_if_fail (self != NULL, NULL); +#line 22 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp0_ = self->priv->_cache; +#line 22 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + result = _tmp0_; +#line 22 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + return result; +#line 487 "gitg-diff-image-composite.c" +} + + +void gitg_diff_image_composite_set_cache (GitgDiffImageComposite* self, GitgDiffImageSurfaceCache* value) { +#line 22 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + g_return_if_fail (self != NULL); +#line 22 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + if (gitg_diff_image_composite_get_cache (self) != value) { +#line 496 "gitg-diff-image-composite.c" + GitgDiffImageSurfaceCache* _tmp0_ = NULL; + GitgDiffImageSurfaceCache* _tmp1_ = NULL; +#line 22 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp0_ = value; +#line 22 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 22 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _g_object_unref0 (self->priv->_cache); +#line 22 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + self->priv->_cache = _tmp1_; +#line 22 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + g_object_notify ((GObject *) self, "cache"); +#line 509 "gitg-diff-image-composite.c" + } +} + + +static void gitg_diff_image_composite_class_init (GitgDiffImageCompositeClass * klass) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + gitg_diff_image_composite_parent_class = g_type_class_peek_parent (klass); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + g_type_class_add_private (klass, sizeof (GitgDiffImageCompositePrivate)); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + ((GtkWidgetClass *) klass)->get_preferred_width = gitg_diff_image_composite_real_get_preferred_width; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + ((GtkWidgetClass *) klass)->get_preferred_height_for_width = gitg_diff_image_composite_real_get_preferred_height_for_width; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + ((GtkWidgetClass *) klass)->get_request_mode = gitg_diff_image_composite_real_get_request_mode; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + ((GtkWidgetClass *) klass)->draw = gitg_diff_image_composite_real_draw; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + ((GtkWidgetClass *) klass)->realize = gitg_diff_image_composite_real_realize; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + G_OBJECT_CLASS (klass)->get_property = _vala_gitg_diff_image_composite_get_property; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + G_OBJECT_CLASS (klass)->set_property = _vala_gitg_diff_image_composite_set_property; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + G_OBJECT_CLASS (klass)->finalize = gitg_diff_image_composite_finalize; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_DIFF_IMAGE_COMPOSITE_CACHE, g_param_spec_object ("cache", "cache", "cache", GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); +#line 537 "gitg-diff-image-composite.c" +} + + +static void gitg_diff_image_composite_instance_init (GitgDiffImageComposite * self) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + self->priv = GITG_DIFF_IMAGE_COMPOSITE_GET_PRIVATE (self); +#line 544 "gitg-diff-image-composite.c" +} + + +static void gitg_diff_image_composite_finalize (GObject * obj) { + GitgDiffImageComposite * self; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageComposite); +#line 22 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + _g_object_unref0 (self->priv->_cache); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + G_OBJECT_CLASS (gitg_diff_image_composite_parent_class)->finalize (obj); +#line 556 "gitg-diff-image-composite.c" +} + + +GType gitg_diff_image_composite_get_type (void) { + static volatile gsize gitg_diff_image_composite_type_id__volatile = 0; + if (g_once_init_enter (&gitg_diff_image_composite_type_id__volatile)) { + static const GTypeInfo g_define_type_info = { sizeof (GitgDiffImageCompositeClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) gitg_diff_image_composite_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (GitgDiffImageComposite), 0, (GInstanceInitFunc) gitg_diff_image_composite_instance_init, NULL }; + GType gitg_diff_image_composite_type_id; + gitg_diff_image_composite_type_id = g_type_register_static (gtk_drawing_area_get_type (), "GitgDiffImageComposite", &g_define_type_info, 0); + g_once_init_leave (&gitg_diff_image_composite_type_id__volatile, gitg_diff_image_composite_type_id); + } + return gitg_diff_image_composite_type_id__volatile; +} + + +static void _vala_gitg_diff_image_composite_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { + GitgDiffImageComposite * self; + self = G_TYPE_CHECK_INSTANCE_CAST (object, GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageComposite); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + switch (property_id) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + case GITG_DIFF_IMAGE_COMPOSITE_CACHE: +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + g_value_set_object (value, gitg_diff_image_composite_get_cache (self)); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + break; +#line 583 "gitg-diff-image-composite.c" + default: +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + break; +#line 589 "gitg-diff-image-composite.c" + } +} + + +static void _vala_gitg_diff_image_composite_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { + GitgDiffImageComposite * self; + self = G_TYPE_CHECK_INSTANCE_CAST (object, GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageComposite); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + switch (property_id) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + case GITG_DIFF_IMAGE_COMPOSITE_CACHE: +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + gitg_diff_image_composite_set_cache (self, g_value_get_object (value)); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + break; +#line 605 "gitg-diff-image-composite.c" + default: +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-composite.vala" + break; +#line 611 "gitg-diff-image-composite.c" + } +} + + + diff -Nru gitg-3.22.0/libgitg/gitg-diff-image-composite.vala gitg-3.23.0/libgitg/gitg-diff-image-composite.vala --- gitg-3.22.0/libgitg/gitg-diff-image-composite.vala 1970-01-01 00:00:00.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-image-composite.vala 2016-11-26 08:32:25.000000000 +0000 @@ -0,0 +1,100 @@ +/* + * This file is part of gitg + * + * Copyright (C) 2016 - Jesse van den Kieboom + * + * gitg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * gitg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gitg. If not, see . + */ + +class Gitg.DiffImageComposite : Gtk.DrawingArea +{ + public Gitg.DiffImageSurfaceCache cache { get; set; } + + private void get_natural_size(out int image_width, out int image_height) + { + var pixbuf = cache.old_pixbuf; + + if (pixbuf == null) + { + image_width = 0; + image_height = 0; + + return; + } + + var window = get_window(); + + double xscale = 1, yscale = 1; + + if (window != null) + { + cache.get_old_surface(get_window()).get_device_scale(out xscale, out yscale); + } + + image_width = (int)(pixbuf.get_width() / xscale); + image_height = (int)(pixbuf.get_height() / yscale); + } + + protected void get_sizing(int width, out int image_width, out int image_height) + { + get_natural_size(out image_width, out image_height); + + // Scale down to fit in width + if (image_width > width) + { + image_height *= width / image_width; + image_width = width; + } + } + + protected override void get_preferred_width(out int minimum_width, out int natural_width) + { + int natural_height; + + get_natural_size(out natural_width, out natural_height); + minimum_width = 0; + } + + protected override void get_preferred_height_for_width(int width, out int minimum_height, out int natural_height) + { + int image_width, image_height; + + get_sizing(width, out image_width, out image_height); + + minimum_height = image_height; + natural_height = image_height; + } + + protected override Gtk.SizeRequestMode get_request_mode() + { + return Gtk.SizeRequestMode.HEIGHT_FOR_WIDTH; + } + + protected override bool draw(Cairo.Context cr) + { + Gtk.Allocation alloc; + get_allocation(out alloc); + + var ctx = get_style_context(); + + ctx.render_background(cr, alloc.x, alloc.y, alloc.width, alloc.height); + return true; + } + + protected override void realize() + { + base.realize(); + queue_resize(); + } +} diff -Nru gitg-3.22.0/libgitg/gitg-diff-image-difference.c gitg-3.23.0/libgitg/gitg-diff-image-difference.c --- gitg-3.22.0/libgitg/gitg-diff-image-difference.c 1970-01-01 00:00:00.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-image-difference.c 2016-11-26 12:23:15.000000000 +0000 @@ -0,0 +1,354 @@ +/* gitg-diff-image-difference.c generated by valac 0.34.0.108-f56ac, the Vala compiler + * generated from gitg-diff-image-difference.vala, do not modify */ + +/* + * This file is part of gitg + * + * Copyright (C) 2016 - Jesse van den Kieboom + * + * gitg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * gitg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gitg. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include + + +#define GITG_TYPE_DIFF_IMAGE_COMPOSITE (gitg_diff_image_composite_get_type ()) +#define GITG_DIFF_IMAGE_COMPOSITE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageComposite)) +#define GITG_DIFF_IMAGE_COMPOSITE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageCompositeClass)) +#define GITG_IS_DIFF_IMAGE_COMPOSITE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_IMAGE_COMPOSITE)) +#define GITG_IS_DIFF_IMAGE_COMPOSITE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GITG_TYPE_DIFF_IMAGE_COMPOSITE)) +#define GITG_DIFF_IMAGE_COMPOSITE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageCompositeClass)) + +typedef struct _GitgDiffImageComposite GitgDiffImageComposite; +typedef struct _GitgDiffImageCompositeClass GitgDiffImageCompositeClass; +typedef struct _GitgDiffImageCompositePrivate GitgDiffImageCompositePrivate; + +#define GITG_TYPE_DIFF_IMAGE_DIFFERENCE (gitg_diff_image_difference_get_type ()) +#define GITG_DIFF_IMAGE_DIFFERENCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_IMAGE_DIFFERENCE, GitgDiffImageDifference)) +#define GITG_DIFF_IMAGE_DIFFERENCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GITG_TYPE_DIFF_IMAGE_DIFFERENCE, GitgDiffImageDifferenceClass)) +#define GITG_IS_DIFF_IMAGE_DIFFERENCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_IMAGE_DIFFERENCE)) +#define GITG_IS_DIFF_IMAGE_DIFFERENCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GITG_TYPE_DIFF_IMAGE_DIFFERENCE)) +#define GITG_DIFF_IMAGE_DIFFERENCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GITG_TYPE_DIFF_IMAGE_DIFFERENCE, GitgDiffImageDifferenceClass)) + +typedef struct _GitgDiffImageDifference GitgDiffImageDifference; +typedef struct _GitgDiffImageDifferenceClass GitgDiffImageDifferenceClass; +typedef struct _GitgDiffImageDifferencePrivate GitgDiffImageDifferencePrivate; + +#define GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE (gitg_diff_image_surface_cache_get_type ()) +#define GITG_DIFF_IMAGE_SURFACE_CACHE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE, GitgDiffImageSurfaceCache)) +#define GITG_IS_DIFF_IMAGE_SURFACE_CACHE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE)) +#define GITG_DIFF_IMAGE_SURFACE_CACHE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE, GitgDiffImageSurfaceCacheIface)) + +typedef struct _GitgDiffImageSurfaceCache GitgDiffImageSurfaceCache; +typedef struct _GitgDiffImageSurfaceCacheIface GitgDiffImageSurfaceCacheIface; +#define _cairo_surface_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_surface_destroy (var), NULL))) +#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) + +struct _GitgDiffImageComposite { + GtkDrawingArea parent_instance; + GitgDiffImageCompositePrivate * priv; +}; + +struct _GitgDiffImageCompositeClass { + GtkDrawingAreaClass parent_class; +}; + +struct _GitgDiffImageDifference { + GitgDiffImageComposite parent_instance; + GitgDiffImageDifferencePrivate * priv; +}; + +struct _GitgDiffImageDifferenceClass { + GitgDiffImageCompositeClass parent_class; +}; + +struct _GitgDiffImageSurfaceCacheIface { + GTypeInterface parent_iface; + cairo_surface_t* (*get_old_surface) (GitgDiffImageSurfaceCache* self, GdkWindow* window); + cairo_surface_t* (*get_new_surface) (GitgDiffImageSurfaceCache* self, GdkWindow* window); + GdkPixbuf* (*get_old_pixbuf) (GitgDiffImageSurfaceCache* self); + void (*set_old_pixbuf) (GitgDiffImageSurfaceCache* self, GdkPixbuf* value); + GdkPixbuf* (*get_new_pixbuf) (GitgDiffImageSurfaceCache* self); + void (*set_new_pixbuf) (GitgDiffImageSurfaceCache* self, GdkPixbuf* value); + GdkWindow* (*get_window) (GitgDiffImageSurfaceCache* self); + void (*set_window) (GitgDiffImageSurfaceCache* self, GdkWindow* value); +}; + + +static gpointer gitg_diff_image_difference_parent_class = NULL; + +GType gitg_diff_image_composite_get_type (void) G_GNUC_CONST; +GType gitg_diff_image_difference_get_type (void) G_GNUC_CONST; +enum { + GITG_DIFF_IMAGE_DIFFERENCE_DUMMY_PROPERTY +}; +static gboolean gitg_diff_image_difference_real_draw (GtkWidget* base, cairo_t* cr); +void gitg_diff_image_composite_get_sizing (GitgDiffImageComposite* self, gint width, gint* image_width, gint* image_height); +GType gitg_diff_image_surface_cache_get_type (void) G_GNUC_CONST; +GitgDiffImageSurfaceCache* gitg_diff_image_composite_get_cache (GitgDiffImageComposite* self); +cairo_surface_t* gitg_diff_image_surface_cache_get_old_surface (GitgDiffImageSurfaceCache* self, GdkWindow* window); +cairo_surface_t* gitg_diff_image_surface_cache_get_new_surface (GitgDiffImageSurfaceCache* self, GdkWindow* window); +static void gitg_diff_image_difference_real_realize (GtkWidget* base); +GitgDiffImageDifference* gitg_diff_image_difference_new (void); +GitgDiffImageDifference* gitg_diff_image_difference_construct (GType object_type); +GitgDiffImageComposite* gitg_diff_image_composite_new (void); +GitgDiffImageComposite* gitg_diff_image_composite_construct (GType object_type); + + +static gpointer _g_object_ref0 (gpointer self) { +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + return self ? g_object_ref (self) : NULL; +#line 120 "gitg-diff-image-difference.c" +} + + +static gboolean gitg_diff_image_difference_real_draw (GtkWidget* base, cairo_t* cr) { + GitgDiffImageDifference * self; + gboolean result = FALSE; + cairo_t* _tmp0_ = NULL; + GdkWindow* window = NULL; + GdkWindow* _tmp1_ = NULL; + GdkWindow* _tmp2_ = NULL; + GtkAllocation alloc = {0}; + GtkAllocation _tmp3_ = {0}; + gint image_width = 0; + gint image_height = 0; + GtkAllocation _tmp4_ = {0}; + gint _tmp5_ = 0; + gint _tmp6_ = 0; + gint _tmp7_ = 0; + cairo_surface_t* old_surface = NULL; + GitgDiffImageSurfaceCache* _tmp8_ = NULL; + GitgDiffImageSurfaceCache* _tmp9_ = NULL; + GdkWindow* _tmp10_ = NULL; + cairo_surface_t* _tmp11_ = NULL; + cairo_surface_t* new_surface = NULL; + GitgDiffImageSurfaceCache* _tmp12_ = NULL; + GitgDiffImageSurfaceCache* _tmp13_ = NULL; + GdkWindow* _tmp14_ = NULL; + cairo_surface_t* _tmp15_ = NULL; + gint x = 0; + GtkAllocation _tmp16_ = {0}; + gint _tmp17_ = 0; + gint _tmp18_ = 0; + gint y = 0; + cairo_surface_t* _tmp19_ = NULL; + cairo_surface_t* _tmp25_ = NULL; +#line 22 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + self = (GitgDiffImageDifference*) base; +#line 22 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + g_return_val_if_fail (cr != NULL, FALSE); +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp0_ = cr; +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + GTK_WIDGET_CLASS (gitg_diff_image_difference_parent_class)->draw ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (self, GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageComposite), _tmp0_); +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp1_ = gtk_widget_get_window ((GtkWidget*) self); +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp2_ = _g_object_ref0 (_tmp1_); +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + window = _tmp2_; +#line 29 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + gtk_widget_get_allocation ((GtkWidget*) self, &_tmp3_); +#line 29 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + alloc = _tmp3_; +#line 32 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp4_ = alloc; +#line 32 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp5_ = _tmp4_.width; +#line 32 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + gitg_diff_image_composite_get_sizing ((GitgDiffImageComposite*) self, _tmp5_, &_tmp6_, &_tmp7_); +#line 32 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + image_width = _tmp6_; +#line 32 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + image_height = _tmp7_; +#line 34 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp8_ = gitg_diff_image_composite_get_cache ((GitgDiffImageComposite*) self); +#line 34 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp9_ = _tmp8_; +#line 34 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp10_ = window; +#line 34 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp11_ = gitg_diff_image_surface_cache_get_old_surface (_tmp9_, _tmp10_); +#line 34 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + old_surface = _tmp11_; +#line 35 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp12_ = gitg_diff_image_composite_get_cache ((GitgDiffImageComposite*) self); +#line 35 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp13_ = _tmp12_; +#line 35 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp14_ = window; +#line 35 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp15_ = gitg_diff_image_surface_cache_get_new_surface (_tmp13_, _tmp14_); +#line 35 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + new_surface = _tmp15_; +#line 37 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp16_ = alloc; +#line 37 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp17_ = _tmp16_.width; +#line 37 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp18_ = image_width; +#line 37 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + x = (_tmp17_ - _tmp18_) / 2; +#line 38 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + y = 0; +#line 40 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp19_ = old_surface; +#line 40 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + if (_tmp19_ != NULL) { +#line 218 "gitg-diff-image-difference.c" + cairo_t* _tmp20_ = NULL; + cairo_surface_t* _tmp21_ = NULL; + gint _tmp22_ = 0; + gint _tmp23_ = 0; + cairo_t* _tmp24_ = NULL; +#line 42 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp20_ = cr; +#line 42 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp21_ = old_surface; +#line 42 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp22_ = x; +#line 42 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp23_ = y; +#line 42 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + cairo_set_source_surface (_tmp20_, _tmp21_, (gdouble) _tmp22_, (gdouble) _tmp23_); +#line 43 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp24_ = cr; +#line 43 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + cairo_paint (_tmp24_); +#line 238 "gitg-diff-image-difference.c" + } +#line 46 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp25_ = new_surface; +#line 46 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + if (_tmp25_ != NULL) { +#line 244 "gitg-diff-image-difference.c" + cairo_t* _tmp26_ = NULL; + cairo_t* _tmp33_ = NULL; +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp26_ = cr; +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + cairo_save (_tmp26_); +#line 251 "gitg-diff-image-difference.c" + { + cairo_t* _tmp27_ = NULL; + cairo_t* _tmp28_ = NULL; + cairo_surface_t* _tmp29_ = NULL; + gint _tmp30_ = 0; + gint _tmp31_ = 0; + cairo_t* _tmp32_ = NULL; +#line 50 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp27_ = cr; +#line 50 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + cairo_set_operator (_tmp27_, CAIRO_OPERATOR_DIFFERENCE); +#line 51 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp28_ = cr; +#line 51 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp29_ = new_surface; +#line 51 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp30_ = x; +#line 51 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp31_ = y; +#line 51 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + cairo_set_source_surface (_tmp28_, _tmp29_, (gdouble) _tmp30_, (gdouble) _tmp31_); +#line 52 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp32_ = cr; +#line 52 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + cairo_paint (_tmp32_); +#line 277 "gitg-diff-image-difference.c" + } +#line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _tmp33_ = cr; +#line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + cairo_restore (_tmp33_); +#line 283 "gitg-diff-image-difference.c" + } +#line 57 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + result = TRUE; +#line 57 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _cairo_surface_destroy0 (new_surface); +#line 57 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _cairo_surface_destroy0 (old_surface); +#line 57 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + _g_object_unref0 (window); +#line 57 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + return result; +#line 295 "gitg-diff-image-difference.c" +} + + +static void gitg_diff_image_difference_real_realize (GtkWidget* base) { + GitgDiffImageDifference * self; +#line 60 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + self = (GitgDiffImageDifference*) base; +#line 62 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + GTK_WIDGET_CLASS (gitg_diff_image_difference_parent_class)->realize ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (self, GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageComposite)); +#line 63 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + gtk_widget_queue_resize ((GtkWidget*) self); +#line 307 "gitg-diff-image-difference.c" +} + + +GitgDiffImageDifference* gitg_diff_image_difference_construct (GType object_type) { + GitgDiffImageDifference * self = NULL; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + self = (GitgDiffImageDifference*) gitg_diff_image_composite_construct (object_type); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + return self; +#line 317 "gitg-diff-image-difference.c" +} + + +GitgDiffImageDifference* gitg_diff_image_difference_new (void) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + return gitg_diff_image_difference_construct (GITG_TYPE_DIFF_IMAGE_DIFFERENCE); +#line 324 "gitg-diff-image-difference.c" +} + + +static void gitg_diff_image_difference_class_init (GitgDiffImageDifferenceClass * klass) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + gitg_diff_image_difference_parent_class = g_type_class_peek_parent (klass); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + ((GtkWidgetClass *) klass)->draw = gitg_diff_image_difference_real_draw; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-difference.vala" + ((GtkWidgetClass *) klass)->realize = gitg_diff_image_difference_real_realize; +#line 335 "gitg-diff-image-difference.c" +} + + +static void gitg_diff_image_difference_instance_init (GitgDiffImageDifference * self) { +} + + +GType gitg_diff_image_difference_get_type (void) { + static volatile gsize gitg_diff_image_difference_type_id__volatile = 0; + if (g_once_init_enter (&gitg_diff_image_difference_type_id__volatile)) { + static const GTypeInfo g_define_type_info = { sizeof (GitgDiffImageDifferenceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) gitg_diff_image_difference_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (GitgDiffImageDifference), 0, (GInstanceInitFunc) gitg_diff_image_difference_instance_init, NULL }; + GType gitg_diff_image_difference_type_id; + gitg_diff_image_difference_type_id = g_type_register_static (GITG_TYPE_DIFF_IMAGE_COMPOSITE, "GitgDiffImageDifference", &g_define_type_info, 0); + g_once_init_leave (&gitg_diff_image_difference_type_id__volatile, gitg_diff_image_difference_type_id); + } + return gitg_diff_image_difference_type_id__volatile; +} + + + diff -Nru gitg-3.22.0/libgitg/gitg-diff-image-difference.vala gitg-3.23.0/libgitg/gitg-diff-image-difference.vala --- gitg-3.22.0/libgitg/gitg-diff-image-difference.vala 1970-01-01 00:00:00.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-image-difference.vala 2016-11-26 08:32:25.000000000 +0000 @@ -0,0 +1,65 @@ +/* + * This file is part of gitg + * + * Copyright (C) 2016 - Jesse van den Kieboom + * + * gitg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * gitg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gitg. If not, see . + */ + +class Gitg.DiffImageDifference : DiffImageComposite +{ + protected override bool draw(Cairo.Context cr) + { + base.draw(cr); + + var window = get_window(); + + Gtk.Allocation alloc; + get_allocation(out alloc); + + int image_width, image_height; + get_sizing(alloc.width, out image_width, out image_height); + + var old_surface = cache.get_old_surface(window); + var new_surface = cache.get_new_surface(window); + + int x = (alloc.width - image_width) / 2; + int y = 0; + + if (old_surface != null) + { + cr.set_source_surface(old_surface, x, y); + cr.paint(); + } + + if (new_surface != null) + { + cr.save(); + { + cr.set_operator(Cairo.Operator.DIFFERENCE); + cr.set_source_surface(new_surface, x, y); + cr.paint(); + } + cr.restore(); + } + + return true; + } + + protected override void realize() + { + base.realize(); + queue_resize(); + } +} diff -Nru gitg-3.22.0/libgitg/gitg-diff-image-overlay.c gitg-3.23.0/libgitg/gitg-diff-image-overlay.c --- gitg-3.22.0/libgitg/gitg-diff-image-overlay.c 1970-01-01 00:00:00.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-image-overlay.c 2016-11-26 12:23:15.000000000 +0000 @@ -0,0 +1,507 @@ +/* gitg-diff-image-overlay.c generated by valac 0.34.0.108-f56ac, the Vala compiler + * generated from gitg-diff-image-overlay.vala, do not modify */ + +/* + * This file is part of gitg + * + * Copyright (C) 2016 - Jesse van den Kieboom + * + * gitg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * gitg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gitg. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include + + +#define GITG_TYPE_DIFF_IMAGE_COMPOSITE (gitg_diff_image_composite_get_type ()) +#define GITG_DIFF_IMAGE_COMPOSITE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageComposite)) +#define GITG_DIFF_IMAGE_COMPOSITE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageCompositeClass)) +#define GITG_IS_DIFF_IMAGE_COMPOSITE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_IMAGE_COMPOSITE)) +#define GITG_IS_DIFF_IMAGE_COMPOSITE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GITG_TYPE_DIFF_IMAGE_COMPOSITE)) +#define GITG_DIFF_IMAGE_COMPOSITE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageCompositeClass)) + +typedef struct _GitgDiffImageComposite GitgDiffImageComposite; +typedef struct _GitgDiffImageCompositeClass GitgDiffImageCompositeClass; +typedef struct _GitgDiffImageCompositePrivate GitgDiffImageCompositePrivate; + +#define GITG_TYPE_DIFF_IMAGE_OVERLAY (gitg_diff_image_overlay_get_type ()) +#define GITG_DIFF_IMAGE_OVERLAY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_IMAGE_OVERLAY, GitgDiffImageOverlay)) +#define GITG_DIFF_IMAGE_OVERLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GITG_TYPE_DIFF_IMAGE_OVERLAY, GitgDiffImageOverlayClass)) +#define GITG_IS_DIFF_IMAGE_OVERLAY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_IMAGE_OVERLAY)) +#define GITG_IS_DIFF_IMAGE_OVERLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GITG_TYPE_DIFF_IMAGE_OVERLAY)) +#define GITG_DIFF_IMAGE_OVERLAY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GITG_TYPE_DIFF_IMAGE_OVERLAY, GitgDiffImageOverlayClass)) + +typedef struct _GitgDiffImageOverlay GitgDiffImageOverlay; +typedef struct _GitgDiffImageOverlayClass GitgDiffImageOverlayClass; +typedef struct _GitgDiffImageOverlayPrivate GitgDiffImageOverlayPrivate; + +#define GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE (gitg_diff_image_surface_cache_get_type ()) +#define GITG_DIFF_IMAGE_SURFACE_CACHE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE, GitgDiffImageSurfaceCache)) +#define GITG_IS_DIFF_IMAGE_SURFACE_CACHE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE)) +#define GITG_DIFF_IMAGE_SURFACE_CACHE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE, GitgDiffImageSurfaceCacheIface)) + +typedef struct _GitgDiffImageSurfaceCache GitgDiffImageSurfaceCache; +typedef struct _GitgDiffImageSurfaceCacheIface GitgDiffImageSurfaceCacheIface; +#define _cairo_surface_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_surface_destroy (var), NULL))) +#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) + +struct _GitgDiffImageComposite { + GtkDrawingArea parent_instance; + GitgDiffImageCompositePrivate * priv; +}; + +struct _GitgDiffImageCompositeClass { + GtkDrawingAreaClass parent_class; +}; + +struct _GitgDiffImageOverlay { + GitgDiffImageComposite parent_instance; + GitgDiffImageOverlayPrivate * priv; +}; + +struct _GitgDiffImageOverlayClass { + GitgDiffImageCompositeClass parent_class; +}; + +struct _GitgDiffImageOverlayPrivate { + gdouble d_alpha; +}; + +struct _GitgDiffImageSurfaceCacheIface { + GTypeInterface parent_iface; + cairo_surface_t* (*get_old_surface) (GitgDiffImageSurfaceCache* self, GdkWindow* window); + cairo_surface_t* (*get_new_surface) (GitgDiffImageSurfaceCache* self, GdkWindow* window); + GdkPixbuf* (*get_old_pixbuf) (GitgDiffImageSurfaceCache* self); + void (*set_old_pixbuf) (GitgDiffImageSurfaceCache* self, GdkPixbuf* value); + GdkPixbuf* (*get_new_pixbuf) (GitgDiffImageSurfaceCache* self); + void (*set_new_pixbuf) (GitgDiffImageSurfaceCache* self, GdkPixbuf* value); + GdkWindow* (*get_window) (GitgDiffImageSurfaceCache* self); + void (*set_window) (GitgDiffImageSurfaceCache* self, GdkWindow* value); +}; + + +static gpointer gitg_diff_image_overlay_parent_class = NULL; + +GType gitg_diff_image_composite_get_type (void) G_GNUC_CONST; +GType gitg_diff_image_overlay_get_type (void) G_GNUC_CONST; +#define GITG_DIFF_IMAGE_OVERLAY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_DIFF_IMAGE_OVERLAY, GitgDiffImageOverlayPrivate)) +enum { + GITG_DIFF_IMAGE_OVERLAY_DUMMY_PROPERTY, + GITG_DIFF_IMAGE_OVERLAY_ALPHA +}; +static gboolean gitg_diff_image_overlay_real_draw (GtkWidget* base, cairo_t* cr); +void gitg_diff_image_composite_get_sizing (GitgDiffImageComposite* self, gint width, gint* image_width, gint* image_height); +GType gitg_diff_image_surface_cache_get_type (void) G_GNUC_CONST; +GitgDiffImageSurfaceCache* gitg_diff_image_composite_get_cache (GitgDiffImageComposite* self); +cairo_surface_t* gitg_diff_image_surface_cache_get_old_surface (GitgDiffImageSurfaceCache* self, GdkWindow* window); +cairo_surface_t* gitg_diff_image_surface_cache_get_new_surface (GitgDiffImageSurfaceCache* self, GdkWindow* window); +static void gitg_diff_image_overlay_real_realize (GtkWidget* base); +GitgDiffImageOverlay* gitg_diff_image_overlay_new (void); +GitgDiffImageOverlay* gitg_diff_image_overlay_construct (GType object_type); +GitgDiffImageComposite* gitg_diff_image_composite_new (void); +GitgDiffImageComposite* gitg_diff_image_composite_construct (GType object_type); +gdouble gitg_diff_image_overlay_get_alpha (GitgDiffImageOverlay* self); +void gitg_diff_image_overlay_set_alpha (GitgDiffImageOverlay* self, gdouble value); +static void gitg_diff_image_overlay_finalize (GObject * obj); +static void _vala_gitg_diff_image_overlay_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); +static void _vala_gitg_diff_image_overlay_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); + + +static gpointer _g_object_ref0 (gpointer self) { +#line 46 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + return self ? g_object_ref (self) : NULL; +#line 131 "gitg-diff-image-overlay.c" +} + + +static gboolean gitg_diff_image_overlay_real_draw (GtkWidget* base, cairo_t* cr) { + GitgDiffImageOverlay * self; + gboolean result = FALSE; + cairo_t* _tmp0_ = NULL; + GdkWindow* window = NULL; + GdkWindow* _tmp1_ = NULL; + GdkWindow* _tmp2_ = NULL; + GtkAllocation alloc = {0}; + GtkAllocation _tmp3_ = {0}; + gint image_width = 0; + gint image_height = 0; + GtkAllocation _tmp4_ = {0}; + gint _tmp5_ = 0; + gint _tmp6_ = 0; + gint _tmp7_ = 0; + cairo_surface_t* old_surface = NULL; + GitgDiffImageSurfaceCache* _tmp8_ = NULL; + GitgDiffImageSurfaceCache* _tmp9_ = NULL; + GdkWindow* _tmp10_ = NULL; + cairo_surface_t* _tmp11_ = NULL; + cairo_surface_t* new_surface = NULL; + GitgDiffImageSurfaceCache* _tmp12_ = NULL; + GitgDiffImageSurfaceCache* _tmp13_ = NULL; + GdkWindow* _tmp14_ = NULL; + cairo_surface_t* _tmp15_ = NULL; + gint x = 0; + GtkAllocation _tmp16_ = {0}; + gint _tmp17_ = 0; + gint _tmp18_ = 0; + gint y = 0; + gboolean _tmp19_ = FALSE; + cairo_surface_t* _tmp20_ = NULL; + gboolean _tmp28_ = FALSE; + cairo_surface_t* _tmp29_ = NULL; +#line 42 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + self = (GitgDiffImageOverlay*) base; +#line 42 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + g_return_val_if_fail (cr != NULL, FALSE); +#line 44 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp0_ = cr; +#line 44 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + GTK_WIDGET_CLASS (gitg_diff_image_overlay_parent_class)->draw ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (self, GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageComposite), _tmp0_); +#line 46 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp1_ = gtk_widget_get_window ((GtkWidget*) self); +#line 46 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp2_ = _g_object_ref0 (_tmp1_); +#line 46 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + window = _tmp2_; +#line 49 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + gtk_widget_get_allocation ((GtkWidget*) self, &_tmp3_); +#line 49 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + alloc = _tmp3_; +#line 52 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp4_ = alloc; +#line 52 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp5_ = _tmp4_.width; +#line 52 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + gitg_diff_image_composite_get_sizing ((GitgDiffImageComposite*) self, _tmp5_, &_tmp6_, &_tmp7_); +#line 52 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + image_width = _tmp6_; +#line 52 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + image_height = _tmp7_; +#line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp8_ = gitg_diff_image_composite_get_cache ((GitgDiffImageComposite*) self); +#line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp9_ = _tmp8_; +#line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp10_ = window; +#line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp11_ = gitg_diff_image_surface_cache_get_old_surface (_tmp9_, _tmp10_); +#line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + old_surface = _tmp11_; +#line 55 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp12_ = gitg_diff_image_composite_get_cache ((GitgDiffImageComposite*) self); +#line 55 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp13_ = _tmp12_; +#line 55 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp14_ = window; +#line 55 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp15_ = gitg_diff_image_surface_cache_get_new_surface (_tmp13_, _tmp14_); +#line 55 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + new_surface = _tmp15_; +#line 57 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp16_ = alloc; +#line 57 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp17_ = _tmp16_.width; +#line 57 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp18_ = image_width; +#line 57 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + x = (_tmp17_ - _tmp18_) / 2; +#line 58 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + y = 0; +#line 60 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp20_ = old_surface; +#line 60 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + if (_tmp20_ != NULL) { +#line 231 "gitg-diff-image-overlay.c" + gdouble _tmp21_ = 0.0; +#line 60 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp21_ = self->priv->d_alpha; +#line 60 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp19_ = _tmp21_ != ((gdouble) 1); +#line 237 "gitg-diff-image-overlay.c" + } else { +#line 60 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp19_ = FALSE; +#line 241 "gitg-diff-image-overlay.c" + } +#line 60 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + if (_tmp19_) { +#line 245 "gitg-diff-image-overlay.c" + cairo_t* _tmp22_ = NULL; + cairo_surface_t* _tmp23_ = NULL; + gint _tmp24_ = 0; + gint _tmp25_ = 0; + cairo_t* _tmp26_ = NULL; + gdouble _tmp27_ = 0.0; +#line 62 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp22_ = cr; +#line 62 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp23_ = old_surface; +#line 62 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp24_ = x; +#line 62 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp25_ = y; +#line 62 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + cairo_set_source_surface (_tmp22_, _tmp23_, (gdouble) _tmp24_, (gdouble) _tmp25_); +#line 63 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp26_ = cr; +#line 63 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp27_ = self->priv->d_alpha; +#line 63 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + cairo_paint_with_alpha (_tmp26_, 1 - _tmp27_); +#line 268 "gitg-diff-image-overlay.c" + } +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp29_ = new_surface; +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + if (_tmp29_ != NULL) { +#line 274 "gitg-diff-image-overlay.c" + gdouble _tmp30_ = 0.0; +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp30_ = self->priv->d_alpha; +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp28_ = _tmp30_ != ((gdouble) 0); +#line 280 "gitg-diff-image-overlay.c" + } else { +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp28_ = FALSE; +#line 284 "gitg-diff-image-overlay.c" + } +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + if (_tmp28_) { +#line 288 "gitg-diff-image-overlay.c" + cairo_t* _tmp31_ = NULL; + cairo_surface_t* _tmp32_ = NULL; + gint _tmp33_ = 0; + gint _tmp34_ = 0; + cairo_t* _tmp35_ = NULL; + gdouble _tmp36_ = 0.0; +#line 68 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp31_ = cr; +#line 68 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp32_ = new_surface; +#line 68 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp33_ = x; +#line 68 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp34_ = y; +#line 68 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + cairo_set_source_surface (_tmp31_, _tmp32_, (gdouble) _tmp33_, (gdouble) _tmp34_); +#line 69 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp35_ = cr; +#line 69 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp36_ = self->priv->d_alpha; +#line 69 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + cairo_paint_with_alpha (_tmp35_, _tmp36_); +#line 311 "gitg-diff-image-overlay.c" + } +#line 72 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + result = TRUE; +#line 72 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _cairo_surface_destroy0 (new_surface); +#line 72 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _cairo_surface_destroy0 (old_surface); +#line 72 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _g_object_unref0 (window); +#line 72 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + return result; +#line 323 "gitg-diff-image-overlay.c" +} + + +static void gitg_diff_image_overlay_real_realize (GtkWidget* base) { + GitgDiffImageOverlay * self; +#line 75 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + self = (GitgDiffImageOverlay*) base; +#line 77 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + GTK_WIDGET_CLASS (gitg_diff_image_overlay_parent_class)->realize ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (self, GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageComposite)); +#line 78 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + gtk_widget_queue_resize ((GtkWidget*) self); +#line 335 "gitg-diff-image-overlay.c" +} + + +GitgDiffImageOverlay* gitg_diff_image_overlay_construct (GType object_type) { + GitgDiffImageOverlay * self = NULL; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + self = (GitgDiffImageOverlay*) gitg_diff_image_composite_construct (object_type); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + return self; +#line 345 "gitg-diff-image-overlay.c" +} + + +GitgDiffImageOverlay* gitg_diff_image_overlay_new (void) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + return gitg_diff_image_overlay_construct (GITG_TYPE_DIFF_IMAGE_OVERLAY); +#line 352 "gitg-diff-image-overlay.c" +} + + +gdouble gitg_diff_image_overlay_get_alpha (GitgDiffImageOverlay* self) { + gdouble result; + gdouble _tmp0_ = 0.0; +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + g_return_val_if_fail (self != NULL, 0.0); +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp0_ = self->priv->d_alpha; +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + result = _tmp0_; +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + return result; +#line 367 "gitg-diff-image-overlay.c" +} + + +void gitg_diff_image_overlay_set_alpha (GitgDiffImageOverlay* self, gdouble value) { +#line 28 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + g_return_if_fail (self != NULL); +#line 28 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + if (gitg_diff_image_overlay_get_alpha (self) != value) { +#line 376 "gitg-diff-image-overlay.c" + gdouble newalpha = 0.0; + gdouble _tmp0_ = 0.0; + gdouble _tmp1_ = 0.0; + gdouble _tmp2_ = 0.0; + gdouble _tmp3_ = 0.0; + gdouble _tmp4_ = 0.0; +#line 30 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp0_ = value; +#line 30 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp1_ = MIN (_tmp0_, (gdouble) 1); +#line 30 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp2_ = MAX ((gdouble) 0, _tmp1_); +#line 30 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + newalpha = _tmp2_; +#line 32 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp3_ = newalpha; +#line 32 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp4_ = self->priv->d_alpha; +#line 32 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + if (_tmp3_ != _tmp4_) { +#line 397 "gitg-diff-image-overlay.c" + gdouble _tmp5_ = 0.0; +#line 34 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + _tmp5_ = newalpha; +#line 34 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + self->priv->d_alpha = _tmp5_; +#line 35 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + gtk_widget_queue_draw ((GtkWidget*) self); +#line 405 "gitg-diff-image-overlay.c" + } +#line 28 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + g_object_notify ((GObject *) self, "alpha"); +#line 409 "gitg-diff-image-overlay.c" + } +} + + +static void gitg_diff_image_overlay_class_init (GitgDiffImageOverlayClass * klass) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + gitg_diff_image_overlay_parent_class = g_type_class_peek_parent (klass); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + g_type_class_add_private (klass, sizeof (GitgDiffImageOverlayPrivate)); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + ((GtkWidgetClass *) klass)->draw = gitg_diff_image_overlay_real_draw; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + ((GtkWidgetClass *) klass)->realize = gitg_diff_image_overlay_real_realize; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + G_OBJECT_CLASS (klass)->get_property = _vala_gitg_diff_image_overlay_get_property; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + G_OBJECT_CLASS (klass)->set_property = _vala_gitg_diff_image_overlay_set_property; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + G_OBJECT_CLASS (klass)->finalize = gitg_diff_image_overlay_finalize; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_DIFF_IMAGE_OVERLAY_ALPHA, g_param_spec_double ("alpha", "alpha", "alpha", -G_MAXDOUBLE, G_MAXDOUBLE, 0.5, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); +#line 431 "gitg-diff-image-overlay.c" +} + + +static void gitg_diff_image_overlay_instance_init (GitgDiffImageOverlay * self) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + self->priv = GITG_DIFF_IMAGE_OVERLAY_GET_PRIVATE (self); +#line 438 "gitg-diff-image-overlay.c" +} + + +static void gitg_diff_image_overlay_finalize (GObject * obj) { + GitgDiffImageOverlay * self; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_DIFF_IMAGE_OVERLAY, GitgDiffImageOverlay); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + G_OBJECT_CLASS (gitg_diff_image_overlay_parent_class)->finalize (obj); +#line 448 "gitg-diff-image-overlay.c" +} + + +GType gitg_diff_image_overlay_get_type (void) { + static volatile gsize gitg_diff_image_overlay_type_id__volatile = 0; + if (g_once_init_enter (&gitg_diff_image_overlay_type_id__volatile)) { + static const GTypeInfo g_define_type_info = { sizeof (GitgDiffImageOverlayClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) gitg_diff_image_overlay_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (GitgDiffImageOverlay), 0, (GInstanceInitFunc) gitg_diff_image_overlay_instance_init, NULL }; + GType gitg_diff_image_overlay_type_id; + gitg_diff_image_overlay_type_id = g_type_register_static (GITG_TYPE_DIFF_IMAGE_COMPOSITE, "GitgDiffImageOverlay", &g_define_type_info, 0); + g_once_init_leave (&gitg_diff_image_overlay_type_id__volatile, gitg_diff_image_overlay_type_id); + } + return gitg_diff_image_overlay_type_id__volatile; +} + + +static void _vala_gitg_diff_image_overlay_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { + GitgDiffImageOverlay * self; + self = G_TYPE_CHECK_INSTANCE_CAST (object, GITG_TYPE_DIFF_IMAGE_OVERLAY, GitgDiffImageOverlay); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + switch (property_id) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + case GITG_DIFF_IMAGE_OVERLAY_ALPHA: +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + g_value_set_double (value, gitg_diff_image_overlay_get_alpha (self)); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + break; +#line 475 "gitg-diff-image-overlay.c" + default: +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + break; +#line 481 "gitg-diff-image-overlay.c" + } +} + + +static void _vala_gitg_diff_image_overlay_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { + GitgDiffImageOverlay * self; + self = G_TYPE_CHECK_INSTANCE_CAST (object, GITG_TYPE_DIFF_IMAGE_OVERLAY, GitgDiffImageOverlay); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + switch (property_id) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + case GITG_DIFF_IMAGE_OVERLAY_ALPHA: +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + gitg_diff_image_overlay_set_alpha (self, g_value_get_double (value)); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + break; +#line 497 "gitg-diff-image-overlay.c" + default: +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-overlay.vala" + break; +#line 503 "gitg-diff-image-overlay.c" + } +} + + + diff -Nru gitg-3.22.0/libgitg/gitg-diff-image-overlay.vala gitg-3.23.0/libgitg/gitg-diff-image-overlay.vala --- gitg-3.22.0/libgitg/gitg-diff-image-overlay.vala 1970-01-01 00:00:00.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-image-overlay.vala 2016-11-26 08:32:25.000000000 +0000 @@ -0,0 +1,80 @@ +/* + * This file is part of gitg + * + * Copyright (C) 2016 - Jesse van den Kieboom + * + * gitg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * gitg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gitg. If not, see . + */ + +class Gitg.DiffImageOverlay : DiffImageComposite +{ + private double d_alpha; + + public double alpha + { + get { return d_alpha; } + + set + { + var newalpha = double.max(0, double.min(value, 1)); + + if (newalpha != d_alpha) + { + d_alpha = newalpha; + queue_draw(); + } + } + + default = 0.5; + } + + protected override bool draw(Cairo.Context cr) + { + base.draw(cr); + + var window = get_window(); + + Gtk.Allocation alloc; + get_allocation(out alloc); + + int image_width, image_height; + get_sizing(alloc.width, out image_width, out image_height); + + var old_surface = cache.get_old_surface(window); + var new_surface = cache.get_new_surface(window); + + int x = (alloc.width - image_width) / 2; + int y = 0; + + if (old_surface != null && d_alpha != 1) + { + cr.set_source_surface(old_surface, x, y); + cr.paint_with_alpha(1 - d_alpha); + } + + if (new_surface != null && d_alpha != 0) + { + cr.set_source_surface(new_surface, x, y); + cr.paint_with_alpha(d_alpha); + } + + return true; + } + + protected override void realize() + { + base.realize(); + queue_resize(); + } +} diff -Nru gitg-3.22.0/libgitg/gitg-diff-image-side-by-side.c gitg-3.23.0/libgitg/gitg-diff-image-side-by-side.c --- gitg-3.22.0/libgitg/gitg-diff-image-side-by-side.c 1970-01-01 00:00:00.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-image-side-by-side.c 2016-11-26 12:23:15.000000000 +0000 @@ -0,0 +1,1729 @@ +/* gitg-diff-image-side-by-side.c generated by valac 0.34.0.108-f56ac, the Vala compiler + * generated from gitg-diff-image-side-by-side.vala, do not modify */ + +/* + * This file is part of gitg + * + * Copyright (C) 2016 - Jesse van den Kieboom + * + * gitg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * gitg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gitg. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +#define GITG_TYPE_DIFF_IMAGE_SIDE_BY_SIDE (gitg_diff_image_side_by_side_get_type ()) +#define GITG_DIFF_IMAGE_SIDE_BY_SIDE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_IMAGE_SIDE_BY_SIDE, GitgDiffImageSideBySide)) +#define GITG_DIFF_IMAGE_SIDE_BY_SIDE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GITG_TYPE_DIFF_IMAGE_SIDE_BY_SIDE, GitgDiffImageSideBySideClass)) +#define GITG_IS_DIFF_IMAGE_SIDE_BY_SIDE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_IMAGE_SIDE_BY_SIDE)) +#define GITG_IS_DIFF_IMAGE_SIDE_BY_SIDE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GITG_TYPE_DIFF_IMAGE_SIDE_BY_SIDE)) +#define GITG_DIFF_IMAGE_SIDE_BY_SIDE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GITG_TYPE_DIFF_IMAGE_SIDE_BY_SIDE, GitgDiffImageSideBySideClass)) + +typedef struct _GitgDiffImageSideBySide GitgDiffImageSideBySide; +typedef struct _GitgDiffImageSideBySideClass GitgDiffImageSideBySideClass; +typedef struct _GitgDiffImageSideBySidePrivate GitgDiffImageSideBySidePrivate; + +#define GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE (gitg_diff_image_surface_cache_get_type ()) +#define GITG_DIFF_IMAGE_SURFACE_CACHE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE, GitgDiffImageSurfaceCache)) +#define GITG_IS_DIFF_IMAGE_SURFACE_CACHE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE)) +#define GITG_DIFF_IMAGE_SURFACE_CACHE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE, GitgDiffImageSurfaceCacheIface)) + +typedef struct _GitgDiffImageSurfaceCache GitgDiffImageSurfaceCache; +typedef struct _GitgDiffImageSurfaceCacheIface GitgDiffImageSurfaceCacheIface; +#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) + +#define GITG_DIFF_IMAGE_SIDE_BY_SIDE_TYPE_SIZING (gitg_diff_image_side_by_side_sizing_get_type ()) + +#define GITG_DIFF_IMAGE_SIDE_BY_SIDE_TYPE_SIZE (gitg_diff_image_side_by_side_size_get_type ()) +typedef struct _GitgDiffImageSideBySideSize GitgDiffImageSideBySideSize; +typedef struct _GitgDiffImageSideBySideSizing GitgDiffImageSideBySideSizing; +#define _cairo_surface_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_surface_destroy (var), NULL))) +#define _g_free0(var) (var = (g_free (var), NULL)) + +struct _GitgDiffImageSideBySide { + GtkDrawingArea parent_instance; + GitgDiffImageSideBySidePrivate * priv; +}; + +struct _GitgDiffImageSideBySideClass { + GtkDrawingAreaClass parent_class; +}; + +struct _GitgDiffImageSurfaceCacheIface { + GTypeInterface parent_iface; + cairo_surface_t* (*get_old_surface) (GitgDiffImageSurfaceCache* self, GdkWindow* window); + cairo_surface_t* (*get_new_surface) (GitgDiffImageSurfaceCache* self, GdkWindow* window); + GdkPixbuf* (*get_old_pixbuf) (GitgDiffImageSurfaceCache* self); + void (*set_old_pixbuf) (GitgDiffImageSurfaceCache* self, GdkPixbuf* value); + GdkPixbuf* (*get_new_pixbuf) (GitgDiffImageSurfaceCache* self); + void (*set_new_pixbuf) (GitgDiffImageSurfaceCache* self, GdkPixbuf* value); + GdkWindow* (*get_window) (GitgDiffImageSurfaceCache* self); + void (*set_window) (GitgDiffImageSurfaceCache* self, GdkWindow* value); +}; + +struct _GitgDiffImageSideBySidePrivate { + PangoLayout* d_old_size_layout; + PangoLayout* d_new_size_layout; + GitgDiffImageSurfaceCache* _cache; + gint _spacing; +}; + +struct _GitgDiffImageSideBySideSize { + gint width; + gint image_width; + gint image_height; +}; + +struct _GitgDiffImageSideBySideSizing { + GitgDiffImageSideBySideSize old_size; + GitgDiffImageSideBySideSize new_size; +}; + + +static gpointer gitg_diff_image_side_by_side_parent_class = NULL; + +GType gitg_diff_image_side_by_side_get_type (void) G_GNUC_CONST; +GType gitg_diff_image_surface_cache_get_type (void) G_GNUC_CONST; +#define GITG_DIFF_IMAGE_SIDE_BY_SIDE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_DIFF_IMAGE_SIDE_BY_SIDE, GitgDiffImageSideBySidePrivate)) +enum { + GITG_DIFF_IMAGE_SIDE_BY_SIDE_DUMMY_PROPERTY, + GITG_DIFF_IMAGE_SIDE_BY_SIDE_CACHE, + GITG_DIFF_IMAGE_SIDE_BY_SIDE_SPACING +}; +#define GITG_DIFF_IMAGE_SIDE_BY_SIDE_TEXT_SPACING 6 +static GType gitg_diff_image_side_by_side_sizing_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; +static GType gitg_diff_image_side_by_side_size_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; +static GitgDiffImageSideBySideSize* gitg_diff_image_side_by_side_size_dup (const GitgDiffImageSideBySideSize* self); +static void gitg_diff_image_side_by_side_size_free (GitgDiffImageSideBySideSize* self); +static GitgDiffImageSideBySideSizing* gitg_diff_image_side_by_side_sizing_dup (const GitgDiffImageSideBySideSizing* self); +static void gitg_diff_image_side_by_side_sizing_free (GitgDiffImageSideBySideSizing* self); +static void gitg_diff_image_side_by_side_get_sizing (GitgDiffImageSideBySide* self, gint width, GitgDiffImageSideBySideSizing* result); +GitgDiffImageSurfaceCache* gitg_diff_image_side_by_side_get_cache (GitgDiffImageSideBySide* self); +GdkPixbuf* gitg_diff_image_surface_cache_get_old_pixbuf (GitgDiffImageSurfaceCache* self); +GdkPixbuf* gitg_diff_image_surface_cache_get_new_pixbuf (GitgDiffImageSurfaceCache* self); +cairo_surface_t* gitg_diff_image_surface_cache_get_old_surface (GitgDiffImageSurfaceCache* self, GdkWindow* window); +cairo_surface_t* gitg_diff_image_surface_cache_get_new_surface (GitgDiffImageSurfaceCache* self, GdkWindow* window); +gint gitg_diff_image_side_by_side_get_spacing (GitgDiffImageSideBySide* self); +static void gitg_diff_image_side_by_side_real_style_updated (GtkWidget* base); +static void gitg_diff_image_side_by_side_real_get_preferred_height_for_width (GtkWidget* base, gint width, gint* minimum_height, gint* natural_height); +static PangoLayout* gitg_diff_image_side_by_side_get_old_size_layout (GitgDiffImageSideBySide* self); +static PangoLayout* gitg_diff_image_side_by_side_get_new_size_layout (GitgDiffImageSideBySide* self); +static GtkSizeRequestMode gitg_diff_image_side_by_side_real_get_request_mode (GtkWidget* base); +static gboolean gitg_diff_image_side_by_side_real_draw (GtkWidget* base, cairo_t* cr); +static void gitg_diff_image_side_by_side_real_realize (GtkWidget* base); +GitgDiffImageSideBySide* gitg_diff_image_side_by_side_new (void); +GitgDiffImageSideBySide* gitg_diff_image_side_by_side_construct (GType object_type); +void gitg_diff_image_side_by_side_set_cache (GitgDiffImageSideBySide* self, GitgDiffImageSurfaceCache* value); +void gitg_diff_image_side_by_side_set_spacing (GitgDiffImageSideBySide* self, gint value); +static void gitg_diff_image_side_by_side_finalize (GObject * obj); +static void _vala_gitg_diff_image_side_by_side_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); +static void _vala_gitg_diff_image_side_by_side_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); + + +static gpointer _g_object_ref0 (gpointer self) { +#line 104 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + return self ? g_object_ref (self) : NULL; +#line 149 "gitg-diff-image-side-by-side.c" +} + + +static void gitg_diff_image_side_by_side_get_sizing (GitgDiffImageSideBySide* self, gint width, GitgDiffImageSideBySideSizing* result) { + gdouble ow = 0.0; + gdouble oh = 0.0; + gdouble nw = 0.0; + gdouble nh = 0.0; + GdkPixbuf* old_pixbuf = NULL; + GitgDiffImageSurfaceCache* _tmp0_ = NULL; + GdkPixbuf* _tmp1_ = NULL; + GdkPixbuf* _tmp2_ = NULL; + GdkPixbuf* _tmp3_ = NULL; + GdkPixbuf* new_pixbuf = NULL; + GitgDiffImageSurfaceCache* _tmp4_ = NULL; + GdkPixbuf* _tmp5_ = NULL; + GdkPixbuf* _tmp6_ = NULL; + GdkPixbuf* _tmp7_ = NULL; + GdkWindow* window = NULL; + GdkWindow* _tmp8_ = NULL; + GdkWindow* _tmp9_ = NULL; + GdkPixbuf* _tmp10_ = NULL; + GdkPixbuf* _tmp24_ = NULL; + gdouble tw = 0.0; + gdouble _tmp38_ = 0.0; + gdouble _tmp39_ = 0.0; + gint _tmp40_ = 0; + gint _tmp41_ = 0; + gdouble osw = 0.0; + gdouble nsw = 0.0; + gdouble _tmp42_ = 0.0; + gdouble oswi = 0.0; + gdouble _tmp51_ = 0.0; + gdouble _tmp52_ = 0.0; + gdouble _tmp53_ = 0.0; + gdouble nswi = 0.0; + gdouble _tmp54_ = 0.0; + gdouble _tmp55_ = 0.0; + gdouble _tmp56_ = 0.0; + gdouble oshi = 0.0; + gdouble nshi = 0.0; + gdouble _tmp57_ = 0.0; + gdouble _tmp61_ = 0.0; + gdouble _tmp65_ = 0.0; + gdouble _tmp66_ = 0.0; + gdouble _tmp67_ = 0.0; + GitgDiffImageSideBySideSize _tmp68_ = {0}; + gdouble _tmp69_ = 0.0; + gdouble _tmp70_ = 0.0; + gdouble _tmp71_ = 0.0; + GitgDiffImageSideBySideSize _tmp72_ = {0}; + GitgDiffImageSideBySideSizing _tmp73_ = {0}; +#line 100 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + g_return_if_fail (self != NULL); +#line 102 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + ow = (gdouble) 0; +#line 102 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + oh = (gdouble) 0; +#line 102 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + nw = (gdouble) 0; +#line 102 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + nh = (gdouble) 0; +#line 104 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp0_ = self->priv->_cache; +#line 104 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp1_ = gitg_diff_image_surface_cache_get_old_pixbuf (_tmp0_); +#line 104 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp2_ = _tmp1_; +#line 104 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp3_ = _g_object_ref0 (_tmp2_); +#line 104 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + old_pixbuf = _tmp3_; +#line 105 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp4_ = self->priv->_cache; +#line 105 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp5_ = gitg_diff_image_surface_cache_get_new_pixbuf (_tmp4_); +#line 105 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp6_ = _tmp5_; +#line 105 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp7_ = _g_object_ref0 (_tmp6_); +#line 105 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + new_pixbuf = _tmp7_; +#line 107 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp8_ = gtk_widget_get_window ((GtkWidget*) self); +#line 107 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp9_ = _g_object_ref0 (_tmp8_); +#line 107 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + window = _tmp9_; +#line 109 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp10_ = old_pixbuf; +#line 109 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (_tmp10_ != NULL) { +#line 242 "gitg-diff-image-side-by-side.c" + gdouble xscale = 0.0; + gdouble yscale = 0.0; + GdkWindow* _tmp11_ = NULL; + GdkPixbuf* _tmp18_ = NULL; + gint _tmp19_ = 0; + gdouble _tmp20_ = 0.0; + GdkPixbuf* _tmp21_ = NULL; + gint _tmp22_ = 0; + gdouble _tmp23_ = 0.0; +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + xscale = (gdouble) 1; +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + yscale = (gdouble) 1; +#line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp11_ = window; +#line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (_tmp11_ != NULL) { +#line 260 "gitg-diff-image-side-by-side.c" + GitgDiffImageSurfaceCache* _tmp12_ = NULL; + GdkWindow* _tmp13_ = NULL; + cairo_surface_t* _tmp14_ = NULL; + cairo_surface_t* _tmp15_ = NULL; + gdouble _tmp16_ = 0.0; + gdouble _tmp17_ = 0.0; +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp12_ = self->priv->_cache; +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp13_ = gtk_widget_get_window ((GtkWidget*) self); +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp14_ = gitg_diff_image_surface_cache_get_old_surface (_tmp12_, _tmp13_); +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp15_ = _tmp14_; +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + cairo_surface_get_device_scale (_tmp15_, &_tmp16_, &_tmp17_); +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + xscale = _tmp16_; +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + yscale = _tmp17_; +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _cairo_surface_destroy0 (_tmp15_); +#line 283 "gitg-diff-image-side-by-side.c" + } +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp18_ = old_pixbuf; +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp19_ = gdk_pixbuf_get_width (_tmp18_); +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp20_ = xscale; +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + ow = ((gdouble) _tmp19_) / _tmp20_; +#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp21_ = old_pixbuf; +#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp22_ = gdk_pixbuf_get_height (_tmp21_); +#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp23_ = yscale; +#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + oh = ((gdouble) _tmp22_) / _tmp23_; +#line 301 "gitg-diff-image-side-by-side.c" + } +#line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp24_ = new_pixbuf; +#line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (_tmp24_ != NULL) { +#line 307 "gitg-diff-image-side-by-side.c" + gdouble xscale = 0.0; + gdouble yscale = 0.0; + GdkWindow* _tmp25_ = NULL; + GdkPixbuf* _tmp32_ = NULL; + gint _tmp33_ = 0; + gdouble _tmp34_ = 0.0; + GdkPixbuf* _tmp35_ = NULL; + gint _tmp36_ = 0; + gdouble _tmp37_ = 0.0; +#line 124 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + xscale = (gdouble) 1; +#line 124 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + yscale = (gdouble) 1; +#line 126 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp25_ = window; +#line 126 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (_tmp25_ != NULL) { +#line 325 "gitg-diff-image-side-by-side.c" + GitgDiffImageSurfaceCache* _tmp26_ = NULL; + GdkWindow* _tmp27_ = NULL; + cairo_surface_t* _tmp28_ = NULL; + cairo_surface_t* _tmp29_ = NULL; + gdouble _tmp30_ = 0.0; + gdouble _tmp31_ = 0.0; +#line 128 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp26_ = self->priv->_cache; +#line 128 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp27_ = gtk_widget_get_window ((GtkWidget*) self); +#line 128 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp28_ = gitg_diff_image_surface_cache_get_new_surface (_tmp26_, _tmp27_); +#line 128 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp29_ = _tmp28_; +#line 128 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + cairo_surface_get_device_scale (_tmp29_, &_tmp30_, &_tmp31_); +#line 128 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + xscale = _tmp30_; +#line 128 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + yscale = _tmp31_; +#line 128 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _cairo_surface_destroy0 (_tmp29_); +#line 348 "gitg-diff-image-side-by-side.c" + } +#line 131 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp32_ = new_pixbuf; +#line 131 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp33_ = gdk_pixbuf_get_width (_tmp32_); +#line 131 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp34_ = xscale; +#line 131 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + nw = ((gdouble) _tmp33_) / _tmp34_; +#line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp35_ = new_pixbuf; +#line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp36_ = gdk_pixbuf_get_height (_tmp35_); +#line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp37_ = yscale; +#line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + nh = ((gdouble) _tmp36_) / _tmp37_; +#line 366 "gitg-diff-image-side-by-side.c" + } +#line 135 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp38_ = ow; +#line 135 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp39_ = nw; +#line 135 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + tw = _tmp38_ + _tmp39_; +#line 137 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp40_ = width; +#line 137 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp41_ = self->priv->_spacing; +#line 137 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + width = _tmp40_ - _tmp41_; +#line 139 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + osw = (gdouble) 0; +#line 139 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + nsw = (gdouble) 0; +#line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp42_ = tw; +#line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (_tmp42_ != ((gdouble) 0)) { +#line 388 "gitg-diff-image-side-by-side.c" + gdouble _tmp43_ = 0.0; + gdouble _tmp47_ = 0.0; +#line 143 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp43_ = ow; +#line 143 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (_tmp43_ != ((gdouble) 0)) { +#line 395 "gitg-diff-image-side-by-side.c" + gint _tmp44_ = 0; + gdouble _tmp45_ = 0.0; + gdouble _tmp46_ = 0.0; +#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp44_ = width; +#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp45_ = ow; +#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp46_ = tw; +#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + osw = _tmp44_ * (_tmp45_ / _tmp46_); +#line 407 "gitg-diff-image-side-by-side.c" + } +#line 148 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp47_ = nw; +#line 148 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (_tmp47_ != ((gdouble) 0)) { +#line 413 "gitg-diff-image-side-by-side.c" + gint _tmp48_ = 0; + gdouble _tmp49_ = 0.0; + gdouble _tmp50_ = 0.0; +#line 150 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp48_ = width; +#line 150 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp49_ = nw; +#line 150 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp50_ = tw; +#line 150 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + nsw = _tmp48_ * (_tmp49_ / _tmp50_); +#line 425 "gitg-diff-image-side-by-side.c" + } + } +#line 154 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp51_ = osw; +#line 154 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp52_ = ow; +#line 154 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp53_ = MIN (_tmp51_, _tmp52_); +#line 154 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + oswi = _tmp53_; +#line 155 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp54_ = nsw; +#line 155 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp55_ = nw; +#line 155 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp56_ = MIN (_tmp54_, _tmp55_); +#line 155 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + nswi = _tmp56_; +#line 157 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + oshi = (gdouble) 0; +#line 157 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + nshi = (gdouble) 0; +#line 159 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp57_ = ow; +#line 159 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (_tmp57_ != ((gdouble) 0)) { +#line 452 "gitg-diff-image-side-by-side.c" + gdouble _tmp58_ = 0.0; + gdouble _tmp59_ = 0.0; + gdouble _tmp60_ = 0.0; +#line 161 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp58_ = oswi; +#line 161 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp59_ = ow; +#line 161 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp60_ = oh; +#line 161 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + oshi = (_tmp58_ / _tmp59_) * _tmp60_; +#line 464 "gitg-diff-image-side-by-side.c" + } +#line 164 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp61_ = nw; +#line 164 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (_tmp61_ != ((gdouble) 0)) { +#line 470 "gitg-diff-image-side-by-side.c" + gdouble _tmp62_ = 0.0; + gdouble _tmp63_ = 0.0; + gdouble _tmp64_ = 0.0; +#line 166 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp62_ = nswi; +#line 166 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp63_ = nw; +#line 166 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp64_ = nh; +#line 166 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + nshi = (_tmp62_ / _tmp63_) * _tmp64_; +#line 482 "gitg-diff-image-side-by-side.c" + } +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp65_ = osw; +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp66_ = oswi; +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp67_ = oshi; +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + memset (&_tmp68_, 0, sizeof (GitgDiffImageSideBySideSize)); +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp68_.width = (gint) _tmp65_; +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp68_.image_width = (gint) _tmp66_; +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp68_.image_height = (gint) _tmp67_; +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp69_ = nsw; +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp70_ = nswi; +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp71_ = nshi; +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + memset (&_tmp72_, 0, sizeof (GitgDiffImageSideBySideSize)); +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp72_.width = (gint) _tmp69_; +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp72_.image_width = (gint) _tmp70_; +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp72_.image_height = (gint) _tmp71_; +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + memset (&_tmp73_, 0, sizeof (GitgDiffImageSideBySideSizing)); +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp73_.old_size = _tmp68_; +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp73_.new_size = _tmp72_; +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + *result = _tmp73_; +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_object_unref0 (window); +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_object_unref0 (new_pixbuf); +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_object_unref0 (old_pixbuf); +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + return; +#line 528 "gitg-diff-image-side-by-side.c" +} + + +static void gitg_diff_image_side_by_side_real_style_updated (GtkWidget* base) { + GitgDiffImageSideBySide * self; +#line 186 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + self = (GitgDiffImageSideBySide*) base; +#line 188 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_object_unref0 (self->priv->d_old_size_layout); +#line 188 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + self->priv->d_old_size_layout = NULL; +#line 189 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_object_unref0 (self->priv->d_new_size_layout); +#line 189 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + self->priv->d_new_size_layout = NULL; +#line 544 "gitg-diff-image-side-by-side.c" +} + + +static void gitg_diff_image_side_by_side_real_get_preferred_height_for_width (GtkWidget* base, gint width, gint* minimum_height, gint* natural_height) { + GitgDiffImageSideBySide * self; + gint _vala_minimum_height = 0; + gint _vala_natural_height = 0; + GitgDiffImageSideBySideSizing sizing = {0}; + gint _tmp0_ = 0; + GitgDiffImageSideBySideSizing _tmp1_ = {0}; + gdouble h = 0.0; + GitgDiffImageSideBySideSizing _tmp2_ = {0}; + GitgDiffImageSideBySideSize _tmp3_ = {0}; + gint _tmp4_ = 0; + GitgDiffImageSideBySideSizing _tmp5_ = {0}; + GitgDiffImageSideBySideSize _tmp6_ = {0}; + gint _tmp7_ = 0; + gdouble _tmp8_ = 0.0; + PangoLayout* ol = NULL; + PangoLayout* _tmp9_ = NULL; + PangoLayout* _tmp10_ = NULL; + PangoLayout* _tmp11_ = NULL; + PangoLayout* nl = NULL; + PangoLayout* _tmp12_ = NULL; + PangoLayout* _tmp13_ = NULL; + PangoLayout* _tmp14_ = NULL; + gint osw = 0; + gint osh = 0; + gint nsw = 0; + gint nsh = 0; + PangoLayout* _tmp15_ = NULL; + PangoLayout* _tmp19_ = NULL; + gdouble _tmp23_ = 0.0; + gint _tmp24_ = 0; + gint _tmp25_ = 0; + gint _tmp26_ = 0; + gdouble _tmp27_ = 0.0; + gdouble _tmp28_ = 0.0; +#line 192 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + self = (GitgDiffImageSideBySide*) base; +#line 194 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp0_ = width; +#line 194 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + gitg_diff_image_side_by_side_get_sizing (self, _tmp0_, &_tmp1_); +#line 194 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + sizing = _tmp1_; +#line 195 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp2_ = sizing; +#line 195 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp3_ = _tmp2_.old_size; +#line 195 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp4_ = _tmp3_.image_height; +#line 195 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp5_ = sizing; +#line 195 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp6_ = _tmp5_.new_size; +#line 195 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp7_ = _tmp6_.image_height; +#line 195 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp8_ = MAX ((gdouble) _tmp4_, (gdouble) _tmp7_); +#line 195 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + h = _tmp8_; +#line 197 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp9_ = gitg_diff_image_side_by_side_get_old_size_layout (self); +#line 197 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp10_ = _tmp9_; +#line 197 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp11_ = _g_object_ref0 (_tmp10_); +#line 197 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + ol = _tmp11_; +#line 198 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp12_ = gitg_diff_image_side_by_side_get_new_size_layout (self); +#line 198 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp13_ = _tmp12_; +#line 198 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp14_ = _g_object_ref0 (_tmp13_); +#line 198 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + nl = _tmp14_; +#line 200 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + osw = 0; +#line 200 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + osh = 0; +#line 200 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + nsw = 0; +#line 200 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + nsh = 0; +#line 202 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp15_ = ol; +#line 202 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (_tmp15_ != NULL) { +#line 635 "gitg-diff-image-side-by-side.c" + PangoLayout* _tmp16_ = NULL; + gint _tmp17_ = 0; + gint _tmp18_ = 0; +#line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp16_ = ol; +#line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + pango_layout_get_pixel_size (_tmp16_, &_tmp17_, &_tmp18_); +#line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + osw = _tmp17_; +#line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + osh = _tmp18_; +#line 647 "gitg-diff-image-side-by-side.c" + } +#line 207 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp19_ = nl; +#line 207 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (_tmp19_ != NULL) { +#line 653 "gitg-diff-image-side-by-side.c" + PangoLayout* _tmp20_ = NULL; + gint _tmp21_ = 0; + gint _tmp22_ = 0; +#line 209 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp20_ = nl; +#line 209 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + pango_layout_get_pixel_size (_tmp20_, &_tmp21_, &_tmp22_); +#line 209 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + nsw = _tmp21_; +#line 209 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + nsh = _tmp22_; +#line 665 "gitg-diff-image-side-by-side.c" + } +#line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp23_ = h; +#line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp24_ = osh; +#line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp25_ = nsh; +#line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp26_ = MAX (_tmp24_, _tmp25_); +#line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + h = _tmp23_ + (GITG_DIFF_IMAGE_SIDE_BY_SIDE_TEXT_SPACING + _tmp26_); +#line 214 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp27_ = h; +#line 214 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _vala_minimum_height = (gint) _tmp27_; +#line 215 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp28_ = h; +#line 215 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _vala_natural_height = (gint) _tmp28_; +#line 192 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_object_unref0 (nl); +#line 192 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_object_unref0 (ol); +#line 192 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (minimum_height) { +#line 192 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + *minimum_height = _vala_minimum_height; +#line 693 "gitg-diff-image-side-by-side.c" + } +#line 192 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (natural_height) { +#line 192 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + *natural_height = _vala_natural_height; +#line 699 "gitg-diff-image-side-by-side.c" + } +} + + +static GtkSizeRequestMode gitg_diff_image_side_by_side_real_get_request_mode (GtkWidget* base) { + GitgDiffImageSideBySide * self; + GtkSizeRequestMode result = 0; +#line 218 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + self = (GitgDiffImageSideBySide*) base; +#line 220 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + result = GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH; +#line 220 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + return result; +#line 713 "gitg-diff-image-side-by-side.c" +} + + +static gboolean gitg_diff_image_side_by_side_real_draw (GtkWidget* base, cairo_t* cr) { + GitgDiffImageSideBySide * self; + gboolean result = FALSE; + GdkWindow* window = NULL; + GdkWindow* _tmp0_ = NULL; + GdkWindow* _tmp1_ = NULL; + GtkAllocation alloc = {0}; + GtkAllocation _tmp2_ = {0}; + GitgDiffImageSideBySideSizing sizing = {0}; + GtkAllocation _tmp3_ = {0}; + gint _tmp4_ = 0; + GitgDiffImageSideBySideSizing _tmp5_ = {0}; + cairo_surface_t* old_surface = NULL; + GitgDiffImageSurfaceCache* _tmp6_ = NULL; + GdkWindow* _tmp7_ = NULL; + cairo_surface_t* _tmp8_ = NULL; + cairo_surface_t* new_surface = NULL; + GitgDiffImageSurfaceCache* _tmp9_ = NULL; + GdkWindow* _tmp10_ = NULL; + cairo_surface_t* _tmp11_ = NULL; + GtkStyleContext* ctx = NULL; + GtkStyleContext* _tmp12_ = NULL; + GtkStyleContext* _tmp13_ = NULL; + GtkStyleContext* _tmp14_ = NULL; + cairo_t* _tmp15_ = NULL; + GtkAllocation _tmp16_ = {0}; + gint _tmp17_ = 0; + GtkAllocation _tmp18_ = {0}; + gint _tmp19_ = 0; + GtkAllocation _tmp20_ = {0}; + gint _tmp21_ = 0; + GtkAllocation _tmp22_ = {0}; + gint _tmp23_ = 0; + gdouble max_height = 0.0; + GitgDiffImageSideBySideSizing _tmp24_ = {0}; + GitgDiffImageSideBySideSize _tmp25_ = {0}; + gint _tmp26_ = 0; + GitgDiffImageSideBySideSizing _tmp27_ = {0}; + GitgDiffImageSideBySideSize _tmp28_ = {0}; + gint _tmp29_ = 0; + gdouble _tmp30_ = 0.0; + gdouble spread_factor = 0.0; + gboolean _tmp31_ = FALSE; + cairo_surface_t* _tmp32_ = NULL; + cairo_surface_t* _tmp34_ = NULL; + cairo_surface_t* _tmp69_ = NULL; +#line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + self = (GitgDiffImageSideBySide*) base; +#line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + g_return_val_if_fail (cr != NULL, FALSE); +#line 225 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp0_ = gtk_widget_get_window ((GtkWidget*) self); +#line 225 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 225 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + window = _tmp1_; +#line 228 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + gtk_widget_get_allocation ((GtkWidget*) self, &_tmp2_); +#line 228 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + alloc = _tmp2_; +#line 230 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp3_ = alloc; +#line 230 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp4_ = _tmp3_.width; +#line 230 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + gitg_diff_image_side_by_side_get_sizing (self, _tmp4_, &_tmp5_); +#line 230 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + sizing = _tmp5_; +#line 232 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp6_ = self->priv->_cache; +#line 232 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp7_ = window; +#line 232 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp8_ = gitg_diff_image_surface_cache_get_old_surface (_tmp6_, _tmp7_); +#line 232 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + old_surface = _tmp8_; +#line 233 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp9_ = self->priv->_cache; +#line 233 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp10_ = window; +#line 233 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp11_ = gitg_diff_image_surface_cache_get_new_surface (_tmp9_, _tmp10_); +#line 233 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + new_surface = _tmp11_; +#line 235 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp12_ = gtk_widget_get_style_context ((GtkWidget*) self); +#line 235 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp13_ = _g_object_ref0 (_tmp12_); +#line 235 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + ctx = _tmp13_; +#line 237 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp14_ = ctx; +#line 237 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp15_ = cr; +#line 237 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp16_ = alloc; +#line 237 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp17_ = _tmp16_.x; +#line 237 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp18_ = alloc; +#line 237 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp19_ = _tmp18_.y; +#line 237 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp20_ = alloc; +#line 237 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp21_ = _tmp20_.width; +#line 237 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp22_ = alloc; +#line 237 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp23_ = _tmp22_.height; +#line 237 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + gtk_render_background (_tmp14_, _tmp15_, (gdouble) _tmp17_, (gdouble) _tmp19_, (gdouble) _tmp21_, (gdouble) _tmp23_); +#line 239 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp24_ = sizing; +#line 239 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp25_ = _tmp24_.old_size; +#line 239 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp26_ = _tmp25_.image_height; +#line 239 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp27_ = sizing; +#line 239 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp28_ = _tmp27_.new_size; +#line 239 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp29_ = _tmp28_.image_height; +#line 239 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp30_ = MAX ((gdouble) _tmp26_, (gdouble) _tmp29_); +#line 239 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + max_height = _tmp30_; +#line 240 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + spread_factor = 0.5; +#line 242 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp32_ = old_surface; +#line 242 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (_tmp32_ != NULL) { +#line 851 "gitg-diff-image-side-by-side.c" + cairo_surface_t* _tmp33_ = NULL; +#line 242 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp33_ = new_surface; +#line 242 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp31_ = _tmp33_ != NULL; +#line 857 "gitg-diff-image-side-by-side.c" + } else { +#line 242 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp31_ = FALSE; +#line 861 "gitg-diff-image-side-by-side.c" + } +#line 242 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (_tmp31_) { +#line 244 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + spread_factor = 2.0 / 3.0; +#line 867 "gitg-diff-image-side-by-side.c" + } +#line 247 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp34_ = old_surface; +#line 247 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (_tmp34_ != NULL) { +#line 873 "gitg-diff-image-side-by-side.c" + gdouble x = 0.0; + GitgDiffImageSideBySideSizing _tmp35_ = {0}; + GitgDiffImageSideBySideSize _tmp36_ = {0}; + gint _tmp37_ = 0; + GitgDiffImageSideBySideSizing _tmp38_ = {0}; + GitgDiffImageSideBySideSize _tmp39_ = {0}; + gint _tmp40_ = 0; + gdouble _tmp41_ = 0.0; + gdouble y = 0.0; + gdouble _tmp42_ = 0.0; + GitgDiffImageSideBySideSizing _tmp43_ = {0}; + GitgDiffImageSideBySideSize _tmp44_ = {0}; + gint _tmp45_ = 0; + cairo_t* _tmp46_ = NULL; + cairo_surface_t* _tmp47_ = NULL; + gdouble _tmp48_ = 0.0; + gdouble _tmp49_ = 0.0; + cairo_t* _tmp50_ = NULL; + PangoRectangle rect = {0}; + PangoLayout* _tmp51_ = NULL; + PangoLayout* _tmp52_ = NULL; + PangoRectangle _tmp53_ = {0}; + GtkStyleContext* _tmp54_ = NULL; + cairo_t* _tmp55_ = NULL; + gdouble _tmp56_ = 0.0; + PangoRectangle _tmp57_ = {0}; + gint _tmp58_ = 0; + GitgDiffImageSideBySideSizing _tmp59_ = {0}; + GitgDiffImageSideBySideSize _tmp60_ = {0}; + gint _tmp61_ = 0; + PangoRectangle _tmp62_ = {0}; + gint _tmp63_ = 0; + PangoRectangle _tmp64_ = {0}; + gint _tmp65_ = 0; + gdouble _tmp66_ = 0.0; + PangoLayout* _tmp67_ = NULL; + PangoLayout* _tmp68_ = NULL; +#line 249 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp35_ = sizing; +#line 249 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp36_ = _tmp35_.old_size; +#line 249 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp37_ = _tmp36_.width; +#line 249 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp38_ = sizing; +#line 249 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp39_ = _tmp38_.old_size; +#line 249 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp40_ = _tmp39_.image_width; +#line 249 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp41_ = spread_factor; +#line 249 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + x = (_tmp37_ - _tmp40_) * _tmp41_; +#line 250 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp42_ = max_height; +#line 250 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp43_ = sizing; +#line 250 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp44_ = _tmp43_.old_size; +#line 250 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp45_ = _tmp44_.image_height; +#line 250 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + y = (_tmp42_ - _tmp45_) / 2; +#line 252 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp46_ = cr; +#line 252 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp47_ = old_surface; +#line 252 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp48_ = x; +#line 252 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp49_ = y; +#line 252 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + cairo_set_source_surface (_tmp46_, _tmp47_, _tmp48_, _tmp49_); +#line 253 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp50_ = cr; +#line 253 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + cairo_paint (_tmp50_); +#line 257 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp51_ = gitg_diff_image_side_by_side_get_old_size_layout (self); +#line 257 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp52_ = _tmp51_; +#line 257 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + pango_layout_get_pixel_extents (_tmp52_, NULL, &_tmp53_); +#line 257 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + rect = _tmp53_; +#line 259 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp54_ = ctx; +#line 259 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp55_ = cr; +#line 259 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp56_ = x; +#line 259 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp57_ = rect; +#line 259 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp58_ = _tmp57_.x; +#line 259 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp59_ = sizing; +#line 259 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp60_ = _tmp59_.old_size; +#line 259 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp61_ = _tmp60_.image_width; +#line 259 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp62_ = rect; +#line 259 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp63_ = _tmp62_.width; +#line 259 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp64_ = rect; +#line 259 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp65_ = _tmp64_.y; +#line 259 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp66_ = max_height; +#line 259 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp67_ = gitg_diff_image_side_by_side_get_old_size_layout (self); +#line 259 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp68_ = _tmp67_; +#line 259 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + gtk_render_layout (_tmp54_, _tmp55_, (_tmp56_ + _tmp58_) + ((_tmp61_ - _tmp63_) / 2), (_tmp65_ + _tmp66_) + GITG_DIFF_IMAGE_SIDE_BY_SIDE_TEXT_SPACING, _tmp68_); +#line 991 "gitg-diff-image-side-by-side.c" + } +#line 265 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp69_ = new_surface; +#line 265 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (_tmp69_ != NULL) { +#line 997 "gitg-diff-image-side-by-side.c" + gdouble x = 0.0; + GitgDiffImageSideBySideSizing _tmp70_ = {0}; + GitgDiffImageSideBySideSize _tmp71_ = {0}; + gint _tmp72_ = 0; + GitgDiffImageSideBySideSizing _tmp73_ = {0}; + GitgDiffImageSideBySideSize _tmp74_ = {0}; + gint _tmp75_ = 0; + gdouble _tmp76_ = 0.0; + gdouble y = 0.0; + gdouble _tmp77_ = 0.0; + GitgDiffImageSideBySideSizing _tmp78_ = {0}; + GitgDiffImageSideBySideSize _tmp79_ = {0}; + gint _tmp80_ = 0; + GitgDiffImageSurfaceCache* _tmp81_ = NULL; + GdkPixbuf* _tmp82_ = NULL; + GdkPixbuf* _tmp83_ = NULL; + cairo_t* _tmp89_ = NULL; + cairo_surface_t* _tmp90_ = NULL; + gdouble _tmp91_ = 0.0; + gdouble _tmp92_ = 0.0; + cairo_t* _tmp93_ = NULL; + PangoRectangle rect = {0}; + PangoLayout* _tmp94_ = NULL; + PangoLayout* _tmp95_ = NULL; + PangoRectangle _tmp96_ = {0}; + GtkStyleContext* _tmp97_ = NULL; + cairo_t* _tmp98_ = NULL; + gdouble _tmp99_ = 0.0; + PangoRectangle _tmp100_ = {0}; + gint _tmp101_ = 0; + GitgDiffImageSideBySideSizing _tmp102_ = {0}; + GitgDiffImageSideBySideSize _tmp103_ = {0}; + gint _tmp104_ = 0; + PangoRectangle _tmp105_ = {0}; + gint _tmp106_ = 0; + PangoRectangle _tmp107_ = {0}; + gint _tmp108_ = 0; + gdouble _tmp109_ = 0.0; + PangoLayout* _tmp110_ = NULL; + PangoLayout* _tmp111_ = NULL; +#line 267 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp70_ = sizing; +#line 267 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp71_ = _tmp70_.new_size; +#line 267 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp72_ = _tmp71_.width; +#line 267 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp73_ = sizing; +#line 267 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp74_ = _tmp73_.new_size; +#line 267 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp75_ = _tmp74_.image_width; +#line 267 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp76_ = spread_factor; +#line 267 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + x = (_tmp72_ - _tmp75_) * (1.0 - _tmp76_); +#line 268 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp77_ = max_height; +#line 268 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp78_ = sizing; +#line 268 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp79_ = _tmp78_.new_size; +#line 268 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp80_ = _tmp79_.image_height; +#line 268 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + y = (_tmp77_ - _tmp80_) / 2; +#line 270 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp81_ = self->priv->_cache; +#line 270 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp82_ = gitg_diff_image_surface_cache_get_old_pixbuf (_tmp81_); +#line 270 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp83_ = _tmp82_; +#line 270 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (_tmp83_ != NULL) { +#line 1072 "gitg-diff-image-side-by-side.c" + gdouble _tmp84_ = 0.0; + GitgDiffImageSideBySideSizing _tmp85_ = {0}; + GitgDiffImageSideBySideSize _tmp86_ = {0}; + gint _tmp87_ = 0; + gint _tmp88_ = 0; +#line 272 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp84_ = x; +#line 272 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp85_ = sizing; +#line 272 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp86_ = _tmp85_.old_size; +#line 272 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp87_ = _tmp86_.width; +#line 272 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp88_ = self->priv->_spacing; +#line 272 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + x = _tmp84_ + (_tmp87_ + _tmp88_); +#line 1090 "gitg-diff-image-side-by-side.c" + } +#line 275 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp89_ = cr; +#line 275 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp90_ = new_surface; +#line 275 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp91_ = x; +#line 275 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp92_ = y; +#line 275 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + cairo_set_source_surface (_tmp89_, _tmp90_, _tmp91_, _tmp92_); +#line 276 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp93_ = cr; +#line 276 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + cairo_paint (_tmp93_); +#line 280 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp94_ = gitg_diff_image_side_by_side_get_new_size_layout (self); +#line 280 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp95_ = _tmp94_; +#line 280 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + pango_layout_get_pixel_extents (_tmp95_, NULL, &_tmp96_); +#line 280 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + rect = _tmp96_; +#line 282 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp97_ = ctx; +#line 282 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp98_ = cr; +#line 282 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp99_ = x; +#line 282 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp100_ = rect; +#line 282 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp101_ = _tmp100_.x; +#line 282 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp102_ = sizing; +#line 282 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp103_ = _tmp102_.new_size; +#line 282 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp104_ = _tmp103_.image_width; +#line 282 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp105_ = rect; +#line 282 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp106_ = _tmp105_.width; +#line 282 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp107_ = rect; +#line 282 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp108_ = _tmp107_.y; +#line 282 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp109_ = max_height; +#line 282 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp110_ = gitg_diff_image_side_by_side_get_new_size_layout (self); +#line 282 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp111_ = _tmp110_; +#line 282 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + gtk_render_layout (_tmp97_, _tmp98_, (_tmp99_ + _tmp101_) + ((_tmp104_ - _tmp106_) / 2), (_tmp108_ + _tmp109_) + GITG_DIFF_IMAGE_SIDE_BY_SIDE_TEXT_SPACING, _tmp111_); +#line 1146 "gitg-diff-image-side-by-side.c" + } +#line 288 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + result = TRUE; +#line 288 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_object_unref0 (ctx); +#line 288 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _cairo_surface_destroy0 (new_surface); +#line 288 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _cairo_surface_destroy0 (old_surface); +#line 288 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_object_unref0 (window); +#line 288 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + return result; +#line 1160 "gitg-diff-image-side-by-side.c" +} + + +static void gitg_diff_image_side_by_side_real_realize (GtkWidget* base) { + GitgDiffImageSideBySide * self; +#line 291 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + self = (GitgDiffImageSideBySide*) base; +#line 293 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + GTK_WIDGET_CLASS (gitg_diff_image_side_by_side_parent_class)->realize ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea)); +#line 294 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + gtk_widget_queue_resize ((GtkWidget*) self); +#line 1172 "gitg-diff-image-side-by-side.c" +} + + +GitgDiffImageSideBySide* gitg_diff_image_side_by_side_construct (GType object_type) { + GitgDiffImageSideBySide * self = NULL; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + self = (GitgDiffImageSideBySide*) g_object_new (object_type, NULL); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + return self; +#line 1182 "gitg-diff-image-side-by-side.c" +} + + +GitgDiffImageSideBySide* gitg_diff_image_side_by_side_new (void) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + return gitg_diff_image_side_by_side_construct (GITG_TYPE_DIFF_IMAGE_SIDE_BY_SIDE); +#line 1189 "gitg-diff-image-side-by-side.c" +} + + +static PangoLayout* gitg_diff_image_side_by_side_get_old_size_layout (GitgDiffImageSideBySide* self) { + PangoLayout* result; + gboolean _tmp0_ = FALSE; + PangoLayout* _tmp1_ = NULL; + PangoLayout* _tmp28_ = NULL; +#line 29 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + g_return_val_if_fail (self != NULL, NULL); +#line 31 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp1_ = self->priv->d_old_size_layout; +#line 31 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (_tmp1_ == NULL) { +#line 1204 "gitg-diff-image-side-by-side.c" + GitgDiffImageSurfaceCache* _tmp2_ = NULL; + GdkPixbuf* _tmp3_ = NULL; + GdkPixbuf* _tmp4_ = NULL; +#line 31 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp2_ = self->priv->_cache; +#line 31 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp3_ = gitg_diff_image_surface_cache_get_old_pixbuf (_tmp2_); +#line 31 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp4_ = _tmp3_; +#line 31 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp0_ = _tmp4_ != NULL; +#line 1216 "gitg-diff-image-side-by-side.c" + } else { +#line 31 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp0_ = FALSE; +#line 1220 "gitg-diff-image-side-by-side.c" + } +#line 31 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (_tmp0_) { +#line 1224 "gitg-diff-image-side-by-side.c" + gchar* message = NULL; + GitgDiffImageSurfaceCache* _tmp5_ = NULL; + GdkPixbuf* _tmp6_ = NULL; + GdkPixbuf* _tmp7_ = NULL; + const gchar* _tmp10_ = NULL; + GitgDiffImageSurfaceCache* _tmp11_ = NULL; + GdkPixbuf* _tmp12_ = NULL; + GdkPixbuf* _tmp13_ = NULL; + gint _tmp14_ = 0; + gchar* _tmp15_ = NULL; + gchar* _tmp16_ = NULL; + GitgDiffImageSurfaceCache* _tmp17_ = NULL; + GdkPixbuf* _tmp18_ = NULL; + GdkPixbuf* _tmp19_ = NULL; + gint _tmp20_ = 0; + gchar* _tmp21_ = NULL; + gchar* _tmp22_ = NULL; + gchar* _tmp23_ = NULL; + gchar* _tmp24_ = NULL; + gchar* _tmp25_ = NULL; + gchar* _tmp26_ = NULL; + PangoLayout* _tmp27_ = NULL; +#line 35 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp5_ = self->priv->_cache; +#line 35 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp6_ = gitg_diff_image_surface_cache_get_new_pixbuf (_tmp5_); +#line 35 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp7_ = _tmp6_; +#line 35 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (_tmp7_ != NULL) { +#line 1255 "gitg-diff-image-side-by-side.c" + gchar* _tmp8_ = NULL; +#line 39 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp8_ = g_strdup (_ ("before (%s)")); +#line 39 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_free0 (message); +#line 39 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + message = _tmp8_; +#line 1263 "gitg-diff-image-side-by-side.c" + } else { + gchar* _tmp9_ = NULL; +#line 45 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp9_ = g_strdup (_ ("removed (%s)")); +#line 45 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_free0 (message); +#line 45 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + message = _tmp9_; +#line 1272 "gitg-diff-image-side-by-side.c" + } +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp10_ = message; +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp11_ = self->priv->_cache; +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp12_ = gitg_diff_image_surface_cache_get_old_pixbuf (_tmp11_); +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp13_ = _tmp12_; +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp14_ = gdk_pixbuf_get_width (_tmp13_); +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp15_ = g_strdup_printf ("%i", _tmp14_); +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp16_ = _tmp15_; +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp17_ = self->priv->_cache; +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp18_ = gitg_diff_image_surface_cache_get_old_pixbuf (_tmp17_); +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp19_ = _tmp18_; +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp20_ = gdk_pixbuf_get_height (_tmp19_); +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp21_ = g_strdup_printf ("%i", _tmp20_); +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp22_ = _tmp21_; +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp23_ = g_strconcat (_tmp16_, " × ", _tmp22_, NULL); +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp24_ = _tmp23_; +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp25_ = g_strdup_printf (_tmp10_, _tmp24_); +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp26_ = _tmp25_; +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp27_ = gtk_widget_create_pango_layout ((GtkWidget*) self, _tmp26_); +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_object_unref0 (self->priv->d_old_size_layout); +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + self->priv->d_old_size_layout = _tmp27_; +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_free0 (_tmp26_); +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_free0 (_tmp24_); +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_free0 (_tmp22_); +#line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_free0 (_tmp16_); +#line 31 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_free0 (message); +#line 1324 "gitg-diff-image-side-by-side.c" + } +#line 51 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp28_ = self->priv->d_old_size_layout; +#line 51 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + result = _tmp28_; +#line 51 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + return result; +#line 1332 "gitg-diff-image-side-by-side.c" +} + + +static PangoLayout* gitg_diff_image_side_by_side_get_new_size_layout (GitgDiffImageSideBySide* self) { + PangoLayout* result; + gboolean _tmp0_ = FALSE; + PangoLayout* _tmp1_ = NULL; + PangoLayout* _tmp28_ = NULL; +#line 57 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + g_return_val_if_fail (self != NULL, NULL); +#line 59 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp1_ = self->priv->d_new_size_layout; +#line 59 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (_tmp1_ == NULL) { +#line 1347 "gitg-diff-image-side-by-side.c" + GitgDiffImageSurfaceCache* _tmp2_ = NULL; + GdkPixbuf* _tmp3_ = NULL; + GdkPixbuf* _tmp4_ = NULL; +#line 59 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp2_ = self->priv->_cache; +#line 59 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp3_ = gitg_diff_image_surface_cache_get_new_pixbuf (_tmp2_); +#line 59 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp4_ = _tmp3_; +#line 59 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp0_ = _tmp4_ != NULL; +#line 1359 "gitg-diff-image-side-by-side.c" + } else { +#line 59 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp0_ = FALSE; +#line 1363 "gitg-diff-image-side-by-side.c" + } +#line 59 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (_tmp0_) { +#line 1367 "gitg-diff-image-side-by-side.c" + gchar* message = NULL; + GitgDiffImageSurfaceCache* _tmp5_ = NULL; + GdkPixbuf* _tmp6_ = NULL; + GdkPixbuf* _tmp7_ = NULL; + const gchar* _tmp10_ = NULL; + GitgDiffImageSurfaceCache* _tmp11_ = NULL; + GdkPixbuf* _tmp12_ = NULL; + GdkPixbuf* _tmp13_ = NULL; + gint _tmp14_ = 0; + gchar* _tmp15_ = NULL; + gchar* _tmp16_ = NULL; + GitgDiffImageSurfaceCache* _tmp17_ = NULL; + GdkPixbuf* _tmp18_ = NULL; + GdkPixbuf* _tmp19_ = NULL; + gint _tmp20_ = 0; + gchar* _tmp21_ = NULL; + gchar* _tmp22_ = NULL; + gchar* _tmp23_ = NULL; + gchar* _tmp24_ = NULL; + gchar* _tmp25_ = NULL; + gchar* _tmp26_ = NULL; + PangoLayout* _tmp27_ = NULL; +#line 63 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp5_ = self->priv->_cache; +#line 63 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp6_ = gitg_diff_image_surface_cache_get_old_pixbuf (_tmp5_); +#line 63 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp7_ = _tmp6_; +#line 63 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (_tmp7_ != NULL) { +#line 1398 "gitg-diff-image-side-by-side.c" + gchar* _tmp8_ = NULL; +#line 67 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp8_ = g_strdup (_ ("after (%s)")); +#line 67 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_free0 (message); +#line 67 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + message = _tmp8_; +#line 1406 "gitg-diff-image-side-by-side.c" + } else { + gchar* _tmp9_ = NULL; +#line 73 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp9_ = g_strdup (_ ("added (%s)")); +#line 73 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_free0 (message); +#line 73 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + message = _tmp9_; +#line 1415 "gitg-diff-image-side-by-side.c" + } +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp10_ = message; +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp11_ = self->priv->_cache; +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp12_ = gitg_diff_image_surface_cache_get_new_pixbuf (_tmp11_); +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp13_ = _tmp12_; +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp14_ = gdk_pixbuf_get_width (_tmp13_); +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp15_ = g_strdup_printf ("%i", _tmp14_); +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp16_ = _tmp15_; +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp17_ = self->priv->_cache; +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp18_ = gitg_diff_image_surface_cache_get_new_pixbuf (_tmp17_); +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp19_ = _tmp18_; +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp20_ = gdk_pixbuf_get_height (_tmp19_); +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp21_ = g_strdup_printf ("%i", _tmp20_); +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp22_ = _tmp21_; +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp23_ = g_strconcat (_tmp16_, " × ", _tmp22_, NULL); +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp24_ = _tmp23_; +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp25_ = g_strdup_printf (_tmp10_, _tmp24_); +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp26_ = _tmp25_; +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp27_ = gtk_widget_create_pango_layout ((GtkWidget*) self, _tmp26_); +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_object_unref0 (self->priv->d_new_size_layout); +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + self->priv->d_new_size_layout = _tmp27_; +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_free0 (_tmp26_); +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_free0 (_tmp24_); +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_free0 (_tmp22_); +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_free0 (_tmp16_); +#line 59 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_free0 (message); +#line 1467 "gitg-diff-image-side-by-side.c" + } +#line 79 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp28_ = self->priv->d_new_size_layout; +#line 79 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + result = _tmp28_; +#line 79 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + return result; +#line 1475 "gitg-diff-image-side-by-side.c" +} + + +GitgDiffImageSurfaceCache* gitg_diff_image_side_by_side_get_cache (GitgDiffImageSideBySide* self) { + GitgDiffImageSurfaceCache* result; + GitgDiffImageSurfaceCache* _tmp0_ = NULL; +#line 83 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + g_return_val_if_fail (self != NULL, NULL); +#line 83 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp0_ = self->priv->_cache; +#line 83 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + result = _tmp0_; +#line 83 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + return result; +#line 1490 "gitg-diff-image-side-by-side.c" +} + + +void gitg_diff_image_side_by_side_set_cache (GitgDiffImageSideBySide* self, GitgDiffImageSurfaceCache* value) { +#line 83 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + g_return_if_fail (self != NULL); +#line 83 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (gitg_diff_image_side_by_side_get_cache (self) != value) { +#line 1499 "gitg-diff-image-side-by-side.c" + GitgDiffImageSurfaceCache* _tmp0_ = NULL; + GitgDiffImageSurfaceCache* _tmp1_ = NULL; +#line 83 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp0_ = value; +#line 83 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 83 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_object_unref0 (self->priv->_cache); +#line 83 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + self->priv->_cache = _tmp1_; +#line 83 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + g_object_notify ((GObject *) self, "cache"); +#line 1512 "gitg-diff-image-side-by-side.c" + } +} + + +gint gitg_diff_image_side_by_side_get_spacing (GitgDiffImageSideBySide* self) { + gint result; + gint _tmp0_ = 0; +#line 84 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + g_return_val_if_fail (self != NULL, 0); +#line 84 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp0_ = self->priv->_spacing; +#line 84 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + result = _tmp0_; +#line 84 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + return result; +#line 1528 "gitg-diff-image-side-by-side.c" +} + + +void gitg_diff_image_side_by_side_set_spacing (GitgDiffImageSideBySide* self, gint value) { +#line 84 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + g_return_if_fail (self != NULL); +#line 84 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + if (gitg_diff_image_side_by_side_get_spacing (self) != value) { +#line 1537 "gitg-diff-image-side-by-side.c" + gint _tmp0_ = 0; +#line 84 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _tmp0_ = value; +#line 84 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + self->priv->_spacing = _tmp0_; +#line 84 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + g_object_notify ((GObject *) self, "spacing"); +#line 1545 "gitg-diff-image-side-by-side.c" + } +} + + +static GitgDiffImageSideBySideSize* gitg_diff_image_side_by_side_size_dup (const GitgDiffImageSideBySideSize* self) { + GitgDiffImageSideBySideSize* dup; +#line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + dup = g_new0 (GitgDiffImageSideBySideSize, 1); +#line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + memcpy (dup, self, sizeof (GitgDiffImageSideBySideSize)); +#line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + return dup; +#line 1558 "gitg-diff-image-side-by-side.c" +} + + +static void gitg_diff_image_side_by_side_size_free (GitgDiffImageSideBySideSize* self) { +#line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + g_free (self); +#line 1565 "gitg-diff-image-side-by-side.c" +} + + +static GType gitg_diff_image_side_by_side_size_get_type (void) { + static volatile gsize gitg_diff_image_side_by_side_size_type_id__volatile = 0; + if (g_once_init_enter (&gitg_diff_image_side_by_side_size_type_id__volatile)) { + GType gitg_diff_image_side_by_side_size_type_id; + gitg_diff_image_side_by_side_size_type_id = g_boxed_type_register_static ("GitgDiffImageSideBySideSize", (GBoxedCopyFunc) gitg_diff_image_side_by_side_size_dup, (GBoxedFreeFunc) gitg_diff_image_side_by_side_size_free); + g_once_init_leave (&gitg_diff_image_side_by_side_size_type_id__volatile, gitg_diff_image_side_by_side_size_type_id); + } + return gitg_diff_image_side_by_side_size_type_id__volatile; +} + + +static GitgDiffImageSideBySideSizing* gitg_diff_image_side_by_side_sizing_dup (const GitgDiffImageSideBySideSizing* self) { + GitgDiffImageSideBySideSizing* dup; +#line 94 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + dup = g_new0 (GitgDiffImageSideBySideSizing, 1); +#line 94 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + memcpy (dup, self, sizeof (GitgDiffImageSideBySideSizing)); +#line 94 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + return dup; +#line 1588 "gitg-diff-image-side-by-side.c" +} + + +static void gitg_diff_image_side_by_side_sizing_free (GitgDiffImageSideBySideSizing* self) { +#line 94 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + g_free (self); +#line 1595 "gitg-diff-image-side-by-side.c" +} + + +static GType gitg_diff_image_side_by_side_sizing_get_type (void) { + static volatile gsize gitg_diff_image_side_by_side_sizing_type_id__volatile = 0; + if (g_once_init_enter (&gitg_diff_image_side_by_side_sizing_type_id__volatile)) { + GType gitg_diff_image_side_by_side_sizing_type_id; + gitg_diff_image_side_by_side_sizing_type_id = g_boxed_type_register_static ("GitgDiffImageSideBySideSizing", (GBoxedCopyFunc) gitg_diff_image_side_by_side_sizing_dup, (GBoxedFreeFunc) gitg_diff_image_side_by_side_sizing_free); + g_once_init_leave (&gitg_diff_image_side_by_side_sizing_type_id__volatile, gitg_diff_image_side_by_side_sizing_type_id); + } + return gitg_diff_image_side_by_side_sizing_type_id__volatile; +} + + +static void gitg_diff_image_side_by_side_class_init (GitgDiffImageSideBySideClass * klass) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + gitg_diff_image_side_by_side_parent_class = g_type_class_peek_parent (klass); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + g_type_class_add_private (klass, sizeof (GitgDiffImageSideBySidePrivate)); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + ((GtkWidgetClass *) klass)->style_updated = gitg_diff_image_side_by_side_real_style_updated; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + ((GtkWidgetClass *) klass)->get_preferred_height_for_width = gitg_diff_image_side_by_side_real_get_preferred_height_for_width; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + ((GtkWidgetClass *) klass)->get_request_mode = gitg_diff_image_side_by_side_real_get_request_mode; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + ((GtkWidgetClass *) klass)->draw = gitg_diff_image_side_by_side_real_draw; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + ((GtkWidgetClass *) klass)->realize = gitg_diff_image_side_by_side_real_realize; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + G_OBJECT_CLASS (klass)->get_property = _vala_gitg_diff_image_side_by_side_get_property; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + G_OBJECT_CLASS (klass)->set_property = _vala_gitg_diff_image_side_by_side_set_property; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + G_OBJECT_CLASS (klass)->finalize = gitg_diff_image_side_by_side_finalize; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_DIFF_IMAGE_SIDE_BY_SIDE_CACHE, g_param_spec_object ("cache", "cache", "cache", GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_DIFF_IMAGE_SIDE_BY_SIDE_SPACING, g_param_spec_int ("spacing", "spacing", "spacing", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); +#line 1635 "gitg-diff-image-side-by-side.c" +} + + +static void gitg_diff_image_side_by_side_instance_init (GitgDiffImageSideBySide * self) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + self->priv = GITG_DIFF_IMAGE_SIDE_BY_SIDE_GET_PRIVATE (self); +#line 1642 "gitg-diff-image-side-by-side.c" +} + + +static void gitg_diff_image_side_by_side_finalize (GObject * obj) { + GitgDiffImageSideBySide * self; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_DIFF_IMAGE_SIDE_BY_SIDE, GitgDiffImageSideBySide); +#line 22 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_object_unref0 (self->priv->d_old_size_layout); +#line 23 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_object_unref0 (self->priv->d_new_size_layout); +#line 83 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + _g_object_unref0 (self->priv->_cache); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + G_OBJECT_CLASS (gitg_diff_image_side_by_side_parent_class)->finalize (obj); +#line 1658 "gitg-diff-image-side-by-side.c" +} + + +GType gitg_diff_image_side_by_side_get_type (void) { + static volatile gsize gitg_diff_image_side_by_side_type_id__volatile = 0; + if (g_once_init_enter (&gitg_diff_image_side_by_side_type_id__volatile)) { + static const GTypeInfo g_define_type_info = { sizeof (GitgDiffImageSideBySideClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) gitg_diff_image_side_by_side_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (GitgDiffImageSideBySide), 0, (GInstanceInitFunc) gitg_diff_image_side_by_side_instance_init, NULL }; + GType gitg_diff_image_side_by_side_type_id; + gitg_diff_image_side_by_side_type_id = g_type_register_static (gtk_drawing_area_get_type (), "GitgDiffImageSideBySide", &g_define_type_info, 0); + g_once_init_leave (&gitg_diff_image_side_by_side_type_id__volatile, gitg_diff_image_side_by_side_type_id); + } + return gitg_diff_image_side_by_side_type_id__volatile; +} + + +static void _vala_gitg_diff_image_side_by_side_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { + GitgDiffImageSideBySide * self; + self = G_TYPE_CHECK_INSTANCE_CAST (object, GITG_TYPE_DIFF_IMAGE_SIDE_BY_SIDE, GitgDiffImageSideBySide); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + switch (property_id) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + case GITG_DIFF_IMAGE_SIDE_BY_SIDE_CACHE: +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + g_value_set_object (value, gitg_diff_image_side_by_side_get_cache (self)); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + break; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + case GITG_DIFF_IMAGE_SIDE_BY_SIDE_SPACING: +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + g_value_set_int (value, gitg_diff_image_side_by_side_get_spacing (self)); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + break; +#line 1691 "gitg-diff-image-side-by-side.c" + default: +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + break; +#line 1697 "gitg-diff-image-side-by-side.c" + } +} + + +static void _vala_gitg_diff_image_side_by_side_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { + GitgDiffImageSideBySide * self; + self = G_TYPE_CHECK_INSTANCE_CAST (object, GITG_TYPE_DIFF_IMAGE_SIDE_BY_SIDE, GitgDiffImageSideBySide); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + switch (property_id) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + case GITG_DIFF_IMAGE_SIDE_BY_SIDE_CACHE: +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + gitg_diff_image_side_by_side_set_cache (self, g_value_get_object (value)); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + break; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + case GITG_DIFF_IMAGE_SIDE_BY_SIDE_SPACING: +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + gitg_diff_image_side_by_side_set_spacing (self, g_value_get_int (value)); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + break; +#line 1719 "gitg-diff-image-side-by-side.c" + default: +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-side-by-side.vala" + break; +#line 1725 "gitg-diff-image-side-by-side.c" + } +} + + + diff -Nru gitg-3.22.0/libgitg/gitg-diff-image-side-by-side.vala gitg-3.23.0/libgitg/gitg-diff-image-side-by-side.vala --- gitg-3.22.0/libgitg/gitg-diff-image-side-by-side.vala 1970-01-01 00:00:00.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-image-side-by-side.vala 2016-11-26 08:32:25.000000000 +0000 @@ -0,0 +1,296 @@ +/* + * This file is part of gitg + * + * Copyright (C) 2016 - Jesse van den Kieboom + * + * gitg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * gitg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gitg. If not, see . + */ + +class Gitg.DiffImageSideBySide : Gtk.DrawingArea +{ + private Pango.Layout d_old_size_layout; + private Pango.Layout d_new_size_layout; + + private static const int TEXT_SPACING = 6; + + private Pango.Layout? old_size_layout + { + get + { + if (d_old_size_layout == null && cache.old_pixbuf != null) + { + string message; + + if (cache.new_pixbuf != null) + { + // Translators: this label is displayed below the image diff, %s + // is substituted with the size of the image + message = _("before (%s)"); + } + else + { + // Translators: this label is displayed below the image diff, %s + // is substituted with the size of the image + message = _("removed (%s)"); + } + + d_old_size_layout = create_pango_layout(message.printf(@"$(cache.old_pixbuf.get_width()) × $(cache.old_pixbuf.get_height())")); + } + + return d_old_size_layout; + } + } + + private Pango.Layout? new_size_layout + { + get + { + if (d_new_size_layout == null && cache.new_pixbuf != null) + { + string message; + + if (cache.old_pixbuf != null) + { + // Translators: this label is displayed below the image diff, %s + // is substituted with the size of the image + message = _("after (%s)"); + } + else + { + // Translators: this label is displayed below the image diff, %s + // is substituted with the size of the image + message = _("added (%s)"); + } + + d_new_size_layout = create_pango_layout(message.printf(@"$(cache.new_pixbuf.get_width()) × $(cache.new_pixbuf.get_height())")); + } + + return d_new_size_layout; + } + } + + public Gitg.DiffImageSurfaceCache cache { get; set; } + public int spacing { get; set; } + + private struct Size + { + public int width; + + public int image_width; + public int image_height; + } + + private struct Sizing + { + public Size old_size; + public Size new_size; + } + + private Sizing get_sizing(int width) + { + double ow = 0, oh = 0, nw = 0, nh = 0; + + var old_pixbuf = cache.old_pixbuf; + var new_pixbuf = cache.new_pixbuf; + + var window = get_window(); + + if (old_pixbuf != null) + { + double xscale = 1, yscale = 1; + + if (window != null) + { + cache.get_old_surface(get_window()).get_device_scale(out xscale, out yscale); + } + + ow = (double)old_pixbuf.get_width() / xscale; + oh = (double)old_pixbuf.get_height() / yscale; + } + + if (new_pixbuf != null) + { + double xscale = 1, yscale = 1; + + if (window != null) + { + cache.get_new_surface(get_window()).get_device_scale(out xscale, out yscale); + } + + nw = (double)new_pixbuf.get_width() / xscale; + nh = (double)new_pixbuf.get_height() / yscale; + } + + var tw = ow + nw; + + width -= spacing; + + double osw = 0, nsw = 0; + + if (tw != 0) + { + if (ow != 0) + { + osw = width * (ow / tw); + } + + if (nw != 0) + { + nsw = width * (nw / tw); + } + } + + var oswi = double.min(osw, ow); + var nswi = double.min(nsw, nw); + + double oshi = 0, nshi = 0; + + if (ow != 0) + { + oshi = oswi / ow * oh; + } + + if (nw != 0) + { + nshi = nswi / nw * nh; + } + + return Sizing() { + old_size = Size() { + width = (int)osw, + + image_width = (int)oswi, + image_height = (int)oshi + }, + + new_size = Size() { + width = (int)nsw, + + image_width = (int)nswi, + image_height = (int)nshi + } + }; + } + + protected override void style_updated() + { + d_old_size_layout = null; + d_new_size_layout = null; + } + + protected override void get_preferred_height_for_width(int width, out int minimum_height, out int natural_height) + { + var sizing = get_sizing(width); + var h = double.max(sizing.old_size.image_height, sizing.new_size.image_height); + + var ol = old_size_layout; + var nl = new_size_layout; + + int osw = 0, osh = 0, nsw = 0, nsh = 0; + + if (ol != null) + { + ol.get_pixel_size(out osw, out osh); + } + + if (nl != null) + { + nl.get_pixel_size(out nsw, out nsh); + } + + h += TEXT_SPACING + int.max(osh, nsh); + + minimum_height = (int)h; + natural_height = (int)h; + } + + protected override Gtk.SizeRequestMode get_request_mode() + { + return Gtk.SizeRequestMode.HEIGHT_FOR_WIDTH; + } + + protected override bool draw(Cairo.Context cr) + { + var window = get_window(); + + Gtk.Allocation alloc; + get_allocation(out alloc); + + var sizing = get_sizing(alloc.width); + + var old_surface = cache.get_old_surface(window); + var new_surface = cache.get_new_surface(window); + + var ctx = get_style_context(); + + ctx.render_background(cr, alloc.x, alloc.y, alloc.width, alloc.height); + + double max_height = double.max(sizing.old_size.image_height, sizing.new_size.image_height); + double spread_factor = 0.5; + + if (old_surface != null && new_surface != null) + { + spread_factor = 2.0 / 3.0; + } + + if (old_surface != null) + { + var x = (sizing.old_size.width - sizing.old_size.image_width) * spread_factor; + var y = (max_height - sizing.old_size.image_height) / 2; + + cr.set_source_surface(old_surface, x, y); + cr.paint(); + + Pango.Rectangle rect; + + old_size_layout.get_pixel_extents(null, out rect); + + ctx.render_layout(cr, + x + rect.x + (sizing.old_size.image_width - rect.width) / 2, + rect.y + max_height + TEXT_SPACING, + old_size_layout); + } + + if (new_surface != null) + { + var x = (sizing.new_size.width - sizing.new_size.image_width) * (1.0 - spread_factor); + var y = (max_height - sizing.new_size.image_height) / 2; + + if (cache.old_pixbuf != null) + { + x += sizing.old_size.width + spacing; + } + + cr.set_source_surface(new_surface, x, y); + cr.paint(); + + Pango.Rectangle rect; + + new_size_layout.get_pixel_extents(null, out rect); + + ctx.render_layout(cr, + x + rect.x + (sizing.new_size.image_width - rect.width) / 2, + rect.y + max_height + TEXT_SPACING, + new_size_layout); + } + + return true; + } + + protected override void realize() + { + base.realize(); + queue_resize(); + } +} diff -Nru gitg-3.22.0/libgitg/gitg-diff-image-slider.c gitg-3.23.0/libgitg/gitg-diff-image-slider.c --- gitg-3.22.0/libgitg/gitg-diff-image-slider.c 1970-01-01 00:00:00.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-image-slider.c 2016-11-26 12:23:15.000000000 +0000 @@ -0,0 +1,561 @@ +/* gitg-diff-image-slider.c generated by valac 0.34.0.108-f56ac, the Vala compiler + * generated from gitg-diff-image-slider.vala, do not modify */ + +/* + * This file is part of gitg + * + * Copyright (C) 2016 - Jesse van den Kieboom + * + * gitg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * gitg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gitg. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include + + +#define GITG_TYPE_DIFF_IMAGE_COMPOSITE (gitg_diff_image_composite_get_type ()) +#define GITG_DIFF_IMAGE_COMPOSITE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageComposite)) +#define GITG_DIFF_IMAGE_COMPOSITE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageCompositeClass)) +#define GITG_IS_DIFF_IMAGE_COMPOSITE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_IMAGE_COMPOSITE)) +#define GITG_IS_DIFF_IMAGE_COMPOSITE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GITG_TYPE_DIFF_IMAGE_COMPOSITE)) +#define GITG_DIFF_IMAGE_COMPOSITE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageCompositeClass)) + +typedef struct _GitgDiffImageComposite GitgDiffImageComposite; +typedef struct _GitgDiffImageCompositeClass GitgDiffImageCompositeClass; +typedef struct _GitgDiffImageCompositePrivate GitgDiffImageCompositePrivate; + +#define GITG_TYPE_DIFF_IMAGE_SLIDER (gitg_diff_image_slider_get_type ()) +#define GITG_DIFF_IMAGE_SLIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_IMAGE_SLIDER, GitgDiffImageSlider)) +#define GITG_DIFF_IMAGE_SLIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GITG_TYPE_DIFF_IMAGE_SLIDER, GitgDiffImageSliderClass)) +#define GITG_IS_DIFF_IMAGE_SLIDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_IMAGE_SLIDER)) +#define GITG_IS_DIFF_IMAGE_SLIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GITG_TYPE_DIFF_IMAGE_SLIDER)) +#define GITG_DIFF_IMAGE_SLIDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GITG_TYPE_DIFF_IMAGE_SLIDER, GitgDiffImageSliderClass)) + +typedef struct _GitgDiffImageSlider GitgDiffImageSlider; +typedef struct _GitgDiffImageSliderClass GitgDiffImageSliderClass; +typedef struct _GitgDiffImageSliderPrivate GitgDiffImageSliderPrivate; + +#define GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE (gitg_diff_image_surface_cache_get_type ()) +#define GITG_DIFF_IMAGE_SURFACE_CACHE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE, GitgDiffImageSurfaceCache)) +#define GITG_IS_DIFF_IMAGE_SURFACE_CACHE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE)) +#define GITG_DIFF_IMAGE_SURFACE_CACHE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE, GitgDiffImageSurfaceCacheIface)) + +typedef struct _GitgDiffImageSurfaceCache GitgDiffImageSurfaceCache; +typedef struct _GitgDiffImageSurfaceCacheIface GitgDiffImageSurfaceCacheIface; +#define _cairo_surface_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_surface_destroy (var), NULL))) +#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) + +struct _GitgDiffImageComposite { + GtkDrawingArea parent_instance; + GitgDiffImageCompositePrivate * priv; +}; + +struct _GitgDiffImageCompositeClass { + GtkDrawingAreaClass parent_class; +}; + +struct _GitgDiffImageSlider { + GitgDiffImageComposite parent_instance; + GitgDiffImageSliderPrivate * priv; +}; + +struct _GitgDiffImageSliderClass { + GitgDiffImageCompositeClass parent_class; +}; + +struct _GitgDiffImageSliderPrivate { + gdouble d_position; +}; + +struct _GitgDiffImageSurfaceCacheIface { + GTypeInterface parent_iface; + cairo_surface_t* (*get_old_surface) (GitgDiffImageSurfaceCache* self, GdkWindow* window); + cairo_surface_t* (*get_new_surface) (GitgDiffImageSurfaceCache* self, GdkWindow* window); + GdkPixbuf* (*get_old_pixbuf) (GitgDiffImageSurfaceCache* self); + void (*set_old_pixbuf) (GitgDiffImageSurfaceCache* self, GdkPixbuf* value); + GdkPixbuf* (*get_new_pixbuf) (GitgDiffImageSurfaceCache* self); + void (*set_new_pixbuf) (GitgDiffImageSurfaceCache* self, GdkPixbuf* value); + GdkWindow* (*get_window) (GitgDiffImageSurfaceCache* self); + void (*set_window) (GitgDiffImageSurfaceCache* self, GdkWindow* value); +}; + + +static gpointer gitg_diff_image_slider_parent_class = NULL; + +GType gitg_diff_image_composite_get_type (void) G_GNUC_CONST; +GType gitg_diff_image_slider_get_type (void) G_GNUC_CONST; +#define GITG_DIFF_IMAGE_SLIDER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_DIFF_IMAGE_SLIDER, GitgDiffImageSliderPrivate)) +enum { + GITG_DIFF_IMAGE_SLIDER_DUMMY_PROPERTY, + GITG_DIFF_IMAGE_SLIDER_POSITION +}; +static gboolean gitg_diff_image_slider_real_draw (GtkWidget* base, cairo_t* cr); +void gitg_diff_image_composite_get_sizing (GitgDiffImageComposite* self, gint width, gint* image_width, gint* image_height); +GType gitg_diff_image_surface_cache_get_type (void) G_GNUC_CONST; +GitgDiffImageSurfaceCache* gitg_diff_image_composite_get_cache (GitgDiffImageComposite* self); +cairo_surface_t* gitg_diff_image_surface_cache_get_old_surface (GitgDiffImageSurfaceCache* self, GdkWindow* window); +cairo_surface_t* gitg_diff_image_surface_cache_get_new_surface (GitgDiffImageSurfaceCache* self, GdkWindow* window); +gdouble gitg_diff_image_slider_get_position (GitgDiffImageSlider* self); +static void gitg_diff_image_slider_real_realize (GtkWidget* base); +GitgDiffImageSlider* gitg_diff_image_slider_new (void); +GitgDiffImageSlider* gitg_diff_image_slider_construct (GType object_type); +GitgDiffImageComposite* gitg_diff_image_composite_new (void); +GitgDiffImageComposite* gitg_diff_image_composite_construct (GType object_type); +void gitg_diff_image_slider_set_position (GitgDiffImageSlider* self, gdouble value); +static void gitg_diff_image_slider_finalize (GObject * obj); +static void _vala_gitg_diff_image_slider_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); +static void _vala_gitg_diff_image_slider_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); + + +static gpointer _g_object_ref0 (gpointer self) { +#line 46 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + return self ? g_object_ref (self) : NULL; +#line 131 "gitg-diff-image-slider.c" +} + + +static gboolean gitg_diff_image_slider_real_draw (GtkWidget* base, cairo_t* cr) { + GitgDiffImageSlider * self; + gboolean result = FALSE; + cairo_t* _tmp0_ = NULL; + GdkWindow* window = NULL; + GdkWindow* _tmp1_ = NULL; + GdkWindow* _tmp2_ = NULL; + GtkAllocation alloc = {0}; + GtkAllocation _tmp3_ = {0}; + gint image_width = 0; + gint image_height = 0; + GtkAllocation _tmp4_ = {0}; + gint _tmp5_ = 0; + gint _tmp6_ = 0; + gint _tmp7_ = 0; + cairo_surface_t* old_surface = NULL; + GitgDiffImageSurfaceCache* _tmp8_ = NULL; + GitgDiffImageSurfaceCache* _tmp9_ = NULL; + GdkWindow* _tmp10_ = NULL; + cairo_surface_t* _tmp11_ = NULL; + cairo_surface_t* new_surface = NULL; + GitgDiffImageSurfaceCache* _tmp12_ = NULL; + GitgDiffImageSurfaceCache* _tmp13_ = NULL; + GdkWindow* _tmp14_ = NULL; + cairo_surface_t* _tmp15_ = NULL; + gint x = 0; + GtkAllocation _tmp16_ = {0}; + gint _tmp17_ = 0; + gint _tmp18_ = 0; + gint y = 0; + gint pos = 0; + gint _tmp19_ = 0; + gdouble _tmp20_ = 0.0; + gdouble _tmp21_ = 0.0; + cairo_surface_t* _tmp22_ = NULL; + cairo_surface_t* _tmp36_ = NULL; +#line 42 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + self = (GitgDiffImageSlider*) base; +#line 42 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + g_return_val_if_fail (cr != NULL, FALSE); +#line 44 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp0_ = cr; +#line 44 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + GTK_WIDGET_CLASS (gitg_diff_image_slider_parent_class)->draw ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (self, GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageComposite), _tmp0_); +#line 46 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp1_ = gtk_widget_get_window ((GtkWidget*) self); +#line 46 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp2_ = _g_object_ref0 (_tmp1_); +#line 46 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + window = _tmp2_; +#line 49 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + gtk_widget_get_allocation ((GtkWidget*) self, &_tmp3_); +#line 49 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + alloc = _tmp3_; +#line 52 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp4_ = alloc; +#line 52 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp5_ = _tmp4_.width; +#line 52 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + gitg_diff_image_composite_get_sizing ((GitgDiffImageComposite*) self, _tmp5_, &_tmp6_, &_tmp7_); +#line 52 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + image_width = _tmp6_; +#line 52 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + image_height = _tmp7_; +#line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp8_ = gitg_diff_image_composite_get_cache ((GitgDiffImageComposite*) self); +#line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp9_ = _tmp8_; +#line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp10_ = window; +#line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp11_ = gitg_diff_image_surface_cache_get_old_surface (_tmp9_, _tmp10_); +#line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + old_surface = _tmp11_; +#line 55 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp12_ = gitg_diff_image_composite_get_cache ((GitgDiffImageComposite*) self); +#line 55 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp13_ = _tmp12_; +#line 55 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp14_ = window; +#line 55 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp15_ = gitg_diff_image_surface_cache_get_new_surface (_tmp13_, _tmp14_); +#line 55 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + new_surface = _tmp15_; +#line 57 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp16_ = alloc; +#line 57 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp17_ = _tmp16_.width; +#line 57 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp18_ = image_width; +#line 57 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + x = (_tmp17_ - _tmp18_) / 2; +#line 58 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + y = 0; +#line 60 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp19_ = image_width; +#line 60 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp20_ = gitg_diff_image_slider_get_position (self); +#line 60 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp21_ = _tmp20_; +#line 60 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + pos = (gint) (_tmp19_ * _tmp21_); +#line 62 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp22_ = old_surface; +#line 62 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + if (_tmp22_ != NULL) { +#line 241 "gitg-diff-image-slider.c" + cairo_t* _tmp23_ = NULL; + cairo_t* _tmp35_ = NULL; +#line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp23_ = cr; +#line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + cairo_save (_tmp23_); +#line 248 "gitg-diff-image-slider.c" + { + cairo_t* _tmp24_ = NULL; + gint _tmp25_ = 0; + gint _tmp26_ = 0; + gint _tmp27_ = 0; + gint _tmp28_ = 0; + cairo_t* _tmp29_ = NULL; + cairo_t* _tmp30_ = NULL; + cairo_surface_t* _tmp31_ = NULL; + gint _tmp32_ = 0; + gint _tmp33_ = 0; + cairo_t* _tmp34_ = NULL; +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp24_ = cr; +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp25_ = x; +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp26_ = y; +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp27_ = pos; +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp28_ = image_height; +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + cairo_rectangle (_tmp24_, (gdouble) _tmp25_, (gdouble) _tmp26_, (gdouble) _tmp27_, (gdouble) _tmp28_); +#line 67 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp29_ = cr; +#line 67 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + cairo_clip (_tmp29_); +#line 68 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp30_ = cr; +#line 68 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp31_ = old_surface; +#line 68 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp32_ = x; +#line 68 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp33_ = y; +#line 68 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + cairo_set_source_surface (_tmp30_, _tmp31_, (gdouble) _tmp32_, (gdouble) _tmp33_); +#line 69 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp34_ = cr; +#line 69 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + cairo_paint (_tmp34_); +#line 291 "gitg-diff-image-slider.c" + } +#line 71 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp35_ = cr; +#line 71 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + cairo_restore (_tmp35_); +#line 297 "gitg-diff-image-slider.c" + } +#line 74 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp36_ = new_surface; +#line 74 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + if (_tmp36_ != NULL) { +#line 303 "gitg-diff-image-slider.c" + cairo_t* _tmp37_ = NULL; + cairo_t* _tmp51_ = NULL; +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp37_ = cr; +#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + cairo_save (_tmp37_); +#line 310 "gitg-diff-image-slider.c" + { + cairo_t* _tmp38_ = NULL; + gint _tmp39_ = 0; + gint _tmp40_ = 0; + gint _tmp41_ = 0; + gint _tmp42_ = 0; + gint _tmp43_ = 0; + gint _tmp44_ = 0; + cairo_t* _tmp45_ = NULL; + cairo_t* _tmp46_ = NULL; + cairo_surface_t* _tmp47_ = NULL; + gint _tmp48_ = 0; + gint _tmp49_ = 0; + cairo_t* _tmp50_ = NULL; +#line 78 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp38_ = cr; +#line 78 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp39_ = x; +#line 78 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp40_ = pos; +#line 78 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp41_ = y; +#line 78 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp42_ = image_width; +#line 78 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp43_ = pos; +#line 78 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp44_ = image_height; +#line 78 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + cairo_rectangle (_tmp38_, (gdouble) (_tmp39_ + _tmp40_), (gdouble) _tmp41_, (gdouble) (_tmp42_ - _tmp43_), (gdouble) _tmp44_); +#line 79 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp45_ = cr; +#line 79 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + cairo_clip (_tmp45_); +#line 80 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp46_ = cr; +#line 80 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp47_ = new_surface; +#line 80 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp48_ = x; +#line 80 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp49_ = y; +#line 80 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + cairo_set_source_surface (_tmp46_, _tmp47_, (gdouble) _tmp48_, (gdouble) _tmp49_); +#line 81 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp50_ = cr; +#line 81 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + cairo_paint (_tmp50_); +#line 359 "gitg-diff-image-slider.c" + } +#line 83 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp51_ = cr; +#line 83 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + cairo_restore (_tmp51_); +#line 365 "gitg-diff-image-slider.c" + } +#line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + result = TRUE; +#line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _cairo_surface_destroy0 (new_surface); +#line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _cairo_surface_destroy0 (old_surface); +#line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _g_object_unref0 (window); +#line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + return result; +#line 377 "gitg-diff-image-slider.c" +} + + +static void gitg_diff_image_slider_real_realize (GtkWidget* base) { + GitgDiffImageSlider * self; +#line 89 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + self = (GitgDiffImageSlider*) base; +#line 91 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + GTK_WIDGET_CLASS (gitg_diff_image_slider_parent_class)->realize ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (self, GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageComposite)); +#line 92 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + gtk_widget_queue_resize ((GtkWidget*) self); +#line 389 "gitg-diff-image-slider.c" +} + + +GitgDiffImageSlider* gitg_diff_image_slider_construct (GType object_type) { + GitgDiffImageSlider * self = NULL; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + self = (GitgDiffImageSlider*) gitg_diff_image_composite_construct (object_type); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + return self; +#line 399 "gitg-diff-image-slider.c" +} + + +GitgDiffImageSlider* gitg_diff_image_slider_new (void) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + return gitg_diff_image_slider_construct (GITG_TYPE_DIFF_IMAGE_SLIDER); +#line 406 "gitg-diff-image-slider.c" +} + + +gdouble gitg_diff_image_slider_get_position (GitgDiffImageSlider* self) { + gdouble result; + gdouble _tmp0_ = 0.0; +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + g_return_val_if_fail (self != NULL, 0.0); +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp0_ = self->priv->d_position; +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + result = _tmp0_; +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + return result; +#line 421 "gitg-diff-image-slider.c" +} + + +void gitg_diff_image_slider_set_position (GitgDiffImageSlider* self, gdouble value) { +#line 28 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + g_return_if_fail (self != NULL); +#line 28 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + if (gitg_diff_image_slider_get_position (self) != value) { +#line 430 "gitg-diff-image-slider.c" + gdouble newpos = 0.0; + gdouble _tmp0_ = 0.0; + gdouble _tmp1_ = 0.0; + gdouble _tmp2_ = 0.0; + gdouble _tmp3_ = 0.0; + gdouble _tmp4_ = 0.0; +#line 30 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp0_ = value; +#line 30 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp1_ = MIN (_tmp0_, (gdouble) 1); +#line 30 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp2_ = MAX ((gdouble) 0, _tmp1_); +#line 30 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + newpos = _tmp2_; +#line 32 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp3_ = newpos; +#line 32 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp4_ = self->priv->d_position; +#line 32 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + if (_tmp3_ != _tmp4_) { +#line 451 "gitg-diff-image-slider.c" + gdouble _tmp5_ = 0.0; +#line 34 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + _tmp5_ = newpos; +#line 34 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + self->priv->d_position = _tmp5_; +#line 35 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + gtk_widget_queue_draw ((GtkWidget*) self); +#line 459 "gitg-diff-image-slider.c" + } +#line 28 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + g_object_notify ((GObject *) self, "position"); +#line 463 "gitg-diff-image-slider.c" + } +} + + +static void gitg_diff_image_slider_class_init (GitgDiffImageSliderClass * klass) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + gitg_diff_image_slider_parent_class = g_type_class_peek_parent (klass); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + g_type_class_add_private (klass, sizeof (GitgDiffImageSliderPrivate)); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + ((GtkWidgetClass *) klass)->draw = gitg_diff_image_slider_real_draw; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + ((GtkWidgetClass *) klass)->realize = gitg_diff_image_slider_real_realize; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + G_OBJECT_CLASS (klass)->get_property = _vala_gitg_diff_image_slider_get_property; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + G_OBJECT_CLASS (klass)->set_property = _vala_gitg_diff_image_slider_set_property; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + G_OBJECT_CLASS (klass)->finalize = gitg_diff_image_slider_finalize; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_DIFF_IMAGE_SLIDER_POSITION, g_param_spec_double ("position", "position", "position", -G_MAXDOUBLE, G_MAXDOUBLE, 0.5, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); +#line 485 "gitg-diff-image-slider.c" +} + + +static void gitg_diff_image_slider_instance_init (GitgDiffImageSlider * self) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + self->priv = GITG_DIFF_IMAGE_SLIDER_GET_PRIVATE (self); +#line 492 "gitg-diff-image-slider.c" +} + + +static void gitg_diff_image_slider_finalize (GObject * obj) { + GitgDiffImageSlider * self; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_DIFF_IMAGE_SLIDER, GitgDiffImageSlider); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + G_OBJECT_CLASS (gitg_diff_image_slider_parent_class)->finalize (obj); +#line 502 "gitg-diff-image-slider.c" +} + + +GType gitg_diff_image_slider_get_type (void) { + static volatile gsize gitg_diff_image_slider_type_id__volatile = 0; + if (g_once_init_enter (&gitg_diff_image_slider_type_id__volatile)) { + static const GTypeInfo g_define_type_info = { sizeof (GitgDiffImageSliderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) gitg_diff_image_slider_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (GitgDiffImageSlider), 0, (GInstanceInitFunc) gitg_diff_image_slider_instance_init, NULL }; + GType gitg_diff_image_slider_type_id; + gitg_diff_image_slider_type_id = g_type_register_static (GITG_TYPE_DIFF_IMAGE_COMPOSITE, "GitgDiffImageSlider", &g_define_type_info, 0); + g_once_init_leave (&gitg_diff_image_slider_type_id__volatile, gitg_diff_image_slider_type_id); + } + return gitg_diff_image_slider_type_id__volatile; +} + + +static void _vala_gitg_diff_image_slider_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { + GitgDiffImageSlider * self; + self = G_TYPE_CHECK_INSTANCE_CAST (object, GITG_TYPE_DIFF_IMAGE_SLIDER, GitgDiffImageSlider); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + switch (property_id) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + case GITG_DIFF_IMAGE_SLIDER_POSITION: +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + g_value_set_double (value, gitg_diff_image_slider_get_position (self)); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + break; +#line 529 "gitg-diff-image-slider.c" + default: +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + break; +#line 535 "gitg-diff-image-slider.c" + } +} + + +static void _vala_gitg_diff_image_slider_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { + GitgDiffImageSlider * self; + self = G_TYPE_CHECK_INSTANCE_CAST (object, GITG_TYPE_DIFF_IMAGE_SLIDER, GitgDiffImageSlider); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + switch (property_id) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + case GITG_DIFF_IMAGE_SLIDER_POSITION: +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + gitg_diff_image_slider_set_position (self, g_value_get_double (value)); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + break; +#line 551 "gitg-diff-image-slider.c" + default: +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-slider.vala" + break; +#line 557 "gitg-diff-image-slider.c" + } +} + + + diff -Nru gitg-3.22.0/libgitg/gitg-diff-image-slider.vala gitg-3.23.0/libgitg/gitg-diff-image-slider.vala --- gitg-3.22.0/libgitg/gitg-diff-image-slider.vala 1970-01-01 00:00:00.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-image-slider.vala 2016-11-26 08:32:25.000000000 +0000 @@ -0,0 +1,94 @@ +/* + * This file is part of gitg + * + * Copyright (C) 2016 - Jesse van den Kieboom + * + * gitg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * gitg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gitg. If not, see . + */ + +class Gitg.DiffImageSlider : DiffImageComposite +{ + private double d_position; + + public double position + { + get { return d_position; } + + set + { + var newpos = double.max(0, double.min(value, 1)); + + if (newpos != d_position) + { + d_position = newpos; + queue_draw(); + } + } + + default = 0.5; + } + + protected override bool draw(Cairo.Context cr) + { + base.draw(cr); + + var window = get_window(); + + Gtk.Allocation alloc; + get_allocation(out alloc); + + int image_width, image_height; + get_sizing(alloc.width, out image_width, out image_height); + + var old_surface = cache.get_old_surface(window); + var new_surface = cache.get_new_surface(window); + + int x = (alloc.width - image_width) / 2; + int y = 0; + + int pos = (int)(image_width * position); + + if (old_surface != null) + { + cr.save(); + { + cr.rectangle(x, y, pos, image_height); + cr.clip(); + cr.set_source_surface(old_surface, x, y); + cr.paint(); + } + cr.restore(); + } + + if (new_surface != null) + { + cr.save(); + { + cr.rectangle(x + pos, y, image_width - pos, image_height); + cr.clip(); + cr.set_source_surface(new_surface, x, y); + cr.paint(); + } + cr.restore(); + } + + return true; + } + + protected override void realize() + { + base.realize(); + queue_resize(); + } +} diff -Nru gitg-3.22.0/libgitg/gitg-diff-image-surface-cache.c gitg-3.23.0/libgitg/gitg-diff-image-surface-cache.c --- gitg-3.22.0/libgitg/gitg-diff-image-surface-cache.c 1970-01-01 00:00:00.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-image-surface-cache.c 2016-11-26 12:23:15.000000000 +0000 @@ -0,0 +1,166 @@ +/* gitg-diff-image-surface-cache.c generated by valac 0.34.0.108-f56ac, the Vala compiler + * generated from gitg-diff-image-surface-cache.vala, do not modify */ + +/* + * This file is part of gitg + * + * Copyright (C) 2016 - Jesse van den Kieboom + * + * gitg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * gitg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gitg. If not, see . + */ + +#include +#include +#include +#include +#include + + +#define GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE (gitg_diff_image_surface_cache_get_type ()) +#define GITG_DIFF_IMAGE_SURFACE_CACHE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE, GitgDiffImageSurfaceCache)) +#define GITG_IS_DIFF_IMAGE_SURFACE_CACHE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE)) +#define GITG_DIFF_IMAGE_SURFACE_CACHE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE, GitgDiffImageSurfaceCacheIface)) + +typedef struct _GitgDiffImageSurfaceCache GitgDiffImageSurfaceCache; +typedef struct _GitgDiffImageSurfaceCacheIface GitgDiffImageSurfaceCacheIface; + +struct _GitgDiffImageSurfaceCacheIface { + GTypeInterface parent_iface; + cairo_surface_t* (*get_old_surface) (GitgDiffImageSurfaceCache* self, GdkWindow* window); + cairo_surface_t* (*get_new_surface) (GitgDiffImageSurfaceCache* self, GdkWindow* window); + GdkPixbuf* (*get_old_pixbuf) (GitgDiffImageSurfaceCache* self); + void (*set_old_pixbuf) (GitgDiffImageSurfaceCache* self, GdkPixbuf* value); + GdkPixbuf* (*get_new_pixbuf) (GitgDiffImageSurfaceCache* self); + void (*set_new_pixbuf) (GitgDiffImageSurfaceCache* self, GdkPixbuf* value); + GdkWindow* (*get_window) (GitgDiffImageSurfaceCache* self); + void (*set_window) (GitgDiffImageSurfaceCache* self, GdkWindow* value); +}; + + + +GType gitg_diff_image_surface_cache_get_type (void) G_GNUC_CONST; +cairo_surface_t* gitg_diff_image_surface_cache_get_old_surface (GitgDiffImageSurfaceCache* self, GdkWindow* window); +cairo_surface_t* gitg_diff_image_surface_cache_get_new_surface (GitgDiffImageSurfaceCache* self, GdkWindow* window); +GdkPixbuf* gitg_diff_image_surface_cache_get_old_pixbuf (GitgDiffImageSurfaceCache* self); +void gitg_diff_image_surface_cache_set_old_pixbuf (GitgDiffImageSurfaceCache* self, GdkPixbuf* value); +GdkPixbuf* gitg_diff_image_surface_cache_get_new_pixbuf (GitgDiffImageSurfaceCache* self); +void gitg_diff_image_surface_cache_set_new_pixbuf (GitgDiffImageSurfaceCache* self, GdkPixbuf* value); +GdkWindow* gitg_diff_image_surface_cache_get_window (GitgDiffImageSurfaceCache* self); +void gitg_diff_image_surface_cache_set_window (GitgDiffImageSurfaceCache* self, GdkWindow* value); + + +cairo_surface_t* gitg_diff_image_surface_cache_get_old_surface (GitgDiffImageSurfaceCache* self, GdkWindow* window) { +#line 27 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-surface-cache.vala" + g_return_val_if_fail (self != NULL, NULL); +#line 27 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-surface-cache.vala" + return GITG_DIFF_IMAGE_SURFACE_CACHE_GET_INTERFACE (self)->get_old_surface (self, window); +#line 69 "gitg-diff-image-surface-cache.c" +} + + +cairo_surface_t* gitg_diff_image_surface_cache_get_new_surface (GitgDiffImageSurfaceCache* self, GdkWindow* window) { +#line 28 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-surface-cache.vala" + g_return_val_if_fail (self != NULL, NULL); +#line 28 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-surface-cache.vala" + return GITG_DIFF_IMAGE_SURFACE_CACHE_GET_INTERFACE (self)->get_new_surface (self, window); +#line 78 "gitg-diff-image-surface-cache.c" +} + + +GdkPixbuf* gitg_diff_image_surface_cache_get_old_pixbuf (GitgDiffImageSurfaceCache* self) { +#line 22 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-surface-cache.vala" + g_return_val_if_fail (self != NULL, NULL); +#line 22 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-surface-cache.vala" + return GITG_DIFF_IMAGE_SURFACE_CACHE_GET_INTERFACE (self)->get_old_pixbuf (self); +#line 87 "gitg-diff-image-surface-cache.c" +} + + +void gitg_diff_image_surface_cache_set_old_pixbuf (GitgDiffImageSurfaceCache* self, GdkPixbuf* value) { +#line 22 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-surface-cache.vala" + g_return_if_fail (self != NULL); +#line 22 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-surface-cache.vala" + GITG_DIFF_IMAGE_SURFACE_CACHE_GET_INTERFACE (self)->set_old_pixbuf (self, value); +#line 96 "gitg-diff-image-surface-cache.c" +} + + +GdkPixbuf* gitg_diff_image_surface_cache_get_new_pixbuf (GitgDiffImageSurfaceCache* self) { +#line 23 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-surface-cache.vala" + g_return_val_if_fail (self != NULL, NULL); +#line 23 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-surface-cache.vala" + return GITG_DIFF_IMAGE_SURFACE_CACHE_GET_INTERFACE (self)->get_new_pixbuf (self); +#line 105 "gitg-diff-image-surface-cache.c" +} + + +void gitg_diff_image_surface_cache_set_new_pixbuf (GitgDiffImageSurfaceCache* self, GdkPixbuf* value) { +#line 23 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-surface-cache.vala" + g_return_if_fail (self != NULL); +#line 23 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-surface-cache.vala" + GITG_DIFF_IMAGE_SURFACE_CACHE_GET_INTERFACE (self)->set_new_pixbuf (self, value); +#line 114 "gitg-diff-image-surface-cache.c" +} + + +GdkWindow* gitg_diff_image_surface_cache_get_window (GitgDiffImageSurfaceCache* self) { +#line 25 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-surface-cache.vala" + g_return_val_if_fail (self != NULL, NULL); +#line 25 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-surface-cache.vala" + return GITG_DIFF_IMAGE_SURFACE_CACHE_GET_INTERFACE (self)->get_window (self); +#line 123 "gitg-diff-image-surface-cache.c" +} + + +void gitg_diff_image_surface_cache_set_window (GitgDiffImageSurfaceCache* self, GdkWindow* value) { +#line 25 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-surface-cache.vala" + g_return_if_fail (self != NULL); +#line 25 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-surface-cache.vala" + GITG_DIFF_IMAGE_SURFACE_CACHE_GET_INTERFACE (self)->set_window (self, value); +#line 132 "gitg-diff-image-surface-cache.c" +} + + +static void gitg_diff_image_surface_cache_base_init (GitgDiffImageSurfaceCacheIface * iface) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-surface-cache.vala" + static gboolean initialized = FALSE; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-surface-cache.vala" + if (!initialized) { +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-surface-cache.vala" + initialized = TRUE; +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-surface-cache.vala" + g_object_interface_install_property (iface, g_param_spec_object ("old-pixbuf", "old-pixbuf", "old-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-surface-cache.vala" + g_object_interface_install_property (iface, g_param_spec_object ("new-pixbuf", "new-pixbuf", "new-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); +#line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-image-surface-cache.vala" + g_object_interface_install_property (iface, g_param_spec_object ("window", "window", "window", gdk_window_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); +#line 149 "gitg-diff-image-surface-cache.c" + } +} + + +GType gitg_diff_image_surface_cache_get_type (void) { + static volatile gsize gitg_diff_image_surface_cache_type_id__volatile = 0; + if (g_once_init_enter (&gitg_diff_image_surface_cache_type_id__volatile)) { + static const GTypeInfo g_define_type_info = { sizeof (GitgDiffImageSurfaceCacheIface), (GBaseInitFunc) gitg_diff_image_surface_cache_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; + GType gitg_diff_image_surface_cache_type_id; + gitg_diff_image_surface_cache_type_id = g_type_register_static (G_TYPE_INTERFACE, "GitgDiffImageSurfaceCache", &g_define_type_info, 0); + g_type_interface_add_prerequisite (gitg_diff_image_surface_cache_type_id, G_TYPE_OBJECT); + g_once_init_leave (&gitg_diff_image_surface_cache_type_id__volatile, gitg_diff_image_surface_cache_type_id); + } + return gitg_diff_image_surface_cache_type_id__volatile; +} + + + diff -Nru gitg-3.22.0/libgitg/gitg-diff-image-surface-cache.vala gitg-3.23.0/libgitg/gitg-diff-image-surface-cache.vala --- gitg-3.22.0/libgitg/gitg-diff-image-surface-cache.vala 1970-01-01 00:00:00.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-image-surface-cache.vala 2016-11-26 08:32:25.000000000 +0000 @@ -0,0 +1,29 @@ +/* + * This file is part of gitg + * + * Copyright (C) 2016 - Jesse van den Kieboom + * + * gitg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * gitg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gitg. If not, see . + */ + +interface Gitg.DiffImageSurfaceCache : Object +{ + public abstract Gdk.Pixbuf? old_pixbuf { get; construct set; } + public abstract Gdk.Pixbuf? new_pixbuf { get; construct set; } + + public abstract Gdk.Window window { get; construct set; } + + public abstract Cairo.Surface? get_old_surface(Gdk.Window window); + public abstract Cairo.Surface? get_new_surface(Gdk.Window window); +} diff -Nru gitg-3.22.0/libgitg/gitg-diff-selectable.c gitg-3.23.0/libgitg/gitg-diff-selectable.c --- gitg-3.22.0/libgitg/gitg-diff-selectable.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-selectable.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-diff-selectable.c generated by valac 0.32.1, the Vala compiler +/* gitg-diff-selectable.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-diff-selectable.vala, do not modify */ /* diff -Nru gitg-3.22.0/libgitg/gitg-diff-stat.c gitg-3.23.0/libgitg/gitg-diff-stat.c --- gitg-3.22.0/libgitg/gitg-diff-stat.c 2016-08-09 09:50:21.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-stat.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-diff-stat.c generated by valac 0.32.1, the Vala compiler +/* gitg-diff-stat.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-diff-stat.vala, do not modify */ /* @@ -82,7 +82,7 @@ void gitg_diff_stat_set_added (GitgDiffStat* self, guint value); void gitg_diff_stat_set_removed (GitgDiffStat* self, guint value); static GObject * gitg_diff_stat_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); -static void gitg_diff_stat_finalize (GObject* obj); +static void gitg_diff_stat_finalize (GObject * obj); static void _vala_gitg_diff_stat_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_diff_stat_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -1098,18 +1098,22 @@ void gitg_diff_stat_set_added (GitgDiffStat* self, guint value) { - guint _tmp0_ = 0U; #line 30 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" g_return_if_fail (self != NULL); +#line 30 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" + if (gitg_diff_stat_get_added (self) != value) { +#line 1106 "gitg-diff-stat.c" + guint _tmp0_ = 0U; #line 32 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" - _tmp0_ = value; + _tmp0_ = value; #line 32 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" - self->priv->d_added = _tmp0_; + self->priv->d_added = _tmp0_; #line 33 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" - gitg_diff_stat_make_layout (self); + gitg_diff_stat_make_layout (self); #line 30 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" - g_object_notify ((GObject *) self, "added"); -#line 1113 "gitg-diff-stat.c" + g_object_notify ((GObject *) self, "added"); +#line 1116 "gitg-diff-stat.c" + } } @@ -1124,23 +1128,27 @@ result = _tmp0_; #line 39 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" return result; -#line 1128 "gitg-diff-stat.c" +#line 1132 "gitg-diff-stat.c" } void gitg_diff_stat_set_removed (GitgDiffStat* self, guint value) { - guint _tmp0_ = 0U; #line 40 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" g_return_if_fail (self != NULL); +#line 40 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" + if (gitg_diff_stat_get_removed (self) != value) { +#line 1141 "gitg-diff-stat.c" + guint _tmp0_ = 0U; #line 42 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" - _tmp0_ = value; + _tmp0_ = value; #line 42 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" - self->priv->d_removed = _tmp0_; + self->priv->d_removed = _tmp0_; #line 43 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" - gitg_diff_stat_make_layout (self); + gitg_diff_stat_make_layout (self); #line 40 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" - g_object_notify ((GObject *) self, "removed"); -#line 1144 "gitg-diff-stat.c" + g_object_notify ((GObject *) self, "removed"); +#line 1151 "gitg-diff-stat.c" + } } @@ -1158,7 +1166,7 @@ gitg_diff_stat_make_layout (self); #line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" return obj; -#line 1162 "gitg-diff-stat.c" +#line 1170 "gitg-diff-stat.c" } @@ -1199,18 +1207,18 @@ _g_param_spec_unref0 (_tmp1_); #line 58 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (klass), "gitg-diffstat"); -#line 1203 "gitg-diff-stat.c" +#line 1211 "gitg-diff-stat.c" } static void gitg_diff_stat_instance_init (GitgDiffStat * self) { #line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" self->priv = GITG_DIFF_STAT_GET_PRIVATE (self); -#line 1210 "gitg-diff-stat.c" +#line 1218 "gitg-diff-stat.c" } -static void gitg_diff_stat_finalize (GObject* obj) { +static void gitg_diff_stat_finalize (GObject * obj) { GitgDiffStat * self; #line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_DIFF_STAT, GitgDiffStat); @@ -1218,7 +1226,7 @@ _g_object_unref0 (self->priv->d_layout); #line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" G_OBJECT_CLASS (gitg_diff_stat_parent_class)->finalize (obj); -#line 1222 "gitg-diff-stat.c" +#line 1230 "gitg-diff-stat.c" } @@ -1251,13 +1259,13 @@ g_value_set_uint (value, gitg_diff_stat_get_removed (self)); #line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" break; -#line 1255 "gitg-diff-stat.c" +#line 1263 "gitg-diff-stat.c" default: #line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" break; -#line 1261 "gitg-diff-stat.c" +#line 1269 "gitg-diff-stat.c" } } @@ -1279,13 +1287,13 @@ gitg_diff_stat_set_removed (self, g_value_get_uint (value)); #line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" break; -#line 1283 "gitg-diff-stat.c" +#line 1291 "gitg-diff-stat.c" default: #line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-stat.vala" break; -#line 1289 "gitg-diff-stat.c" +#line 1297 "gitg-diff-stat.c" } } diff -Nru gitg-3.22.0/libgitg/gitg-diff-view.c gitg-3.23.0/libgitg/gitg-diff-view.c --- gitg-3.22.0/libgitg/gitg-diff-view.c 2016-09-18 12:01:41.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-view.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-diff-view.c generated by valac 0.32.1, the Vala compiler +/* gitg-diff-view.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-diff-view.vala, do not modify */ /* @@ -25,14 +25,15 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include #include #include +#include #include @@ -160,8 +161,14 @@ #define GITG_PATCH_SET_TYPE_TYPE (gitg_patch_set_type_get_type ()) typedef struct _GitgPatchSetPatch GitgPatchSetPatch; #define _gitg_patch_set_unref0(var) ((var == NULL) ? NULL : (var = (gitg_patch_set_unref (var), NULL))) +#define _g_slist_free0(var) ((var == NULL) ? NULL : (var = (g_slist_free (var), NULL))) #define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL))) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) +enum { + GITG_DIFF_VIEW_OPTIONS_CHANGED_SIGNAL, + GITG_DIFF_VIEW_LAST_SIGNAL +}; +static guint gitg_diff_view_signals[GITG_DIFF_VIEW_LAST_SIGNAL] = {0}; struct _GitgDiffView { GtkGrid parent_instance; @@ -286,6 +293,8 @@ static gpointer gitg_diff_view_parent_class = NULL; +static GeeHashSet* gitg_diff_view_s_image_mime_types; +static GeeHashSet* gitg_diff_view_s_image_mime_types = NULL; static GRegex* gitg_diff_view_s_message_regexp; static GRegex* gitg_diff_view_s_message_regexp = NULL; @@ -354,8 +363,7 @@ gboolean gitg_diff_selectable_get_has_selection (GitgDiffSelectable* self); gboolean gitg_diff_view_get_has_selection (GitgDiffView* self); static void gitg_diff_view_set_has_selection (GitgDiffView* self, gboolean value); -static gchar* gitg_diff_view_primary_path (GitgDiffView* self, GitgDiffViewFile* f); -GgitDiffDelta* gitg_diff_view_file_get_delta (GitgDiffViewFile* self); +static gchar* gitg_diff_view_primary_path (GitgDiffView* self, GgitDiffDelta* delta); static gchar* gitg_diff_view_key_for_delta (GitgDiffView* self, GgitDiffDelta* delta); GType gitg_diff_view_file_info_get_type (void) G_GNUC_CONST; static Block6Data* block6_data_ref (Block6Data* _data6_); @@ -383,7 +391,9 @@ static void ___lambda58__gitg_diff_view_anon (gpointer self); static gint ___lambda59_ (Block8Data* _data8_, GgitDiffDelta* delta, gfloat progress); const gchar* gitg_diff_view_file_info_get_new_file_content_type (GitgDiffViewFileInfo* self); -static gboolean _vala_string_array_contains (gchar** stack, int stack_length, gchar* needle); +static gboolean _vala_string_array_contains (gchar* * stack, int stack_length, gchar* needle); +GitgDiffViewFile* gitg_diff_view_file_new_image (GitgRepository* repository, GgitDiffDelta* delta); +GitgDiffViewFile* gitg_diff_view_file_construct_image (GType object_type, GitgRepository* repository, GgitDiffDelta* delta); GitgDiffViewFile* gitg_diff_view_file_new_binary (GitgRepository* repository, GgitDiffDelta* delta); GitgDiffViewFile* gitg_diff_view_file_construct_binary (GType object_type, GitgRepository* repository, GgitDiffDelta* delta); gboolean gitg_diff_view_get_handle_selection (GitgDiffView* self); @@ -397,6 +407,7 @@ static gint ___lambda62_ (Block8Data* _data8_, GgitDiffDelta* delta, GgitDiffHunk* hunk, GgitDiffLine* line); static gint ____lambda62__ggit_diff_line_callback (GgitDiffDelta* delta, GgitDiffHunk* hunk, GgitDiffLine* line, gpointer self); gboolean gitg_diff_view_file_get_expanded (GitgDiffViewFile* self); +GgitDiffDelta* gitg_diff_view_file_get_delta (GitgDiffViewFile* self); gboolean gitg_diff_view_get_default_collapse_all (GitgDiffView* self); void gitg_diff_view_commit_details_set_expander_visible (GitgDiffViewCommitDetails* self, gboolean value); GType gitg_diff_view_file_renderer_text_get_type (void) G_GNUC_CONST; @@ -448,13 +459,14 @@ GType gitg_patch_set_type_get_type (void) G_GNUC_CONST; GitgPatchSetPatch* gitg_patch_set_patch_dup (const GitgPatchSetPatch* self); void gitg_patch_set_patch_free (GitgPatchSetPatch* self); -static void _vala_array_add2 (GitgPatchSet*** array, int* length, int* size, GitgPatchSet* value); +static void _vala_array_add2 (GitgPatchSet** * array, int* length, int* size, GitgPatchSet* value); static void gitg_diff_view_real_options_changed (GitgDiffView* self); -static void gitg_diff_view_finalize (GObject* obj); +static void gitg_diff_view_finalize (GObject * obj); static void _vala_gitg_diff_view_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_diff_view_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static gint _vala_array_length (gpointer array); static gboolean gitg_diff_view_flag_get (GitgDiffView* self, GgitDiffOption f) { @@ -464,23 +476,23 @@ GgitDiffOption _tmp2_ = 0; GgitDiffOption _tmp3_ = 0; GgitDiffOption _tmp4_ = 0; -#line 123 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_return_val_if_fail (self != NULL, FALSE); #line 125 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_return_val_if_fail (self != NULL, FALSE); +#line 127 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = gitg_diff_view_get_options (self); -#line 125 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 127 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = _tmp0_; -#line 125 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 127 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = ggit_diff_options_get_flags (_tmp1_); -#line 125 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 127 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = _tmp2_; -#line 125 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 127 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = f; -#line 125 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 127 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = (_tmp3_ & _tmp4_) != 0; -#line 125 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 127 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 484 "gitg-diff-view.c" +#line 496 "gitg-diff-view.c" } @@ -496,94 +508,94 @@ GgitDiffOptions* _tmp11_ = NULL; GgitDiffOption _tmp12_ = 0; GgitDiffOption _tmp13_ = 0; -#line 128 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_return_if_fail (self != NULL); #line 130 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_return_if_fail (self != NULL); +#line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = gitg_diff_view_get_options (self); -#line 130 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = _tmp0_; -#line 130 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = ggit_diff_options_get_flags (_tmp1_); -#line 130 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = _tmp2_; -#line 130 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - flags = _tmp3_; #line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + flags = _tmp3_; +#line 134 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = val; -#line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 134 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp4_) { -#line 516 "gitg-diff-view.c" +#line 528 "gitg-diff-view.c" GgitDiffOption _tmp5_ = 0; GgitDiffOption _tmp6_ = 0; -#line 134 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 136 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp5_ = flags; -#line 134 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 136 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp6_ = f; -#line 134 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 136 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" flags = _tmp5_ | _tmp6_; -#line 525 "gitg-diff-view.c" +#line 537 "gitg-diff-view.c" } else { GgitDiffOption _tmp7_ = 0; GgitDiffOption _tmp8_ = 0; -#line 138 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 140 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp7_ = flags; -#line 138 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 140 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp8_ = f; -#line 138 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 140 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" flags = _tmp7_ & (~_tmp8_); -#line 535 "gitg-diff-view.c" +#line 547 "gitg-diff-view.c" } -#line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 143 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp9_ = flags; -#line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 143 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp10_ = gitg_diff_view_get_options (self); -#line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 143 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp11_ = _tmp10_; -#line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 143 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp12_ = ggit_diff_options_get_flags (_tmp11_); -#line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 143 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp13_ = _tmp12_; -#line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 143 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp9_ != _tmp13_) { -#line 549 "gitg-diff-view.c" +#line 561 "gitg-diff-view.c" GgitDiffOptions* _tmp14_ = NULL; GgitDiffOptions* _tmp15_ = NULL; GgitDiffOption _tmp16_ = 0; -#line 143 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp14_ = gitg_diff_view_get_options (self); -#line 143 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp15_ = _tmp14_; -#line 143 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp16_ = flags; -#line 143 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" ggit_diff_options_set_flags (_tmp15_, _tmp16_); -#line 144 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_signal_emit_by_name (self, "options-changed"); -#line 563 "gitg-diff-view.c" +#line 146 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_signal_emit (self, gitg_diff_view_signals[GITG_DIFF_VIEW_OPTIONS_CHANGED_SIGNAL], 0); +#line 575 "gitg-diff-view.c" } } static void _gitg_diff_view_update_expanded_files_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { -#line 189 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 191 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_update_expanded_files ((GitgDiffView*) self); -#line 571 "gitg-diff-view.c" +#line 583 "gitg-diff-view.c" } static void _gitg_diff_view_parent_commit_changed_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { -#line 190 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 192 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_parent_commit_changed ((GitgDiffView*) self); -#line 578 "gitg-diff-view.c" +#line 590 "gitg-diff-view.c" } static gboolean _gitg_diff_view_motion_notify_event_on_event_box_gtk_widget_motion_notify_event (GtkWidget* _sender, GdkEventMotion* event, gpointer self) { gboolean result; result = gitg_diff_view_motion_notify_event_on_event_box ((GitgDiffView*) self, _sender, event); -#line 194 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 196 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 587 "gitg-diff-view.c" +#line 599 "gitg-diff-view.c" } @@ -596,65 +608,65 @@ GitgDiffViewCommitDetails* _tmp4_ = NULL; GtkEventBox* _tmp5_ = NULL; GitgDiffViewOptions* _tmp6_ = NULL; -#line 187 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - self = (GitgDiffView*) base; #line 189 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + self = (GitgDiffView*) base; +#line 191 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->d_commit_details; -#line 189 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 191 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = g_signal_connect_object ((GObject*) _tmp0_, "notify::expanded", (GCallback) _gitg_diff_view_update_expanded_files_g_object_notify, self, 0); -#line 189 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 191 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self->priv->d_expanded_notify = _tmp1_; -#line 190 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 192 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = self->priv->d_commit_details; -#line 190 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 192 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = g_signal_connect_object ((GObject*) _tmp2_, "notify::parent-commit", (GCallback) _gitg_diff_view_parent_commit_changed_g_object_notify, self, 0); -#line 190 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - self->priv->d_parent_commit_notify = _tmp3_; #line 192 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + self->priv->d_parent_commit_notify = _tmp3_; +#line 194 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = self->priv->d_commit_details; -#line 192 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_bind_property_with_closures ((GObject*) self, "use-gravatar", (GObject*) _tmp4_, "use-gravatar", G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); #line 194 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_bind_property_with_closures ((GObject*) self, "use-gravatar", (GObject*) _tmp4_, "use-gravatar", G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); +#line 196 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp5_ = self->priv->d_event_box; -#line 194 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 196 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_signal_connect_object ((GtkWidget*) _tmp5_, "motion-notify-event", (GCallback) _gitg_diff_view_motion_notify_event_on_event_box_gtk_widget_motion_notify_event, self, 0); -#line 195 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 197 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp6_ = self->priv->d_diff_view_options; -#line 195 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 197 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_options_set_view (_tmp6_, self); -#line 626 "gitg-diff-view.c" +#line 638 "gitg-diff-view.c" } static void gitg_diff_view_real_dispose (GObject* base) { GitgDiffView * self; GCancellable* _tmp0_ = NULL; -#line 198 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - self = (GitgDiffView*) base; #line 200 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + self = (GitgDiffView*) base; +#line 202 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->d_cancellable; -#line 200 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 202 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp0_ != NULL) { -#line 639 "gitg-diff-view.c" +#line 651 "gitg-diff-view.c" GCancellable* _tmp1_ = NULL; -#line 202 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = self->priv->d_cancellable; -#line 202 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_cancellable_cancel (_tmp1_); -#line 645 "gitg-diff-view.c" +#line 657 "gitg-diff-view.c" } -#line 205 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 207 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" G_OBJECT_CLASS (gitg_diff_view_parent_class)->dispose ((GObject*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_grid_get_type (), GtkGrid)); -#line 649 "gitg-diff-view.c" +#line 661 "gitg-diff-view.c" } static void gitg_diff_view_parent_commit_changed (GitgDiffView* self) { -#line 208 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_return_if_fail (self != NULL); #line 210 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_return_if_fail (self != NULL); +#line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_update (self, FALSE); -#line 658 "gitg-diff-view.c" +#line 670 "gitg-diff-view.c" } @@ -665,48 +677,48 @@ gboolean _tmp2_ = FALSE; GtkGrid* _tmp3_ = NULL; GList* _tmp4_ = NULL; -#line 213 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_return_if_fail (self != NULL); #line 215 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_return_if_fail (self != NULL); +#line 217 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->d_commit_details; -#line 215 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 217 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = gitg_diff_view_commit_details_get_expanded (_tmp0_); -#line 215 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 217 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = _tmp1_; -#line 215 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - expanded = _tmp2_; #line 217 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + expanded = _tmp2_; +#line 219 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = self->priv->d_grid_files; -#line 217 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 219 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = gtk_container_get_children ((GtkContainer*) _tmp3_); -#line 683 "gitg-diff-view.c" +#line 695 "gitg-diff-view.c" { GList* file_collection = NULL; GList* file_it = NULL; -#line 217 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 219 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" file_collection = _tmp4_; -#line 217 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 219 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" for (file_it = file_collection; file_it != NULL; file_it = file_it->next) { -#line 691 "gitg-diff-view.c" +#line 703 "gitg-diff-view.c" GtkWidget* file = NULL; -#line 217 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 219 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" file = (GtkWidget*) file_it->data; -#line 695 "gitg-diff-view.c" +#line 707 "gitg-diff-view.c" { GtkWidget* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; -#line 219 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 221 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp5_ = file; -#line 219 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 221 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp6_ = expanded; -#line 219 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 221 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_file_set_expanded (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, GITG_TYPE_DIFF_VIEW_FILE) ? ((GitgDiffViewFile*) _tmp5_) : NULL, _tmp6_); -#line 705 "gitg-diff-view.c" +#line 717 "gitg-diff-view.c" } } -#line 217 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 219 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_list_free0 (file_collection); -#line 710 "gitg-diff-view.c" +#line 722 "gitg-diff-view.c" } } @@ -723,72 +735,72 @@ GMatchInfo* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; gchar* _tmp9_ = NULL; -#line 233 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 245 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, NULL); -#line 233 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 245 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (commit != NULL, NULL); -#line 235 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 247 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = commit; -#line 235 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 247 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = ggit_commit_get_message ((GgitCommit*) _tmp0_); -#line 235 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 247 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = g_strdup (_tmp1_); -#line 235 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 247 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" message = _tmp2_; -#line 238 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 250 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = gitg_diff_view_s_message_regexp; -#line 238 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 250 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = message; -#line 238 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 250 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp6_ = g_regex_match (_tmp3_, _tmp4_, 0, &_tmp5_); -#line 238 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 250 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_match_info_unref0 (minfo); -#line 238 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 250 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" minfo = _tmp5_; -#line 238 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 250 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp6_) { -#line 751 "gitg-diff-view.c" +#line 763 "gitg-diff-view.c" GMatchInfo* _tmp7_ = NULL; gchar* _tmp8_ = NULL; -#line 240 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 252 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp7_ = minfo; -#line 240 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 252 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp8_ = g_match_info_fetch_named (_tmp7_, "message"); -#line 240 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 252 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp8_; -#line 240 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 252 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_match_info_unref0 (minfo); -#line 240 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 252 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_free0 (message); -#line 240 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 252 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 766 "gitg-diff-view.c" +#line 778 "gitg-diff-view.c" } -#line 243 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 255 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp9_ = g_strdup (""); -#line 243 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 255 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp9_; -#line 243 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 255 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_match_info_unref0 (minfo); -#line 243 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 255 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_free0 (message); -#line 243 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 255 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 778 "gitg-diff-view.c" +#line 790 "gitg-diff-view.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 273 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 285 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return self ? g_object_ref (self) : NULL; -#line 785 "gitg-diff-view.c" +#line 797 "gitg-diff-view.c" } static void _vala_GgitOId_free (GgitOId* self) { -#line 281 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 293 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_boxed_free (ggit_oid_get_type (), self); -#line 792 "gitg-diff-view.c" +#line 804 "gitg-diff-view.c" } @@ -801,64 +813,64 @@ GCancellable* _tmp8_ = NULL; GitgCommit* _tmp9_ = NULL; GgitDiff* _tmp56_ = NULL; -#line 246 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 258 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (self != NULL); -#line 250 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 262 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = self->priv->d_diff; -#line 250 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 262 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp1_ == NULL) { -#line 811 "gitg-diff-view.c" +#line 823 "gitg-diff-view.c" GitgCommit* _tmp2_ = NULL; -#line 250 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 262 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = self->priv->d_commit; -#line 250 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 262 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = _tmp2_ == NULL; -#line 817 "gitg-diff-view.c" +#line 829 "gitg-diff-view.c" } else { -#line 250 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 262 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = FALSE; -#line 821 "gitg-diff-view.c" +#line 833 "gitg-diff-view.c" } -#line 250 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 262 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp0_) { -#line 825 "gitg-diff-view.c" +#line 837 "gitg-diff-view.c" GitgDiffViewCommitDetails* _tmp3_ = NULL; GtkScrolledWindow* _tmp4_ = NULL; -#line 252 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 264 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = self->priv->d_commit_details; -#line 252 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 264 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gtk_widget_hide ((GtkWidget*) _tmp3_); -#line 253 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 265 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = self->priv->d_scrolledwindow; -#line 253 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 265 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gtk_widget_hide ((GtkWidget*) _tmp4_); -#line 254 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 266 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return; -#line 838 "gitg-diff-view.c" +#line 850 "gitg-diff-view.c" } -#line 257 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 269 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp5_ = self->priv->d_commit_details; -#line 257 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 269 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gtk_widget_show ((GtkWidget*) _tmp5_); -#line 258 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 270 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp6_ = self->priv->d_scrolledwindow; -#line 258 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 270 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gtk_widget_show ((GtkWidget*) _tmp6_); -#line 261 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 273 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp7_ = self->priv->d_cancellable; -#line 261 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 273 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_cancellable_cancel (_tmp7_); -#line 262 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 274 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp8_ = g_cancellable_new (); -#line 262 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 274 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (self->priv->d_cancellable); -#line 262 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 274 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self->priv->d_cancellable = _tmp8_; -#line 264 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 276 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp9_ = self->priv->d_commit; -#line 264 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 276 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp9_ != NULL) { -#line 862 "gitg-diff-view.c" +#line 874 "gitg-diff-view.c" GitgDiffViewCommitDetails* _tmp10_ = NULL; gulong _tmp11_ = 0UL; GitgDiffViewCommitDetails* _tmp12_ = NULL; @@ -890,59 +902,59 @@ const gchar* _tmp50_ = NULL; GtkTextView* _tmp51_ = NULL; const gchar* _tmp52_ = NULL; -#line 266 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 278 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp10_ = self->priv->d_commit_details; -#line 266 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 278 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp11_ = self->priv->d_parent_commit_notify; -#line 266 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 278 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_signal_handler_block (_tmp10_, _tmp11_); -#line 267 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 279 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp12_ = self->priv->d_commit_details; -#line 267 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 279 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp13_ = self->priv->d_commit; -#line 267 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 279 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_commit_details_set_commit (_tmp12_, (GgitCommit*) _tmp13_); -#line 268 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 280 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp14_ = self->priv->d_commit_details; -#line 268 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 280 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp15_ = self->priv->d_parent_commit_notify; -#line 268 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 280 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_signal_handler_unblock (_tmp14_, _tmp15_); -#line 270 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 282 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" parent = 0; -#line 271 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 283 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp16_ = self->priv->d_commit; -#line 271 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 283 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp17_ = ggit_commit_get_parents ((GgitCommit*) _tmp16_); -#line 271 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 283 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" parents = _tmp17_; -#line 273 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 285 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp18_ = self->priv->d_commit_details; -#line 273 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 285 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp19_ = gitg_diff_view_commit_details_get_parent_commit (_tmp18_); -#line 273 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 285 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp20_ = _tmp19_; -#line 273 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 285 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp21_ = _g_object_ref0 (_tmp20_); -#line 273 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 285 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" parent_commit = _tmp21_; -#line 275 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 287 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp22_ = parent_commit; -#line 275 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 287 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp22_ != NULL) { -#line 934 "gitg-diff-view.c" +#line 946 "gitg-diff-view.c" { gint i = 0; -#line 277 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 289 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" i = 0; -#line 939 "gitg-diff-view.c" +#line 951 "gitg-diff-view.c" { gboolean _tmp23_ = FALSE; -#line 277 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 289 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp23_ = TRUE; -#line 277 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 289 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" while (TRUE) { -#line 946 "gitg-diff-view.c" +#line 958 "gitg-diff-view.c" gint _tmp25_ = 0; GgitCommitParents* _tmp26_ = NULL; guint _tmp27_ = 0U; @@ -957,157 +969,157 @@ GgitOId* _tmp35_ = NULL; gboolean _tmp36_ = FALSE; gboolean _tmp37_ = FALSE; -#line 277 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 289 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (!_tmp23_) { -#line 963 "gitg-diff-view.c" +#line 975 "gitg-diff-view.c" gint _tmp24_ = 0; -#line 277 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 289 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp24_ = i; -#line 277 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 289 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" i = _tmp24_ + 1; -#line 969 "gitg-diff-view.c" +#line 981 "gitg-diff-view.c" } -#line 277 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 289 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp23_ = FALSE; -#line 277 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 289 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp25_ = i; -#line 277 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 289 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp26_ = parents; -#line 277 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 289 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp27_ = ggit_commit_parents_get_size (_tmp26_); -#line 277 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 289 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp28_ = _tmp27_; -#line 277 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 289 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (!(((guint) _tmp25_) < _tmp28_)) { -#line 277 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 289 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" break; -#line 985 "gitg-diff-view.c" +#line 997 "gitg-diff-view.c" } -#line 279 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 291 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp29_ = parents; -#line 279 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 291 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp30_ = i; -#line 279 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 291 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp31_ = ggit_commit_parents_get_id (_tmp29_, (guint) _tmp30_); -#line 279 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 291 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" id = _tmp31_; -#line 281 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 293 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp32_ = id; -#line 281 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 293 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp33_ = parent_commit; -#line 281 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 293 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp34_ = ggit_object_get_id ((GgitObject*) _tmp33_); -#line 281 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 293 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp35_ = _tmp34_; -#line 281 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 293 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp36_ = ggit_oid_equal (_tmp32_, _tmp35_); -#line 281 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 293 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp37_ = _tmp36_; -#line 281 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 293 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" __vala_GgitOId_free0 (_tmp35_); -#line 281 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 293 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp37_) { -#line 1011 "gitg-diff-view.c" +#line 1023 "gitg-diff-view.c" gint _tmp38_ = 0; -#line 283 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 295 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp38_ = i; -#line 283 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 295 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" parent = _tmp38_; -#line 284 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 296 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" __vala_GgitOId_free0 (id); -#line 284 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 296 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" break; -#line 1021 "gitg-diff-view.c" +#line 1033 "gitg-diff-view.c" } -#line 277 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 289 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" __vala_GgitOId_free0 (id); -#line 1025 "gitg-diff-view.c" +#line 1037 "gitg-diff-view.c" } } } } -#line 289 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 301 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp39_ = self->priv->d_commit; -#line 289 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 301 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp40_ = gitg_diff_view_get_options (self); -#line 289 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 301 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp41_ = _tmp40_; -#line 289 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 301 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp42_ = parent; -#line 289 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 301 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp43_ = gitg_commit_get_diff (_tmp39_, _tmp41_, _tmp42_); -#line 289 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 301 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (self->priv->d_diff); -#line 289 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 301 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self->priv->d_diff = _tmp43_; -#line 290 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 302 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp44_ = self->priv->d_commit_details; -#line 290 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 302 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gtk_widget_show ((GtkWidget*) _tmp44_); -#line 292 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 304 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp45_ = self->priv->d_commit; -#line 292 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 304 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp46_ = gitg_diff_view_message_without_subject (self, _tmp45_); -#line 292 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 304 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" message = _tmp46_; -#line 294 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 306 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp47_ = self->priv->d_text_view_message; -#line 294 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 306 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp48_ = gtk_text_view_get_buffer (_tmp47_); -#line 294 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 306 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp49_ = _tmp48_; -#line 294 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 306 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp50_ = message; -#line 294 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 306 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gtk_text_buffer_set_text (_tmp49_, _tmp50_, -1); -#line 295 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 307 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp51_ = self->priv->d_text_view_message; -#line 295 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 307 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp52_ = message; -#line 295 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 307 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gtk_widget_set_visible ((GtkWidget*) _tmp51_, g_strcmp0 (_tmp52_, "") != 0); -#line 264 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 276 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_free0 (message); -#line 264 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 276 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (parent_commit); -#line 264 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 276 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (parents); -#line 1076 "gitg-diff-view.c" +#line 1088 "gitg-diff-view.c" } else { GitgDiffViewCommitDetails* _tmp53_ = NULL; GitgDiffViewCommitDetails* _tmp54_ = NULL; GtkTextView* _tmp55_ = NULL; -#line 299 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 311 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp53_ = self->priv->d_commit_details; -#line 299 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 311 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_commit_details_set_commit (_tmp53_, NULL); -#line 300 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 312 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp54_ = self->priv->d_commit_details; -#line 300 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 312 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gtk_widget_hide ((GtkWidget*) _tmp54_); -#line 302 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 314 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp55_ = self->priv->d_text_view_message; -#line 302 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 314 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gtk_widget_hide ((GtkWidget*) _tmp55_); -#line 1093 "gitg-diff-view.c" +#line 1105 "gitg-diff-view.c" } -#line 305 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 317 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp56_ = self->priv->d_diff; -#line 305 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 317 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp56_ != NULL) { -#line 1099 "gitg-diff-view.c" +#line 1111 "gitg-diff-view.c" GgitDiff* _tmp57_ = NULL; gboolean _tmp58_ = FALSE; GCancellable* _tmp59_ = NULL; -#line 307 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 319 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp57_ = self->priv->d_diff; -#line 307 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 319 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp58_ = preserve_expanded; -#line 307 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 319 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp59_ = self->priv->d_cancellable; -#line 307 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 319 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_update_diff (self, _tmp57_, _tmp58_, _tmp59_); -#line 1111 "gitg-diff-view.c" +#line 1123 "gitg-diff-view.c" } } @@ -1119,27 +1131,27 @@ gboolean _tmp3_ = FALSE; GitgDiffViewCommitDetails* _tmp4_ = NULL; gulong _tmp5_ = 0UL; -#line 311 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 323 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (self != NULL); -#line 313 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 325 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->d_commit_details; -#line 313 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 325 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = self->priv->d_expanded_notify; -#line 313 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 325 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_signal_handler_block (_tmp0_, _tmp1_); -#line 314 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 326 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = self->priv->d_commit_details; -#line 314 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 326 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = expanded; -#line 314 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 326 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_commit_details_set_expanded (_tmp2_, _tmp3_); -#line 315 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 327 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = self->priv->d_commit_details; -#line 315 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 327 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp5_ = self->priv->d_expanded_notify; -#line 315 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 327 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_signal_handler_unblock (_tmp4_, _tmp5_); -#line 1143 "gitg-diff-view.c" +#line 1155 "gitg-diff-view.c" } @@ -1149,27 +1161,27 @@ GList* _tmp1_ = NULL; gboolean _tmp9_ = FALSE; gboolean _tmp10_ = FALSE; -#line 318 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 330 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (self != NULL); -#line 320 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 332 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" something_selected = FALSE; -#line 322 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 334 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->d_grid_files; -#line 322 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 334 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = gtk_container_get_children ((GtkContainer*) _tmp0_); -#line 1161 "gitg-diff-view.c" +#line 1173 "gitg-diff-view.c" { GList* file_collection = NULL; GList* file_it = NULL; -#line 322 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 334 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" file_collection = _tmp1_; -#line 322 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 334 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" for (file_it = file_collection; file_it != NULL; file_it = file_it->next) { -#line 1169 "gitg-diff-view.c" +#line 1181 "gitg-diff-view.c" GtkWidget* file = NULL; -#line 322 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 334 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" file = (GtkWidget*) file_it->data; -#line 1173 "gitg-diff-view.c" +#line 1185 "gitg-diff-view.c" { GitgDiffSelectable* selectable = NULL; GtkWidget* _tmp2_ = NULL; @@ -1179,131 +1191,119 @@ GitgDiffSelectable* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; gboolean _tmp8_ = FALSE; -#line 324 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 336 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = file; -#line 324 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 336 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = gitg_diff_view_file_get_renderer (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, GITG_TYPE_DIFF_VIEW_FILE) ? ((GitgDiffViewFile*) _tmp2_) : NULL); -#line 324 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 336 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = _tmp3_; -#line 324 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 336 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp5_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, GITG_TYPE_DIFF_SELECTABLE) ? ((GitgDiffSelectable*) _tmp4_) : NULL; -#line 324 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 336 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp5_ == NULL) { -#line 324 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 336 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (_tmp4_); -#line 1195 "gitg-diff-view.c" +#line 1207 "gitg-diff-view.c" } -#line 324 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 336 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" selectable = _tmp5_; -#line 326 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 338 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp6_ = selectable; -#line 326 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 338 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp7_ = gitg_diff_selectable_get_has_selection (_tmp6_); -#line 326 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 338 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp8_ = _tmp7_; -#line 326 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 338 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp8_) { -#line 328 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 340 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" something_selected = TRUE; -#line 329 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 341 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (selectable); -#line 329 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 341 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" break; -#line 1213 "gitg-diff-view.c" +#line 1225 "gitg-diff-view.c" } -#line 322 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 334 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (selectable); -#line 1217 "gitg-diff-view.c" +#line 1229 "gitg-diff-view.c" } } -#line 322 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 334 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_list_free0 (file_collection); -#line 1222 "gitg-diff-view.c" +#line 1234 "gitg-diff-view.c" } -#line 333 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 345 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp9_ = self->priv->_has_selection; -#line 333 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 345 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp10_ = something_selected; -#line 333 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 345 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp9_ != _tmp10_) { -#line 1230 "gitg-diff-view.c" +#line 1242 "gitg-diff-view.c" gboolean _tmp11_ = FALSE; -#line 335 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 347 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp11_ = something_selected; -#line 335 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 347 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_set_has_selection (self, _tmp11_); -#line 1236 "gitg-diff-view.c" +#line 1248 "gitg-diff-view.c" } } -static gchar* gitg_diff_view_primary_path (GitgDiffView* self, GitgDiffViewFile* f) { +static gchar* gitg_diff_view_primary_path (GitgDiffView* self, GgitDiffDelta* delta) { gchar* result = NULL; gchar* path = NULL; - GitgDiffViewFile* _tmp0_ = NULL; - GgitDiffDelta* _tmp1_ = NULL; - GgitDiffDelta* _tmp2_ = NULL; - GgitDiffFile* _tmp3_ = NULL; + GgitDiffDelta* _tmp0_ = NULL; + GgitDiffFile* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; + gchar* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; -#line 339 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 351 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, NULL); -#line 339 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_return_val_if_fail (f != NULL, NULL); -#line 341 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp0_ = f; -#line 341 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp1_ = gitg_diff_view_file_get_delta (_tmp0_); -#line 341 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp2_ = _tmp1_; -#line 341 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp3_ = ggit_diff_delta_get_old_file (_tmp2_); -#line 341 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp4_ = ggit_diff_file_get_path (_tmp3_); -#line 341 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp5_ = g_strdup (_tmp4_); -#line 341 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - path = _tmp5_; -#line 343 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp6_ = path; -#line 343 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - if (_tmp6_ == NULL) { -#line 1273 "gitg-diff-view.c" - GitgDiffViewFile* _tmp7_ = NULL; - GgitDiffDelta* _tmp8_ = NULL; - GgitDiffDelta* _tmp9_ = NULL; - GgitDiffFile* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; -#line 345 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp7_ = f; -#line 345 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp8_ = gitg_diff_view_file_get_delta (_tmp7_); -#line 345 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp9_ = _tmp8_; -#line 345 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp10_ = ggit_diff_delta_get_new_file (_tmp9_); -#line 345 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp11_ = ggit_diff_file_get_path (_tmp10_); -#line 345 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp12_ = g_strdup (_tmp11_); -#line 345 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _g_free0 (path); -#line 345 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - path = _tmp12_; +#line 351 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_return_val_if_fail (delta != NULL, NULL); +#line 353 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp0_ = delta; +#line 353 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp1_ = ggit_diff_delta_get_old_file (_tmp0_); +#line 353 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp2_ = ggit_diff_file_get_path (_tmp1_); +#line 353 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp3_ = g_strdup (_tmp2_); +#line 353 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + path = _tmp3_; +#line 355 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp4_ = path; +#line 355 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (_tmp4_ == NULL) { +#line 1279 "gitg-diff-view.c" + GgitDiffDelta* _tmp5_ = NULL; + GgitDiffFile* _tmp6_ = NULL; + const gchar* _tmp7_ = NULL; + gchar* _tmp8_ = NULL; +#line 357 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp5_ = delta; +#line 357 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp6_ = ggit_diff_delta_get_new_file (_tmp5_); +#line 357 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp7_ = ggit_diff_file_get_path (_tmp6_); +#line 357 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp8_ = g_strdup (_tmp7_); +#line 357 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _g_free0 (path); +#line 357 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + path = _tmp8_; #line 1296 "gitg-diff-view.c" } -#line 348 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 360 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = path; -#line 348 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 360 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; #line 1302 "gitg-diff-view.c" } static gpointer _ggit_diff_file_ref0 (gpointer self) { -#line 355 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 367 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return self ? ggit_diff_file_ref (self) : NULL; #line 1309 "gitg-diff-view.c" } @@ -1311,11 +1311,11 @@ static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 1321 "gitg-diff-view.c" } @@ -1342,116 +1342,116 @@ gchar* _tmp15_ = NULL; const gchar* _tmp16_ = NULL; gchar* _tmp20_ = NULL; -#line 353 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 365 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, NULL); -#line 353 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 365 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (delta != NULL, NULL); -#line 355 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 367 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = delta; -#line 355 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 367 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = ggit_diff_delta_get_new_file (_tmp0_); -#line 355 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 367 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = _ggit_diff_file_ref0 (_tmp1_); -#line 355 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 367 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" new_file = _tmp2_; -#line 356 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 368 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = new_file; -#line 356 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 368 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = ggit_diff_file_get_path (_tmp3_); -#line 356 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 368 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp5_ = g_strdup (_tmp4_); -#line 356 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 368 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" new_path = _tmp5_; -#line 358 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 370 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp6_ = new_path; -#line 358 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 370 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp6_ != NULL) { #line 1370 "gitg-diff-view.c" const gchar* _tmp7_ = NULL; const gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; -#line 360 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 372 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp7_ = new_path; -#line 360 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 372 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp8_ = string_to_string (_tmp7_); -#line 360 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 372 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp9_ = g_strconcat ("path:", _tmp8_, NULL); -#line 360 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 372 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp9_; -#line 360 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 372 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_free0 (new_path); -#line 360 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 372 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _ggit_diff_file_unref0 (new_file); -#line 360 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 372 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; #line 1388 "gitg-diff-view.c" } -#line 363 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 375 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp10_ = delta; -#line 363 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 375 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp11_ = ggit_diff_delta_get_old_file (_tmp10_); -#line 363 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 375 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp12_ = _ggit_diff_file_ref0 (_tmp11_); -#line 363 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 375 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" old_file = _tmp12_; -#line 364 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 376 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp13_ = old_file; -#line 364 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 376 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp14_ = ggit_diff_file_get_path (_tmp13_); -#line 364 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 376 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp15_ = g_strdup (_tmp14_); -#line 364 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 376 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" old_path = _tmp15_; -#line 366 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 378 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp16_ = old_path; -#line 366 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 378 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp16_ != NULL) { #line 1410 "gitg-diff-view.c" const gchar* _tmp17_ = NULL; const gchar* _tmp18_ = NULL; gchar* _tmp19_ = NULL; -#line 368 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 380 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp17_ = old_path; -#line 368 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 380 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp18_ = string_to_string (_tmp17_); -#line 368 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 380 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp19_ = g_strconcat ("path:", _tmp18_, NULL); -#line 368 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 380 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp19_; -#line 368 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 380 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_free0 (old_path); -#line 368 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 380 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _ggit_diff_file_unref0 (old_file); -#line 368 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 380 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_free0 (new_path); -#line 368 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 380 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _ggit_diff_file_unref0 (new_file); -#line 368 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 380 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; #line 1432 "gitg-diff-view.c" } -#line 371 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 383 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp20_ = g_strdup (""); -#line 371 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 383 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp20_; -#line 371 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 383 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_free0 (old_path); -#line 371 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 383 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _ggit_diff_file_unref0 (old_file); -#line 371 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 383 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_free0 (new_path); -#line 371 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 383 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _ggit_diff_file_unref0 (new_file); -#line 371 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 383 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; #line 1448 "gitg-diff-view.c" } static Block6Data* block6_data_ref (Block6Data* _data6_) { -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_atomic_int_inc (&_data6_->_ref_count_); -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return _data6_; #line 1457 "gitg-diff-view.c" } @@ -1460,29 +1460,29 @@ static void block6_data_unref (void * _userdata_) { Block6Data* _data6_; _data6_ = (Block6Data*) _userdata_; -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) { #line 1466 "gitg-diff-view.c" GitgDiffView* self; -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self = _data6_->self; -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" (_data6_->check_finish_target_destroy_notify == NULL) ? NULL : (_data6_->check_finish_target_destroy_notify (_data6_->check_finish_target), NULL); -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data6_->check_finish = NULL; -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data6_->check_finish_target = NULL; -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data6_->check_finish_target_destroy_notify = NULL; -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (_data6_->infomap); -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (_data6_->diff); -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (_data6_->cancellable); -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (self); -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_slice_free (Block6Data, _data6_); #line 1488 "gitg-diff-view.c" } @@ -1494,73 +1494,73 @@ gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; gint _tmp2_ = 0; -#line 380 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 392 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self = _data6_->self; -#line 381 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 393 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = _data6_->nqueries; -#line 381 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 393 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp2_ == 0) { #line 1504 "gitg-diff-view.c" gboolean _tmp3_ = FALSE; -#line 381 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 393 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = _data6_->finished; -#line 381 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 393 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = _tmp3_; #line 1510 "gitg-diff-view.c" } else { -#line 381 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 393 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = FALSE; #line 1514 "gitg-diff-view.c" } -#line 381 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 393 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp1_) { #line 1518 "gitg-diff-view.c" gboolean _tmp4_ = FALSE; GCancellable* _tmp5_ = NULL; -#line 381 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 393 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp5_ = _data6_->cancellable; -#line 381 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 393 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp5_ == NULL) { -#line 381 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 393 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = TRUE; #line 1527 "gitg-diff-view.c" } else { GCancellable* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; -#line 381 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 393 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp6_ = _data6_->cancellable; -#line 381 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 393 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp7_ = g_cancellable_is_cancelled (_tmp6_); -#line 381 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 393 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = !_tmp7_; #line 1537 "gitg-diff-view.c" } -#line 381 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 393 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = _tmp4_; #line 1541 "gitg-diff-view.c" } else { -#line 381 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 393 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = FALSE; #line 1545 "gitg-diff-view.c" } -#line 381 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 393 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp0_) { #line 1549 "gitg-diff-view.c" GgitDiff* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; GeeHashMap* _tmp10_ = NULL; GCancellable* _tmp11_ = NULL; -#line 383 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 395 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data6_->finished = FALSE; -#line 384 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 396 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp8_ = _data6_->diff; -#line 384 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 396 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp9_ = _data6_->preserve_expanded; -#line 384 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 396 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp10_ = _data6_->infomap; -#line 384 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 396 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp11_ = _data6_->cancellable; -#line 384 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 396 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_update_diff_hunks (self, _tmp8_, _tmp9_, _tmp10_, _tmp11_); #line 1566 "gitg-diff-view.c" } @@ -1568,16 +1568,16 @@ static void ___lambda48__gitg_diff_view_anon (gpointer self) { -#line 380 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 392 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" __lambda48_ (self); #line 1574 "gitg-diff-view.c" } static Block7Data* block7_data_ref (Block7Data* _data7_) { -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_atomic_int_inc (&_data7_->_ref_count_); -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return _data7_; #line 1583 "gitg-diff-view.c" } @@ -1586,21 +1586,21 @@ static void block7_data_unref (void * _userdata_) { Block7Data* _data7_; _data7_ = (Block7Data*) _userdata_; -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (g_atomic_int_dec_and_test (&_data7_->_ref_count_)) { #line 1592 "gitg-diff-view.c" GitgDiffView* self; -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self = _data7_->_data6_->self; -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (_data7_->info); -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _ggit_diff_delta_unref0 (_data7_->delta); -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" block6_data_unref (_data7_->_data6_); -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data7_->_data6_ = NULL; -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_slice_free (Block7Data, _data7_); #line 1606 "gitg-diff-view.c" } @@ -1620,50 +1620,50 @@ gint _tmp7_ = 0; GitgDiffViewAnon _tmp8_ = NULL; void* _tmp8__target = NULL; -#line 396 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 408 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data6_ = _data7_->_data6_; -#line 396 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 408 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self = _data6_->self; -#line 396 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 408 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (res != NULL); -#line 397 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 409 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = _data7_->info; -#line 397 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 409 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = res; -#line 397 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 409 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_file_info_query_finish (_tmp0_, _tmp1_); -#line 399 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = _data6_->infomap; -#line 399 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = _data7_->delta; -#line 399 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = gitg_diff_view_key_for_delta (self, _tmp3_); -#line 399 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp5_ = _tmp4_; -#line 399 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp6_ = _data7_->info; -#line 399 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gee_abstract_map_set ((GeeAbstractMap*) _tmp2_, _tmp5_, _tmp6_); -#line 399 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_free0 (_tmp5_); -#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 413 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp7_ = _data6_->nqueries; -#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 413 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data6_->nqueries = _tmp7_ - 1; -#line 403 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 415 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp8_ = _data6_->check_finish; -#line 403 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 415 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp8__target = _data6_->check_finish_target; -#line 403 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 415 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp8_ (_tmp8__target); #line 1660 "gitg-diff-view.c" } static void ______lambda63__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { -#line 396 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 408 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _____lambda63_ (self, source_object, res); -#line 396 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 408 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" block7_data_unref (self); #line 1669 "gitg-diff-view.c" } @@ -1679,61 +1679,61 @@ GeeHashMap* _tmp5_ = NULL; GitgDiffViewAnon _tmp21_ = NULL; void* _tmp21__target = NULL; -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (self != NULL); -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (diff != NULL); -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data6_ = g_slice_new0 (Block6Data); -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data6_->_ref_count_ = 1; -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data6_->self = g_object_ref (self); -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = diff; -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (_data6_->diff); -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data6_->diff = _tmp1_; -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = preserve_expanded; -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data6_->preserve_expanded = _tmp2_; -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = cancellable; -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = _g_object_ref0 (_tmp3_); -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (_data6_->cancellable); -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data6_->cancellable = _tmp4_; -#line 376 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 388 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data6_->nqueries = 0; -#line 377 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data6_->finished = FALSE; -#line 378 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 390 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp5_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GITG_TYPE_DIFF_VIEW_FILE_INFO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -#line 378 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 390 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data6_->infomap = _tmp5_; -#line 380 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 392 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data6_->check_finish = ___lambda48__gitg_diff_view_anon; -#line 380 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 392 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data6_->check_finish_target = block6_data_ref (_data6_); -#line 380 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 392 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data6_->check_finish_target_destroy_notify = block6_data_unref; #line 1727 "gitg-diff-view.c" { gint i = 0; -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" i = 0; #line 1732 "gitg-diff-view.c" { gboolean _tmp6_ = FALSE; -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp6_ = TRUE; -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" while (TRUE) { #line 1739 "gitg-diff-view.c" Block7Data* _data7_; @@ -1750,96 +1750,96 @@ gint _tmp18_ = 0; GitgDiffViewFileInfo* _tmp19_ = NULL; GCancellable* _tmp20_ = NULL; -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data7_ = g_slice_new0 (Block7Data); -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data7_->_ref_count_ = 1; -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data7_->_data6_ = block6_data_ref (_data6_); -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (!_tmp6_) { #line 1762 "gitg-diff-view.c" gint _tmp7_ = 0; -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp7_ = i; -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" i = _tmp7_ + 1; #line 1768 "gitg-diff-view.c" } -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp6_ = FALSE; -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp8_ = i; -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp9_ = _data6_->diff; -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp10_ = ggit_diff_get_num_deltas (_tmp9_); -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (!(((gsize) _tmp8_) < _tmp10_)) { -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" block7_data_unref (_data7_); -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data7_ = NULL; -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" break; #line 1786 "gitg-diff-view.c" } -#line 391 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 403 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp11_ = _data6_->diff; -#line 391 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 403 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp12_ = i; -#line 391 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 403 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp13_ = ggit_diff_get_delta (_tmp11_, (gsize) _tmp12_); -#line 391 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 403 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data7_->delta = _tmp13_; -#line 392 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 404 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp14_ = self->priv->_repository; -#line 392 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 404 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp15_ = _data7_->delta; -#line 392 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 404 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp16_ = self->priv->_new_is_workdir; -#line 392 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 404 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp17_ = gitg_diff_view_file_info_new (_tmp14_, _tmp15_, _tmp16_); -#line 392 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 404 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data7_->info = _tmp17_; -#line 394 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 406 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp18_ = _data6_->nqueries; -#line 394 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 406 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data6_->nqueries = _tmp18_ + 1; -#line 396 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 408 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp19_ = _data7_->info; -#line 396 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 408 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp20_ = _data6_->cancellable; -#line 396 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 408 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_file_info_query (_tmp19_, _tmp20_, ______lambda63__gasync_ready_callback, block7_data_ref (_data7_)); -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" block7_data_unref (_data7_); -#line 389 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 401 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data7_ = NULL; #line 1820 "gitg-diff-view.c" } } } -#line 407 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 419 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data6_->finished = TRUE; -#line 408 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 420 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp21_ = _data6_->check_finish; -#line 408 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 420 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp21__target = _data6_->check_finish_target; -#line 408 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 420 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp21_ (_tmp21__target); -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" block6_data_unref (_data6_); -#line 374 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 386 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data6_ = NULL; #line 1836 "gitg-diff-view.c" } static Block8Data* block8_data_ref (Block8Data* _data8_) { -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_atomic_int_inc (&_data8_->_ref_count_); -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return _data8_; #line 1845 "gitg-diff-view.c" } @@ -1848,43 +1848,43 @@ static void block8_data_unref (void * _userdata_) { Block8Data* _data8_; _data8_ = (Block8Data*) _userdata_; -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (g_atomic_int_dec_and_test (&_data8_->_ref_count_)) { #line 1854 "gitg-diff-view.c" GitgDiffView* self; -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self = _data8_->self; -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" (_data8_->add_file_target_destroy_notify == NULL) ? NULL : (_data8_->add_file_target_destroy_notify (_data8_->add_file_target), NULL); -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->add_file = NULL; -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->add_file_target = NULL; -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->add_file_target_destroy_notify = NULL; -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" (_data8_->add_hunk_target_destroy_notify == NULL) ? NULL : (_data8_->add_hunk_target_destroy_notify (_data8_->add_hunk_target), NULL); -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->add_hunk = NULL; -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->add_hunk_target = NULL; -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->add_hunk_target_destroy_notify = NULL; -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (_data8_->current_lines); -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _ggit_diff_hunk_unref0 (_data8_->current_hunk); -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (_data8_->current_file); -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (_data8_->files); -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (_data8_->infomap); -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (_data8_->cancellable); -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (self); -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_slice_free (Block8Data, _data8_); #line 1890 "gitg-diff-view.c" } @@ -1893,19 +1893,19 @@ static void __lambda57_ (Block8Data* _data8_) { GitgDiffView* self; -#line 422 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 434 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self = _data8_->self; -#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 435 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_data8_->current_hunk != NULL) { -#line 425 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 437 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_file_add_hunk (_data8_->current_file, _data8_->current_hunk, _data8_->current_lines); -#line 427 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 439 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (_data8_->current_lines); -#line 427 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 439 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->current_lines = NULL; -#line 428 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 440 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _ggit_diff_hunk_unref0 (_data8_->current_hunk); -#line 428 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 440 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->current_hunk = NULL; #line 1911 "gitg-diff-view.c" } @@ -1913,14 +1913,14 @@ static void ___lambda57__gitg_diff_view_anon (gpointer self) { -#line 422 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 434 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" __lambda57_ (self); #line 1919 "gitg-diff-view.c" } static void _gitg_diff_view_on_selection_changed_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { -#line 438 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 450 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_on_selection_changed ((GitgDiffView*) self); #line 1926 "gitg-diff-view.c" } @@ -1928,33 +1928,33 @@ static void __lambda58_ (Block8Data* _data8_) { GitgDiffView* self; -#line 432 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 444 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self = _data8_->self; -#line 433 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 445 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->add_hunk (_data8_->add_hunk_target); -#line 435 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 447 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_data8_->current_file != NULL) { #line 1938 "gitg-diff-view.c" GitgDiffViewFileRenderer* _tmp0_ = NULL; GitgDiffViewFileRenderer* _tmp1_ = NULL; GitgDiffViewFileRenderer* _tmp2_ = NULL; -#line 437 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 449 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gtk_widget_show ((GtkWidget*) _data8_->current_file); -#line 438 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 450 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = gitg_diff_view_file_get_renderer (_data8_->current_file); -#line 438 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 450 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = _tmp0_; -#line 438 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 450 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = _tmp1_; -#line 438 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 450 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_signal_connect_object ((GObject*) _tmp2_, "notify::has-selection", (GCallback) _gitg_diff_view_on_selection_changed_g_object_notify, self, 0); -#line 438 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 450 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (_tmp2_); -#line 440 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 452 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _data8_->files, _data8_->current_file); -#line 442 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 454 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (_data8_->current_file); -#line 442 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 454 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->current_file = NULL; #line 1960 "gitg-diff-view.c" } @@ -1962,24 +1962,24 @@ static void ___lambda58__gitg_diff_view_anon (gpointer self) { -#line 432 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 444 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" __lambda58_ (self); #line 1968 "gitg-diff-view.c" } -static gboolean _vala_string_array_contains (gchar** stack, int stack_length, gchar* needle) { +static gboolean _vala_string_array_contains (gchar* * stack, int stack_length, gchar* needle) { int i; -#line 477 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 489 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" for (i = 0; i < stack_length; i++) { -#line 477 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 489 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (g_strcmp0 (stack[i], needle) == 0) { -#line 477 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 489 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return TRUE; #line 1980 "gitg-diff-view.c" } } -#line 477 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 489 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return FALSE; #line 1985 "gitg-diff-view.c" } @@ -2006,211 +2006,376 @@ gint _known_binary_files_types_size_ = 0; gboolean _tmp20_ = FALSE; GitgDiffViewFileInfo* _tmp21_ = NULL; -#line 449 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + gchar* mime_type_for_image = NULL; + gboolean _tmp26_ = FALSE; + GitgDiffViewFileInfo* _tmp27_ = NULL; + gboolean _tmp49_ = FALSE; + const gchar* _tmp50_ = NULL; +#line 461 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self = _data8_->self; -#line 449 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 461 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (delta != NULL, 0); -#line 450 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 462 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = _data8_->cancellable; -#line 450 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 462 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp1_ != NULL) { -#line 2018 "gitg-diff-view.c" +#line 2023 "gitg-diff-view.c" GCancellable* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 450 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 462 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = _data8_->cancellable; -#line 450 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 462 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = g_cancellable_is_cancelled (_tmp2_); -#line 450 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 462 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = _tmp3_; -#line 2027 "gitg-diff-view.c" +#line 2032 "gitg-diff-view.c" } else { -#line 450 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 462 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = FALSE; -#line 2031 "gitg-diff-view.c" +#line 2036 "gitg-diff-view.c" } -#line 450 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 462 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp0_) { -#line 452 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 464 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = 1; -#line 452 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 464 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 2039 "gitg-diff-view.c" +#line 2044 "gitg-diff-view.c" } -#line 455 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 467 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->add_file (_data8_->add_file_target); -#line 457 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 469 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" info = NULL; -#line 458 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 470 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = delta; -#line 458 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 470 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp5_ = gitg_diff_view_key_for_delta (self, _tmp4_); -#line 458 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 470 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" deltakey = _tmp5_; -#line 460 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 472 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp6_ = _data8_->infomap; -#line 460 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 472 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp7_ = deltakey; -#line 460 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 472 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp8_ = gee_abstract_map_has_key ((GeeAbstractMap*) _tmp6_, _tmp7_); -#line 460 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 472 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp8_) { -#line 2059 "gitg-diff-view.c" +#line 2064 "gitg-diff-view.c" GeeHashMap* _tmp9_ = NULL; const gchar* _tmp10_ = NULL; gpointer _tmp11_ = NULL; -#line 462 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 474 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp9_ = _data8_->infomap; -#line 462 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 474 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp10_ = deltakey; -#line 462 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 474 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp11_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp9_, _tmp10_); -#line 462 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 474 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (info); -#line 462 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 474 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" info = (GitgDiffViewFileInfo*) _tmp11_; -#line 2073 "gitg-diff-view.c" +#line 2078 "gitg-diff-view.c" } else { GitgRepository* _tmp12_ = NULL; GgitDiffDelta* _tmp13_ = NULL; gboolean _tmp14_ = FALSE; GitgDiffViewFileInfo* _tmp15_ = NULL; -#line 466 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 478 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp12_ = self->priv->_repository; -#line 466 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 478 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp13_ = delta; -#line 466 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 478 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp14_ = self->priv->_new_is_workdir; -#line 466 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 478 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp15_ = gitg_diff_view_file_info_new (_tmp12_, _tmp13_, _tmp14_); -#line 466 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 478 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (info); -#line 466 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 478 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" info = _tmp15_; -#line 2091 "gitg-diff-view.c" +#line 2096 "gitg-diff-view.c" } -#line 469 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 481 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp16_ = delta; -#line 469 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 481 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp17_ = ggit_diff_delta_get_flags (_tmp16_); -#line 469 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 481 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->current_is_binary = (_tmp17_ & GGIT_DIFF_FLAG_BINARY) != 0; -#line 474 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 486 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp18_ = g_strdup ("application/pdf"); -#line 474 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 486 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp19_ = g_new0 (gchar*, 1 + 1); -#line 474 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 486 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp19_[0] = _tmp18_; -#line 474 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 486 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" known_binary_files_types = _tmp19_; -#line 474 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 486 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" known_binary_files_types_length1 = 1; -#line 474 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 486 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _known_binary_files_types_size_ = known_binary_files_types_length1; -#line 477 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 489 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp21_ = info; -#line 477 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 489 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp21_ != NULL) { -#line 2115 "gitg-diff-view.c" +#line 2120 "gitg-diff-view.c" GitgDiffViewFileInfo* _tmp22_ = NULL; const gchar* _tmp23_ = NULL; const gchar* _tmp24_ = NULL; gchar** _tmp25_ = NULL; gint _tmp25__length1 = 0; -#line 477 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 489 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp22_ = info; -#line 477 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 489 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp23_ = gitg_diff_view_file_info_get_new_file_content_type (_tmp22_); -#line 477 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 489 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp24_ = _tmp23_; -#line 477 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 489 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp25_ = known_binary_files_types; -#line 477 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 489 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp25__length1 = known_binary_files_types_length1; -#line 477 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 489 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp20_ = _vala_string_array_contains (_tmp25_, _tmp25__length1, _tmp24_); -#line 2133 "gitg-diff-view.c" +#line 2138 "gitg-diff-view.c" } else { -#line 477 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 489 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp20_ = FALSE; -#line 2137 "gitg-diff-view.c" +#line 2142 "gitg-diff-view.c" } -#line 477 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 489 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp20_) { -#line 479 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 491 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->current_is_binary = TRUE; -#line 2143 "gitg-diff-view.c" +#line 2148 "gitg-diff-view.c" } -#line 482 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - if (_data8_->current_is_binary) { -#line 2147 "gitg-diff-view.c" - GitgRepository* _tmp26_ = NULL; - GgitDiffDelta* _tmp27_ = NULL; - GitgDiffViewFile* _tmp28_ = NULL; -#line 484 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp26_ = self->priv->_repository; -#line 484 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp27_ = delta; -#line 484 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp28_ = gitg_diff_view_file_new_binary (_tmp26_, _tmp27_); -#line 484 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_ref_sink (_tmp28_); -#line 484 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _g_object_unref0 (_data8_->current_file); -#line 484 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _data8_->current_file = _tmp28_; -#line 2163 "gitg-diff-view.c" +#line 494 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + mime_type_for_image = NULL; +#line 496 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp27_ = info; +#line 496 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (_tmp27_ == NULL) { +#line 496 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp26_ = TRUE; +#line 2158 "gitg-diff-view.c" } else { - GitgDiffViewFileInfo* _tmp29_ = NULL; - gboolean _tmp30_ = FALSE; - GitgDiffViewFile* _tmp31_ = NULL; - GitgDiffViewFileRenderer* _tmp32_ = NULL; - GitgDiffViewFileRenderer* _tmp33_ = NULL; - GitgDiffViewFileRenderer* _tmp34_ = NULL; -#line 488 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp29_ = info; -#line 488 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp30_ = self->priv->_handle_selection; -#line 488 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp31_ = gitg_diff_view_file_new_text (_tmp29_, _tmp30_); -#line 488 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_ref_sink (_tmp31_); -#line 488 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + GitgDiffViewFileInfo* _tmp28_ = NULL; + const gchar* _tmp29_ = NULL; + const gchar* _tmp30_ = NULL; +#line 496 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp28_ = info; +#line 496 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp29_ = gitg_diff_view_file_info_get_new_file_content_type (_tmp28_); +#line 496 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp30_ = _tmp29_; +#line 496 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp26_ = _tmp30_ == NULL; +#line 2171 "gitg-diff-view.c" + } +#line 496 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (_tmp26_) { +#line 2175 "gitg-diff-view.c" + gchar* oldpath = NULL; + GgitDiffDelta* _tmp31_ = NULL; + GgitDiffFile* _tmp32_ = NULL; + const gchar* _tmp33_ = NULL; + gchar* _tmp34_ = NULL; + const gchar* _tmp35_ = NULL; +#line 499 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp31_ = delta; +#line 499 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp32_ = ggit_diff_delta_get_old_file (_tmp31_); +#line 499 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp33_ = ggit_diff_file_get_path (_tmp32_); +#line 499 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp34_ = g_strdup (_tmp33_); +#line 499 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + oldpath = _tmp34_; +#line 501 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp35_ = oldpath; +#line 501 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (_tmp35_ != NULL) { +#line 2196 "gitg-diff-view.c" + gboolean uncertain = FALSE; + gchar* ctype = NULL; + const gchar* _tmp36_ = NULL; + gchar* _tmp37_ = NULL; + gchar* _tmp38_ = NULL; + gboolean _tmp39_ = FALSE; + gchar* _tmp40_ = NULL; + gchar* _tmp41_ = NULL; + const gchar* _tmp42_ = NULL; +#line 504 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp36_ = oldpath; +#line 504 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp37_ = g_path_get_basename (_tmp36_); +#line 504 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp38_ = _tmp37_; +#line 504 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp40_ = g_content_type_guess (_tmp38_, NULL, (gsize) 0, &_tmp39_); +#line 504 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + uncertain = _tmp39_; +#line 504 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp41_ = _tmp40_; +#line 504 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _g_free0 (_tmp38_); +#line 504 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + ctype = _tmp41_; +#line 506 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp42_ = ctype; +#line 506 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (_tmp42_ != NULL) { +#line 2226 "gitg-diff-view.c" + const gchar* _tmp43_ = NULL; + gchar* _tmp44_ = NULL; +#line 508 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp43_ = ctype; +#line 508 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp44_ = g_content_type_get_mime_type (_tmp43_); +#line 508 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _g_free0 (mime_type_for_image); +#line 508 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + mime_type_for_image = _tmp44_; +#line 2237 "gitg-diff-view.c" + } +#line 501 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _g_free0 (ctype); +#line 2241 "gitg-diff-view.c" + } +#line 496 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _g_free0 (oldpath); +#line 2245 "gitg-diff-view.c" + } else { + GitgDiffViewFileInfo* _tmp45_ = NULL; + const gchar* _tmp46_ = NULL; + const gchar* _tmp47_ = NULL; + gchar* _tmp48_ = NULL; +#line 514 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp45_ = info; +#line 514 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp46_ = gitg_diff_view_file_info_get_new_file_content_type (_tmp45_); +#line 514 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp47_ = _tmp46_; +#line 514 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp48_ = g_content_type_get_mime_type (_tmp47_); +#line 514 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _g_free0 (mime_type_for_image); +#line 514 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + mime_type_for_image = _tmp48_; +#line 2263 "gitg-diff-view.c" + } +#line 517 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp50_ = mime_type_for_image; +#line 517 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (_tmp50_ != NULL) { +#line 2269 "gitg-diff-view.c" + GeeHashSet* _tmp51_ = NULL; + const gchar* _tmp52_ = NULL; + gboolean _tmp53_ = FALSE; +#line 517 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp51_ = gitg_diff_view_s_image_mime_types; +#line 517 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp52_ = mime_type_for_image; +#line 517 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp53_ = gee_abstract_collection_contains ((GeeAbstractCollection*) _tmp51_, _tmp52_); +#line 517 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp49_ = _tmp53_; +#line 2281 "gitg-diff-view.c" + } else { +#line 517 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp49_ = FALSE; +#line 2285 "gitg-diff-view.c" + } +#line 517 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (_tmp49_) { +#line 2289 "gitg-diff-view.c" + GitgRepository* _tmp54_ = NULL; + GgitDiffDelta* _tmp55_ = NULL; + GitgDiffViewFile* _tmp56_ = NULL; +#line 519 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp54_ = self->priv->_repository; +#line 519 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp55_ = delta; +#line 519 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp56_ = gitg_diff_view_file_new_image (_tmp54_, _tmp55_); +#line 519 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_ref_sink (_tmp56_); +#line 519 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (_data8_->current_file); -#line 488 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _data8_->current_file = _tmp31_; -#line 489 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp32_ = gitg_diff_view_file_get_renderer (_data8_->current_file); -#line 489 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp33_ = _tmp32_; -#line 489 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp34_ = _tmp33_; -#line 489 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_bind_property_with_closures ((GObject*) self, "highlight", (GObject*) _tmp34_, "highlight", G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); -#line 489 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _g_object_unref0 (_tmp34_); -#line 2193 "gitg-diff-view.c" +#line 519 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _data8_->current_file = _tmp56_; +#line 2305 "gitg-diff-view.c" + } else { +#line 521 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (_data8_->current_is_binary) { +#line 2309 "gitg-diff-view.c" + GitgRepository* _tmp57_ = NULL; + GgitDiffDelta* _tmp58_ = NULL; + GitgDiffViewFile* _tmp59_ = NULL; +#line 523 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp57_ = self->priv->_repository; +#line 523 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp58_ = delta; +#line 523 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp59_ = gitg_diff_view_file_new_binary (_tmp57_, _tmp58_); +#line 523 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_ref_sink (_tmp59_); +#line 523 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _g_object_unref0 (_data8_->current_file); +#line 523 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _data8_->current_file = _tmp59_; +#line 2325 "gitg-diff-view.c" + } else { + GitgDiffViewFileInfo* _tmp60_ = NULL; + gboolean _tmp61_ = FALSE; + GitgDiffViewFile* _tmp62_ = NULL; + GitgDiffViewFileRenderer* _tmp63_ = NULL; + GitgDiffViewFileRenderer* _tmp64_ = NULL; + GitgDiffViewFileRenderer* _tmp65_ = NULL; +#line 527 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp60_ = info; +#line 527 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp61_ = self->priv->_handle_selection; +#line 527 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp62_ = gitg_diff_view_file_new_text (_tmp60_, _tmp61_); +#line 527 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_ref_sink (_tmp62_); +#line 527 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _g_object_unref0 (_data8_->current_file); +#line 527 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _data8_->current_file = _tmp62_; +#line 528 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp63_ = gitg_diff_view_file_get_renderer (_data8_->current_file); +#line 528 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp64_ = _tmp63_; +#line 528 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp65_ = _tmp64_; +#line 528 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_bind_property_with_closures ((GObject*) self, "highlight", (GObject*) _tmp65_, "highlight", G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); +#line 528 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _g_object_unref0 (_tmp65_); +#line 2355 "gitg-diff-view.c" + } } -#line 492 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 531 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = 0; -#line 492 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 531 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _g_free0 (mime_type_for_image); +#line 531 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" known_binary_files_types = (_vala_array_free (known_binary_files_types, known_binary_files_types_length1, (GDestroyNotify) g_free), NULL); -#line 492 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 531 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_free0 (deltakey); -#line 492 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 531 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (info); -#line 492 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 531 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 2205 "gitg-diff-view.c" +#line 2370 "gitg-diff-view.c" } static gint ____lambda59__ggit_diff_file_callback (GgitDiffDelta* delta, gfloat progress, gpointer self) { gint result; result = ___lambda59_ (self, delta, progress); -#line 448 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 460 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 2214 "gitg-diff-view.c" +#line 2379 "gitg-diff-view.c" } @@ -2219,60 +2384,60 @@ gint result = 0; gboolean _tmp0_ = FALSE; GCancellable* _tmp1_ = NULL; -#line 495 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 534 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self = _data8_->self; -#line 495 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 534 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (delta != NULL, 0); -#line 495 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 534 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (binary != NULL, 0); -#line 497 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 536 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = _data8_->cancellable; -#line 497 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 536 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp1_ != NULL) { -#line 2233 "gitg-diff-view.c" +#line 2398 "gitg-diff-view.c" GCancellable* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 497 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 536 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = _data8_->cancellable; -#line 497 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 536 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = g_cancellable_is_cancelled (_tmp2_); -#line 497 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 536 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = _tmp3_; -#line 2242 "gitg-diff-view.c" +#line 2407 "gitg-diff-view.c" } else { -#line 497 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 536 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = FALSE; -#line 2246 "gitg-diff-view.c" +#line 2411 "gitg-diff-view.c" } -#line 497 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 536 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp0_) { -#line 499 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 538 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = 1; -#line 499 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 538 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 2254 "gitg-diff-view.c" +#line 2419 "gitg-diff-view.c" } -#line 502 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 541 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = 0; -#line 502 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 541 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 2260 "gitg-diff-view.c" +#line 2425 "gitg-diff-view.c" } static gint ____lambda60__ggit_diff_binary_callback (GgitDiffDelta* delta, GgitDiffBinary* binary, gpointer self) { gint result; result = ___lambda60_ (self, delta, binary); -#line 448 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 460 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 2269 "gitg-diff-view.c" +#line 2434 "gitg-diff-view.c" } static gpointer _ggit_diff_hunk_ref0 (gpointer self) { -#line 518 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 557 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return self ? ggit_diff_hunk_ref (self) : NULL; -#line 2276 "gitg-diff-view.c" +#line 2441 "gitg-diff-view.c" } @@ -2281,42 +2446,42 @@ gint result = 0; gboolean _tmp0_ = FALSE; GCancellable* _tmp1_ = NULL; -#line 505 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 544 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self = _data8_->self; -#line 505 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 544 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (delta != NULL, 0); -#line 505 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 544 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (hunk != NULL, 0); -#line 506 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 545 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = _data8_->cancellable; -#line 506 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 545 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp1_ != NULL) { -#line 2295 "gitg-diff-view.c" +#line 2460 "gitg-diff-view.c" GCancellable* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 506 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 545 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = _data8_->cancellable; -#line 506 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 545 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = g_cancellable_is_cancelled (_tmp2_); -#line 506 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 545 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = _tmp3_; -#line 2304 "gitg-diff-view.c" +#line 2469 "gitg-diff-view.c" } else { -#line 506 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 545 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = FALSE; -#line 2308 "gitg-diff-view.c" +#line 2473 "gitg-diff-view.c" } -#line 506 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 545 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp0_) { -#line 508 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 547 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = 1; -#line 508 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 547 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 2316 "gitg-diff-view.c" +#line 2481 "gitg-diff-view.c" } -#line 511 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 550 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (!_data8_->current_is_binary) { -#line 2320 "gitg-diff-view.c" +#line 2485 "gitg-diff-view.c" GgitDiffHunk* _tmp4_ = NULL; gint _tmp5_ = 0; GgitDiffHunk* _tmp6_ = NULL; @@ -2330,62 +2495,62 @@ GgitDiffHunk* _tmp14_ = NULL; GgitDiffHunk* _tmp15_ = NULL; GeeArrayList* _tmp16_ = NULL; -#line 513 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 552 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = hunk; -#line 513 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 552 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp5_ = ggit_diff_hunk_get_old_start (_tmp4_); -#line 513 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 552 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp6_ = hunk; -#line 513 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 552 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp7_ = ggit_diff_hunk_get_old_lines (_tmp6_); -#line 513 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 552 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp8_ = MAX (_data8_->maxlines, _tmp5_ + _tmp7_); -#line 513 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 552 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->maxlines = _tmp8_; -#line 514 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 553 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp9_ = hunk; -#line 514 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 553 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp10_ = ggit_diff_hunk_get_new_start (_tmp9_); -#line 514 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 553 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp11_ = hunk; -#line 514 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 553 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp12_ = ggit_diff_hunk_get_new_lines (_tmp11_); -#line 514 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 553 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp13_ = MAX (_data8_->maxlines, _tmp10_ + _tmp12_); -#line 514 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 553 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->maxlines = _tmp13_; -#line 516 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 555 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->add_hunk (_data8_->add_hunk_target); -#line 518 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 557 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp14_ = hunk; -#line 518 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 557 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp15_ = _ggit_diff_hunk_ref0 (_tmp14_); -#line 518 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 557 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _ggit_diff_hunk_unref0 (_data8_->current_hunk); -#line 518 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 557 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->current_hunk = _tmp15_; -#line 519 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 558 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp16_ = gee_array_list_new (ggit_diff_line_get_type (), (GBoxedCopyFunc) ggit_diff_line_ref, ggit_diff_line_unref, NULL, NULL, NULL); -#line 519 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 558 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (_data8_->current_lines); -#line 519 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 558 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->current_lines = _tmp16_; -#line 2374 "gitg-diff-view.c" +#line 2539 "gitg-diff-view.c" } -#line 522 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 561 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = 0; -#line 522 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 561 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 2380 "gitg-diff-view.c" +#line 2545 "gitg-diff-view.c" } static gint ____lambda61__ggit_diff_hunk_callback (GgitDiffDelta* delta, GgitDiffHunk* hunk, gpointer self) { gint result; result = ___lambda61_ (self, delta, hunk); -#line 448 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 460 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 2389 "gitg-diff-view.c" +#line 2554 "gitg-diff-view.c" } @@ -2394,72 +2559,72 @@ gint result = 0; gboolean _tmp0_ = FALSE; GCancellable* _tmp1_ = NULL; -#line 525 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 564 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self = _data8_->self; -#line 525 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 564 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (delta != NULL, 0); -#line 525 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 564 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (hunk != NULL, 0); -#line 525 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 564 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (line != NULL, 0); -#line 526 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 565 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = _data8_->cancellable; -#line 526 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 565 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp1_ != NULL) { -#line 2410 "gitg-diff-view.c" +#line 2575 "gitg-diff-view.c" GCancellable* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 526 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 565 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = _data8_->cancellable; -#line 526 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 565 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = g_cancellable_is_cancelled (_tmp2_); -#line 526 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 565 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = _tmp3_; -#line 2419 "gitg-diff-view.c" +#line 2584 "gitg-diff-view.c" } else { -#line 526 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 565 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = FALSE; -#line 2423 "gitg-diff-view.c" +#line 2588 "gitg-diff-view.c" } -#line 526 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 565 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp0_) { -#line 528 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 567 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = 1; -#line 528 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 567 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 2431 "gitg-diff-view.c" +#line 2596 "gitg-diff-view.c" } -#line 531 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 570 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (!_data8_->current_is_binary) { -#line 2435 "gitg-diff-view.c" +#line 2600 "gitg-diff-view.c" GgitDiffLine* _tmp4_ = NULL; -#line 533 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 572 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = line; -#line 533 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 572 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _data8_->current_lines, _tmp4_); -#line 2441 "gitg-diff-view.c" +#line 2606 "gitg-diff-view.c" } -#line 536 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 575 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = 0; -#line 536 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 575 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 2447 "gitg-diff-view.c" +#line 2612 "gitg-diff-view.c" } static gint ____lambda62__ggit_diff_line_callback (GgitDiffDelta* delta, GgitDiffHunk* hunk, GgitDiffLine* line, gpointer self) { gint result; result = ___lambda62_ (self, delta, hunk, line); -#line 448 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 460 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 2456 "gitg-diff-view.c" +#line 2621 "gitg-diff-view.c" } static void _gitg_diff_view_auto_update_expanded_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { -#line 591 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 630 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_auto_update_expanded ((GitgDiffView*) self); -#line 2463 "gitg-diff-view.c" +#line 2628 "gitg-diff-view.c" } @@ -2476,548 +2641,560 @@ GeeHashSet* was_expanded = NULL; GeeHashSet* _tmp8_ = NULL; GList* _tmp9_ = NULL; - gboolean _tmp23_ = FALSE; - gint _tmp24_ = 0; - gint _tmp25_ = 0; - GitgDiffViewCommitDetails* _tmp27_ = NULL; - GitgDiffViewCommitDetails* _tmp28_ = NULL; - gint _tmp29_ = 0; - gint _tmp30_ = 0; + gboolean _tmp25_ = FALSE; + gint _tmp26_ = 0; + gint _tmp27_ = 0; + GitgDiffViewCommitDetails* _tmp29_ = NULL; + GitgDiffViewCommitDetails* _tmp30_ = NULL; + gint _tmp31_ = 0; + gint _tmp32_ = 0; GError * _inner_error_ = NULL; -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (self != NULL); -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (diff != NULL); -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (infomap != NULL); -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_ = g_slice_new0 (Block8Data); -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->_ref_count_ = 1; -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->self = g_object_ref (self); -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = infomap; -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (_data8_->infomap); -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->infomap = _tmp1_; -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = cancellable; -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = _g_object_ref0 (_tmp2_); -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (_data8_->cancellable); -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->cancellable = _tmp3_; -#line 413 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 425 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = gee_array_list_new (GITG_TYPE_DIFF_VIEW_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); -#line 413 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 425 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->files = _tmp4_; -#line 415 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 427 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->current_file = NULL; -#line 416 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 428 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->current_hunk = NULL; -#line 417 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 429 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->current_lines = NULL; -#line 418 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 430 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->current_is_binary = FALSE; -#line 420 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 432 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->maxlines = 0; -#line 422 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 434 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->add_hunk = ___lambda57__gitg_diff_view_anon; -#line 422 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 434 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->add_hunk_target = block8_data_ref (_data8_); -#line 422 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 434 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->add_hunk_target_destroy_notify = block8_data_unref; -#line 432 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 444 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->add_file = ___lambda58__gitg_diff_view_anon; -#line 432 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 444 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->add_file_target = block8_data_ref (_data8_); -#line 432 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 444 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->add_file_target_destroy_notify = block8_data_unref; -#line 2542 "gitg-diff-view.c" +#line 2707 "gitg-diff-view.c" { GgitDiff* _tmp5_ = NULL; -#line 448 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 460 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp5_ = diff; -#line 448 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 460 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" ggit_diff_foreach (_tmp5_, ____lambda59__ggit_diff_file_callback, ____lambda60__ggit_diff_binary_callback, ____lambda61__ggit_diff_hunk_callback, ____lambda62__ggit_diff_line_callback, _data8_, &_inner_error_); -#line 448 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 460 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2551 "gitg-diff-view.c" +#line 2716 "gitg-diff-view.c" goto __catch33_g_error; } } goto __finally33; __catch33_g_error: { -#line 446 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 458 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_clear_error (&_inner_error_); -#line 446 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 458 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _inner_error_ = NULL; -#line 2562 "gitg-diff-view.c" +#line 2727 "gitg-diff-view.c" } __finally33: -#line 446 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 458 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 446 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 458 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" block8_data_unref (_data8_); -#line 446 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 458 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_ = NULL; -#line 446 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 458 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.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 446 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 458 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_clear_error (&_inner_error_); -#line 446 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 458 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return; -#line 2577 "gitg-diff-view.c" +#line 2742 "gitg-diff-view.c" } -#line 541 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 580 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->add_hunk (_data8_->add_hunk_target); -#line 542 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 581 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_->add_file (_data8_->add_file_target); -#line 544 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 583 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp6_ = self->priv->d_grid_files; -#line 544 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 583 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp7_ = gtk_container_get_children ((GtkContainer*) _tmp6_); -#line 544 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 583 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" file_widgets = _tmp7_; -#line 545 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 584 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp8_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL); -#line 545 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 584 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" was_expanded = _tmp8_; -#line 547 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 586 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp9_ = file_widgets; -#line 2595 "gitg-diff-view.c" +#line 2760 "gitg-diff-view.c" { GList* file_collection = NULL; GList* file_it = NULL; -#line 547 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 586 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" file_collection = _tmp9_; -#line 547 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 586 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" for (file_it = file_collection; file_it != NULL; file_it = file_it->next) { -#line 2603 "gitg-diff-view.c" +#line 2768 "gitg-diff-view.c" GtkWidget* file = NULL; -#line 547 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 586 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" file = (GtkWidget*) file_it->data; -#line 2607 "gitg-diff-view.c" +#line 2772 "gitg-diff-view.c" { GitgDiffViewFile* f = NULL; GtkWidget* _tmp10_ = NULL; GitgDiffViewFile* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; gboolean _tmp13_ = FALSE; - GitgDiffViewFile* _tmp22_ = NULL; -#line 549 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + GitgDiffViewFile* _tmp24_ = NULL; +#line 588 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp10_ = file; -#line 549 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 588 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, GITG_TYPE_DIFF_VIEW_FILE) ? ((GitgDiffViewFile*) _tmp10_) : NULL); -#line 549 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 588 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" f = _tmp11_; -#line 551 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 590 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp13_ = preserve_expanded; -#line 551 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 590 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp13_) { -#line 2625 "gitg-diff-view.c" +#line 2790 "gitg-diff-view.c" GitgDiffViewFile* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; gboolean _tmp16_ = FALSE; -#line 551 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 590 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp14_ = f; -#line 551 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 590 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp15_ = gitg_diff_view_file_get_expanded (_tmp14_); -#line 551 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 590 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp16_ = _tmp15_; -#line 551 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 590 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp12_ = _tmp16_; -#line 2637 "gitg-diff-view.c" +#line 2802 "gitg-diff-view.c" } else { -#line 551 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 590 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp12_ = FALSE; -#line 2641 "gitg-diff-view.c" +#line 2806 "gitg-diff-view.c" } -#line 551 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 590 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp12_) { -#line 2645 "gitg-diff-view.c" +#line 2810 "gitg-diff-view.c" gchar* path = NULL; GitgDiffViewFile* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; -#line 553 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + GgitDiffDelta* _tmp18_ = NULL; + GgitDiffDelta* _tmp19_ = NULL; + gchar* _tmp20_ = NULL; + const gchar* _tmp21_ = NULL; +#line 592 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp17_ = f; -#line 553 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp18_ = gitg_diff_view_primary_path (self, _tmp17_); -#line 553 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - path = _tmp18_; -#line 555 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp19_ = path; -#line 555 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - if (_tmp19_ != NULL) { -#line 2660 "gitg-diff-view.c" - GeeHashSet* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; -#line 557 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp20_ = was_expanded; -#line 557 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp21_ = path; -#line 557 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp20_, _tmp21_); -#line 2669 "gitg-diff-view.c" +#line 592 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp18_ = gitg_diff_view_file_get_delta (_tmp17_); +#line 592 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp19_ = _tmp18_; +#line 592 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp20_ = gitg_diff_view_primary_path (self, _tmp19_); +#line 592 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + path = _tmp20_; +#line 594 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp21_ = path; +#line 594 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (_tmp21_ != NULL) { +#line 2831 "gitg-diff-view.c" + GeeHashSet* _tmp22_ = NULL; + const gchar* _tmp23_ = NULL; +#line 596 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp22_ = was_expanded; +#line 596 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp23_ = path; +#line 596 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp22_, _tmp23_); +#line 2840 "gitg-diff-view.c" } -#line 551 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 590 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_free0 (path); -#line 2673 "gitg-diff-view.c" +#line 2844 "gitg-diff-view.c" } -#line 561 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp22_ = f; -#line 561 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - gtk_widget_destroy ((GtkWidget*) _tmp22_); -#line 547 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 600 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp24_ = f; +#line 600 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + gtk_widget_destroy ((GtkWidget*) _tmp24_); +#line 586 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (f); -#line 2681 "gitg-diff-view.c" +#line 2852 "gitg-diff-view.c" } } } -#line 564 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp24_ = gee_abstract_collection_get_size ((GeeCollection*) _data8_->files); -#line 564 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp25_ = _tmp24_; -#line 564 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - if (_tmp25_ <= 1) { -#line 564 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp23_ = TRUE; -#line 2693 "gitg-diff-view.c" +#line 603 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp26_ = gee_abstract_collection_get_size ((GeeCollection*) _data8_->files); +#line 603 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp27_ = _tmp26_; +#line 603 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (_tmp27_ <= 1) { +#line 603 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp25_ = TRUE; +#line 2864 "gitg-diff-view.c" } else { - gboolean _tmp26_ = FALSE; -#line 564 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp26_ = self->priv->_default_collapse_all; -#line 564 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp23_ = !_tmp26_; -#line 2700 "gitg-diff-view.c" - } -#line 564 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp27_ = self->priv->d_commit_details; -#line 564 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - gitg_diff_view_commit_details_set_expanded (_tmp27_, _tmp23_); -#line 565 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp28_ = self->priv->d_commit_details; -#line 565 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp29_ = gee_abstract_collection_get_size ((GeeCollection*) _data8_->files); -#line 565 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp30_ = _tmp29_; -#line 565 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - gitg_diff_view_commit_details_set_expander_visible (_tmp28_, _tmp30_ > 1); -#line 2714 "gitg-diff-view.c" + gboolean _tmp28_ = FALSE; +#line 603 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp28_ = self->priv->_default_collapse_all; +#line 603 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp25_ = !_tmp28_; +#line 2871 "gitg-diff-view.c" + } +#line 603 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp29_ = self->priv->d_commit_details; +#line 603 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + gitg_diff_view_commit_details_set_expanded (_tmp29_, _tmp25_); +#line 604 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp30_ = self->priv->d_commit_details; +#line 604 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp31_ = gee_abstract_collection_get_size ((GeeCollection*) _data8_->files); +#line 604 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp32_ = _tmp31_; +#line 604 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + gitg_diff_view_commit_details_set_expander_visible (_tmp30_, _tmp32_ > 1); +#line 2885 "gitg-diff-view.c" { gint i = 0; -#line 567 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 606 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" i = 0; -#line 2719 "gitg-diff-view.c" +#line 2890 "gitg-diff-view.c" { - gboolean _tmp31_ = FALSE; -#line 567 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp31_ = TRUE; -#line 567 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + gboolean _tmp33_ = FALSE; +#line 606 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp33_ = TRUE; +#line 606 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" while (TRUE) { -#line 2726 "gitg-diff-view.c" - gint _tmp33_ = 0; - gint _tmp34_ = 0; +#line 2897 "gitg-diff-view.c" gint _tmp35_ = 0; - GitgDiffViewFile* file = NULL; gint _tmp36_ = 0; - gpointer _tmp37_ = NULL; + gint _tmp37_ = 0; + GitgDiffViewFile* file = NULL; + gint _tmp38_ = 0; + gpointer _tmp39_ = NULL; gchar* path = NULL; - GitgDiffViewFile* _tmp38_ = NULL; - gchar* _tmp39_ = NULL; - gboolean _tmp40_ = FALSE; - GitgDiffViewCommitDetails* _tmp41_ = NULL; - gboolean _tmp42_ = FALSE; - gboolean _tmp43_ = FALSE; - GitgDiffViewFile* _tmp49_ = NULL; + GitgDiffViewFile* _tmp40_ = NULL; + GgitDiffDelta* _tmp41_ = NULL; + GgitDiffDelta* _tmp42_ = NULL; + gchar* _tmp43_ = NULL; + gboolean _tmp44_ = FALSE; + GitgDiffViewCommitDetails* _tmp45_ = NULL; + gboolean _tmp46_ = FALSE; + gboolean _tmp47_ = FALSE; + GitgDiffViewFile* _tmp53_ = NULL; GitgDiffViewFileRendererText* renderer_text = NULL; - GitgDiffViewFile* _tmp50_ = NULL; - GitgDiffViewFileRenderer* _tmp51_ = NULL; - GitgDiffViewFileRenderer* _tmp52_ = NULL; - GitgDiffViewFileRendererText* _tmp53_ = NULL; - GitgDiffViewFileRendererText* _tmp54_ = NULL; - gint _tmp58_ = 0; - gint _tmp59_ = 0; - gint _tmp60_ = 0; - GtkGrid* _tmp62_ = NULL; - GitgDiffViewFile* _tmp63_ = NULL; - GitgDiffViewFile* _tmp64_ = NULL; -#line 567 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - if (!_tmp31_) { -#line 2755 "gitg-diff-view.c" - gint _tmp32_ = 0; -#line 567 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp32_ = i; -#line 567 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - i = _tmp32_ + 1; -#line 2761 "gitg-diff-view.c" + GitgDiffViewFile* _tmp54_ = NULL; + GitgDiffViewFileRenderer* _tmp55_ = NULL; + GitgDiffViewFileRenderer* _tmp56_ = NULL; + GitgDiffViewFileRendererText* _tmp57_ = NULL; + GitgDiffViewFileRendererText* _tmp58_ = NULL; + gint _tmp62_ = 0; + gint _tmp63_ = 0; + gint _tmp64_ = 0; + GtkGrid* _tmp66_ = NULL; + GitgDiffViewFile* _tmp67_ = NULL; + GitgDiffViewFile* _tmp68_ = NULL; +#line 606 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (!_tmp33_) { +#line 2928 "gitg-diff-view.c" + gint _tmp34_ = 0; +#line 606 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp34_ = i; +#line 606 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + i = _tmp34_ + 1; +#line 2934 "gitg-diff-view.c" } -#line 567 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp31_ = FALSE; -#line 567 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp33_ = i; -#line 567 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp34_ = gee_abstract_collection_get_size ((GeeCollection*) _data8_->files); -#line 567 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp35_ = _tmp34_; -#line 567 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - if (!(_tmp33_ < _tmp35_)) { -#line 567 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 606 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp33_ = FALSE; +#line 606 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp35_ = i; +#line 606 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp36_ = gee_abstract_collection_get_size ((GeeCollection*) _data8_->files); +#line 606 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp37_ = _tmp36_; +#line 606 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (!(_tmp35_ < _tmp37_)) { +#line 606 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" break; -#line 2775 "gitg-diff-view.c" +#line 2948 "gitg-diff-view.c" } -#line 569 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp36_ = i; -#line 569 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp37_ = gee_abstract_list_get ((GeeAbstractList*) _data8_->files, _tmp36_); -#line 569 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - file = (GitgDiffViewFile*) _tmp37_; -#line 570 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp38_ = file; -#line 570 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp39_ = gitg_diff_view_primary_path (self, _tmp38_); -#line 570 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - path = _tmp39_; -#line 572 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp41_ = self->priv->d_commit_details; -#line 572 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp42_ = gitg_diff_view_commit_details_get_expanded (_tmp41_); -#line 572 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp43_ = _tmp42_; -#line 572 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - if (_tmp43_) { -#line 572 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp40_ = TRUE; -#line 2799 "gitg-diff-view.c" +#line 608 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp38_ = i; +#line 608 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp39_ = gee_abstract_list_get ((GeeAbstractList*) _data8_->files, _tmp38_); +#line 608 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + file = (GitgDiffViewFile*) _tmp39_; +#line 609 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp40_ = file; +#line 609 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp41_ = gitg_diff_view_file_get_delta (_tmp40_); +#line 609 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp42_ = _tmp41_; +#line 609 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp43_ = gitg_diff_view_primary_path (self, _tmp42_); +#line 609 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + path = _tmp43_; +#line 611 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp45_ = self->priv->d_commit_details; +#line 611 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp46_ = gitg_diff_view_commit_details_get_expanded (_tmp45_); +#line 611 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp47_ = _tmp46_; +#line 611 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (_tmp47_) { +#line 611 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp44_ = TRUE; +#line 2976 "gitg-diff-view.c" } else { - gboolean _tmp44_ = FALSE; - const gchar* _tmp45_ = NULL; -#line 572 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp45_ = path; -#line 572 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - if (_tmp45_ != NULL) { -#line 2807 "gitg-diff-view.c" - GeeHashSet* _tmp46_ = NULL; - const gchar* _tmp47_ = NULL; - gboolean _tmp48_ = FALSE; -#line 572 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp46_ = was_expanded; -#line 572 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp47_ = path; -#line 572 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp48_ = gee_abstract_collection_contains ((GeeAbstractCollection*) _tmp46_, _tmp47_); -#line 572 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp44_ = _tmp48_; -#line 2819 "gitg-diff-view.c" + gboolean _tmp48_ = FALSE; + const gchar* _tmp49_ = NULL; +#line 611 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp49_ = path; +#line 611 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (_tmp49_ != NULL) { +#line 2984 "gitg-diff-view.c" + GeeHashSet* _tmp50_ = NULL; + const gchar* _tmp51_ = NULL; + gboolean _tmp52_ = FALSE; +#line 611 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp50_ = was_expanded; +#line 611 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp51_ = path; +#line 611 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp52_ = gee_abstract_collection_contains ((GeeAbstractCollection*) _tmp50_, _tmp51_); +#line 611 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp48_ = _tmp52_; +#line 2996 "gitg-diff-view.c" } else { -#line 572 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp44_ = FALSE; -#line 2823 "gitg-diff-view.c" +#line 611 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp48_ = FALSE; +#line 3000 "gitg-diff-view.c" } -#line 572 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp40_ = _tmp44_; -#line 2827 "gitg-diff-view.c" +#line 611 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp44_ = _tmp48_; +#line 3004 "gitg-diff-view.c" } -#line 572 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp49_ = file; -#line 572 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - gitg_diff_view_file_set_expanded (_tmp49_, _tmp40_); -#line 574 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp50_ = file; -#line 574 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp51_ = gitg_diff_view_file_get_renderer (_tmp50_); -#line 574 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp52_ = _tmp51_; -#line 574 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp53_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp52_, GITG_TYPE_DIFF_VIEW_FILE_RENDERER_TEXT) ? ((GitgDiffViewFileRendererText*) _tmp52_) : NULL; -#line 574 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - if (_tmp53_ == NULL) { -#line 574 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _g_object_unref0 (_tmp52_); -#line 2845 "gitg-diff-view.c" +#line 611 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp53_ = file; +#line 611 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + gitg_diff_view_file_set_expanded (_tmp53_, _tmp44_); +#line 613 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp54_ = file; +#line 613 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp55_ = gitg_diff_view_file_get_renderer (_tmp54_); +#line 613 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp56_ = _tmp55_; +#line 613 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp57_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp56_, GITG_TYPE_DIFF_VIEW_FILE_RENDERER_TEXT) ? ((GitgDiffViewFileRendererText*) _tmp56_) : NULL; +#line 613 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (_tmp57_ == NULL) { +#line 613 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _g_object_unref0 (_tmp56_); +#line 3022 "gitg-diff-view.c" } -#line 574 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - renderer_text = _tmp53_; -#line 576 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp54_ = renderer_text; -#line 576 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - if (_tmp54_ != NULL) { -#line 2853 "gitg-diff-view.c" - GitgDiffViewFileRendererText* _tmp55_ = NULL; - GitgDiffViewFileRendererText* _tmp56_ = NULL; - GitgDiffViewFileRendererText* _tmp57_ = NULL; -#line 578 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp55_ = renderer_text; -#line 578 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - gitg_diff_view_file_renderer_text_set_maxlines (_tmp55_, _data8_->maxlines); -#line 580 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp56_ = renderer_text; -#line 580 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_bind_property_with_closures ((GObject*) self, "wrap-lines", (GObject*) _tmp56_, "wrap-lines", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); -#line 581 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp57_ = renderer_text; -#line 581 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_bind_property_with_closures ((GObject*) self, "tab-width", (GObject*) _tmp57_, "tab-width", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); -#line 2869 "gitg-diff-view.c" +#line 613 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + renderer_text = _tmp57_; +#line 615 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp58_ = renderer_text; +#line 615 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (_tmp58_ != NULL) { +#line 3030 "gitg-diff-view.c" + GitgDiffViewFileRendererText* _tmp59_ = NULL; + GitgDiffViewFileRendererText* _tmp60_ = NULL; + GitgDiffViewFileRendererText* _tmp61_ = NULL; +#line 617 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp59_ = renderer_text; +#line 617 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + gitg_diff_view_file_renderer_text_set_maxlines (_tmp59_, _data8_->maxlines); +#line 619 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp60_ = renderer_text; +#line 619 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_bind_property_with_closures ((GObject*) self, "wrap-lines", (GObject*) _tmp60_, "wrap-lines", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); +#line 620 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp61_ = renderer_text; +#line 620 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_bind_property_with_closures ((GObject*) self, "tab-width", (GObject*) _tmp61_, "tab-width", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); +#line 3046 "gitg-diff-view.c" } -#line 584 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp58_ = i; -#line 584 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp59_ = gee_abstract_collection_get_size ((GeeCollection*) _data8_->files); -#line 584 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp60_ = _tmp59_; -#line 584 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - if (_tmp58_ == (_tmp60_ - 1)) { -#line 2879 "gitg-diff-view.c" - GitgDiffViewFile* _tmp61_ = NULL; -#line 586 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp61_ = file; -#line 586 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - gtk_widget_set_vexpand ((GtkWidget*) _tmp61_, TRUE); -#line 2885 "gitg-diff-view.c" +#line 623 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp62_ = i; +#line 623 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp63_ = gee_abstract_collection_get_size ((GeeCollection*) _data8_->files); +#line 623 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp64_ = _tmp63_; +#line 623 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (_tmp62_ == (_tmp64_ - 1)) { +#line 3056 "gitg-diff-view.c" + GitgDiffViewFile* _tmp65_ = NULL; +#line 625 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp65_ = file; +#line 625 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + gtk_widget_set_vexpand ((GtkWidget*) _tmp65_, TRUE); +#line 3062 "gitg-diff-view.c" } -#line 589 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp62_ = self->priv->d_grid_files; -#line 589 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp63_ = file; -#line 589 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - gtk_container_add ((GtkContainer*) _tmp62_, (GtkWidget*) _tmp63_); -#line 591 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp64_ = file; -#line 591 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_signal_connect_object ((GObject*) _tmp64_, "notify::expanded", (GCallback) _gitg_diff_view_auto_update_expanded_g_object_notify, self, 0); -#line 567 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 628 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp66_ = self->priv->d_grid_files; +#line 628 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp67_ = file; +#line 628 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + gtk_container_add ((GtkContainer*) _tmp66_, (GtkWidget*) _tmp67_); +#line 630 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp68_ = file; +#line 630 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_signal_connect_object ((GObject*) _tmp68_, "notify::expanded", (GCallback) _gitg_diff_view_auto_update_expanded_g_object_notify, self, 0); +#line 606 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (renderer_text); -#line 567 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 606 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_free0 (path); -#line 567 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 606 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (file); -#line 2903 "gitg-diff-view.c" +#line 3080 "gitg-diff-view.c" } } } -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (was_expanded); -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_list_free0 (file_widgets); -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" block8_data_unref (_data8_); -#line 411 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 423 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _data8_ = NULL; -#line 2915 "gitg-diff-view.c" +#line 3092 "gitg-diff-view.c" } static void gitg_diff_view_auto_update_expanded (GitgDiffView* self) { GtkGrid* _tmp0_ = NULL; GList* _tmp1_ = NULL; -#line 595 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 634 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (self != NULL); -#line 597 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 636 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->d_grid_files; -#line 597 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 636 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = gtk_container_get_children ((GtkContainer*) _tmp0_); -#line 2928 "gitg-diff-view.c" +#line 3105 "gitg-diff-view.c" { GList* file_collection = NULL; GList* file_it = NULL; -#line 597 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 636 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" file_collection = _tmp1_; -#line 597 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 636 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" for (file_it = file_collection; file_it != NULL; file_it = file_it->next) { -#line 2936 "gitg-diff-view.c" +#line 3113 "gitg-diff-view.c" GtkWidget* file = NULL; -#line 597 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 636 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" file = (GtkWidget*) file_it->data; -#line 2940 "gitg-diff-view.c" +#line 3117 "gitg-diff-view.c" { GtkWidget* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; gboolean _tmp4_ = FALSE; -#line 599 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 638 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = file; -#line 599 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 638 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = gitg_diff_view_file_get_expanded (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, GITG_TYPE_DIFF_VIEW_FILE) ? ((GitgDiffViewFile*) _tmp2_) : NULL); -#line 599 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 638 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = _tmp3_; -#line 599 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 638 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (!_tmp4_) { -#line 601 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 640 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_auto_change_expanded (self, FALSE); -#line 602 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 641 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_list_free0 (file_collection); -#line 602 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 641 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return; -#line 2959 "gitg-diff-view.c" +#line 3136 "gitg-diff-view.c" } } } -#line 597 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 636 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_list_free0 (file_collection); -#line 2965 "gitg-diff-view.c" +#line 3142 "gitg-diff-view.c" } -#line 606 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 645 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_auto_change_expanded (self, TRUE); -#line 2969 "gitg-diff-view.c" +#line 3146 "gitg-diff-view.c" } static gboolean ___lambda64_ (GitgDiffView* self) { gboolean result = FALSE; GtkRevealer* _tmp0_ = NULL; -#line 658 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 697 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self->priv->d_reveal_options_timeout = (guint) 0; -#line 659 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 698 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->d_revealer_options; -#line 659 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 698 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gtk_revealer_set_reveal_child (_tmp0_, TRUE); -#line 660 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 699 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = FALSE; -#line 660 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 699 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 2986 "gitg-diff-view.c" +#line 3163 "gitg-diff-view.c" } static gboolean ____lambda64__gsource_func (gpointer self) { gboolean result; result = ___lambda64_ ((GitgDiffView*) self); -#line 657 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 696 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 2995 "gitg-diff-view.c" +#line 3172 "gitg-diff-view.c" } static gboolean _____lambda65_ (GitgDiffView* self) { gboolean result = FALSE; GtkRevealer* _tmp0_ = NULL; -#line 676 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 715 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self->priv->d_unreveal_options_timeout = (guint) 0; -#line 677 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 716 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->d_revealer_options; -#line 677 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 716 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gtk_revealer_set_reveal_child (_tmp0_, FALSE); -#line 678 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 717 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = FALSE; -#line 678 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 717 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3012 "gitg-diff-view.c" +#line 3189 "gitg-diff-view.c" } static gboolean ______lambda65__gsource_func (gpointer self) { gboolean result; result = _____lambda65_ ((GitgDiffView*) self); -#line 675 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 714 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3021 "gitg-diff-view.c" +#line 3198 "gitg-diff-view.c" } @@ -3049,155 +3226,155 @@ GtkRevealer* _tmp18_ = NULL; gboolean _tmp19_ = FALSE; gboolean _tmp20_ = FALSE; -#line 629 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 668 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (self != NULL); -#line 629 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 668 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (window != NULL); -#line 632 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 671 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = window; -#line 632 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 671 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gdk_window_get_user_data (_tmp0_, &_tmp1_); -#line 632 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 671 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" data = _tmp1_; -#line 634 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 673 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = data; -#line 634 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 673 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp2_) : NULL); -#line 634 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 673 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" w = _tmp3_; -#line 636 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 675 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = w; -#line 636 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 675 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp4_ == NULL) { -#line 638 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 677 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (w); -#line 638 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 677 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return; -#line 3077 "gitg-diff-view.c" +#line 3254 "gitg-diff-view.c" } -#line 642 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 681 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp5_ = w; -#line 642 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 681 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp6_ = self->priv->d_event_box; -#line 642 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 681 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp7_ = ex; -#line 642 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 681 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp8_ = ey; -#line 642 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 681 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gtk_widget_translate_coordinates (_tmp5_, (GtkWidget*) _tmp6_, _tmp7_, _tmp8_, &_tmp9_, &_tmp10_); -#line 642 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 681 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" x = _tmp9_; -#line 642 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 681 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" y = _tmp10_; -#line 646 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 685 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp11_ = self->priv->d_event_box; -#line 646 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 685 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gtk_widget_get_allocation ((GtkWidget*) _tmp11_, &_tmp12_); -#line 646 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 685 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" alloc = _tmp12_; -#line 647 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 686 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp13_ = self->priv->d_revealer_options; -#line 647 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 686 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gtk_widget_get_allocation ((GtkWidget*) _tmp13_, &_tmp14_); -#line 647 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 686 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" revealer_alloc = _tmp14_; -#line 649 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 688 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp18_ = self->priv->d_revealer_options; -#line 649 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 688 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp19_ = gtk_revealer_get_reveal_child (_tmp18_); -#line 649 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 688 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp20_ = _tmp19_; -#line 649 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 688 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (!_tmp20_) { -#line 3113 "gitg-diff-view.c" +#line 3290 "gitg-diff-view.c" gint _tmp21_ = 0; GtkAllocation _tmp22_ = {0}; gint _tmp23_ = 0; -#line 649 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 688 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp21_ = y; -#line 649 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 688 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp22_ = alloc; -#line 649 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 688 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp23_ = _tmp22_.height; -#line 649 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 688 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp17_ = _tmp21_ >= (_tmp23_ - 18); -#line 3125 "gitg-diff-view.c" +#line 3302 "gitg-diff-view.c" } else { -#line 649 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 688 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp17_ = FALSE; -#line 3129 "gitg-diff-view.c" +#line 3306 "gitg-diff-view.c" } -#line 649 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 688 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp17_) { -#line 3133 "gitg-diff-view.c" +#line 3310 "gitg-diff-view.c" gint _tmp24_ = 0; GtkAllocation _tmp25_ = {0}; gint _tmp26_ = 0; -#line 649 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 688 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp24_ = x; -#line 649 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 688 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp25_ = alloc; -#line 649 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 688 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp26_ = _tmp25_.width; -#line 649 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 688 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp16_ = _tmp24_ >= (_tmp26_ - 150); -#line 3145 "gitg-diff-view.c" +#line 3322 "gitg-diff-view.c" } else { -#line 649 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 688 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp16_ = FALSE; -#line 3149 "gitg-diff-view.c" +#line 3326 "gitg-diff-view.c" } -#line 649 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 688 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp16_) { -#line 3153 "gitg-diff-view.c" +#line 3330 "gitg-diff-view.c" guint _tmp27_ = 0U; -#line 649 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 688 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp27_ = self->priv->d_reveal_options_timeout; -#line 649 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 688 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp15_ = _tmp27_ == ((guint) 0); -#line 3159 "gitg-diff-view.c" +#line 3336 "gitg-diff-view.c" } else { -#line 649 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 688 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp15_ = FALSE; -#line 3163 "gitg-diff-view.c" +#line 3340 "gitg-diff-view.c" } -#line 649 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 688 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp15_) { -#line 3167 "gitg-diff-view.c" +#line 3344 "gitg-diff-view.c" guint _tmp28_ = 0U; guint _tmp30_ = 0U; -#line 651 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 690 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp28_ = self->priv->d_unreveal_options_timeout; -#line 651 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 690 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp28_ != ((guint) 0)) { -#line 3174 "gitg-diff-view.c" +#line 3351 "gitg-diff-view.c" guint _tmp29_ = 0U; -#line 653 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 692 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp29_ = self->priv->d_unreveal_options_timeout; -#line 653 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 692 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_source_remove (_tmp29_); -#line 654 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 693 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self->priv->d_unreveal_options_timeout = (guint) 0; -#line 3182 "gitg-diff-view.c" +#line 3359 "gitg-diff-view.c" } -#line 657 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 696 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp30_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 300, ____lambda64__gsource_func, g_object_ref (self), g_object_unref); -#line 657 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 696 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self->priv->d_reveal_options_timeout = _tmp30_; -#line 3188 "gitg-diff-view.c" +#line 3365 "gitg-diff-view.c" } else { GtkRevealer* _tmp31_ = NULL; gboolean _tmp32_ = FALSE; gboolean _tmp33_ = FALSE; -#line 663 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 702 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp31_ = self->priv->d_revealer_options; -#line 663 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 702 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp32_ = gtk_revealer_get_reveal_child (_tmp31_); -#line 663 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 702 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp33_ = _tmp32_; -#line 663 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 702 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp33_) { -#line 3201 "gitg-diff-view.c" +#line 3378 "gitg-diff-view.c" gboolean above = FALSE; gint _tmp34_ = 0; GtkAllocation _tmp35_ = {0}; @@ -3206,95 +3383,95 @@ gint _tmp38_ = 0; gboolean _tmp39_ = FALSE; gboolean _tmp40_ = FALSE; -#line 665 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 704 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp34_ = y; -#line 665 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 704 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp35_ = alloc; -#line 665 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 704 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp36_ = _tmp35_.height; -#line 665 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 704 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp37_ = revealer_alloc; -#line 665 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 704 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp38_ = _tmp37_.height; -#line 665 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 704 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" above = _tmp34_ <= ((_tmp36_ - 6) - _tmp38_); -#line 667 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 706 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp40_ = above; -#line 667 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 706 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp40_) { -#line 3226 "gitg-diff-view.c" +#line 3403 "gitg-diff-view.c" guint _tmp41_ = 0U; -#line 667 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 706 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp41_ = self->priv->d_unreveal_options_timeout; -#line 667 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 706 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp39_ = _tmp41_ == ((guint) 0); -#line 3232 "gitg-diff-view.c" +#line 3409 "gitg-diff-view.c" } else { -#line 667 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 706 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp39_ = FALSE; -#line 3236 "gitg-diff-view.c" +#line 3413 "gitg-diff-view.c" } -#line 667 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 706 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp39_) { -#line 3240 "gitg-diff-view.c" +#line 3417 "gitg-diff-view.c" guint _tmp42_ = 0U; guint _tmp44_ = 0U; -#line 669 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 708 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp42_ = self->priv->d_reveal_options_timeout; -#line 669 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 708 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp42_ != ((guint) 0)) { -#line 3247 "gitg-diff-view.c" +#line 3424 "gitg-diff-view.c" guint _tmp43_ = 0U; -#line 671 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 710 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp43_ = self->priv->d_reveal_options_timeout; -#line 671 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 710 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_source_remove (_tmp43_); -#line 672 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 711 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self->priv->d_reveal_options_timeout = (guint) 0; -#line 3255 "gitg-diff-view.c" +#line 3432 "gitg-diff-view.c" } -#line 675 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 714 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp44_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 1000, ______lambda65__gsource_func, g_object_ref (self), g_object_unref); -#line 675 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 714 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self->priv->d_unreveal_options_timeout = _tmp44_; -#line 3261 "gitg-diff-view.c" +#line 3438 "gitg-diff-view.c" } else { gboolean _tmp45_ = FALSE; gboolean _tmp46_ = FALSE; -#line 681 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 720 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp46_ = above; -#line 681 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 720 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (!_tmp46_) { -#line 3269 "gitg-diff-view.c" +#line 3446 "gitg-diff-view.c" guint _tmp47_ = 0U; -#line 681 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 720 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp47_ = self->priv->d_unreveal_options_timeout; -#line 681 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 720 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp45_ = _tmp47_ != ((guint) 0); -#line 3275 "gitg-diff-view.c" +#line 3452 "gitg-diff-view.c" } else { -#line 681 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 720 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp45_ = FALSE; -#line 3279 "gitg-diff-view.c" +#line 3456 "gitg-diff-view.c" } -#line 681 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 720 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp45_) { -#line 3283 "gitg-diff-view.c" +#line 3460 "gitg-diff-view.c" guint _tmp48_ = 0U; -#line 683 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 722 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp48_ = self->priv->d_unreveal_options_timeout; -#line 683 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 722 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_source_remove (_tmp48_); -#line 684 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 723 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self->priv->d_unreveal_options_timeout = (guint) 0; -#line 3291 "gitg-diff-view.c" +#line 3468 "gitg-diff-view.c" } } } } -#line 629 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 668 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (w); -#line 3298 "gitg-diff-view.c" +#line 3475 "gitg-diff-view.c" } @@ -3306,31 +3483,31 @@ gdouble _tmp3_ = 0.0; GdkEventCrossing* _tmp4_ = NULL; gdouble _tmp5_ = 0.0; -#line 690 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 729 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 690 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 729 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (widget != NULL, FALSE); -#line 690 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 729 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 692 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 731 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = event; -#line 692 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 731 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = _tmp0_->window; -#line 692 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 731 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = event; -#line 692 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 731 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = _tmp2_->x; -#line 692 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 731 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = event; -#line 692 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 731 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp5_ = _tmp4_->y; -#line 692 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 731 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_update_hide_show_options (self, _tmp1_, (gint) _tmp3_, (gint) _tmp5_); -#line 693 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 732 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = FALSE; -#line 693 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 732 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3334 "gitg-diff-view.c" +#line 3511 "gitg-diff-view.c" } @@ -3339,7 +3516,7 @@ result = gitg_diff_view_leave_notify_event_on_event_box ((GitgDiffView*) self, _sender, event); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3343 "gitg-diff-view.c" +#line 3520 "gitg-diff-view.c" } @@ -3351,31 +3528,31 @@ gdouble _tmp3_ = 0.0; GdkEventCrossing* _tmp4_ = NULL; gdouble _tmp5_ = 0.0; -#line 697 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 736 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 697 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 736 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (widget != NULL, FALSE); -#line 697 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 736 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 699 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 738 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = event; -#line 699 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 738 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = _tmp0_->window; -#line 699 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 738 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = event; -#line 699 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 738 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = _tmp2_->x; -#line 699 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 738 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = event; -#line 699 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 738 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp5_ = _tmp4_->y; -#line 699 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 738 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_update_hide_show_options (self, _tmp1_, (gint) _tmp3_, (gint) _tmp5_); -#line 700 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 739 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = FALSE; -#line 700 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 739 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3379 "gitg-diff-view.c" +#line 3556 "gitg-diff-view.c" } @@ -3384,7 +3561,7 @@ result = gitg_diff_view_enter_notify_event_on_event_box ((GitgDiffView*) self, _sender, event); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3388 "gitg-diff-view.c" +#line 3565 "gitg-diff-view.c" } @@ -3396,31 +3573,31 @@ gdouble _tmp3_ = 0.0; GdkEventMotion* _tmp4_ = NULL; gdouble _tmp5_ = 0.0; -#line 704 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 743 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 704 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 743 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (widget != NULL, FALSE); -#line 704 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 743 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 706 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 745 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = event; -#line 706 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 745 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = _tmp0_->window; -#line 706 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 745 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = event; -#line 706 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 745 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = _tmp2_->x; -#line 706 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 745 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = event; -#line 706 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 745 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp5_ = _tmp4_->y; -#line 706 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 745 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_update_hide_show_options (self, _tmp1_, (gint) _tmp3_, (gint) _tmp5_); -#line 707 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 746 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = FALSE; -#line 707 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 746 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3424 "gitg-diff-view.c" +#line 3601 "gitg-diff-view.c" } @@ -3430,14 +3607,14 @@ self = (GitgDiffView*) g_object_new (object_type, NULL); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return self; -#line 3434 "gitg-diff-view.c" +#line 3611 "gitg-diff-view.c" } GitgDiffView* gitg_diff_view_new (void) { #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return gitg_diff_view_construct (GITG_TYPE_DIFF_VIEW); -#line 3441 "gitg-diff-view.c" +#line 3618 "gitg-diff-view.c" } @@ -3445,553 +3622,617 @@ GgitDiffOptions* result; GgitDiffOptions* _tmp0_ = NULL; GgitDiffOptions* _tmp2_ = NULL; -#line 57 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_return_val_if_fail (self != NULL, NULL); #line 59 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_return_val_if_fail (self != NULL, NULL); +#line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->d_options; -#line 59 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp0_ == NULL) { -#line 3455 "gitg-diff-view.c" +#line 3632 "gitg-diff-view.c" GgitDiffOptions* _tmp1_ = NULL; -#line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 63 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = ggit_diff_options_new (); -#line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 63 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (self->priv->d_options); -#line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 63 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self->priv->d_options = _tmp1_; -#line 3463 "gitg-diff-view.c" +#line 3640 "gitg-diff-view.c" } -#line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = self->priv->d_options; -#line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp2_; -#line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3471 "gitg-diff-view.c" +#line 3648 "gitg-diff-view.c" } gboolean gitg_diff_view_get_has_selection (GitgDiffView* self) { gboolean result; gboolean _tmp0_ = FALSE; -#line 70 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 72 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 70 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 72 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->_has_selection; -#line 70 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 72 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp0_; -#line 70 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 72 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3486 "gitg-diff-view.c" +#line 3663 "gitg-diff-view.c" } static void gitg_diff_view_set_has_selection (GitgDiffView* self, gboolean value) { - gboolean _tmp0_ = FALSE; -#line 70 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 72 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (self != NULL); -#line 70 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp0_ = value; -#line 70 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - self->priv->_has_selection = _tmp0_; -#line 70 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_notify ((GObject *) self, "has-selection"); -#line 3500 "gitg-diff-view.c" +#line 72 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (gitg_diff_view_get_has_selection (self) != value) { +#line 3672 "gitg-diff-view.c" + gboolean _tmp0_ = FALSE; +#line 72 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp0_ = value; +#line 72 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + self->priv->_has_selection = _tmp0_; +#line 72 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_notify ((GObject *) self, "has-selection"); +#line 3680 "gitg-diff-view.c" + } } GgitDiff* gitg_diff_view_get_diff (GitgDiffView* self) { GgitDiff* result; GgitDiff* _tmp0_ = NULL; -#line 75 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 77 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, NULL); -#line 75 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 77 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->d_diff; -#line 75 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 77 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp0_; -#line 75 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 77 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3515 "gitg-diff-view.c" +#line 3696 "gitg-diff-view.c" } void gitg_diff_view_set_diff (GitgDiffView* self, GgitDiff* value) { - GgitDiff* _tmp0_ = NULL; - GgitDiff* _tmp1_ = NULL; -#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_return_if_fail (self != NULL); #line 78 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp0_ = self->priv->d_diff; -#line 78 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp1_ = value; + g_return_if_fail (self != NULL); #line 78 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - if (_tmp0_ != _tmp1_) { -#line 3530 "gitg-diff-view.c" - GgitDiff* _tmp2_ = NULL; - GgitDiff* _tmp3_ = NULL; -#line 80 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp2_ = value; + if (gitg_diff_view_get_diff (self) != value) { +#line 3705 "gitg-diff-view.c" + GgitDiff* _tmp0_ = NULL; + GgitDiff* _tmp1_ = NULL; #line 80 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp0_ = self->priv->d_diff; #line 80 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _g_object_unref0 (self->priv->d_diff); + _tmp1_ = value; #line 80 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - self->priv->d_diff = _tmp3_; -#line 81 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _g_object_unref0 (self->priv->d_commit); -#line 81 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - self->priv->d_commit = NULL; -#line 3545 "gitg-diff-view.c" + if (_tmp0_ != _tmp1_) { +#line 3714 "gitg-diff-view.c" + GgitDiff* _tmp2_ = NULL; + GgitDiff* _tmp3_ = NULL; +#line 82 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp2_ = value; +#line 82 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp3_ = _g_object_ref0 (_tmp2_); +#line 82 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _g_object_unref0 (self->priv->d_diff); +#line 82 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + self->priv->d_diff = _tmp3_; +#line 83 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _g_object_unref0 (self->priv->d_commit); +#line 83 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + self->priv->d_commit = NULL; +#line 3729 "gitg-diff-view.c" + } +#line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + gitg_diff_view_update (self, FALSE); +#line 78 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_notify ((GObject *) self, "diff"); +#line 3735 "gitg-diff-view.c" } -#line 84 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - gitg_diff_view_update (self, FALSE); -#line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_notify ((GObject *) self, "diff"); -#line 3551 "gitg-diff-view.c" } GitgCommit* gitg_diff_view_get_commit (GitgDiffView* self) { GitgCommit* result; GitgCommit* _tmp0_ = NULL; -#line 90 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 92 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, NULL); -#line 90 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 92 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->d_commit; -#line 90 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 92 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp0_; -#line 90 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 92 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3566 "gitg-diff-view.c" +#line 3751 "gitg-diff-view.c" } void gitg_diff_view_set_commit (GitgDiffView* self, GitgCommit* value) { - GitgCommit* _tmp0_ = NULL; - GitgCommit* _tmp1_ = NULL; -#line 91 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_return_if_fail (self != NULL); -#line 93 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp0_ = self->priv->d_commit; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp1_ = value; + g_return_if_fail (self != NULL); #line 93 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - if (_tmp0_ != _tmp1_) { -#line 3581 "gitg-diff-view.c" - GitgCommit* _tmp2_ = NULL; - GitgCommit* _tmp3_ = NULL; + if (gitg_diff_view_get_commit (self) != value) { +#line 3760 "gitg-diff-view.c" + GitgCommit* _tmp0_ = NULL; + GitgCommit* _tmp1_ = NULL; #line 95 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp2_ = value; + _tmp0_ = self->priv->d_commit; #line 95 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp1_ = value; #line 95 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _g_object_unref0 (self->priv->d_commit); -#line 95 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - self->priv->d_commit = _tmp3_; -#line 96 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _g_object_unref0 (self->priv->d_diff); -#line 96 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - self->priv->d_diff = NULL; -#line 3596 "gitg-diff-view.c" + if (_tmp0_ != _tmp1_) { +#line 3769 "gitg-diff-view.c" + GitgCommit* _tmp2_ = NULL; + GitgCommit* _tmp3_ = NULL; +#line 97 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp2_ = value; +#line 97 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp3_ = _g_object_ref0 (_tmp2_); +#line 97 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _g_object_unref0 (self->priv->d_commit); +#line 97 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + self->priv->d_commit = _tmp3_; +#line 98 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _g_object_unref0 (self->priv->d_diff); +#line 98 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + self->priv->d_diff = NULL; +#line 3784 "gitg-diff-view.c" + } +#line 101 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + gitg_diff_view_update (self, FALSE); +#line 93 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_notify ((GObject *) self, "commit"); +#line 3790 "gitg-diff-view.c" } -#line 99 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - gitg_diff_view_update (self, FALSE); -#line 91 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_notify ((GObject *) self, "commit"); -#line 3602 "gitg-diff-view.c" } gboolean gitg_diff_view_get_wrap_lines (GitgDiffView* self) { gboolean result; gboolean _tmp0_ = FALSE; -#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->_wrap_lines; -#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp0_; -#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3617 "gitg-diff-view.c" +#line 3806 "gitg-diff-view.c" } void gitg_diff_view_set_wrap_lines (GitgDiffView* self, gboolean value) { - gboolean _tmp0_ = FALSE; -#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (self != NULL); -#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp0_ = value; -#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - self->priv->_wrap_lines = _tmp0_; -#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_notify ((GObject *) self, "wrap-lines"); -#line 3631 "gitg-diff-view.c" +#line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (gitg_diff_view_get_wrap_lines (self) != value) { +#line 3815 "gitg-diff-view.c" + gboolean _tmp0_ = FALSE; +#line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp0_ = value; +#line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + self->priv->_wrap_lines = _tmp0_; +#line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_notify ((GObject *) self, "wrap-lines"); +#line 3823 "gitg-diff-view.c" + } } gboolean gitg_diff_view_get_staged (GitgDiffView* self) { gboolean result; gboolean _tmp0_ = FALSE; -#line 112 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 114 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 112 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 114 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->_staged; -#line 112 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 114 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp0_; -#line 112 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 114 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3646 "gitg-diff-view.c" +#line 3839 "gitg-diff-view.c" } void gitg_diff_view_set_staged (GitgDiffView* self, gboolean value) { - gboolean _tmp0_ = FALSE; -#line 112 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 114 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (self != NULL); -#line 112 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp0_ = value; -#line 112 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - self->priv->_staged = _tmp0_; -#line 112 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_notify ((GObject *) self, "staged"); -#line 3660 "gitg-diff-view.c" +#line 114 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (gitg_diff_view_get_staged (self) != value) { +#line 3848 "gitg-diff-view.c" + gboolean _tmp0_ = FALSE; +#line 114 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp0_ = value; +#line 114 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + self->priv->_staged = _tmp0_; +#line 114 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_notify ((GObject *) self, "staged"); +#line 3856 "gitg-diff-view.c" + } } gboolean gitg_diff_view_get_unstaged (GitgDiffView* self) { gboolean result; gboolean _tmp0_ = FALSE; -#line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->_unstaged; -#line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp0_; -#line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3675 "gitg-diff-view.c" +#line 3872 "gitg-diff-view.c" } void gitg_diff_view_set_unstaged (GitgDiffView* self, gboolean value) { - gboolean _tmp0_ = FALSE; -#line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (self != NULL); -#line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp0_ = value; -#line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - self->priv->_unstaged = _tmp0_; -#line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_notify ((GObject *) self, "unstaged"); -#line 3689 "gitg-diff-view.c" +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (gitg_diff_view_get_unstaged (self) != value) { +#line 3881 "gitg-diff-view.c" + gboolean _tmp0_ = FALSE; +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp0_ = value; +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + self->priv->_unstaged = _tmp0_; +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_notify ((GObject *) self, "unstaged"); +#line 3889 "gitg-diff-view.c" + } } gboolean gitg_diff_view_get_show_parents (GitgDiffView* self) { gboolean result; gboolean _tmp0_ = FALSE; -#line 114 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 114 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->_show_parents; -#line 114 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp0_; -#line 114 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3704 "gitg-diff-view.c" +#line 3905 "gitg-diff-view.c" } void gitg_diff_view_set_show_parents (GitgDiffView* self, gboolean value) { - gboolean _tmp0_ = FALSE; -#line 114 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (self != NULL); -#line 114 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp0_ = value; -#line 114 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - self->priv->_show_parents = _tmp0_; -#line 114 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_notify ((GObject *) self, "show-parents"); -#line 3718 "gitg-diff-view.c" +#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (gitg_diff_view_get_show_parents (self) != value) { +#line 3914 "gitg-diff-view.c" + gboolean _tmp0_ = FALSE; +#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp0_ = value; +#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + self->priv->_show_parents = _tmp0_; +#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_notify ((GObject *) self, "show-parents"); +#line 3922 "gitg-diff-view.c" + } } gboolean gitg_diff_view_get_default_collapse_all (GitgDiffView* self) { gboolean result; gboolean _tmp0_ = FALSE; -#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 117 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 117 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->_default_collapse_all; -#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 117 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp0_; -#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 117 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3733 "gitg-diff-view.c" +#line 3938 "gitg-diff-view.c" } void gitg_diff_view_set_default_collapse_all (GitgDiffView* self, gboolean value) { - gboolean _tmp0_ = FALSE; -#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 117 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (self != NULL); -#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp0_ = value; -#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - self->priv->_default_collapse_all = _tmp0_; -#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_notify ((GObject *) self, "default-collapse-all"); -#line 3747 "gitg-diff-view.c" +#line 117 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (gitg_diff_view_get_default_collapse_all (self) != value) { +#line 3947 "gitg-diff-view.c" + gboolean _tmp0_ = FALSE; +#line 117 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp0_ = value; +#line 117 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + self->priv->_default_collapse_all = _tmp0_; +#line 117 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_notify ((GObject *) self, "default-collapse-all"); +#line 3955 "gitg-diff-view.c" + } } gboolean gitg_diff_view_get_use_gravatar (GitgDiffView* self) { gboolean result; gboolean _tmp0_ = FALSE; -#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->_use_gravatar; -#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp0_; -#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3762 "gitg-diff-view.c" +#line 3971 "gitg-diff-view.c" } void gitg_diff_view_set_use_gravatar (GitgDiffView* self, gboolean value) { - gboolean _tmp0_ = FALSE; -#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (self != NULL); -#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp0_ = value; -#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - self->priv->_use_gravatar = _tmp0_; -#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_notify ((GObject *) self, "use-gravatar"); -#line 3776 "gitg-diff-view.c" +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (gitg_diff_view_get_use_gravatar (self) != value) { +#line 3980 "gitg-diff-view.c" + gboolean _tmp0_ = FALSE; +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp0_ = value; +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + self->priv->_use_gravatar = _tmp0_; +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_notify ((GObject *) self, "use-gravatar"); +#line 3988 "gitg-diff-view.c" + } } gint gitg_diff_view_get_tab_width (GitgDiffView* self) { gint result; gint _tmp0_ = 0; -#line 117 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, 0); -#line 117 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->_tab_width; -#line 117 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp0_; -#line 117 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3791 "gitg-diff-view.c" +#line 4004 "gitg-diff-view.c" } void gitg_diff_view_set_tab_width (GitgDiffView* self, gint value) { - gint _tmp0_ = 0; -#line 117 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (self != NULL); -#line 117 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp0_ = value; -#line 117 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - self->priv->_tab_width = _tmp0_; -#line 117 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_notify ((GObject *) self, "tab-width"); -#line 3805 "gitg-diff-view.c" +#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (gitg_diff_view_get_tab_width (self) != value) { +#line 4013 "gitg-diff-view.c" + gint _tmp0_ = 0; +#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp0_ = value; +#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + self->priv->_tab_width = _tmp0_; +#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_notify ((GObject *) self, "tab-width"); +#line 4021 "gitg-diff-view.c" + } } gboolean gitg_diff_view_get_handle_selection (GitgDiffView* self) { gboolean result; gboolean _tmp0_ = FALSE; -#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->_handle_selection; -#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp0_; -#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3820 "gitg-diff-view.c" +#line 4037 "gitg-diff-view.c" } void gitg_diff_view_set_handle_selection (GitgDiffView* self, gboolean value) { - gboolean _tmp0_ = FALSE; -#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (self != NULL); -#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp0_ = value; -#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - self->priv->_handle_selection = _tmp0_; -#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_notify ((GObject *) self, "handle-selection"); -#line 3834 "gitg-diff-view.c" +#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (gitg_diff_view_get_handle_selection (self) != value) { +#line 4046 "gitg-diff-view.c" + gboolean _tmp0_ = FALSE; +#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp0_ = value; +#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + self->priv->_handle_selection = _tmp0_; +#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_notify ((GObject *) self, "handle-selection"); +#line 4054 "gitg-diff-view.c" + } } gboolean gitg_diff_view_get_highlight (GitgDiffView* self) { gboolean result; gboolean _tmp0_ = FALSE; -#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 121 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 121 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->_highlight; -#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 121 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp0_; -#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 121 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3849 "gitg-diff-view.c" +#line 4070 "gitg-diff-view.c" } void gitg_diff_view_set_highlight (GitgDiffView* self, gboolean value) { - gboolean _tmp0_ = FALSE; -#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 121 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (self != NULL); -#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp0_ = value; -#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - self->priv->_highlight = _tmp0_; -#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_notify ((GObject *) self, "highlight"); -#line 3863 "gitg-diff-view.c" +#line 121 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (gitg_diff_view_get_highlight (self) != value) { +#line 4079 "gitg-diff-view.c" + gboolean _tmp0_ = FALSE; +#line 121 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp0_ = value; +#line 121 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + self->priv->_highlight = _tmp0_; +#line 121 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_notify ((GObject *) self, "highlight"); +#line 4087 "gitg-diff-view.c" + } } GitgRepository* gitg_diff_view_get_repository (GitgDiffView* self) { GitgRepository* result; GitgRepository* _tmp0_ = NULL; -#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, NULL); -#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->_repository; -#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp0_; -#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3878 "gitg-diff-view.c" +#line 4103 "gitg-diff-view.c" } void gitg_diff_view_set_repository (GitgDiffView* self, GitgRepository* value) { - GitgRepository* _tmp0_ = NULL; - GitgRepository* _tmp1_ = NULL; -#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (self != NULL); -#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp0_ = value; -#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); -#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _g_object_unref0 (self->priv->_repository); -#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - self->priv->_repository = _tmp1_; -#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_notify ((GObject *) self, "repository"); -#line 3897 "gitg-diff-view.c" +#line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (gitg_diff_view_get_repository (self) != value) { +#line 4112 "gitg-diff-view.c" + GitgRepository* _tmp0_ = NULL; + GitgRepository* _tmp1_ = NULL; +#line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp0_ = value; +#line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _g_object_unref0 (self->priv->_repository); +#line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + self->priv->_repository = _tmp1_; +#line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_notify ((GObject *) self, "repository"); +#line 4125 "gitg-diff-view.c" + } } gboolean gitg_diff_view_get_new_is_workdir (GitgDiffView* self) { gboolean result; gboolean _tmp0_ = FALSE; -#line 121 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 123 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 121 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 123 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->_new_is_workdir; -#line 121 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 123 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp0_; -#line 121 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 123 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3912 "gitg-diff-view.c" +#line 4141 "gitg-diff-view.c" } void gitg_diff_view_set_new_is_workdir (GitgDiffView* self, gboolean value) { - gboolean _tmp0_ = FALSE; -#line 121 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 123 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (self != NULL); -#line 121 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp0_ = value; -#line 121 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - self->priv->_new_is_workdir = _tmp0_; -#line 121 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_notify ((GObject *) self, "new-is-workdir"); -#line 3926 "gitg-diff-view.c" +#line 123 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (gitg_diff_view_get_new_is_workdir (self) != value) { +#line 4150 "gitg-diff-view.c" + gboolean _tmp0_ = FALSE; +#line 123 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp0_ = value; +#line 123 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + self->priv->_new_is_workdir = _tmp0_; +#line 123 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_notify ((GObject *) self, "new-is-workdir"); +#line 4158 "gitg-diff-view.c" + } } gboolean gitg_diff_view_get_ignore_whitespace (GitgDiffView* self) { gboolean result; gboolean _tmp0_ = FALSE; -#line 150 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 152 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 150 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 152 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = gitg_diff_view_flag_get (self, GGIT_DIFF_IGNORE_WHITESPACE); -#line 150 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 152 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp0_; -#line 150 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 152 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3941 "gitg-diff-view.c" +#line 4174 "gitg-diff-view.c" } void gitg_diff_view_set_ignore_whitespace (GitgDiffView* self, gboolean value) { - gboolean _tmp0_ = FALSE; -#line 151 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 153 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_if_fail (self != NULL); -#line 151 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp0_ = value; -#line 151 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - gitg_diff_view_flag_set (self, GGIT_DIFF_IGNORE_WHITESPACE, _tmp0_); -#line 151 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_notify ((GObject *) self, "ignore-whitespace"); -#line 3955 "gitg-diff-view.c" +#line 153 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (gitg_diff_view_get_ignore_whitespace (self) != value) { +#line 4183 "gitg-diff-view.c" + gboolean _tmp0_ = FALSE; +#line 153 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp0_ = value; +#line 153 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + gitg_diff_view_flag_set (self, GGIT_DIFF_IGNORE_WHITESPACE, _tmp0_); +#line 153 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_notify ((GObject *) self, "ignore-whitespace"); +#line 4191 "gitg-diff-view.c" + } } gboolean gitg_diff_view_get_changes_inline (GitgDiffView* self) { gboolean result; gboolean _tmp0_ = FALSE; -#line 156 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 158 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 156 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 158 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->d_changes_inline; -#line 156 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 158 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp0_; -#line 156 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 158 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 3970 "gitg-diff-view.c" +#line 4207 "gitg-diff-view.c" } void gitg_diff_view_set_changes_inline (GitgDiffView* self, gboolean value) { - gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; -#line 157 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_return_if_fail (self != NULL); -#line 159 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp0_ = self->priv->d_changes_inline; #line 159 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp1_ = value; + g_return_if_fail (self != NULL); #line 159 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - if (_tmp0_ != _tmp1_) { -#line 3985 "gitg-diff-view.c" - gboolean _tmp2_ = FALSE; + if (gitg_diff_view_get_changes_inline (self) != value) { +#line 4216 "gitg-diff-view.c" + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; #line 161 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp2_ = value; + _tmp0_ = self->priv->d_changes_inline; #line 161 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - self->priv->d_changes_inline = _tmp2_; -#line 3991 "gitg-diff-view.c" + _tmp1_ = value; +#line 161 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (_tmp0_ != _tmp1_) { +#line 4225 "gitg-diff-view.c" + gboolean _tmp2_ = FALSE; +#line 163 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp2_ = value; +#line 163 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + self->priv->d_changes_inline = _tmp2_; +#line 4231 "gitg-diff-view.c" + } +#line 159 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_notify ((GObject *) self, "changes-inline"); +#line 4235 "gitg-diff-view.c" } -#line 157 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_notify ((GObject *) self, "changes-inline"); -#line 3995 "gitg-diff-view.c" } @@ -4001,91 +4242,95 @@ GgitDiffOptions* _tmp1_ = NULL; gint _tmp2_ = 0; gint _tmp3_ = 0; -#line 171 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 173 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, 0); -#line 171 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 173 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = gitg_diff_view_get_options (self); -#line 171 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 173 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = _tmp0_; -#line 171 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 173 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = ggit_diff_options_get_n_context_lines (_tmp1_); -#line 171 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 173 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = _tmp2_; -#line 171 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 173 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp3_; -#line 171 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 173 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 4019 "gitg-diff-view.c" +#line 4260 "gitg-diff-view.c" } void gitg_diff_view_set_context_lines (GitgDiffView* self, gint value) { - GgitDiffOptions* _tmp0_ = NULL; - GgitDiffOptions* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - gint _tmp4_ = 0; -#line 173 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_return_if_fail (self != NULL); -#line 175 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp0_ = gitg_diff_view_get_options (self); -#line 175 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp1_ = _tmp0_; -#line 175 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp2_ = ggit_diff_options_get_n_context_lines (_tmp1_); #line 175 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp3_ = _tmp2_; -#line 175 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp4_ = value; + g_return_if_fail (self != NULL); #line 175 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - if (_tmp3_ != _tmp4_) { -#line 4043 "gitg-diff-view.c" - GgitDiffOptions* _tmp5_ = NULL; - GgitDiffOptions* _tmp6_ = NULL; - gint _tmp7_ = 0; - GgitDiffOptions* _tmp8_ = NULL; - GgitDiffOptions* _tmp9_ = NULL; - gint _tmp10_ = 0; + if (gitg_diff_view_get_context_lines (self) != value) { +#line 4269 "gitg-diff-view.c" + GgitDiffOptions* _tmp0_ = NULL; + GgitDiffOptions* _tmp1_ = NULL; + gint _tmp2_ = 0; + gint _tmp3_ = 0; + gint _tmp4_ = 0; +#line 177 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp0_ = gitg_diff_view_get_options (self); +#line 177 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp1_ = _tmp0_; #line 177 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp5_ = gitg_diff_view_get_options (self); + _tmp2_ = ggit_diff_options_get_n_context_lines (_tmp1_); #line 177 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp6_ = _tmp5_; + _tmp3_ = _tmp2_; #line 177 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp7_ = value; + _tmp4_ = value; #line 177 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - ggit_diff_options_set_n_context_lines (_tmp6_, _tmp7_); -#line 178 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp8_ = gitg_diff_view_get_options (self); -#line 178 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp9_ = _tmp8_; -#line 178 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp10_ = value; -#line 178 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - ggit_diff_options_set_n_interhunk_lines (_tmp9_, _tmp10_); + if (_tmp3_ != _tmp4_) { +#line 4287 "gitg-diff-view.c" + GgitDiffOptions* _tmp5_ = NULL; + GgitDiffOptions* _tmp6_ = NULL; + gint _tmp7_ = 0; + GgitDiffOptions* _tmp8_ = NULL; + GgitDiffOptions* _tmp9_ = NULL; + gint _tmp10_ = 0; +#line 179 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp5_ = gitg_diff_view_get_options (self); +#line 179 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp6_ = _tmp5_; +#line 179 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp7_ = value; +#line 179 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + ggit_diff_options_set_n_context_lines (_tmp6_, _tmp7_); +#line 180 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp8_ = gitg_diff_view_get_options (self); +#line 180 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp9_ = _tmp8_; +#line 180 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp10_ = value; #line 180 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_signal_emit_by_name (self, "options-changed"); -#line 4068 "gitg-diff-view.c" + ggit_diff_options_set_n_interhunk_lines (_tmp9_, _tmp10_); +#line 182 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_signal_emit (self, gitg_diff_view_signals[GITG_DIFF_VIEW_OPTIONS_CHANGED_SIGNAL], 0); +#line 4312 "gitg-diff-view.c" + } +#line 175 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + g_object_notify ((GObject *) self, "context-lines"); +#line 4316 "gitg-diff-view.c" } -#line 173 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_object_notify ((GObject *) self, "context-lines"); -#line 4072 "gitg-diff-view.c" } -static void _vala_array_add2 (GitgPatchSet*** array, int* length, int* size, GitgPatchSet* value) { -#line 621 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +static void _vala_array_add2 (GitgPatchSet** * array, int* length, int* size, GitgPatchSet* value) { +#line 660 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if ((*length) == (*size)) { -#line 621 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 660 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 621 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 660 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" *array = g_renew (GitgPatchSet*, *array, (*size) + 1); -#line 4083 "gitg-diff-view.c" +#line 4328 "gitg-diff-view.c" } -#line 621 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 660 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" (*array)[(*length)++] = value; -#line 621 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 660 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" (*array)[*length] = NULL; -#line 4089 "gitg-diff-view.c" +#line 4334 "gitg-diff-view.c" } @@ -4099,33 +4344,33 @@ GList* _tmp2_ = NULL; GitgPatchSet** _tmp22_ = NULL; gint _tmp22__length1 = 0; -#line 611 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 650 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_return_val_if_fail (self != NULL, NULL); -#line 613 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 652 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = g_new0 (GitgPatchSet*, 0 + 1); -#line 613 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 652 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" ret = _tmp0_; -#line 613 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 652 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" ret_length1 = 0; -#line 613 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 652 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _ret_size_ = ret_length1; -#line 615 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 654 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp1_ = self->priv->d_grid_files; -#line 615 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 654 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp2_ = gtk_container_get_children ((GtkContainer*) _tmp1_); -#line 4117 "gitg-diff-view.c" +#line 4362 "gitg-diff-view.c" { GList* file_collection = NULL; GList* file_it = NULL; -#line 615 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 654 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" file_collection = _tmp2_; -#line 615 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 654 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" for (file_it = file_collection; file_it != NULL; file_it = file_it->next) { -#line 4125 "gitg-diff-view.c" +#line 4370 "gitg-diff-view.c" GtkWidget* file = NULL; -#line 615 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 654 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" file = (GtkWidget*) file_it->data; -#line 4129 "gitg-diff-view.c" +#line 4374 "gitg-diff-view.c" { GitgDiffSelectable* sel = NULL; GtkWidget* _tmp3_ = NULL; @@ -4135,139 +4380,141 @@ gboolean _tmp7_ = FALSE; gboolean _tmp8_ = FALSE; GitgDiffSelectable* _tmp9_ = NULL; -#line 617 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 656 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp3_ = file; -#line 617 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 656 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp4_ = gitg_diff_view_file_get_renderer (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, GITG_TYPE_DIFF_VIEW_FILE) ? ((GitgDiffViewFile*) _tmp3_) : NULL); -#line 617 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 656 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp5_ = _tmp4_; -#line 617 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 656 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, GITG_TYPE_DIFF_SELECTABLE) ? ((GitgDiffSelectable*) _tmp5_) : NULL; -#line 617 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 656 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp6_ == NULL) { -#line 617 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 656 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (_tmp5_); -#line 4151 "gitg-diff-view.c" +#line 4396 "gitg-diff-view.c" } -#line 617 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 656 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" sel = _tmp6_; -#line 619 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 658 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp9_ = sel; -#line 619 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 658 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp9_ != NULL) { -#line 4159 "gitg-diff-view.c" +#line 4404 "gitg-diff-view.c" GitgDiffSelectable* _tmp10_ = NULL; gboolean _tmp11_ = FALSE; gboolean _tmp12_ = FALSE; -#line 619 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 658 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp10_ = sel; -#line 619 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 658 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp11_ = gitg_diff_selectable_get_has_selection (_tmp10_); -#line 619 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 658 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp12_ = _tmp11_; -#line 619 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 658 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp8_ = _tmp12_; -#line 4171 "gitg-diff-view.c" +#line 4416 "gitg-diff-view.c" } else { -#line 619 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 658 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp8_ = FALSE; -#line 4175 "gitg-diff-view.c" +#line 4420 "gitg-diff-view.c" } -#line 619 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 658 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp8_) { -#line 4179 "gitg-diff-view.c" +#line 4424 "gitg-diff-view.c" GitgDiffSelectable* _tmp13_ = NULL; GitgPatchSet* _tmp14_ = NULL; GitgPatchSet* _tmp15_ = NULL; GitgPatchSet* _tmp16_ = NULL; GitgPatchSetPatch* _tmp17_ = NULL; gint _tmp17__length1 = 0; -#line 619 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 658 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp13_ = sel; -#line 619 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 658 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp14_ = gitg_diff_selectable_get_selection (_tmp13_); -#line 619 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 658 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp15_ = _tmp14_; -#line 619 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 658 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp16_ = _tmp15_; -#line 619 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 658 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp17_ = _tmp16_->patches; -#line 619 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 658 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp17__length1 = _tmp16_->patches_length1; -#line 619 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 658 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp7_ = _tmp17__length1 != 0; -#line 619 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 658 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _gitg_patch_set_unref0 (_tmp16_); -#line 4202 "gitg-diff-view.c" +#line 4447 "gitg-diff-view.c" } else { -#line 619 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 658 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp7_ = FALSE; -#line 4206 "gitg-diff-view.c" +#line 4451 "gitg-diff-view.c" } -#line 619 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 658 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (_tmp7_) { -#line 4210 "gitg-diff-view.c" +#line 4455 "gitg-diff-view.c" GitgPatchSet** _tmp18_ = NULL; gint _tmp18__length1 = 0; GitgDiffSelectable* _tmp19_ = NULL; GitgPatchSet* _tmp20_ = NULL; GitgPatchSet* _tmp21_ = NULL; -#line 621 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 660 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp18_ = ret; -#line 621 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 660 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp18__length1 = ret_length1; -#line 621 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 660 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp19_ = sel; -#line 621 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 660 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp20_ = gitg_diff_selectable_get_selection (_tmp19_); -#line 621 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 660 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp21_ = _tmp20_; -#line 621 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 660 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _vala_array_add2 (&ret, &ret_length1, &_ret_size_, _tmp21_); -#line 4228 "gitg-diff-view.c" +#line 4473 "gitg-diff-view.c" } -#line 615 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 654 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (sel); -#line 4232 "gitg-diff-view.c" +#line 4477 "gitg-diff-view.c" } } -#line 615 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 654 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_list_free0 (file_collection); -#line 4237 "gitg-diff-view.c" +#line 4482 "gitg-diff-view.c" } -#line 625 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 664 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp22_ = ret; -#line 625 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 664 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp22__length1 = ret_length1; -#line 625 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 664 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (result_length1) { -#line 625 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 664 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" *result_length1 = _tmp22__length1; -#line 4247 "gitg-diff-view.c" +#line 4492 "gitg-diff-view.c" } -#line 625 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 664 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" result = _tmp22_; -#line 625 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 664 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" return result; -#line 4253 "gitg-diff-view.c" +#line 4498 "gitg-diff-view.c" } static void gitg_diff_view_real_options_changed (GitgDiffView* self) { GitgCommit* _tmp0_ = NULL; -#line 105 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 107 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _tmp0_ = self->priv->d_commit; -#line 105 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - if (_tmp0_ != NULL) { #line 107 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + if (_tmp0_ != NULL) { +#line 109 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_update (self, TRUE); -#line 4265 "gitg-diff-view.c" +#line 4510 "gitg-diff-view.c" } } static void gitg_diff_view_class_init (GitgDiffViewClass * klass) { gint GitgDiffView_private_offset; + GeeHashSet* _tmp0_ = NULL; + GSList* _tmp1_ = NULL; GError * _inner_error_ = NULL; #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gitg_diff_view_parent_class = g_type_class_peek_parent (klass); @@ -4326,7 +4573,7 @@ #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/gitg/ui/gitg-diff-view.ui"); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - g_signal_new ("options_changed", GITG_TYPE_DIFF_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgDiffViewClass, options_changed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_diff_view_signals[GITG_DIFF_VIEW_OPTIONS_CHANGED_SIGNAL] = g_signal_new ("options_changed", GITG_TYPE_DIFF_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgDiffViewClass, options_changed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "commit_details", FALSE, GitgDiffView_private_offset + G_STRUCT_OFFSET (GitgDiffViewPrivate, d_commit_details)); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" @@ -4347,74 +4594,146 @@ gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "enter_notify_event_on_event_box", G_CALLBACK(_gitg_diff_view_enter_notify_event_on_event_box_gtk_widget_enter_notify_event)); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "motion_notify_event_on_event_box", G_CALLBACK(_gitg_diff_view_motion_notify_event_on_event_box_gtk_widget_motion_notify_event)); -#line 4351 "gitg-diff-view.c" - { - GRegex* _tmp0_ = NULL; - GRegex* _tmp1_ = NULL; - GRegex* _tmp2_ = NULL; #line 229 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp1_ = g_regex_new (".*[\\R\\s]*(?P(?:.|\\R)*?)\\s*$", 0, 0, &_inner_error_); + _tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 229 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp0_ = _tmp1_; + _g_object_unref0 (gitg_diff_view_s_image_mime_types); #line 229 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + gitg_diff_view_s_image_mime_types = _tmp0_; +#line 231 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp1_ = gdk_pixbuf_get_formats (); +#line 4606 "gitg-diff-view.c" + { + GSList* format_collection = NULL; + GSList* format_it = NULL; +#line 231 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + format_collection = _tmp1_; +#line 231 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + for (format_it = format_collection; format_it != NULL; format_it = format_it->next) { +#line 4614 "gitg-diff-view.c" + GdkPixbufFormat* format = NULL; +#line 231 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + format = (GdkPixbufFormat*) format_it->data; +#line 4618 "gitg-diff-view.c" + { + GdkPixbufFormat* _tmp2_ = NULL; + gchar** _tmp3_ = NULL; + gchar** _tmp4_ = NULL; +#line 233 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp2_ = format; +#line 233 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp4_ = _tmp3_ = gdk_pixbuf_format_get_mime_types (_tmp2_); +#line 4627 "gitg-diff-view.c" + { + gchar** mime_type_collection = NULL; + gint mime_type_collection_length1 = 0; + gint _mime_type_collection_size_ = 0; + gint mime_type_it = 0; +#line 233 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + mime_type_collection = _tmp4_; +#line 233 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + mime_type_collection_length1 = _vala_array_length (_tmp3_); +#line 233 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + for (mime_type_it = 0; mime_type_it < _vala_array_length (_tmp3_); mime_type_it = mime_type_it + 1) { +#line 4639 "gitg-diff-view.c" + gchar* _tmp5_ = NULL; + gchar* mime_type = NULL; +#line 233 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp5_ = g_strdup (mime_type_collection[mime_type_it]); +#line 233 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + mime_type = _tmp5_; +#line 4646 "gitg-diff-view.c" + { + GeeHashSet* _tmp6_ = NULL; + const gchar* _tmp7_ = NULL; +#line 235 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp6_ = gitg_diff_view_s_image_mime_types; +#line 235 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp7_ = mime_type; +#line 235 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp6_, _tmp7_); +#line 233 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _g_free0 (mime_type); +#line 4658 "gitg-diff-view.c" + } + } +#line 233 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + mime_type_collection = (_vala_array_free (mime_type_collection, mime_type_collection_length1, (GDestroyNotify) g_free), NULL); +#line 4663 "gitg-diff-view.c" + } + } + } +#line 231 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _g_slist_free0 (format_collection); +#line 4669 "gitg-diff-view.c" + } + { + GRegex* _tmp8_ = NULL; + GRegex* _tmp9_ = NULL; + GRegex* _tmp10_ = NULL; +#line 241 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp9_ = g_regex_new (".*[\\R\\s]*(?P(?:.|\\R)*?)\\s*$", 0, 0, &_inner_error_); +#line 241 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp8_ = _tmp9_; +#line 241 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4362 "gitg-diff-view.c" +#line 4681 "gitg-diff-view.c" goto __catch34_g_error; } -#line 229 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp2_ = _tmp0_; -#line 229 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp0_ = NULL; -#line 229 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 241 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp10_ = _tmp8_; +#line 241 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp8_ = NULL; +#line 241 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_regex_unref0 (gitg_diff_view_s_message_regexp); -#line 229 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - gitg_diff_view_s_message_regexp = _tmp2_; -#line 227 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _g_regex_unref0 (_tmp0_); -#line 4375 "gitg-diff-view.c" +#line 241 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + gitg_diff_view_s_message_regexp = _tmp10_; +#line 239 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _g_regex_unref0 (_tmp8_); +#line 4694 "gitg-diff-view.c" } goto __finally34; __catch34_g_error: { GError* e = NULL; - FILE* _tmp3_ = NULL; - GError* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; -#line 227 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + FILE* _tmp11_ = NULL; + GError* _tmp12_ = NULL; + const gchar* _tmp13_ = NULL; + const gchar* _tmp14_ = NULL; + gchar* _tmp15_ = NULL; + gchar* _tmp16_ = NULL; +#line 239 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" e = _inner_error_; -#line 227 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 239 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _inner_error_ = NULL; -#line 230 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp3_ = stderr; -#line 230 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp4_ = e; -#line 230 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp5_ = _tmp4_->message; -#line 230 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp6_ = string_to_string (_tmp5_); -#line 230 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp7_ = g_strconcat ("Failed to compile regex: ", _tmp6_, "\n", NULL); -#line 230 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _tmp8_ = _tmp7_; -#line 230 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - fprintf (_tmp3_, "%s", _tmp8_); -#line 230 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" - _g_free0 (_tmp8_); -#line 227 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 242 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp11_ = stderr; +#line 242 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp12_ = e; +#line 242 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp13_ = _tmp12_->message; +#line 242 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp14_ = string_to_string (_tmp13_); +#line 242 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp15_ = g_strconcat ("Failed to compile regex: ", _tmp14_, "\n", NULL); +#line 242 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _tmp16_ = _tmp15_; +#line 242 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + fprintf (_tmp11_, "%s", _tmp16_); +#line 242 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" + _g_free0 (_tmp16_); +#line 239 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_error_free0 (e); -#line 4409 "gitg-diff-view.c" +#line 4728 "gitg-diff-view.c" } __finally34: -#line 227 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 239 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 227 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 239 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.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 227 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 239 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_clear_error (&_inner_error_); -#line 4418 "gitg-diff-view.c" +#line 4737 "gitg-diff-view.c" } } @@ -4422,23 +4741,23 @@ static void gitg_diff_view_instance_init (GitgDiffView * self) { #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self->priv = GITG_DIFF_VIEW_GET_PRIVATE (self); -#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self->priv->_wrap_lines = TRUE; -#line 112 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 114 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self->priv->_staged = FALSE; -#line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self->priv->_unstaged = FALSE; -#line 114 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self->priv->_show_parents = FALSE; -#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 117 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self->priv->_default_collapse_all = TRUE; -#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self->priv->_use_gravatar = TRUE; -#line 117 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self->priv->_tab_width = 4; -#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self->priv->_handle_selection = FALSE; -#line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 121 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self->priv->_highlight = TRUE; #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" g_type_ensure (GITG_TYPE_DIFF_VIEW_COMMIT_DETAILS); @@ -4446,11 +4765,11 @@ g_type_ensure (GITG_TYPE_DIFF_VIEW_OPTIONS); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 4450 "gitg-diff-view.c" +#line 4769 "gitg-diff-view.c" } -static void gitg_diff_view_finalize (GObject* obj) { +static void gitg_diff_view_finalize (GObject * obj) { GitgDiffView * self; #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_DIFF_VIEW, GitgDiffView); @@ -4476,11 +4795,11 @@ _g_object_unref0 (self->priv->d_options); #line 47 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (self->priv->d_cancellable); -#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" +#line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" _g_object_unref0 (self->priv->_repository); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" G_OBJECT_CLASS (gitg_diff_view_parent_class)->finalize (obj); -#line 4484 "gitg-diff-view.c" +#line 4803 "gitg-diff-view.c" } @@ -4609,13 +4928,13 @@ g_value_set_int (value, gitg_diff_view_get_context_lines (self)); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" break; -#line 4613 "gitg-diff-view.c" +#line 4932 "gitg-diff-view.c" default: #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" break; -#line 4619 "gitg-diff-view.c" +#line 4938 "gitg-diff-view.c" } } @@ -4727,13 +5046,13 @@ gitg_diff_view_set_context_lines (self, g_value_get_int (value)); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" break; -#line 4731 "gitg-diff-view.c" +#line 5050 "gitg-diff-view.c" default: #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view.vala" break; -#line 4737 "gitg-diff-view.c" +#line 5056 "gitg-diff-view.c" } } @@ -4756,4 +5075,16 @@ } +static gint _vala_array_length (gpointer array) { + int length; + length = 0; + if (array) { + while (((gpointer*) array)[length]) { + length++; + } + } + return length; +} + + diff -Nru gitg-3.22.0/libgitg/gitg-diff-view-commit-details.c gitg-3.23.0/libgitg/gitg-diff-view-commit-details.c --- gitg-3.22.0/libgitg/gitg-diff-view-commit-details.c 2016-09-18 12:01:41.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-view-commit-details.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-diff-view-commit-details.c generated by valac 0.32.1, the Vala compiler +/* gitg-diff-view-commit-details.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-diff-view-commit-details.vala, do not modify */ /* @@ -159,7 +159,7 @@ static GObject * gitg_diff_view_commit_details_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); static void _gitg_diff_view_commit_details___lambda47_ (GitgDiffViewCommitDetails* self); static void __gitg_diff_view_commit_details___lambda47__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); -static void gitg_diff_view_commit_details_finalize (GObject* obj); +static void gitg_diff_view_commit_details_finalize (GObject * obj); static void _vala_gitg_diff_view_commit_details_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_diff_view_commit_details_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -370,37 +370,37 @@ glong _tmp1_ = 0L; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1315 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1315 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { #line 386 "gitg-diff-view-commit-details.c" glong _tmp4_ = 0L; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = maxlen; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 394 "gitg-diff-view-commit-details.c" } else { gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = (glong) (_tmp5_ - _tmp6_); -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 406 "gitg-diff-view-commit-details.c" } @@ -420,112 +420,112 @@ glong _tmp20_ = 0L; glong _tmp21_ = 0L; gchar* _tmp22_ = NULL; -#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1325 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = offset; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { #line 430 "gitg-diff-view-commit-details.c" glong _tmp2_ = 0L; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = len; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); #line 436 "gitg-diff-view-commit-details.c" } else { -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = FALSE; #line 440 "gitg-diff-view-commit-details.c" } -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_) { #line 444 "gitg-diff-view-commit-details.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; glong _tmp5_ = 0L; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = offset; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = len; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = _tmp5_; #line 456 "gitg-diff-view-commit-details.c" } else { gint _tmp6_ = 0; gint _tmp7_ = 0; -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = strlen (self); -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = _tmp6_; -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; #line 466 "gitg-diff-view-commit-details.c" } -#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = offset; -#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { #line 472 "gitg-diff-view-commit-details.c" glong _tmp9_ = 0L; glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1335 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = string_length; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1335 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = offset; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1335 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" offset = _tmp9_ + _tmp10_; -#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = offset; -#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); #line 486 "gitg-diff-view-commit-details.c" } else { glong _tmp12_ = 0L; glong _tmp13_ = 0L; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = offset; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = string_length; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); #line 496 "gitg-diff-view-commit-details.c" } -#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1340 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = len; -#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1340 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { #line 502 "gitg-diff-view-commit-details.c" glong _tmp15_ = 0L; glong _tmp16_ = 0L; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1341 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1341 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = offset; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1341 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; #line 511 "gitg-diff-view-commit-details.c" } -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = offset; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = len; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = string_length; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = offset; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = len; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp22_; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 531 "gitg-diff-view-commit-details.c" } @@ -533,11 +533,11 @@ static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 543 "gitg-diff-view-commit-details.c" } @@ -639,19 +639,19 @@ GgitSignature* _tmp42_ = NULL; const gchar* _tmp43_ = NULL; GgitCommitParents* parents = NULL; + GgitCommit* _tmp74_ = NULL; GgitCommit* _tmp75_ = NULL; - GgitCommit* _tmp76_ = NULL; - GgitCommitParents* _tmp77_ = NULL; - GgitCommit* _tmp78_ = NULL; - GgitCommitParents* _tmp79_ = NULL; + GgitCommitParents* _tmp76_ = NULL; + GgitCommit* _tmp77_ = NULL; + GgitCommitParents* _tmp78_ = NULL; + guint _tmp79_ = 0U; guint _tmp80_ = 0U; - guint _tmp81_ = 0U; GgitCommit* first_parent = NULL; + GgitCommit* _tmp83_ = NULL; GgitCommit* _tmp84_ = NULL; - GgitCommit* _tmp85_ = NULL; - GgitCommitParents* _tmp86_ = NULL; + GgitCommitParents* _tmp85_ = NULL; + guint _tmp86_ = 0U; guint _tmp87_ = 0U; - guint _tmp88_ = 0U; #line 174 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" g_return_if_fail (self != NULL); #line 176 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" @@ -859,223 +859,220 @@ if (_tmp38_) { #line 861 "gitg-diff-view-commit-details.c" GtkLabel* _tmp55_ = NULL; - const gchar* _tmp56_ = NULL; - GgitSignature* _tmp57_ = NULL; + GgitSignature* _tmp56_ = NULL; + gchar* _tmp57_ = NULL; gchar* _tmp58_ = NULL; gchar* _tmp59_ = NULL; gchar* _tmp60_ = NULL; - gchar* _tmp61_ = NULL; - GtkLabel* _tmp62_ = NULL; - GgitSignature* _tmp63_ = NULL; + GtkLabel* _tmp61_ = NULL; + GgitSignature* _tmp62_ = NULL; + GDateTime* _tmp63_ = NULL; GDateTime* _tmp64_ = NULL; - GDateTime* _tmp65_ = NULL; - GgitSignature* _tmp66_ = NULL; + GgitSignature* _tmp65_ = NULL; + GTimeZone* _tmp66_ = NULL; GTimeZone* _tmp67_ = NULL; - GTimeZone* _tmp68_ = NULL; + GDateTime* _tmp68_ = NULL; GDateTime* _tmp69_ = NULL; - GDateTime* _tmp70_ = NULL; + gchar* _tmp70_ = NULL; gchar* _tmp71_ = NULL; - gchar* _tmp72_ = NULL; #line 202 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" _tmp55_ = self->priv->d_label_committer; #line 202 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp56_ = _ ("Committed by %s"); + _tmp56_ = committer; #line 202 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp57_ = committer; + _tmp57_ = gitg_diff_view_commit_details_author_to_markup (self, _tmp56_); #line 202 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp58_ = gitg_diff_view_commit_details_author_to_markup (self, _tmp57_); + _tmp58_ = _tmp57_; #line 202 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp59_ = _tmp58_; + _tmp59_ = g_strdup_printf (_ ("Committed by %s"), _tmp58_); #line 202 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp60_ = g_strdup_printf (_tmp56_, _tmp59_); + _tmp60_ = _tmp59_; #line 202 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp61_ = _tmp60_; + gtk_label_set_label (_tmp55_, _tmp60_); #line 202 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - gtk_label_set_label (_tmp55_, _tmp61_); + _g_free0 (_tmp60_); #line 202 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _g_free0 (_tmp61_); -#line 202 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _g_free0 (_tmp59_); + _g_free0 (_tmp58_); #line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp62_ = self->priv->d_label_committer_date; + _tmp61_ = self->priv->d_label_committer_date; #line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp63_ = committer; + _tmp62_ = committer; #line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp64_ = ggit_signature_get_time (_tmp63_); + _tmp63_ = ggit_signature_get_time (_tmp62_); #line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp65_ = _tmp64_; + _tmp64_ = _tmp63_; #line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp66_ = committer; + _tmp65_ = committer; #line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp67_ = ggit_signature_get_time_zone (_tmp66_); + _tmp66_ = ggit_signature_get_time_zone (_tmp65_); #line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp68_ = _tmp67_; + _tmp67_ = _tmp66_; #line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp69_ = g_date_time_to_timezone (_tmp65_, _tmp68_); + _tmp68_ = g_date_time_to_timezone (_tmp64_, _tmp67_); #line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp70_ = _tmp69_; + _tmp69_ = _tmp68_; #line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp71_ = g_date_time_format (_tmp70_, "%x %X %z"); + _tmp70_ = g_date_time_format (_tmp69_, "%x %X %z"); #line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp72_ = _tmp71_; + _tmp71_ = _tmp70_; #line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - gtk_label_set_label (_tmp62_, _tmp72_); + gtk_label_set_label (_tmp61_, _tmp71_); #line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _g_free0 (_tmp72_); + _g_free0 (_tmp71_); #line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _g_date_time_unref0 (_tmp70_); + _g_date_time_unref0 (_tmp69_); #line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _g_time_zone_unref0 (_tmp68_); + _g_time_zone_unref0 (_tmp67_); #line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _g_date_time_unref0 (_tmp65_); -#line 932 "gitg-diff-view-commit-details.c" + _g_date_time_unref0 (_tmp64_); +#line 929 "gitg-diff-view-commit-details.c" } else { + GtkLabel* _tmp72_ = NULL; GtkLabel* _tmp73_ = NULL; - GtkLabel* _tmp74_ = NULL; #line 207 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp73_ = self->priv->d_label_committer; + _tmp72_ = self->priv->d_label_committer; #line 207 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - gtk_label_set_label (_tmp73_, ""); + gtk_label_set_label (_tmp72_, ""); #line 208 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp74_ = self->priv->d_label_committer_date; + _tmp73_ = self->priv->d_label_committer_date; #line 208 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - gtk_label_set_label (_tmp74_, ""); -#line 944 "gitg-diff-view-commit-details.c" + gtk_label_set_label (_tmp73_, ""); +#line 941 "gitg-diff-view-commit-details.c" } #line 211 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp75_ = gitg_diff_view_commit_details_get_commit (self); + _tmp74_ = gitg_diff_view_commit_details_get_commit (self); #line 211 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp76_ = _tmp75_; + _tmp75_ = _tmp74_; #line 211 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp77_ = ggit_commit_get_parents (_tmp76_); + _tmp76_ = ggit_commit_get_parents (_tmp75_); #line 211 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - parents = _tmp77_; + parents = _tmp76_; #line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp79_ = parents; + _tmp78_ = parents; #line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp80_ = ggit_commit_parents_get_size (_tmp79_); + _tmp79_ = ggit_commit_parents_get_size (_tmp78_); #line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp81_ = _tmp80_; + _tmp80_ = _tmp79_; #line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - if (_tmp81_ == ((guint) 0)) { + if (_tmp80_ == ((guint) 0)) { #line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _g_object_unref0 (_tmp78_); + _g_object_unref0 (_tmp77_); #line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp78_ = NULL; -#line 966 "gitg-diff-view-commit-details.c" + _tmp77_ = NULL; +#line 963 "gitg-diff-view-commit-details.c" } else { - GgitCommitParents* _tmp82_ = NULL; - GgitCommit* _tmp83_ = NULL; + GgitCommitParents* _tmp81_ = NULL; + GgitCommit* _tmp82_ = NULL; #line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp82_ = parents; + _tmp81_ = parents; #line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp83_ = ggit_commit_parents_get (_tmp82_, (guint) 0); + _tmp82_ = ggit_commit_parents_get (_tmp81_, (guint) 0); #line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _g_object_unref0 (_tmp78_); + _g_object_unref0 (_tmp77_); #line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp78_ = _tmp83_; -#line 978 "gitg-diff-view-commit-details.c" + _tmp77_ = _tmp82_; +#line 975 "gitg-diff-view-commit-details.c" } #line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp84_ = _g_object_ref0 (_tmp78_); + _tmp83_ = _g_object_ref0 (_tmp77_); #line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - first_parent = _tmp84_; + first_parent = _tmp83_; #line 214 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp85_ = first_parent; + _tmp84_ = first_parent; #line 214 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - gitg_diff_view_commit_details_set_parent_commit (self, _tmp85_); + gitg_diff_view_commit_details_set_parent_commit (self, _tmp84_); #line 216 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp86_ = parents; + _tmp85_ = parents; #line 216 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp87_ = ggit_commit_parents_get_size (_tmp86_); + _tmp86_ = ggit_commit_parents_get_size (_tmp85_); #line 216 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp88_ = _tmp87_; + _tmp87_ = _tmp86_; #line 216 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - if (_tmp88_ > ((guint) 1)) { -#line 996 "gitg-diff-view-commit-details.c" - GtkGrid* _tmp89_ = NULL; + if (_tmp87_ > ((guint) 1)) { +#line 993 "gitg-diff-view-commit-details.c" + GtkGrid* _tmp88_ = NULL; GSList* grp = NULL; GtkRadioButton* first = NULL; #line 218 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp89_ = self->priv->d_grid_parents_container; + _tmp88_ = self->priv->d_grid_parents_container; #line 218 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - gtk_widget_show ((GtkWidget*) _tmp89_); + gtk_widget_show ((GtkWidget*) _tmp88_); #line 219 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" grp = NULL; #line 221 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" first = NULL; -#line 1008 "gitg-diff-view-commit-details.c" +#line 1005 "gitg-diff-view-commit-details.c" { GgitCommitParents* _parent_list = NULL; + GgitCommitParents* _tmp89_ = NULL; GgitCommitParents* _tmp90_ = NULL; - GgitCommitParents* _tmp91_ = NULL; guint _parent_size = 0U; - GgitCommitParents* _tmp92_ = NULL; + GgitCommitParents* _tmp91_ = NULL; + guint _tmp92_ = 0U; guint _tmp93_ = 0U; - guint _tmp94_ = 0U; gint _parent_index = 0; #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp90_ = parents; + _tmp89_ = parents; #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp91_ = _g_object_ref0 (_tmp90_); + _tmp90_ = _g_object_ref0 (_tmp89_); #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _parent_list = _tmp91_; + _parent_list = _tmp90_; #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp92_ = _parent_list; + _tmp91_ = _parent_list; #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp93_ = ggit_commit_parents_get_size (_tmp92_); + _tmp92_ = ggit_commit_parents_get_size (_tmp91_); #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp94_ = _tmp93_; + _tmp93_ = _tmp92_; #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _parent_size = _tmp94_; + _parent_size = _tmp93_; #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" _parent_index = -1; #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" while (TRUE) { -#line 1036 "gitg-diff-view-commit-details.c" +#line 1033 "gitg-diff-view-commit-details.c" Block10Data* _data10_; + gint _tmp94_ = 0; gint _tmp95_ = 0; - gint _tmp96_ = 0; - guint _tmp97_ = 0U; + guint _tmp96_ = 0U; GgitCommit* parent = NULL; - GgitCommitParents* _tmp98_ = NULL; - gint _tmp99_ = 0; - GgitCommit* _tmp100_ = NULL; + GgitCommitParents* _tmp97_ = NULL; + gint _tmp98_ = 0; + GgitCommit* _tmp99_ = NULL; gchar* pid = NULL; - GgitCommit* _tmp101_ = NULL; + GgitCommit* _tmp100_ = NULL; + GgitOId* _tmp101_ = NULL; GgitOId* _tmp102_ = NULL; - GgitOId* _tmp103_ = NULL; + gchar* _tmp103_ = NULL; gchar* _tmp104_ = NULL; gchar* _tmp105_ = NULL; gchar* _tmp106_ = NULL; - gchar* _tmp107_ = NULL; gchar* psubj = NULL; - GgitCommit* _tmp108_ = NULL; - const gchar* _tmp109_ = NULL; - gchar* _tmp110_ = NULL; - GSList* _tmp111_ = NULL; + GgitCommit* _tmp107_ = NULL; + const gchar* _tmp108_ = NULL; + gchar* _tmp109_ = NULL; + GSList* _tmp110_ = NULL; + const gchar* _tmp111_ = NULL; const gchar* _tmp112_ = NULL; const gchar* _tmp113_ = NULL; const gchar* _tmp114_ = NULL; - const gchar* _tmp115_ = NULL; + gchar* _tmp115_ = NULL; gchar* _tmp116_ = NULL; - gchar* _tmp117_ = NULL; + GtkRadioButton* _tmp117_ = NULL; GtkRadioButton* _tmp118_ = NULL; GtkRadioButton* _tmp119_ = NULL; - GtkRadioButton* _tmp120_ = NULL; + GtkRadioButton* _tmp122_ = NULL; GtkRadioButton* _tmp123_ = NULL; - GtkRadioButton* _tmp124_ = NULL; - GeeHashMap* _tmp125_ = NULL; - GgitCommit* _tmp126_ = NULL; + GeeHashMap* _tmp124_ = NULL; + GgitCommit* _tmp125_ = NULL; + GgitOId* _tmp126_ = NULL; GgitOId* _tmp127_ = NULL; - GgitOId* _tmp128_ = NULL; + GtkRadioButton* _tmp128_ = NULL; GtkRadioButton* _tmp129_ = NULL; - GtkRadioButton* _tmp130_ = NULL; - GtkGrid* _tmp131_ = NULL; - GtkRadioButton* _tmp132_ = NULL; + GtkGrid* _tmp130_ = NULL; + GtkRadioButton* _tmp131_ = NULL; + GgitCommit* _tmp132_ = NULL; GgitCommit* _tmp133_ = NULL; - GgitCommit* _tmp134_ = NULL; - GtkRadioButton* _tmp135_ = NULL; + GtkRadioButton* _tmp134_ = NULL; #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" _data10_ = g_slice_new0 (Block10Data); #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" @@ -1083,140 +1080,140 @@ #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" _data10_->self = g_object_ref (self); #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp95_ = _parent_index; + _tmp94_ = _parent_index; #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _parent_index = _tmp95_ + 1; + _parent_index = _tmp94_ + 1; #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp96_ = _parent_index; + _tmp95_ = _parent_index; #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp97_ = _parent_size; + _tmp96_ = _parent_size; #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - if (!(((guint) _tmp96_) < _tmp97_)) { + if (!(((guint) _tmp95_) < _tmp96_)) { #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" block10_data_unref (_data10_); #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" _data10_ = NULL; #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" break; -#line 1102 "gitg-diff-view-commit-details.c" +#line 1099 "gitg-diff-view-commit-details.c" } #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp98_ = _parent_list; + _tmp97_ = _parent_list; #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp99_ = _parent_index; + _tmp98_ = _parent_index; #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp100_ = ggit_commit_parents_get (_tmp98_, (guint) _tmp99_); + _tmp99_ = ggit_commit_parents_get (_tmp97_, (guint) _tmp98_); #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - parent = _tmp100_; + parent = _tmp99_; #line 225 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp101_ = parent; + _tmp100_ = parent; #line 225 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp102_ = ggit_object_get_id ((GgitObject*) _tmp101_); + _tmp101_ = ggit_object_get_id ((GgitObject*) _tmp100_); #line 225 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp103_ = _tmp102_; + _tmp102_ = _tmp101_; #line 225 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp104_ = ggit_oid_to_string (_tmp103_); + _tmp103_ = ggit_oid_to_string (_tmp102_); #line 225 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp105_ = _tmp104_; + _tmp104_ = _tmp103_; #line 225 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp106_ = string_substring (_tmp105_, (glong) 0, (glong) 6); + _tmp105_ = string_substring (_tmp104_, (glong) 0, (glong) 6); #line 225 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp107_ = _tmp106_; + _tmp106_ = _tmp105_; #line 225 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _g_free0 (_tmp105_); + _g_free0 (_tmp104_); #line 225 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - __vala_GgitOId_free0 (_tmp103_); + __vala_GgitOId_free0 (_tmp102_); #line 225 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - pid = _tmp107_; + pid = _tmp106_; #line 226 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp108_ = parent; + _tmp107_ = parent; #line 226 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp109_ = ggit_commit_get_subject (_tmp108_); + _tmp108_ = ggit_commit_get_subject (_tmp107_); #line 226 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp110_ = g_strdup (_tmp109_); + _tmp109_ = g_strdup (_tmp108_); #line 226 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - psubj = _tmp110_; + psubj = _tmp109_; #line 228 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp111_ = grp; + _tmp110_ = grp; #line 228 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp112_ = pid; + _tmp111_ = pid; #line 228 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp113_ = string_to_string (_tmp112_); + _tmp112_ = string_to_string (_tmp111_); #line 228 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp114_ = psubj; + _tmp113_ = psubj; #line 228 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp115_ = string_to_string (_tmp114_); + _tmp114_ = string_to_string (_tmp113_); #line 228 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp116_ = g_strconcat (_tmp113_, ": ", _tmp115_, NULL); + _tmp115_ = g_strconcat (_tmp112_, ": ", _tmp114_, NULL); #line 228 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp117_ = _tmp116_; + _tmp116_ = _tmp115_; #line 228 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp118_ = (GtkRadioButton*) gtk_radio_button_new_with_label (_tmp111_, _tmp117_); + _tmp117_ = (GtkRadioButton*) gtk_radio_button_new_with_label (_tmp110_, _tmp116_); #line 228 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - g_object_ref_sink (_tmp118_); + g_object_ref_sink (_tmp117_); #line 228 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp119_ = _tmp118_; + _tmp118_ = _tmp117_; #line 228 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _g_free0 (_tmp117_); + _g_free0 (_tmp116_); #line 228 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _data10_->button = _tmp119_; + _data10_->button = _tmp118_; #line 230 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp120_ = first; + _tmp119_ = first; #line 230 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - if (_tmp120_ == NULL) { -#line 1168 "gitg-diff-view-commit-details.c" + if (_tmp119_ == NULL) { +#line 1165 "gitg-diff-view-commit-details.c" + GtkRadioButton* _tmp120_ = NULL; GtkRadioButton* _tmp121_ = NULL; - GtkRadioButton* _tmp122_ = NULL; #line 232 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp121_ = _data10_->button; + _tmp120_ = _data10_->button; #line 232 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp122_ = _g_object_ref0 (_tmp121_); + _tmp121_ = _g_object_ref0 (_tmp120_); #line 232 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" _g_object_unref0 (first); #line 232 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - first = _tmp122_; -#line 1179 "gitg-diff-view-commit-details.c" + first = _tmp121_; +#line 1176 "gitg-diff-view-commit-details.c" } #line 235 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp123_ = _data10_->button; + _tmp122_ = _data10_->button; #line 235 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp124_ = first; + _tmp123_ = first; #line 235 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - g_object_set (_tmp123_, "group", _tmp124_, NULL); + g_object_set (_tmp122_, "group", _tmp123_, NULL); #line 237 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp125_ = self->priv->d_parents_map; + _tmp124_ = self->priv->d_parents_map; #line 237 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp126_ = parent; + _tmp125_ = parent; #line 237 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp127_ = ggit_object_get_id ((GgitObject*) _tmp126_); + _tmp126_ = ggit_object_get_id ((GgitObject*) _tmp125_); #line 237 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp128_ = _tmp127_; + _tmp127_ = _tmp126_; #line 237 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp129_ = _data10_->button; + _tmp128_ = _data10_->button; #line 237 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - gee_abstract_map_set ((GeeAbstractMap*) _tmp125_, _tmp128_, _tmp129_); + gee_abstract_map_set ((GeeAbstractMap*) _tmp124_, _tmp127_, _tmp128_); #line 237 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - __vala_GgitOId_free0 (_tmp128_); + __vala_GgitOId_free0 (_tmp127_); #line 239 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp130_ = _data10_->button; + _tmp129_ = _data10_->button; #line 239 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - gtk_widget_show ((GtkWidget*) _tmp130_); + gtk_widget_show ((GtkWidget*) _tmp129_); #line 240 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp131_ = self->priv->d_grid_parents; + _tmp130_ = self->priv->d_grid_parents; #line 240 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp132_ = _data10_->button; + _tmp131_ = _data10_->button; #line 240 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - gtk_container_add ((GtkContainer*) _tmp131_, (GtkWidget*) _tmp132_); + gtk_container_add ((GtkContainer*) _tmp130_, (GtkWidget*) _tmp131_); #line 242 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp133_ = parent; + _tmp132_ = parent; #line 242 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp134_ = _g_object_ref0 (_tmp133_); + _tmp133_ = _g_object_ref0 (_tmp132_); #line 242 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _data10_->par = _tmp134_; + _data10_->par = _tmp133_; #line 244 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp135_ = _data10_->button; + _tmp134_ = _data10_->button; #line 244 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - g_signal_connect_data ((GtkToggleButton*) _tmp135_, "toggled", (GCallback) ______lambda45__gtk_toggle_button_toggled, block10_data_ref (_data10_), (GClosureNotify) block10_data_unref, 0); + g_signal_connect_data ((GtkToggleButton*) _tmp134_, "toggled", (GCallback) ______lambda45__gtk_toggle_button_toggled, block10_data_ref (_data10_), (GClosureNotify) block10_data_unref, 0); #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" _g_free0 (psubj); #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" @@ -1227,38 +1224,38 @@ block10_data_unref (_data10_); #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" _data10_ = NULL; -#line 1231 "gitg-diff-view-commit-details.c" +#line 1228 "gitg-diff-view-commit-details.c" } #line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" _g_object_unref0 (_parent_list); -#line 1235 "gitg-diff-view-commit-details.c" +#line 1232 "gitg-diff-view-commit-details.c" } #line 216 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" _g_object_unref0 (first); #line 216 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" __g_slist_free__g_object_unref0_0 (grp); -#line 1241 "gitg-diff-view-commit-details.c" +#line 1238 "gitg-diff-view-commit-details.c" } else { - GtkGrid* _tmp136_ = NULL; + GtkGrid* _tmp135_ = NULL; #line 253 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp136_ = self->priv->d_grid_parents_container; + _tmp135_ = self->priv->d_grid_parents_container; #line 253 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - gtk_widget_hide ((GtkWidget*) _tmp136_); -#line 1248 "gitg-diff-view-commit-details.c" + gtk_widget_hide ((GtkWidget*) _tmp135_); +#line 1245 "gitg-diff-view-commit-details.c" } #line 256 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" gitg_diff_view_commit_details_update_avatar (self); #line 174 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" _g_object_unref0 (first_parent); #line 174 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _g_object_unref0 (_tmp78_); + _g_object_unref0 (_tmp77_); #line 174 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" _g_object_unref0 (parents); #line 174 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" _g_object_unref0 (committer); #line 174 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" _g_object_unref0 (author); -#line 1262 "gitg-diff-view-commit-details.c" +#line 1259 "gitg-diff-view-commit-details.c" } @@ -1267,7 +1264,7 @@ g_atomic_int_inc (&_data11_->_ref_count_); #line 266 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" return _data11_; -#line 1271 "gitg-diff-view-commit-details.c" +#line 1268 "gitg-diff-view-commit-details.c" } @@ -1276,7 +1273,7 @@ _data11_ = (Block11Data*) _userdata_; #line 266 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" if (g_atomic_int_dec_and_test (&_data11_->_ref_count_)) { -#line 1280 "gitg-diff-view-commit-details.c" +#line 1277 "gitg-diff-view-commit-details.c" GitgDiffViewCommitDetails* self; #line 266 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" self = _data11_->self; @@ -1288,7 +1285,7 @@ _g_object_unref0 (self); #line 266 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" g_slice_free (Block11Data, _data11_); -#line 1292 "gitg-diff-view-commit-details.c" +#line 1289 "gitg-diff-view-commit-details.c" } } @@ -1309,7 +1306,7 @@ _tmp1_ = g_cancellable_is_cancelled (_tmp0_); #line 279 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" if (!_tmp1_) { -#line 1313 "gitg-diff-view-commit-details.c" +#line 1310 "gitg-diff-view-commit-details.c" GdkPixbuf* pixbuf = NULL; GitgAvatarCache* _tmp2_ = NULL; GAsyncResult* _tmp3_ = NULL; @@ -1327,7 +1324,7 @@ _tmp5_ = pixbuf; #line 283 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" if (_tmp5_ != NULL) { -#line 1331 "gitg-diff-view-commit-details.c" +#line 1328 "gitg-diff-view-commit-details.c" GtkImage* _tmp6_ = NULL; GdkPixbuf* _tmp7_ = NULL; GtkImage* _tmp8_ = NULL; @@ -1344,7 +1341,7 @@ _tmp9_ = gtk_widget_get_style_context ((GtkWidget*) _tmp8_); #line 286 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" gtk_style_context_remove_class (_tmp9_, "dim-label"); -#line 1348 "gitg-diff-view-commit-details.c" +#line 1345 "gitg-diff-view-commit-details.c" } else { GtkImage* _tmp10_ = NULL; GtkImage* _tmp11_ = NULL; @@ -1359,11 +1356,11 @@ _tmp12_ = gtk_widget_get_style_context ((GtkWidget*) _tmp11_); #line 291 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" gtk_style_context_add_class (_tmp12_, "dim-label"); -#line 1363 "gitg-diff-view-commit-details.c" +#line 1360 "gitg-diff-view-commit-details.c" } #line 279 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" _g_object_unref0 (pixbuf); -#line 1367 "gitg-diff-view-commit-details.c" +#line 1364 "gitg-diff-view-commit-details.c" } #line 295 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" _tmp13_ = _data11_->cancel; @@ -1375,7 +1372,7 @@ _g_object_unref0 (self->priv->d_avatar_cancel); #line 297 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" self->priv->d_avatar_cancel = NULL; -#line 1379 "gitg-diff-view-commit-details.c" +#line 1376 "gitg-diff-view-commit-details.c" } } @@ -1385,7 +1382,7 @@ ___lambda46_ (self, source_object, res); #line 278 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" block11_data_unref (self); -#line 1389 "gitg-diff-view-commit-details.c" +#line 1386 "gitg-diff-view-commit-details.c" } @@ -1403,13 +1400,13 @@ if (_tmp1_ == NULL) { #line 263 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" return; -#line 1407 "gitg-diff-view-commit-details.c" +#line 1404 "gitg-diff-view-commit-details.c" } #line 266 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" _tmp2_ = self->priv->d_use_gravatar; #line 266 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" if (_tmp2_) { -#line 1413 "gitg-diff-view-commit-details.c" +#line 1410 "gitg-diff-view-commit-details.c" Block11Data* _data11_; GCancellable* _tmp3_ = NULL; GCancellable* _tmp5_ = NULL; @@ -1436,13 +1433,13 @@ _tmp3_ = self->priv->d_avatar_cancel; #line 268 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" if (_tmp3_ != NULL) { -#line 1440 "gitg-diff-view-commit-details.c" +#line 1437 "gitg-diff-view-commit-details.c" GCancellable* _tmp4_ = NULL; #line 270 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" _tmp4_ = self->priv->d_avatar_cancel; #line 270 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" g_cancellable_cancel (_tmp4_); -#line 1446 "gitg-diff-view-commit-details.c" +#line 1443 "gitg-diff-view-commit-details.c" } #line 273 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" _tmp5_ = g_cancellable_new (); @@ -1488,7 +1485,7 @@ block11_data_unref (_data11_); #line 266 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" _data11_ = NULL; -#line 1492 "gitg-diff-view-commit-details.c" +#line 1489 "gitg-diff-view-commit-details.c" } else { GtkImage* _tmp19_ = NULL; GtkImage* _tmp20_ = NULL; @@ -1503,7 +1500,7 @@ _tmp21_ = gtk_widget_get_style_context ((GtkWidget*) _tmp20_); #line 304 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" gtk_style_context_add_class (_tmp21_, "dim-label"); -#line 1507 "gitg-diff-view-commit-details.c" +#line 1504 "gitg-diff-view-commit-details.c" } } @@ -1522,7 +1519,7 @@ _tmp1_ = _tmp0_->button; #line 311 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" if (_tmp1_ == ((guint) GDK_BUTTON_PRIMARY)) { -#line 1526 "gitg-diff-view-commit-details.c" +#line 1523 "gitg-diff-view-commit-details.c" GtkExpander* _tmp2_ = NULL; GtkExpander* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; @@ -1541,13 +1538,13 @@ result = TRUE; #line 314 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" return result; -#line 1545 "gitg-diff-view-commit-details.c" +#line 1542 "gitg-diff-view-commit-details.c" } #line 317 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" result = FALSE; #line 317 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" return result; -#line 1551 "gitg-diff-view-commit-details.c" +#line 1548 "gitg-diff-view-commit-details.c" } @@ -1556,7 +1553,7 @@ result = gitg_diff_view_commit_details_button_press_on_event_box_expand_collapse ((GitgDiffViewCommitDetails*) self, event); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" return result; -#line 1560 "gitg-diff-view-commit-details.c" +#line 1557 "gitg-diff-view-commit-details.c" } @@ -1577,41 +1574,45 @@ result = _tmp2_; #line 58 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" return result; -#line 1581 "gitg-diff-view-commit-details.c" +#line 1578 "gitg-diff-view-commit-details.c" } void gitg_diff_view_commit_details_set_expanded (GitgDiffViewCommitDetails* self, gboolean value) { - GtkExpander* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; #line 59 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" g_return_if_fail (self != NULL); +#line 59 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" + if (gitg_diff_view_commit_details_get_expanded (self) != value) { +#line 1587 "gitg-diff-view-commit-details.c" + GtkExpander* _tmp0_ = NULL; + gboolean _tmp1_ = FALSE; + gboolean _tmp2_ = FALSE; + gboolean _tmp3_ = FALSE; #line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp0_ = self->priv->d_expander_files; + _tmp0_ = self->priv->d_expander_files; #line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp1_ = gtk_expander_get_expanded (_tmp0_); + _tmp1_ = gtk_expander_get_expanded (_tmp0_); #line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp2_ = _tmp1_; + _tmp2_ = _tmp1_; #line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp3_ = value; + _tmp3_ = value; #line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - if (_tmp2_ != _tmp3_) { + if (_tmp2_ != _tmp3_) { #line 1602 "gitg-diff-view-commit-details.c" - GtkExpander* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + GtkExpander* _tmp4_ = NULL; + gboolean _tmp5_ = FALSE; #line 63 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp4_ = self->priv->d_expander_files; + _tmp4_ = self->priv->d_expander_files; #line 63 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp5_ = value; + _tmp5_ = value; #line 63 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - gtk_expander_set_expanded (_tmp4_, _tmp5_); + gtk_expander_set_expanded (_tmp4_, _tmp5_); #line 1611 "gitg-diff-view-commit-details.c" - } + } #line 59 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - g_object_notify ((GObject *) self, "expanded"); + g_object_notify ((GObject *) self, "expanded"); #line 1615 "gitg-diff-view-commit-details.c" + } } @@ -1632,32 +1633,36 @@ result = _tmp2_; #line 70 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" return result; -#line 1636 "gitg-diff-view-commit-details.c" +#line 1637 "gitg-diff-view-commit-details.c" } void gitg_diff_view_commit_details_set_expander_visible (GitgDiffViewCommitDetails* self, gboolean value) { - GtkExpander* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - GtkLabel* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; #line 72 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" g_return_if_fail (self != NULL); +#line 72 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" + if (gitg_diff_view_commit_details_get_expander_visible (self) != value) { +#line 1646 "gitg-diff-view-commit-details.c" + GtkExpander* _tmp0_ = NULL; + gboolean _tmp1_ = FALSE; + GtkLabel* _tmp2_ = NULL; + gboolean _tmp3_ = FALSE; #line 74 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp0_ = self->priv->d_expander_files; + _tmp0_ = self->priv->d_expander_files; #line 74 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp1_ = value; + _tmp1_ = value; #line 74 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - gtk_widget_set_visible ((GtkWidget*) _tmp0_, _tmp1_); + gtk_widget_set_visible ((GtkWidget*) _tmp0_, _tmp1_); #line 75 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp2_ = self->priv->d_label_expand_collapse_files; + _tmp2_ = self->priv->d_label_expand_collapse_files; #line 75 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp3_ = value; + _tmp3_ = value; #line 75 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - gtk_widget_set_visible ((GtkWidget*) _tmp2_, _tmp3_); + gtk_widget_set_visible ((GtkWidget*) _tmp2_, _tmp3_); #line 72 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - g_object_notify ((GObject *) self, "expander-visible"); -#line 1661 "gitg-diff-view-commit-details.c" + g_object_notify ((GObject *) self, "expander-visible"); +#line 1665 "gitg-diff-view-commit-details.c" + } } @@ -1672,39 +1677,43 @@ result = _tmp0_; #line 85 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" return result; -#line 1676 "gitg-diff-view-commit-details.c" +#line 1681 "gitg-diff-view-commit-details.c" } void gitg_diff_view_commit_details_set_commit (GitgDiffViewCommitDetails* self, GgitCommit* value) { - GgitCommit* _tmp0_ = NULL; - GgitCommit* _tmp1_ = NULL; #line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" g_return_if_fail (self != NULL); +#line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" + if (gitg_diff_view_commit_details_get_commit (self) != value) { +#line 1690 "gitg-diff-view-commit-details.c" + GgitCommit* _tmp0_ = NULL; + GgitCommit* _tmp1_ = NULL; #line 88 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp0_ = self->priv->d_commit; + _tmp0_ = self->priv->d_commit; #line 88 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp1_ = value; + _tmp1_ = value; #line 88 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - if (_tmp0_ != _tmp1_) { -#line 1691 "gitg-diff-view-commit-details.c" - GgitCommit* _tmp2_ = NULL; - GgitCommit* _tmp3_ = NULL; + if (_tmp0_ != _tmp1_) { +#line 1699 "gitg-diff-view-commit-details.c" + GgitCommit* _tmp2_ = NULL; + GgitCommit* _tmp3_ = NULL; #line 90 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp2_ = value; + _tmp2_ = value; #line 90 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp3_ = _g_object_ref0 (_tmp2_); #line 90 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _g_object_unref0 (self->priv->d_commit); + _g_object_unref0 (self->priv->d_commit); #line 90 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - self->priv->d_commit = _tmp3_; + self->priv->d_commit = _tmp3_; #line 91 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - gitg_diff_view_commit_details_update (self); -#line 1704 "gitg-diff-view-commit-details.c" - } + gitg_diff_view_commit_details_update (self); +#line 1712 "gitg-diff-view-commit-details.c" + } #line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - g_object_notify ((GObject *) self, "commit"); -#line 1708 "gitg-diff-view-commit-details.c" + g_object_notify ((GObject *) self, "commit"); +#line 1716 "gitg-diff-view-commit-details.c" + } } @@ -1719,82 +1728,86 @@ result = _tmp0_; #line 100 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" return result; -#line 1723 "gitg-diff-view-commit-details.c" +#line 1732 "gitg-diff-view-commit-details.c" } void gitg_diff_view_commit_details_set_parent_commit (GitgDiffViewCommitDetails* self, GgitCommit* value) { - GgitCommit* _tmp0_ = NULL; - GgitCommit* _tmp1_ = NULL; #line 101 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" g_return_if_fail (self != NULL); +#line 101 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" + if (gitg_diff_view_commit_details_get_parent_commit (self) != value) { +#line 1741 "gitg-diff-view-commit-details.c" + GgitCommit* _tmp0_ = NULL; + GgitCommit* _tmp1_ = NULL; #line 103 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp0_ = self->priv->d_parent_commit; + _tmp0_ = self->priv->d_parent_commit; #line 103 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp1_ = value; + _tmp1_ = value; #line 103 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - if (_tmp0_ != _tmp1_) { -#line 1738 "gitg-diff-view-commit-details.c" - GgitCommit* _tmp2_ = NULL; - GgitCommit* _tmp3_ = NULL; - GgitCommit* _tmp4_ = NULL; + if (_tmp0_ != _tmp1_) { +#line 1750 "gitg-diff-view-commit-details.c" + GgitCommit* _tmp2_ = NULL; + GgitCommit* _tmp3_ = NULL; + GgitCommit* _tmp4_ = NULL; #line 105 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp2_ = value; + _tmp2_ = value; #line 105 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp3_ = _g_object_ref0 (_tmp2_); #line 105 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _g_object_unref0 (self->priv->d_parent_commit); + _g_object_unref0 (self->priv->d_parent_commit); #line 105 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - self->priv->d_parent_commit = _tmp3_; + self->priv->d_parent_commit = _tmp3_; #line 107 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp4_ = value; + _tmp4_ = value; #line 107 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - if (_tmp4_ != NULL) { -#line 1754 "gitg-diff-view-commit-details.c" - GtkRadioButton* button = NULL; - GeeHashMap* _tmp5_ = NULL; - GgitCommit* _tmp6_ = NULL; - GgitOId* _tmp7_ = NULL; - GgitOId* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - GtkRadioButton* _tmp10_ = NULL; - GtkRadioButton* _tmp11_ = NULL; + if (_tmp4_ != NULL) { +#line 1766 "gitg-diff-view-commit-details.c" + GtkRadioButton* button = NULL; + GeeHashMap* _tmp5_ = NULL; + GgitCommit* _tmp6_ = NULL; + GgitOId* _tmp7_ = NULL; + GgitOId* _tmp8_ = NULL; + gpointer _tmp9_ = NULL; + GtkRadioButton* _tmp10_ = NULL; + GtkRadioButton* _tmp11_ = NULL; #line 109 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp5_ = self->priv->d_parents_map; + _tmp5_ = self->priv->d_parents_map; #line 109 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp6_ = value; + _tmp6_ = value; #line 109 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp7_ = ggit_object_get_id ((GgitObject*) _tmp6_); + _tmp7_ = ggit_object_get_id ((GgitObject*) _tmp6_); #line 109 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp8_ = _tmp7_; + _tmp8_ = _tmp7_; #line 109 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp9_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp5_, _tmp8_); + _tmp9_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp5_, _tmp8_); #line 109 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp10_ = (GtkRadioButton*) _tmp9_; + _tmp10_ = (GtkRadioButton*) _tmp9_; #line 109 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - __vala_GgitOId_free0 (_tmp8_); + __vala_GgitOId_free0 (_tmp8_); #line 109 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - button = _tmp10_; + button = _tmp10_; #line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp11_ = button; + _tmp11_ = button; #line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - if (_tmp11_ != NULL) { -#line 1783 "gitg-diff-view-commit-details.c" - GtkRadioButton* _tmp12_ = NULL; + if (_tmp11_ != NULL) { +#line 1795 "gitg-diff-view-commit-details.c" + GtkRadioButton* _tmp12_ = NULL; #line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp12_ = button; + _tmp12_ = button; #line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - gtk_toggle_button_set_active ((GtkToggleButton*) _tmp12_, TRUE); -#line 1789 "gitg-diff-view-commit-details.c" - } + gtk_toggle_button_set_active ((GtkToggleButton*) _tmp12_, TRUE); +#line 1801 "gitg-diff-view-commit-details.c" + } #line 107 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _g_object_unref0 (button); -#line 1793 "gitg-diff-view-commit-details.c" + _g_object_unref0 (button); +#line 1805 "gitg-diff-view-commit-details.c" + } } - } #line 101 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - g_object_notify ((GObject *) self, "parent-commit"); -#line 1798 "gitg-diff-view-commit-details.c" + g_object_notify ((GObject *) self, "parent-commit"); +#line 1810 "gitg-diff-view-commit-details.c" + } } @@ -1809,23 +1822,27 @@ result = _tmp0_; #line 129 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" return result; -#line 1813 "gitg-diff-view-commit-details.c" +#line 1826 "gitg-diff-view-commit-details.c" } void gitg_diff_view_commit_details_set_use_gravatar (GitgDiffViewCommitDetails* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 130 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" g_return_if_fail (self != NULL); +#line 130 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" + if (gitg_diff_view_commit_details_get_use_gravatar (self) != value) { +#line 1835 "gitg-diff-view-commit-details.c" + gboolean _tmp0_ = FALSE; #line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp0_ = value; + _tmp0_ = value; #line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - self->priv->d_use_gravatar = _tmp0_; + self->priv->d_use_gravatar = _tmp0_; #line 133 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - gitg_diff_view_commit_details_update_avatar (self); + gitg_diff_view_commit_details_update_avatar (self); #line 130 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - g_object_notify ((GObject *) self, "use-gravatar"); -#line 1829 "gitg-diff-view-commit-details.c" + g_object_notify ((GObject *) self, "use-gravatar"); +#line 1845 "gitg-diff-view-commit-details.c" + } } @@ -1841,37 +1858,31 @@ _tmp2_ = _tmp1_; #line 143 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" if (_tmp2_) { -#line 1845 "gitg-diff-view-commit-details.c" +#line 1862 "gitg-diff-view-commit-details.c" GtkLabel* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; #line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" _tmp3_ = self->priv->d_label_expand_collapse_files; #line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp4_ = _ ("Collapse all"); -#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - gtk_label_set_label (_tmp3_, _tmp4_); -#line 1854 "gitg-diff-view-commit-details.c" + gtk_label_set_label (_tmp3_, _ ("Collapse all")); +#line 1868 "gitg-diff-view-commit-details.c" } else { - GtkLabel* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; -#line 149 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp5_ = self->priv->d_label_expand_collapse_files; + GtkLabel* _tmp4_ = NULL; #line 149 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - _tmp6_ = _ ("Expand all"); + _tmp4_ = self->priv->d_label_expand_collapse_files; #line 149 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" - gtk_label_set_label (_tmp5_, _tmp6_); -#line 1864 "gitg-diff-view-commit-details.c" + gtk_label_set_label (_tmp4_, _ ("Expand all")); +#line 1875 "gitg-diff-view-commit-details.c" } #line 152 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" g_object_notify ((GObject*) self, "expanded"); -#line 1868 "gitg-diff-view-commit-details.c" +#line 1879 "gitg-diff-view-commit-details.c" } static void __gitg_diff_view_commit_details___lambda47__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 142 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" _gitg_diff_view_commit_details___lambda47_ ((GitgDiffViewCommitDetails*) self); -#line 1875 "gitg-diff-view-commit-details.c" +#line 1886 "gitg-diff-view-commit-details.c" } @@ -1892,7 +1903,7 @@ g_signal_connect_object ((GObject*) _tmp0_, "notify::expanded", (GCallback) __gitg_diff_view_commit_details___lambda47__g_object_notify, self, 0); #line 140 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" return obj; -#line 1896 "gitg-diff-view-commit-details.c" +#line 1907 "gitg-diff-view-commit-details.c" } @@ -1950,7 +1961,7 @@ gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "label_expand_collapse_files", FALSE, GitgDiffViewCommitDetails_private_offset + G_STRUCT_OFFSET (GitgDiffViewCommitDetailsPrivate, d_label_expand_collapse_files)); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "button_press_on_event_box_expand_collapse", G_CALLBACK(_gitg_diff_view_commit_details_button_press_on_event_box_expand_collapse_gtk_widget_button_press_event)); -#line 1954 "gitg-diff-view-commit-details.c" +#line 1965 "gitg-diff-view-commit-details.c" } @@ -1959,11 +1970,11 @@ self->priv = GITG_DIFF_VIEW_COMMIT_DETAILS_GET_PRIVATE (self); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 1963 "gitg-diff-view-commit-details.c" +#line 1974 "gitg-diff-view-commit-details.c" } -static void gitg_diff_view_commit_details_finalize (GObject* obj) { +static void gitg_diff_view_commit_details_finalize (GObject * obj) { GitgDiffViewCommitDetails * self; #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_DIFF_VIEW_COMMIT_DETAILS, GitgDiffViewCommitDetails); @@ -1999,7 +2010,7 @@ _g_object_unref0 (self->priv->d_parents_map); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" G_OBJECT_CLASS (gitg_diff_view_commit_details_parent_class)->finalize (obj); -#line 2003 "gitg-diff-view-commit-details.c" +#line 2014 "gitg-diff-view-commit-details.c" } @@ -2050,13 +2061,13 @@ g_value_set_boolean (value, gitg_diff_view_commit_details_get_use_gravatar (self)); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" break; -#line 2054 "gitg-diff-view-commit-details.c" +#line 2065 "gitg-diff-view-commit-details.c" default: #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" break; -#line 2060 "gitg-diff-view-commit-details.c" +#line 2071 "gitg-diff-view-commit-details.c" } } @@ -2096,13 +2107,13 @@ gitg_diff_view_commit_details_set_use_gravatar (self, g_value_get_boolean (value)); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" break; -#line 2100 "gitg-diff-view-commit-details.c" +#line 2111 "gitg-diff-view-commit-details.c" default: #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-commit-details.vala" break; -#line 2106 "gitg-diff-view-commit-details.c" +#line 2117 "gitg-diff-view-commit-details.c" } } diff -Nru gitg-3.22.0/libgitg/gitg-diff-view-file.c gitg-3.23.0/libgitg/gitg-diff-view-file.c --- gitg-3.22.0/libgitg/gitg-diff-view-file.c 2016-09-18 12:01:41.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-view-file.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-diff-view-file.c generated by valac 0.32.1, the Vala compiler +/* gitg-diff-view-file.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-diff-view-file.vala, do not modify */ /* @@ -104,6 +104,16 @@ typedef struct _GitgDiffViewFileRendererBinary GitgDiffViewFileRendererBinary; typedef struct _GitgDiffViewFileRendererBinaryClass GitgDiffViewFileRendererBinaryClass; + +#define GITG_TYPE_DIFF_VIEW_FILE_RENDERER_IMAGE (gitg_diff_view_file_renderer_image_get_type ()) +#define GITG_DIFF_VIEW_FILE_RENDERER_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_VIEW_FILE_RENDERER_IMAGE, GitgDiffViewFileRendererImage)) +#define GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GITG_TYPE_DIFF_VIEW_FILE_RENDERER_IMAGE, GitgDiffViewFileRendererImageClass)) +#define GITG_IS_DIFF_VIEW_FILE_RENDERER_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_VIEW_FILE_RENDERER_IMAGE)) +#define GITG_IS_DIFF_VIEW_FILE_RENDERER_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GITG_TYPE_DIFF_VIEW_FILE_RENDERER_IMAGE)) +#define GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GITG_TYPE_DIFF_VIEW_FILE_RENDERER_IMAGE, GitgDiffViewFileRendererImageClass)) + +typedef struct _GitgDiffViewFileRendererImage GitgDiffViewFileRendererImage; +typedef struct _GitgDiffViewFileRendererImageClass GitgDiffViewFileRendererImageClass; #define _g_free0(var) (var = (g_free (var), NULL)) #define _ggit_diff_file_unref0(var) ((var == NULL) ? NULL : (var = (ggit_diff_file_unref (var), NULL))) typedef struct _Block9Data Block9Data; @@ -176,6 +186,9 @@ GType gitg_diff_view_file_renderer_binary_get_type (void) G_GNUC_CONST; GitgDiffViewFile* gitg_diff_view_file_new_image (GitgRepository* repository, GgitDiffDelta* delta); GitgDiffViewFile* gitg_diff_view_file_construct_image (GType object_type, GitgRepository* repository, GgitDiffDelta* delta); +GitgDiffViewFileRendererImage* gitg_diff_view_file_renderer_image_new (GitgRepository* repository, GgitDiffDelta* delta); +GitgDiffViewFileRendererImage* gitg_diff_view_file_renderer_image_construct (GType object_type, GitgRepository* repository, GgitDiffDelta* delta); +GType gitg_diff_view_file_renderer_image_get_type (void) G_GNUC_CONST; static void gitg_diff_view_file_real_constructed (GObject* base); GgitDiffDelta* gitg_diff_view_file_get_delta (GitgDiffViewFile* self); GitgRepository* gitg_diff_view_file_get_repository (GitgDiffViewFile* self); @@ -200,7 +213,7 @@ void gitg_diff_view_file_set_expanded (GitgDiffViewFile* self, gboolean value); void gitg_diff_view_file_set_delta (GitgDiffViewFile* self, GgitDiffDelta* value); void gitg_diff_view_file_set_repository (GitgDiffViewFile* self, GitgRepository* value); -static void gitg_diff_view_file_finalize (GObject* obj); +static void gitg_diff_view_file_finalize (GObject * obj); static void _vala_gitg_diff_view_file_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_diff_view_file_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -219,14 +232,14 @@ self = (GitgDiffViewFile*) g_object_new (object_type, "repository", _tmp0_, "delta", _tmp1_, NULL); #line 102 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return self; -#line 223 "gitg-diff-view-file.c" +#line 236 "gitg-diff-view-file.c" } GitgDiffViewFile* gitg_diff_view_file_new (GitgRepository* repository, GgitDiffDelta* delta) { #line 102 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return gitg_diff_view_file_construct (GITG_TYPE_DIFF_VIEW_FILE, repository, delta); -#line 230 "gitg-diff-view-file.c" +#line 243 "gitg-diff-view-file.c" } @@ -319,14 +332,14 @@ _g_object_unref0 (_tmp19_); #line 107 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return self; -#line 323 "gitg-diff-view-file.c" +#line 336 "gitg-diff-view-file.c" } GitgDiffViewFile* gitg_diff_view_file_new_text (GitgDiffViewFileInfo* info, gboolean handle_selection) { #line 107 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return gitg_diff_view_file_construct_text (GITG_TYPE_DIFF_VIEW_FILE, info, handle_selection); -#line 330 "gitg-diff-view-file.c" +#line 343 "gitg-diff-view-file.c" } @@ -374,14 +387,14 @@ gtk_widget_hide ((GtkWidget*) _tmp7_); #line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return self; -#line 378 "gitg-diff-view-file.c" +#line 391 "gitg-diff-view-file.c" } GitgDiffViewFile* gitg_diff_view_file_new_binary (GitgRepository* repository, GgitDiffDelta* delta) { #line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return gitg_diff_view_file_construct_binary (GITG_TYPE_DIFF_VIEW_FILE, repository, delta); -#line 385 "gitg-diff-view-file.c" +#line 398 "gitg-diff-view-file.c" } @@ -389,6 +402,14 @@ GitgDiffViewFile * self = NULL; GitgRepository* _tmp0_ = NULL; GgitDiffDelta* _tmp1_ = NULL; + GitgRepository* _tmp2_ = NULL; + GgitDiffDelta* _tmp3_ = NULL; + GitgDiffViewFileRendererImage* _tmp4_ = NULL; + GitgDiffViewFileRendererImage* _tmp5_ = NULL; + GitgDiffViewFileRenderer* _tmp6_ = NULL; + GitgDiffViewFileRenderer* _tmp7_ = NULL; + GitgDiffViewFileRenderer* _tmp8_ = NULL; + GitgDiffStat* _tmp9_ = NULL; #line 128 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_return_val_if_fail (delta != NULL, NULL); #line 130 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" @@ -397,53 +418,81 @@ _tmp1_ = delta; #line 130 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" self = (GitgDiffViewFile*) gitg_diff_view_file_construct (object_type, _tmp0_, _tmp1_); +#line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp2_ = repository; +#line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp3_ = delta; +#line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp4_ = gitg_diff_view_file_renderer_image_new (_tmp2_, _tmp3_); +#line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + g_object_ref_sink (_tmp4_); +#line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp5_ = _tmp4_; +#line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + gitg_diff_view_file_set_renderer (self, (GitgDiffViewFileRenderer*) _tmp5_); +#line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _g_object_unref0 (_tmp5_); +#line 133 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp6_ = gitg_diff_view_file_get_renderer (self); +#line 133 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp7_ = _tmp6_; +#line 133 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp8_ = _tmp7_; +#line 133 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + gtk_widget_show ((GtkWidget*) _tmp8_); +#line 133 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _g_object_unref0 (_tmp8_); +#line 135 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp9_ = self->priv->d_diff_stat_file; +#line 135 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + gtk_widget_hide ((GtkWidget*) _tmp9_); #line 128 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return self; -#line 403 "gitg-diff-view-file.c" +#line 452 "gitg-diff-view-file.c" } GitgDiffViewFile* gitg_diff_view_file_new_image (GitgRepository* repository, GgitDiffDelta* delta) { #line 128 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return gitg_diff_view_file_construct_image (GITG_TYPE_DIFF_VIEW_FILE, repository, delta); -#line 410 "gitg-diff-view-file.c" +#line 459 "gitg-diff-view-file.c" } static gpointer _ggit_diff_file_ref0 (gpointer self) { -#line 137 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 142 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return self ? ggit_diff_file_ref (self) : NULL; -#line 417 "gitg-diff-view-file.c" +#line 466 "gitg-diff-view-file.c" } static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 429 "gitg-diff-view-file.c" +#line 478 "gitg-diff-view-file.c" } static gboolean _gitg_diff_view_file_expander_popup_menu_gtk_widget_popup_menu (GtkWidget* _sender, gpointer self) { gboolean result; result = gitg_diff_view_file_expander_popup_menu ((GitgDiffViewFile*) self, _sender); -#line 160 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return result; -#line 438 "gitg-diff-view-file.c" +#line 487 "gitg-diff-view-file.c" } static gboolean _gitg_diff_view_file_expander_button_press_event_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { gboolean result; result = gitg_diff_view_file_expander_button_press_event ((GitgDiffViewFile*) self, _sender, event); -#line 161 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 166 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return result; -#line 447 "gitg-diff-view-file.c" +#line 496 "gitg-diff-view-file.c" } @@ -470,79 +519,79 @@ GtkExpander* _tmp32_ = NULL; gboolean _tmp33_ = FALSE; GitgRepository* _tmp34_ = NULL; -#line 133 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 138 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" self = (GitgDiffViewFile*) base; -#line 135 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 140 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" G_OBJECT_CLASS (gitg_diff_view_file_parent_class)->constructed ((GObject*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_grid_get_type (), GtkGrid)); -#line 137 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 142 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp0_ = self->priv->_delta; -#line 137 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 142 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp1_ = ggit_diff_delta_get_old_file (_tmp0_); -#line 137 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 142 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp2_ = _ggit_diff_file_ref0 (_tmp1_); -#line 137 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 142 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" oldfile = _tmp2_; -#line 138 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 143 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp3_ = self->priv->_delta; -#line 138 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 143 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp4_ = ggit_diff_delta_get_new_file (_tmp3_); -#line 138 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 143 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp5_ = _ggit_diff_file_ref0 (_tmp4_); -#line 138 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 143 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" newfile = _tmp5_; -#line 140 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp7_ = oldfile; -#line 140 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" if (_tmp7_ != NULL) { -#line 498 "gitg-diff-view-file.c" +#line 547 "gitg-diff-view-file.c" GgitDiffFile* _tmp8_ = NULL; const gchar* _tmp9_ = NULL; -#line 140 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp8_ = oldfile; -#line 140 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp9_ = ggit_diff_file_get_path (_tmp8_); -#line 140 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp6_ = _tmp9_; -#line 507 "gitg-diff-view-file.c" +#line 556 "gitg-diff-view-file.c" } else { -#line 140 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp6_ = NULL; -#line 511 "gitg-diff-view-file.c" +#line 560 "gitg-diff-view-file.c" } -#line 140 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp10_ = g_strdup (_tmp6_); -#line 140 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" oldpath = _tmp10_; -#line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 146 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp12_ = newfile; -#line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 146 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" if (_tmp12_ != NULL) { -#line 521 "gitg-diff-view-file.c" +#line 570 "gitg-diff-view-file.c" GgitDiffFile* _tmp13_ = NULL; const gchar* _tmp14_ = NULL; -#line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 146 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp13_ = newfile; -#line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 146 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp14_ = ggit_diff_file_get_path (_tmp13_); -#line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 146 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp11_ = _tmp14_; -#line 530 "gitg-diff-view-file.c" +#line 579 "gitg-diff-view-file.c" } else { -#line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 146 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp11_ = NULL; -#line 534 "gitg-diff-view-file.c" +#line 583 "gitg-diff-view-file.c" } -#line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 146 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp15_ = g_strdup (_tmp11_); -#line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 146 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" newpath = _tmp15_; -#line 143 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 148 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp16_ = self->priv->_delta; -#line 143 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 148 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp17_ = ggit_diff_delta_get_similarity (_tmp16_); -#line 143 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 148 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" if (_tmp17_ > ((guint) 0)) { -#line 546 "gitg-diff-view-file.c" +#line 595 "gitg-diff-view-file.c" GtkLabel* _tmp18_ = NULL; GgitDiffFile* _tmp19_ = NULL; const gchar* _tmp20_ = NULL; @@ -552,135 +601,135 @@ const gchar* _tmp24_ = NULL; gchar* _tmp25_ = NULL; gchar* _tmp26_ = NULL; -#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 150 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp18_ = self->priv->d_label_file_header; -#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 150 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp19_ = newfile; -#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 150 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp20_ = ggit_diff_file_get_path (_tmp19_); -#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 150 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp21_ = string_to_string (_tmp20_); -#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 150 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp22_ = oldfile; -#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 150 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp23_ = ggit_diff_file_get_path (_tmp22_); -#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 150 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp24_ = string_to_string (_tmp23_); -#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 150 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp25_ = g_strconcat (_tmp21_, " ← ", _tmp24_, NULL); -#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 150 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp26_ = _tmp25_; -#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 150 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" gtk_label_set_label (_tmp18_, _tmp26_); -#line 145 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 150 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_free0 (_tmp26_); -#line 578 "gitg-diff-view-file.c" +#line 627 "gitg-diff-view-file.c" } else { const gchar* _tmp27_ = NULL; -#line 147 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 152 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp27_ = newpath; -#line 147 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 152 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" if (_tmp27_ != NULL) { -#line 585 "gitg-diff-view-file.c" +#line 634 "gitg-diff-view-file.c" GtkLabel* _tmp28_ = NULL; const gchar* _tmp29_ = NULL; -#line 149 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 154 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp28_ = self->priv->d_label_file_header; -#line 149 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 154 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp29_ = newpath; -#line 149 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 154 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" gtk_label_set_label (_tmp28_, _tmp29_); -#line 594 "gitg-diff-view-file.c" +#line 643 "gitg-diff-view-file.c" } else { GtkLabel* _tmp30_ = NULL; const gchar* _tmp31_ = NULL; -#line 153 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 158 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp30_ = self->priv->d_label_file_header; -#line 153 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 158 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp31_ = oldpath; -#line 153 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 158 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" gtk_label_set_label (_tmp30_, _tmp31_); -#line 604 "gitg-diff-view-file.c" +#line 653 "gitg-diff-view-file.c" } } -#line 156 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 161 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp32_ = self->priv->d_expander; -#line 156 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 161 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_object_bind_property_with_closures ((GObject*) _tmp32_, "expanded", (GObject*) self, "expanded", G_BINDING_BIDIRECTIONAL, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); -#line 158 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 163 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp34_ = self->priv->_repository; -#line 158 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 163 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" if (_tmp34_ != NULL) { -#line 615 "gitg-diff-view-file.c" +#line 664 "gitg-diff-view-file.c" GitgRepository* _tmp35_ = NULL; gboolean _tmp36_ = FALSE; gboolean _tmp37_ = FALSE; -#line 158 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 163 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp35_ = self->priv->_repository; -#line 158 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 163 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_object_get ((GgitRepository*) _tmp35_, "is-bare", &_tmp36_, NULL); -#line 158 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 163 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp37_ = _tmp36_; -#line 158 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 163 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp33_ = !_tmp37_; -#line 627 "gitg-diff-view-file.c" +#line 676 "gitg-diff-view-file.c" } else { -#line 158 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 163 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp33_ = FALSE; -#line 631 "gitg-diff-view-file.c" +#line 680 "gitg-diff-view-file.c" } -#line 158 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 163 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" if (_tmp33_) { -#line 635 "gitg-diff-view-file.c" +#line 684 "gitg-diff-view-file.c" GtkExpander* _tmp38_ = NULL; GtkExpander* _tmp39_ = NULL; -#line 160 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp38_ = self->priv->d_expander; -#line 160 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_signal_connect_object ((GtkWidget*) _tmp38_, "popup-menu", (GCallback) _gitg_diff_view_file_expander_popup_menu_gtk_widget_popup_menu, self, 0); -#line 161 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 166 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp39_ = self->priv->d_expander; -#line 161 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 166 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_signal_connect_object ((GtkWidget*) _tmp39_, "button-press-event", (GCallback) _gitg_diff_view_file_expander_button_press_event_gtk_widget_button_press_event, self, 0); -#line 646 "gitg-diff-view-file.c" +#line 695 "gitg-diff-view-file.c" } -#line 133 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 138 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_free0 (newpath); -#line 133 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 138 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_free0 (oldpath); -#line 133 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 138 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _ggit_diff_file_unref0 (newfile); -#line 133 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 138 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _ggit_diff_file_unref0 (oldfile); -#line 656 "gitg-diff-view-file.c" +#line 705 "gitg-diff-view-file.c" } static Block9Data* block9_data_ref (Block9Data* _data9_) { -#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_atomic_int_inc (&_data9_->_ref_count_); -#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return _data9_; -#line 665 "gitg-diff-view-file.c" +#line 714 "gitg-diff-view-file.c" } static void block9_data_unref (void * _userdata_) { Block9Data* _data9_; _data9_ = (Block9Data*) _userdata_; -#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" if (g_atomic_int_dec_and_test (&_data9_->_ref_count_)) { -#line 674 "gitg-diff-view-file.c" +#line 723 "gitg-diff-view-file.c" GitgDiffViewFile* self; -#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" self = _data9_->self; -#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_object_unref0 (_data9_->location); -#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_object_unref0 (self); -#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_slice_free (Block9Data, _data9_); -#line 684 "gitg-diff-view-file.c" +#line 733 "gitg-diff-view-file.c" } } @@ -688,32 +737,32 @@ static void __lambda54_ (Block9Data* _data9_) { GitgDiffViewFile* self; GError * _inner_error_ = NULL; -#line 191 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 196 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" self = _data9_->self; -#line 694 "gitg-diff-view-file.c" +#line 743 "gitg-diff-view-file.c" { GtkExpander* _tmp0_ = NULL; GdkScreen* _tmp1_ = NULL; GFile* _tmp2_ = NULL; gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; -#line 194 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 199 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp0_ = self->priv->d_expander; -#line 194 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 199 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp1_ = gtk_widget_get_screen ((GtkWidget*) _tmp0_); -#line 194 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 199 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp2_ = _data9_->location; -#line 194 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 199 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp3_ = g_file_get_uri (_tmp2_); -#line 194 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 199 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp4_ = _tmp3_; -#line 194 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 199 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" gtk_show_uri (_tmp1_, _tmp4_, (guint32) GDK_CURRENT_TIME, &_inner_error_); -#line 194 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 199 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_free0 (_tmp4_); -#line 194 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 199 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 717 "gitg-diff-view-file.c" +#line 766 "gitg-diff-view-file.c" goto __catch35_g_error; } } @@ -727,57 +776,57 @@ const gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; -#line 192 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 197 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" e = _inner_error_; -#line 192 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 197 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _inner_error_ = NULL; -#line 198 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp5_ = stderr; -#line 198 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp6_ = e; -#line 198 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp7_ = _tmp6_->message; -#line 198 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp8_ = string_to_string (_tmp7_); -#line 198 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp9_ = g_strconcat ("Failed to open file: ", _tmp8_, "\n", NULL); -#line 198 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp10_ = _tmp9_; -#line 198 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" fprintf (_tmp5_, "%s", _tmp10_); -#line 198 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 203 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_free0 (_tmp10_); -#line 192 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 197 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_error_free0 (e); -#line 753 "gitg-diff-view-file.c" +#line 802 "gitg-diff-view-file.c" } __finally35: -#line 192 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 197 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 192 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 197 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.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 192 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 197 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_clear_error (&_inner_error_); -#line 192 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 197 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return; -#line 764 "gitg-diff-view-file.c" +#line 813 "gitg-diff-view-file.c" } } static void ___lambda54__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { -#line 191 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 196 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" __lambda54_ (self); -#line 772 "gitg-diff-view-file.c" +#line 821 "gitg-diff-view-file.c" } static void __lambda55_ (Block9Data* _data9_) { GitgDiffViewFile* self; GError * _inner_error_ = NULL; -#line 207 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" self = _data9_->self; -#line 781 "gitg-diff-view-file.c" +#line 830 "gitg-diff-view-file.c" { GtkExpander* _tmp0_ = NULL; GdkScreen* _tmp1_ = NULL; @@ -786,29 +835,29 @@ GFile* _tmp4_ = NULL; gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; -#line 210 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 215 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp0_ = self->priv->d_expander; -#line 210 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 215 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp1_ = gtk_widget_get_screen ((GtkWidget*) _tmp0_); -#line 210 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 215 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp2_ = _data9_->location; -#line 210 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 215 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp3_ = g_file_get_parent (_tmp2_); -#line 210 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 215 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp4_ = _tmp3_; -#line 210 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 215 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp5_ = g_file_get_uri (_tmp4_); -#line 210 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 215 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp6_ = _tmp5_; -#line 210 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 215 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" gtk_show_uri (_tmp1_, _tmp6_, (guint32) GDK_CURRENT_TIME, &_inner_error_); -#line 210 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 215 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_free0 (_tmp6_); -#line 210 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 215 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_object_unref0 (_tmp4_); -#line 210 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 215 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 812 "gitg-diff-view-file.c" +#line 861 "gitg-diff-view-file.c" goto __catch36_g_error; } } @@ -822,55 +871,55 @@ const gchar* _tmp10_ = NULL; gchar* _tmp11_ = NULL; gchar* _tmp12_ = NULL; -#line 208 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 213 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" e = _inner_error_; -#line 208 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 213 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _inner_error_ = NULL; -#line 214 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 219 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp7_ = stderr; -#line 214 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 219 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp8_ = e; -#line 214 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 219 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp9_ = _tmp8_->message; -#line 214 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 219 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp10_ = string_to_string (_tmp9_); -#line 214 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 219 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp11_ = g_strconcat ("Failed to open folder: ", _tmp10_, "\n", NULL); -#line 214 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 219 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp12_ = _tmp11_; -#line 214 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 219 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" fprintf (_tmp7_, "%s", _tmp12_); -#line 214 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 219 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_free0 (_tmp12_); -#line 208 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 213 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_error_free0 (e); -#line 848 "gitg-diff-view-file.c" +#line 897 "gitg-diff-view-file.c" } __finally36: -#line 208 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 213 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 208 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 213 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.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 208 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 213 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_clear_error (&_inner_error_); -#line 208 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 213 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return; -#line 859 "gitg-diff-view-file.c" +#line 908 "gitg-diff-view-file.c" } } static void ___lambda55__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { -#line 207 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" __lambda55_ (self); -#line 867 "gitg-diff-view-file.c" +#line 916 "gitg-diff-view-file.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 228 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 233 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return self ? g_object_ref (self) : NULL; -#line 874 "gitg-diff-view-file.c" +#line 923 "gitg-diff-view-file.c" } @@ -883,36 +932,36 @@ GFile* _tmp3_ = NULL; gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; -#line 227 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 232 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" self = _data9_->self; -#line 228 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 233 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp0_ = self->priv->d_expander; -#line 228 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 233 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp1_ = gtk_widget_get_clipboard ((GtkWidget*) _tmp0_, GDK_SELECTION_CLIPBOARD); -#line 228 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 233 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 228 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 233 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" clip = _tmp2_; -#line 229 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 234 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp3_ = _data9_->location; -#line 229 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 234 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp4_ = g_file_get_path (_tmp3_); -#line 229 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 234 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp5_ = _tmp4_; -#line 229 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 234 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" gtk_clipboard_set_text (clip, _tmp5_, -1); -#line 229 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 234 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_free0 (_tmp5_); -#line 227 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 232 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_object_unref0 (clip); -#line 909 "gitg-diff-view-file.c" +#line 958 "gitg-diff-view-file.c" } static void ___lambda56__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { -#line 227 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 232 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" __lambda56_ (self); -#line 916 "gitg-diff-view-file.c" +#line 965 "gitg-diff-view-file.c" } @@ -931,327 +980,318 @@ const gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; GtkMenuItem* open_file = NULL; - const gchar* _tmp9_ = NULL; + GtkMenuItem* _tmp9_ = NULL; GtkMenuItem* _tmp10_ = NULL; - GtkMenuItem* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - const gchar* _tmp13_ = NULL; - GFile* _tmp28_ = NULL; - GtkMenuItem* _tmp29_ = NULL; - GtkMenu* _tmp30_ = NULL; - GtkMenuItem* _tmp31_ = NULL; + gboolean _tmp11_ = FALSE; + const gchar* _tmp12_ = NULL; + GFile* _tmp27_ = NULL; + GtkMenuItem* _tmp28_ = NULL; + GtkMenu* _tmp29_ = NULL; + GtkMenuItem* _tmp30_ = NULL; GtkMenuItem* open_folder = NULL; - const gchar* _tmp32_ = NULL; + GtkMenuItem* _tmp31_ = NULL; + GtkMenuItem* _tmp32_ = NULL; GtkMenuItem* _tmp33_ = NULL; - GtkMenuItem* _tmp34_ = NULL; + GtkMenu* _tmp34_ = NULL; GtkMenuItem* _tmp35_ = NULL; - GtkMenu* _tmp36_ = NULL; - GtkMenuItem* _tmp37_ = NULL; GtkSeparatorMenuItem* separator = NULL; - GtkSeparatorMenuItem* _tmp38_ = NULL; + GtkSeparatorMenuItem* _tmp36_ = NULL; + GtkSeparatorMenuItem* _tmp37_ = NULL; + GtkMenu* _tmp38_ = NULL; GtkSeparatorMenuItem* _tmp39_ = NULL; - GtkMenu* _tmp40_ = NULL; - GtkSeparatorMenuItem* _tmp41_ = NULL; GtkMenuItem* copy_file_path = NULL; - const gchar* _tmp42_ = NULL; - GtkMenuItem* _tmp43_ = NULL; + GtkMenuItem* _tmp40_ = NULL; + GtkMenuItem* _tmp41_ = NULL; + GtkMenuItem* _tmp42_ = NULL; + GtkMenu* _tmp43_ = NULL; GtkMenuItem* _tmp44_ = NULL; - GtkMenuItem* _tmp45_ = NULL; - GtkMenu* _tmp46_ = NULL; - GtkMenuItem* _tmp47_ = NULL; guint button = 0U; guint evtime = 0U; - GdkEventButton* _tmp48_ = NULL; - GtkMenu* _tmp53_ = NULL; - GtkExpander* _tmp54_ = NULL; - GtkMenu* _tmp55_ = NULL; - guint _tmp56_ = 0U; - guint _tmp57_ = 0U; -#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + GdkEventButton* _tmp45_ = NULL; + GtkMenu* _tmp50_ = NULL; + GtkExpander* _tmp51_ = NULL; + GtkMenu* _tmp52_ = NULL; + guint _tmp53_ = 0U; + guint _tmp54_ = 0U; +#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_return_if_fail (self != NULL); -#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _data9_ = g_slice_new0 (Block9Data); -#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _data9_->_ref_count_ = 1; -#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _data9_->self = g_object_ref (self); -#line 167 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 172 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp0_ = (GtkMenu*) gtk_menu_new (); -#line 167 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 172 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_object_ref_sink (_tmp0_); -#line 167 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 172 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" menu = _tmp0_; -#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 174 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp1_ = self->priv->_delta; -#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 174 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp2_ = ggit_diff_delta_get_old_file (_tmp1_); -#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 174 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp3_ = ggit_diff_file_get_path (_tmp2_); -#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 174 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp4_ = g_strdup (_tmp3_); -#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 174 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" oldpath = _tmp4_; -#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 175 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp5_ = self->priv->_delta; -#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 175 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp6_ = ggit_diff_delta_get_new_file (_tmp5_); -#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 175 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp7_ = ggit_diff_file_get_path (_tmp6_); -#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 175 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp8_ = g_strdup (_tmp7_); -#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - newpath = _tmp8_; -#line 172 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp9_ = _ ("_Open file"); -#line 172 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp10_ = (GtkMenuItem*) gtk_menu_item_new_with_mnemonic (_tmp9_); -#line 172 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - g_object_ref_sink (_tmp10_); -#line 172 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - open_file = _tmp10_; -#line 173 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp11_ = open_file; -#line 173 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - gtk_widget_show ((GtkWidget*) _tmp11_); #line 175 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _data9_->location = NULL; -#line 177 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp13_ = newpath; + newpath = _tmp8_; #line 177 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - if (_tmp13_ != NULL) { -#line 1023 "gitg-diff-view-file.c" - const gchar* _tmp14_ = NULL; + _tmp9_ = (GtkMenuItem*) gtk_menu_item_new_with_mnemonic (_ ("_Open file")); #line 177 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp14_ = newpath; + g_object_ref_sink (_tmp9_); #line 177 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp12_ = g_strcmp0 (_tmp14_, "") != 0; -#line 1029 "gitg-diff-view-file.c" + open_file = _tmp9_; +#line 178 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp10_ = open_file; +#line 178 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + gtk_widget_show ((GtkWidget*) _tmp10_); +#line 180 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _data9_->location = NULL; +#line 182 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp12_ = newpath; +#line 182 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + if (_tmp12_ != NULL) { +#line 1067 "gitg-diff-view-file.c" + const gchar* _tmp13_ = NULL; +#line 182 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp13_ = newpath; +#line 182 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp11_ = g_strcmp0 (_tmp13_, "") != 0; +#line 1073 "gitg-diff-view-file.c" } else { -#line 177 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp12_ = FALSE; -#line 1033 "gitg-diff-view-file.c" +#line 182 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp11_ = FALSE; +#line 1077 "gitg-diff-view-file.c" } -#line 177 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - if (_tmp12_) { -#line 1037 "gitg-diff-view-file.c" - GitgRepository* _tmp15_ = NULL; +#line 182 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + if (_tmp11_) { +#line 1081 "gitg-diff-view-file.c" + GitgRepository* _tmp14_ = NULL; + GFile* _tmp15_ = NULL; GFile* _tmp16_ = NULL; - GFile* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - GFile* _tmp19_ = NULL; -#line 179 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp15_ = self->priv->_repository; -#line 179 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp16_ = ggit_repository_get_workdir ((GgitRepository*) _tmp15_); -#line 179 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp17_ = _tmp16_; -#line 179 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp18_ = newpath; -#line 179 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp19_ = g_file_get_child (_tmp17_, _tmp18_); -#line 179 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + const gchar* _tmp17_ = NULL; + GFile* _tmp18_ = NULL; +#line 184 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp14_ = self->priv->_repository; +#line 184 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp15_ = ggit_repository_get_workdir ((GgitRepository*) _tmp14_); +#line 184 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp16_ = _tmp15_; +#line 184 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp17_ = newpath; +#line 184 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp18_ = g_file_get_child (_tmp16_, _tmp17_); +#line 184 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_object_unref0 (_data9_->location); -#line 179 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _data9_->location = _tmp19_; -#line 179 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _g_object_unref0 (_tmp17_); -#line 1059 "gitg-diff-view-file.c" +#line 184 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _data9_->location = _tmp18_; +#line 184 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _g_object_unref0 (_tmp16_); +#line 1103 "gitg-diff-view-file.c" } else { - gboolean _tmp20_ = FALSE; - const gchar* _tmp21_ = NULL; -#line 181 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp21_ = oldpath; -#line 181 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - if (_tmp21_ != NULL) { -#line 1067 "gitg-diff-view-file.c" - const gchar* _tmp22_ = NULL; -#line 181 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp22_ = oldpath; -#line 181 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp20_ = g_strcmp0 (_tmp22_, "") != 0; -#line 1073 "gitg-diff-view-file.c" + gboolean _tmp19_ = FALSE; + const gchar* _tmp20_ = NULL; +#line 186 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp20_ = oldpath; +#line 186 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + if (_tmp20_ != NULL) { +#line 1111 "gitg-diff-view-file.c" + const gchar* _tmp21_ = NULL; +#line 186 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp21_ = oldpath; +#line 186 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp19_ = g_strcmp0 (_tmp21_, "") != 0; +#line 1117 "gitg-diff-view-file.c" } else { -#line 181 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp20_ = FALSE; -#line 1077 "gitg-diff-view-file.c" +#line 186 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp19_ = FALSE; +#line 1121 "gitg-diff-view-file.c" } -#line 181 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - if (_tmp20_) { -#line 1081 "gitg-diff-view-file.c" - GitgRepository* _tmp23_ = NULL; +#line 186 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + if (_tmp19_) { +#line 1125 "gitg-diff-view-file.c" + GitgRepository* _tmp22_ = NULL; + GFile* _tmp23_ = NULL; GFile* _tmp24_ = NULL; - GFile* _tmp25_ = NULL; - const gchar* _tmp26_ = NULL; - GFile* _tmp27_ = NULL; -#line 183 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp23_ = self->priv->_repository; -#line 183 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp24_ = ggit_repository_get_workdir ((GgitRepository*) _tmp23_); -#line 183 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp25_ = _tmp24_; -#line 183 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp26_ = oldpath; -#line 183 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp27_ = g_file_get_child (_tmp25_, _tmp26_); -#line 183 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + const gchar* _tmp25_ = NULL; + GFile* _tmp26_ = NULL; +#line 188 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp22_ = self->priv->_repository; +#line 188 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp23_ = ggit_repository_get_workdir ((GgitRepository*) _tmp22_); +#line 188 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp24_ = _tmp23_; +#line 188 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp25_ = oldpath; +#line 188 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp26_ = g_file_get_child (_tmp24_, _tmp25_); +#line 188 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_object_unref0 (_data9_->location); -#line 183 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _data9_->location = _tmp27_; -#line 183 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _g_object_unref0 (_tmp25_); -#line 1103 "gitg-diff-view-file.c" +#line 188 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _data9_->location = _tmp26_; +#line 188 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _g_object_unref0 (_tmp24_); +#line 1147 "gitg-diff-view-file.c" } } -#line 186 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp28_ = _data9_->location; -#line 186 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - if (_tmp28_ == NULL) { -#line 188 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 191 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp27_ = _data9_->location; +#line 191 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + if (_tmp27_ == NULL) { +#line 193 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_object_unref0 (open_file); -#line 188 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 193 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_free0 (newpath); -#line 188 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 193 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_free0 (oldpath); -#line 188 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 193 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_object_unref0 (menu); -#line 188 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 193 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" block9_data_unref (_data9_); -#line 188 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 193 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _data9_ = NULL; -#line 188 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 193 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return; -#line 1124 "gitg-diff-view-file.c" +#line 1168 "gitg-diff-view-file.c" } -#line 191 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp29_ = open_file; -#line 191 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - g_signal_connect_data (_tmp29_, "activate", (GCallback) ___lambda54__gtk_menu_item_activate, block9_data_ref (_data9_), (GClosureNotify) block9_data_unref, 0); -#line 202 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp30_ = menu; -#line 202 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp31_ = open_file; -#line 202 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - gtk_container_add ((GtkContainer*) _tmp30_, (GtkWidget*) _tmp31_); -#line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp32_ = _ ("Open containing _folder"); -#line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp33_ = (GtkMenuItem*) gtk_menu_item_new_with_mnemonic (_tmp32_); -#line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - g_object_ref_sink (_tmp33_); -#line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - open_folder = _tmp33_; -#line 205 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp34_ = open_folder; -#line 205 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - gtk_widget_show ((GtkWidget*) _tmp34_); +#line 196 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp28_ = open_file; +#line 196 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + g_signal_connect_data (_tmp28_, "activate", (GCallback) ___lambda54__gtk_menu_item_activate, block9_data_ref (_data9_), (GClosureNotify) block9_data_unref, 0); #line 207 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp35_ = open_folder; + _tmp29_ = menu; #line 207 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - g_signal_connect_data (_tmp35_, "activate", (GCallback) ___lambda55__gtk_menu_item_activate, block9_data_ref (_data9_), (GClosureNotify) block9_data_unref, 0); -#line 218 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp36_ = menu; -#line 218 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp37_ = open_folder; -#line 218 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - gtk_container_add ((GtkContainer*) _tmp36_, (GtkWidget*) _tmp37_); -#line 220 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp38_ = (GtkSeparatorMenuItem*) gtk_separator_menu_item_new (); -#line 220 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - g_object_ref_sink (_tmp38_); -#line 220 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - separator = _tmp38_; -#line 221 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp39_ = separator; -#line 221 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - gtk_widget_show ((GtkWidget*) _tmp39_); -#line 222 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp40_ = menu; -#line 222 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp41_ = separator; -#line 222 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - gtk_container_add ((GtkContainer*) _tmp40_, (GtkWidget*) _tmp41_); -#line 224 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp42_ = _ ("_Copy file path"); -#line 224 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp43_ = (GtkMenuItem*) gtk_menu_item_new_with_mnemonic (_tmp42_); -#line 224 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - g_object_ref_sink (_tmp43_); -#line 224 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - copy_file_path = _tmp43_; + _tmp30_ = open_file; +#line 207 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + gtk_container_add ((GtkContainer*) _tmp29_, (GtkWidget*) _tmp30_); +#line 209 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp31_ = (GtkMenuItem*) gtk_menu_item_new_with_mnemonic (_ ("Open containing _folder")); +#line 209 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + g_object_ref_sink (_tmp31_); +#line 209 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + open_folder = _tmp31_; +#line 210 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp32_ = open_folder; +#line 210 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + gtk_widget_show ((GtkWidget*) _tmp32_); +#line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp33_ = open_folder; +#line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + g_signal_connect_data (_tmp33_, "activate", (GCallback) ___lambda55__gtk_menu_item_activate, block9_data_ref (_data9_), (GClosureNotify) block9_data_unref, 0); +#line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp34_ = menu; +#line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp35_ = open_folder; +#line 223 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + gtk_container_add ((GtkContainer*) _tmp34_, (GtkWidget*) _tmp35_); #line 225 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp44_ = copy_file_path; + _tmp36_ = (GtkSeparatorMenuItem*) gtk_separator_menu_item_new (); +#line 225 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + g_object_ref_sink (_tmp36_); #line 225 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - gtk_widget_show ((GtkWidget*) _tmp44_); + separator = _tmp36_; +#line 226 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp37_ = separator; +#line 226 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + gtk_widget_show ((GtkWidget*) _tmp37_); #line 227 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp45_ = copy_file_path; + _tmp38_ = menu; #line 227 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - g_signal_connect_data (_tmp45_, "activate", (GCallback) ___lambda56__gtk_menu_item_activate, block9_data_ref (_data9_), (GClosureNotify) block9_data_unref, 0); -#line 232 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp46_ = menu; + _tmp39_ = separator; +#line 227 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + gtk_container_add ((GtkContainer*) _tmp38_, (GtkWidget*) _tmp39_); +#line 229 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp40_ = (GtkMenuItem*) gtk_menu_item_new_with_mnemonic (_ ("_Copy file path")); +#line 229 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + g_object_ref_sink (_tmp40_); +#line 229 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + copy_file_path = _tmp40_; +#line 230 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp41_ = copy_file_path; +#line 230 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + gtk_widget_show ((GtkWidget*) _tmp41_); #line 232 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp47_ = copy_file_path; + _tmp42_ = copy_file_path; #line 232 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - gtk_container_add ((GtkContainer*) _tmp46_, (GtkWidget*) _tmp47_); -#line 234 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - button = (guint) 0; -#line 235 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - evtime = (guint) GDK_CURRENT_TIME; + g_signal_connect_data (_tmp42_, "activate", (GCallback) ___lambda56__gtk_menu_item_activate, block9_data_ref (_data9_), (GClosureNotify) block9_data_unref, 0); #line 237 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp48_ = event; + _tmp43_ = menu; #line 237 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - if (_tmp48_ != NULL) { -#line 1204 "gitg-diff-view-file.c" - GdkEventButton* _tmp49_ = NULL; - guint _tmp50_ = 0U; - GdkEventButton* _tmp51_ = NULL; - guint32 _tmp52_ = 0U; -#line 239 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp49_ = event; -#line 239 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp50_ = _tmp49_->button; + _tmp44_ = copy_file_path; +#line 237 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + gtk_container_add ((GtkContainer*) _tmp43_, (GtkWidget*) _tmp44_); #line 239 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - button = _tmp50_; -#line 240 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp51_ = event; -#line 240 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp52_ = _tmp51_->time; + button = (guint) 0; #line 240 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - evtime = (guint) _tmp52_; -#line 1221 "gitg-diff-view-file.c" - } -#line 243 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp53_ = menu; -#line 243 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp54_ = self->priv->d_expander; -#line 243 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - gtk_menu_attach_to_widget (_tmp53_, (GtkWidget*) _tmp54_, NULL); -#line 244 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp55_ = menu; + evtime = (guint) GDK_CURRENT_TIME; +#line 242 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp45_ = event; +#line 242 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + if (_tmp45_ != NULL) { +#line 1244 "gitg-diff-view-file.c" + GdkEventButton* _tmp46_ = NULL; + guint _tmp47_ = 0U; + GdkEventButton* _tmp48_ = NULL; + guint32 _tmp49_ = 0U; #line 244 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp56_ = button; + _tmp46_ = event; #line 244 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp57_ = evtime; + _tmp47_ = _tmp46_->button; #line 244 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - gtk_menu_popup (_tmp55_, NULL, NULL, NULL, NULL, _tmp56_, (guint32) _tmp57_); -#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + button = _tmp47_; +#line 245 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp48_ = event; +#line 245 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp49_ = _tmp48_->time; +#line 245 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + evtime = (guint) _tmp49_; +#line 1261 "gitg-diff-view-file.c" + } +#line 248 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp50_ = menu; +#line 248 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp51_ = self->priv->d_expander; +#line 248 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + gtk_menu_attach_to_widget (_tmp50_, (GtkWidget*) _tmp51_, NULL); +#line 249 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp52_ = menu; +#line 249 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp53_ = button; +#line 249 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp54_ = evtime; +#line 249 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + gtk_menu_popup (_tmp52_, NULL, NULL, NULL, NULL, _tmp53_, (guint32) _tmp54_); +#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_object_unref0 (copy_file_path); -#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_object_unref0 (separator); -#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_object_unref0 (open_folder); -#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_object_unref0 (open_file); -#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_free0 (newpath); -#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_free0 (oldpath); -#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_object_unref0 (menu); -#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" block9_data_unref (_data9_); -#line 165 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 170 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _data9_ = NULL; -#line 1255 "gitg-diff-view-file.c" +#line 1295 "gitg-diff-view-file.c" } @@ -1259,49 +1299,49 @@ gboolean result = FALSE; GdkEventButton* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; -#line 247 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 252 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 247 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 252 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_return_val_if_fail (widget != NULL, FALSE); -#line 249 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 254 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp0_ = event; -#line 249 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 254 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp1_ = gdk_event_triggers_context_menu ((GdkEvent*) _tmp0_); -#line 249 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 254 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" if (_tmp1_) { -#line 1273 "gitg-diff-view-file.c" +#line 1313 "gitg-diff-view-file.c" GdkEventButton* _tmp2_ = NULL; -#line 251 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 256 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp2_ = event; -#line 251 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 256 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" gitg_diff_view_file_show_popup (self, _tmp2_); -#line 252 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 257 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" result = TRUE; -#line 252 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 257 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return result; -#line 1283 "gitg-diff-view-file.c" +#line 1323 "gitg-diff-view-file.c" } -#line 255 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 260 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" result = FALSE; -#line 255 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 260 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return result; -#line 1289 "gitg-diff-view-file.c" +#line 1329 "gitg-diff-view-file.c" } static gboolean gitg_diff_view_file_expander_popup_menu (GitgDiffViewFile* self, GtkWidget* widget) { gboolean result = FALSE; -#line 258 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 263 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 258 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 263 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_return_val_if_fail (widget != NULL, FALSE); -#line 260 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 265 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" gitg_diff_view_file_show_popup (self, NULL); -#line 261 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 266 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" result = TRUE; -#line 261 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 266 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return result; -#line 1305 "gitg-diff-view-file.c" +#line 1345 "gitg-diff-view-file.c" } @@ -1311,27 +1351,27 @@ GitgDiffViewFileRenderer* _tmp2_ = NULL; GgitDiffHunk* _tmp3_ = NULL; GeeArrayList* _tmp4_ = NULL; -#line 264 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 269 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_return_if_fail (self != NULL); -#line 264 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 269 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_return_if_fail (hunk != NULL); -#line 264 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 269 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_return_if_fail (lines != NULL); -#line 266 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 271 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp0_ = gitg_diff_view_file_get_renderer (self); -#line 266 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 271 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp1_ = _tmp0_; -#line 266 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 271 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp2_ = _tmp1_; -#line 266 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 271 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp3_ = hunk; -#line 266 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 271 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _tmp4_ = lines; -#line 266 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 271 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" gitg_diff_view_file_renderer_add_hunk (_tmp2_, _tmp3_, _tmp4_); -#line 266 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" +#line 271 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" _g_object_unref0 (_tmp2_); -#line 1335 "gitg-diff-view-file.c" +#line 1375 "gitg-diff-view-file.c" } @@ -1352,95 +1392,99 @@ result = _tmp2_; #line 43 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return result; -#line 1356 "gitg-diff-view-file.c" +#line 1396 "gitg-diff-view-file.c" } void gitg_diff_view_file_set_renderer (GitgDiffViewFile* self, GitgDiffViewFileRenderer* value) { - GitgDiffViewFileRenderer* current = NULL; - GitgDiffViewFileRenderer* _tmp0_ = NULL; - GitgDiffViewFileRenderer* _tmp1_ = NULL; - GitgDiffViewFileRenderer* _tmp2_ = NULL; - GitgDiffViewFileRenderer* _tmp3_ = NULL; #line 46 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_return_if_fail (self != NULL); +#line 46 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + if (gitg_diff_view_file_get_renderer (self) != value) { +#line 1405 "gitg-diff-view-file.c" + GitgDiffViewFileRenderer* current = NULL; + GitgDiffViewFileRenderer* _tmp0_ = NULL; + GitgDiffViewFileRenderer* _tmp1_ = NULL; + GitgDiffViewFileRenderer* _tmp2_ = NULL; + GitgDiffViewFileRenderer* _tmp3_ = NULL; #line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp0_ = gitg_diff_view_file_get_renderer (self); + _tmp0_ = gitg_diff_view_file_get_renderer (self); #line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp1_ = _tmp0_; + _tmp1_ = _tmp0_; #line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - current = _tmp1_; + current = _tmp1_; #line 50 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp2_ = current; + _tmp2_ = current; #line 50 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp3_ = value; + _tmp3_ = value; #line 50 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - if (_tmp2_ != _tmp3_) { -#line 1380 "gitg-diff-view-file.c" - GBinding* _tmp4_ = NULL; - GitgDiffViewFileRenderer* _tmp7_ = NULL; - GtkRevealer* _tmp10_ = NULL; - GitgDiffViewFileRenderer* _tmp11_ = NULL; - GitgDiffViewFileRenderer* _tmp12_ = NULL; - GBinding* _tmp13_ = NULL; - GBinding* _tmp14_ = NULL; + if (_tmp2_ != _tmp3_) { +#line 1423 "gitg-diff-view-file.c" + GBinding* _tmp4_ = NULL; + GitgDiffViewFileRenderer* _tmp7_ = NULL; + GtkRevealer* _tmp10_ = NULL; + GitgDiffViewFileRenderer* _tmp11_ = NULL; + GitgDiffViewFileRenderer* _tmp12_ = NULL; + GBinding* _tmp13_ = NULL; + GBinding* _tmp14_ = NULL; #line 52 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp4_ = self->priv->d_vexpand_binding; + _tmp4_ = self->priv->d_vexpand_binding; #line 52 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - if (_tmp4_ != NULL) { -#line 1392 "gitg-diff-view-file.c" - GBinding* _tmp5_ = NULL; - GBinding* _tmp6_ = NULL; + if (_tmp4_ != NULL) { +#line 1435 "gitg-diff-view-file.c" + GBinding* _tmp5_ = NULL; + GBinding* _tmp6_ = NULL; #line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp5_ = self->priv->d_vexpand_binding; + _tmp5_ = self->priv->d_vexpand_binding; #line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp6_ = _g_object_ref0 (_tmp5_); + _tmp6_ = _g_object_ref0 (_tmp5_); #line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - g_binding_unbind (_tmp6_); + g_binding_unbind (_tmp6_); #line 55 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _g_object_unref0 (self->priv->d_vexpand_binding); + _g_object_unref0 (self->priv->d_vexpand_binding); #line 55 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - self->priv->d_vexpand_binding = NULL; -#line 1405 "gitg-diff-view-file.c" - } + self->priv->d_vexpand_binding = NULL; +#line 1448 "gitg-diff-view-file.c" + } #line 58 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp7_ = current; + _tmp7_ = current; #line 58 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - if (_tmp7_ != NULL) { -#line 1411 "gitg-diff-view-file.c" - GtkRevealer* _tmp8_ = NULL; - GitgDiffViewFileRenderer* _tmp9_ = NULL; + if (_tmp7_ != NULL) { +#line 1454 "gitg-diff-view-file.c" + GtkRevealer* _tmp8_ = NULL; + GitgDiffViewFileRenderer* _tmp9_ = NULL; #line 60 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp8_ = self->priv->d_revealer_content; + _tmp8_ = self->priv->d_revealer_content; #line 60 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp9_ = current; + _tmp9_ = current; #line 60 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - gtk_container_remove ((GtkContainer*) _tmp8_, (GtkWidget*) _tmp9_); -#line 1420 "gitg-diff-view-file.c" - } + gtk_container_remove ((GtkContainer*) _tmp8_, (GtkWidget*) _tmp9_); +#line 1463 "gitg-diff-view-file.c" + } #line 63 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp10_ = self->priv->d_revealer_content; + _tmp10_ = self->priv->d_revealer_content; #line 63 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp11_ = value; + _tmp11_ = value; #line 63 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - gtk_container_add ((GtkContainer*) _tmp10_, (GtkWidget*) _tmp11_); + gtk_container_add ((GtkContainer*) _tmp10_, (GtkWidget*) _tmp11_); #line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp12_ = value; + _tmp12_ = value; #line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp13_ = g_object_bind_property_with_closures ((GObject*) self, "vexpand", (GObject*) _tmp12_, "vexpand", G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); + _tmp13_ = g_object_bind_property_with_closures ((GObject*) self, "vexpand", (GObject*) _tmp12_, "vexpand", G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); #line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp14_ = _g_object_ref0 (_tmp13_); + _tmp14_ = _g_object_ref0 (_tmp13_); #line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _g_object_unref0 (self->priv->d_vexpand_binding); + _g_object_unref0 (self->priv->d_vexpand_binding); #line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - self->priv->d_vexpand_binding = _tmp14_; -#line 1438 "gitg-diff-view-file.c" - } + self->priv->d_vexpand_binding = _tmp14_; +#line 1481 "gitg-diff-view-file.c" + } #line 46 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _g_object_unref0 (current); + _g_object_unref0 (current); #line 46 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - g_object_notify ((GObject *) self, "renderer"); -#line 1444 "gitg-diff-view-file.c" + g_object_notify ((GObject *) self, "renderer"); +#line 1487 "gitg-diff-view-file.c" + } } @@ -1455,21 +1499,25 @@ result = _tmp0_; #line 69 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return result; -#line 1459 "gitg-diff-view-file.c" +#line 1503 "gitg-diff-view-file.c" } void gitg_diff_view_file_set_new_is_workdir (GitgDiffViewFile* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 69 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_return_if_fail (self != NULL); #line 69 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp0_ = value; + if (gitg_diff_view_file_get_new_is_workdir (self) != value) { +#line 1512 "gitg-diff-view-file.c" + gboolean _tmp0_ = FALSE; +#line 69 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _tmp0_ = value; #line 69 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - self->priv->_new_is_workdir = _tmp0_; + self->priv->_new_is_workdir = _tmp0_; #line 69 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - g_object_notify ((GObject *) self, "new-is-workdir"); -#line 1473 "gitg-diff-view-file.c" + g_object_notify ((GObject *) self, "new-is-workdir"); +#line 1520 "gitg-diff-view-file.c" + } } @@ -1484,71 +1532,75 @@ result = _tmp0_; #line 75 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return result; -#line 1488 "gitg-diff-view-file.c" +#line 1536 "gitg-diff-view-file.c" } void gitg_diff_view_file_set_expanded (GitgDiffViewFile* self, gboolean value) { - gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; #line 78 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_return_if_fail (self != NULL); +#line 78 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + if (gitg_diff_view_file_get_expanded (self) != value) { +#line 1545 "gitg-diff-view-file.c" + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; #line 80 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp0_ = self->priv->d_expanded; + _tmp0_ = self->priv->d_expanded; #line 80 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp1_ = value; + _tmp1_ = value; #line 80 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - if (_tmp0_ != _tmp1_) { -#line 1503 "gitg-diff-view-file.c" - gboolean _tmp2_ = FALSE; - GtkRevealer* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - GtkStyleContext* ctx = NULL; - GtkStyleContext* _tmp5_ = NULL; - GtkStyleContext* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + if (_tmp0_ != _tmp1_) { +#line 1554 "gitg-diff-view-file.c" + gboolean _tmp2_ = FALSE; + GtkRevealer* _tmp3_ = NULL; + gboolean _tmp4_ = FALSE; + GtkStyleContext* ctx = NULL; + GtkStyleContext* _tmp5_ = NULL; + GtkStyleContext* _tmp6_ = NULL; + gboolean _tmp7_ = FALSE; #line 82 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp2_ = value; + _tmp2_ = value; #line 82 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - self->priv->d_expanded = _tmp2_; + self->priv->d_expanded = _tmp2_; #line 83 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp3_ = self->priv->d_revealer_content; + _tmp3_ = self->priv->d_revealer_content; #line 83 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp4_ = self->priv->d_expanded; + _tmp4_ = self->priv->d_expanded; #line 83 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - gtk_revealer_set_reveal_child (_tmp3_, _tmp4_); + gtk_revealer_set_reveal_child (_tmp3_, _tmp4_); #line 85 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp5_ = gtk_widget_get_style_context ((GtkWidget*) self); + _tmp5_ = gtk_widget_get_style_context ((GtkWidget*) self); #line 85 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp6_ = _g_object_ref0 (_tmp5_); + _tmp6_ = _g_object_ref0 (_tmp5_); #line 85 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - ctx = _tmp6_; + ctx = _tmp6_; #line 87 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp7_ = self->priv->d_expanded; + _tmp7_ = self->priv->d_expanded; #line 87 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - if (_tmp7_) { -#line 1531 "gitg-diff-view-file.c" - GtkStyleContext* _tmp8_ = NULL; + if (_tmp7_) { +#line 1582 "gitg-diff-view-file.c" + GtkStyleContext* _tmp8_ = NULL; #line 89 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp8_ = ctx; + _tmp8_ = ctx; #line 89 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - gtk_style_context_add_class (_tmp8_, "expanded"); -#line 1537 "gitg-diff-view-file.c" - } else { - GtkStyleContext* _tmp9_ = NULL; + gtk_style_context_add_class (_tmp8_, "expanded"); +#line 1588 "gitg-diff-view-file.c" + } else { + GtkStyleContext* _tmp9_ = NULL; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp9_ = ctx; + _tmp9_ = ctx; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - gtk_style_context_remove_class (_tmp9_, "expanded"); -#line 1544 "gitg-diff-view-file.c" - } + gtk_style_context_remove_class (_tmp9_, "expanded"); +#line 1595 "gitg-diff-view-file.c" + } #line 80 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _g_object_unref0 (ctx); -#line 1548 "gitg-diff-view-file.c" - } + _g_object_unref0 (ctx); +#line 1599 "gitg-diff-view-file.c" + } #line 78 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - g_object_notify ((GObject *) self, "expanded"); -#line 1552 "gitg-diff-view-file.c" + g_object_notify ((GObject *) self, "expanded"); +#line 1603 "gitg-diff-view-file.c" + } } @@ -1563,33 +1615,37 @@ result = _tmp0_; #line 99 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return result; -#line 1567 "gitg-diff-view-file.c" +#line 1619 "gitg-diff-view-file.c" } static gpointer _ggit_diff_delta_ref0 (gpointer self) { #line 99 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return self ? ggit_diff_delta_ref (self) : NULL; -#line 1574 "gitg-diff-view-file.c" +#line 1626 "gitg-diff-view-file.c" } void gitg_diff_view_file_set_delta (GitgDiffViewFile* self, GgitDiffDelta* value) { - GgitDiffDelta* _tmp0_ = NULL; - GgitDiffDelta* _tmp1_ = NULL; #line 99 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_return_if_fail (self != NULL); #line 99 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp0_ = value; + if (gitg_diff_view_file_get_delta (self) != value) { +#line 1635 "gitg-diff-view-file.c" + GgitDiffDelta* _tmp0_ = NULL; + GgitDiffDelta* _tmp1_ = NULL; #line 99 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp1_ = _ggit_diff_delta_ref0 (_tmp0_); + _tmp0_ = value; #line 99 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _ggit_diff_delta_unref0 (self->priv->_delta); + _tmp1_ = _ggit_diff_delta_ref0 (_tmp0_); +#line 99 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + _ggit_diff_delta_unref0 (self->priv->_delta); #line 99 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - self->priv->_delta = _tmp1_; + self->priv->_delta = _tmp1_; #line 99 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - g_object_notify ((GObject *) self, "delta"); -#line 1593 "gitg-diff-view-file.c" + g_object_notify ((GObject *) self, "delta"); +#line 1648 "gitg-diff-view-file.c" + } } @@ -1604,26 +1660,30 @@ result = _tmp0_; #line 100 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" return result; -#line 1608 "gitg-diff-view-file.c" +#line 1664 "gitg-diff-view-file.c" } void gitg_diff_view_file_set_repository (GitgDiffViewFile* self, GitgRepository* value) { - GitgRepository* _tmp0_ = NULL; - GitgRepository* _tmp1_ = NULL; #line 100 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" g_return_if_fail (self != NULL); #line 100 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp0_ = value; + if (gitg_diff_view_file_get_repository (self) != value) { +#line 1673 "gitg-diff-view-file.c" + GitgRepository* _tmp0_ = NULL; + GitgRepository* _tmp1_ = NULL; #line 100 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 100 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - _g_object_unref0 (self->priv->_repository); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 100 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - self->priv->_repository = _tmp1_; + _g_object_unref0 (self->priv->_repository); #line 100 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" - g_object_notify ((GObject *) self, "repository"); -#line 1627 "gitg-diff-view-file.c" + self->priv->_repository = _tmp1_; +#line 100 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" + g_object_notify ((GObject *) self, "repository"); +#line 1686 "gitg-diff-view-file.c" + } } @@ -1663,7 +1723,7 @@ gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "diff_stat_file", FALSE, GitgDiffViewFile_private_offset + G_STRUCT_OFFSET (GitgDiffViewFilePrivate, d_diff_stat_file)); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "revealer_content", FALSE, GitgDiffViewFile_private_offset + G_STRUCT_OFFSET (GitgDiffViewFilePrivate, d_revealer_content)); -#line 1667 "gitg-diff-view-file.c" +#line 1727 "gitg-diff-view-file.c" } @@ -1674,11 +1734,11 @@ g_type_ensure (GITG_TYPE_DIFF_STAT); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 1678 "gitg-diff-view-file.c" +#line 1738 "gitg-diff-view-file.c" } -static void gitg_diff_view_file_finalize (GObject* obj) { +static void gitg_diff_view_file_finalize (GObject * obj) { GitgDiffViewFile * self; #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_DIFF_VIEW_FILE, GitgDiffViewFile); @@ -1698,7 +1758,7 @@ _g_object_unref0 (self->priv->_repository); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" G_OBJECT_CLASS (gitg_diff_view_file_parent_class)->finalize (obj); -#line 1702 "gitg-diff-view-file.c" +#line 1762 "gitg-diff-view-file.c" } @@ -1749,13 +1809,13 @@ g_value_set_object (value, gitg_diff_view_file_get_repository (self)); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" break; -#line 1753 "gitg-diff-view-file.c" +#line 1813 "gitg-diff-view-file.c" default: #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" break; -#line 1759 "gitg-diff-view-file.c" +#line 1819 "gitg-diff-view-file.c" } } @@ -1795,13 +1855,13 @@ gitg_diff_view_file_set_repository (self, g_value_get_object (value)); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" break; -#line 1799 "gitg-diff-view-file.c" +#line 1859 "gitg-diff-view-file.c" default: #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file.vala" break; -#line 1805 "gitg-diff-view-file.c" +#line 1865 "gitg-diff-view-file.c" } } diff -Nru gitg-3.22.0/libgitg/gitg-diff-view-file-info.c gitg-3.23.0/libgitg/gitg-diff-view-file-info.c --- gitg-3.22.0/libgitg/gitg-diff-view-file-info.c 2016-08-19 08:31:58.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-view-file-info.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-diff-view-file-info.c generated by valac 0.32.1, the Vala compiler +/* gitg-diff-view-file-info.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-diff-view-file-info.vala, do not modify */ @@ -222,7 +222,7 @@ void gitg_diff_view_file_info_set_from_workdir (GitgDiffViewFileInfo* self, gboolean value); void gitg_diff_view_file_info_set_repository (GitgDiffViewFileInfo* self, GitgRepository* value); const gchar* gitg_diff_view_file_info_get_new_file_content_type (GitgDiffViewFileInfo* self); -static void gitg_diff_view_file_info_finalize (GObject* obj); +static void gitg_diff_view_file_info_finalize (GObject * obj); static void _vala_gitg_diff_view_file_info_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_diff_view_file_info_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -1360,21 +1360,25 @@ void gitg_diff_view_file_info_set_delta (GitgDiffViewFileInfo* self, GgitDiffDelta* value) { - GgitDiffDelta* _tmp0_ = NULL; - GgitDiffDelta* _tmp1_ = NULL; #line 3 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" g_return_if_fail (self != NULL); #line 3 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - _tmp0_ = value; + if (gitg_diff_view_file_info_get_delta (self) != value) { +#line 1368 "gitg-diff-view-file-info.c" + GgitDiffDelta* _tmp0_ = NULL; + GgitDiffDelta* _tmp1_ = NULL; #line 3 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - _tmp1_ = _ggit_diff_delta_ref0 (_tmp0_); + _tmp0_ = value; #line 3 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - _ggit_diff_delta_unref0 (self->priv->_delta); + _tmp1_ = _ggit_diff_delta_ref0 (_tmp0_); #line 3 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - self->priv->_delta = _tmp1_; + _ggit_diff_delta_unref0 (self->priv->_delta); #line 3 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - g_object_notify ((GObject *) self, "delta"); -#line 1378 "gitg-diff-view-file-info.c" + self->priv->_delta = _tmp1_; +#line 3 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" + g_object_notify ((GObject *) self, "delta"); +#line 1381 "gitg-diff-view-file-info.c" + } } @@ -1389,21 +1393,25 @@ result = _tmp0_; #line 4 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" return result; -#line 1393 "gitg-diff-view-file-info.c" +#line 1397 "gitg-diff-view-file-info.c" } void gitg_diff_view_file_info_set_from_workdir (GitgDiffViewFileInfo* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 4 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" g_return_if_fail (self != NULL); #line 4 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - _tmp0_ = value; + if (gitg_diff_view_file_info_get_from_workdir (self) != value) { +#line 1406 "gitg-diff-view-file-info.c" + gboolean _tmp0_ = FALSE; #line 4 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - self->priv->_from_workdir = _tmp0_; + _tmp0_ = value; #line 4 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - g_object_notify ((GObject *) self, "from-workdir"); -#line 1407 "gitg-diff-view-file-info.c" + self->priv->_from_workdir = _tmp0_; +#line 4 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" + g_object_notify ((GObject *) self, "from-workdir"); +#line 1414 "gitg-diff-view-file-info.c" + } } @@ -1418,26 +1426,30 @@ result = _tmp0_; #line 5 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" return result; -#line 1422 "gitg-diff-view-file-info.c" +#line 1430 "gitg-diff-view-file-info.c" } void gitg_diff_view_file_info_set_repository (GitgDiffViewFileInfo* self, GitgRepository* value) { - GitgRepository* _tmp0_ = NULL; - GitgRepository* _tmp1_ = NULL; #line 5 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" g_return_if_fail (self != NULL); #line 5 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - _tmp0_ = value; + if (gitg_diff_view_file_info_get_repository (self) != value) { +#line 1439 "gitg-diff-view-file-info.c" + GitgRepository* _tmp0_ = NULL; + GitgRepository* _tmp1_ = NULL; #line 5 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 5 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - _g_object_unref0 (self->priv->_repository); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 5 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" + _g_object_unref0 (self->priv->_repository); #line 5 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - self->priv->_repository = _tmp1_; + self->priv->_repository = _tmp1_; #line 5 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - g_object_notify ((GObject *) self, "repository"); -#line 1441 "gitg-diff-view-file-info.c" + g_object_notify ((GObject *) self, "repository"); +#line 1452 "gitg-diff-view-file-info.c" + } } @@ -1452,26 +1464,30 @@ result = _tmp0_; #line 7 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" return result; -#line 1456 "gitg-diff-view-file-info.c" +#line 1468 "gitg-diff-view-file-info.c" } void gitg_diff_view_file_info_set_new_file_input_stream (GitgDiffViewFileInfo* self, GInputStream* value) { - GInputStream* _tmp0_ = NULL; - GInputStream* _tmp1_ = NULL; #line 7 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" g_return_if_fail (self != NULL); #line 7 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - _tmp0_ = value; + if (gitg_diff_view_file_info_get_new_file_input_stream (self) != value) { +#line 1477 "gitg-diff-view-file-info.c" + GInputStream* _tmp0_ = NULL; + GInputStream* _tmp1_ = NULL; #line 7 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 7 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - _g_object_unref0 (self->priv->_new_file_input_stream); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 7 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - self->priv->_new_file_input_stream = _tmp1_; + _g_object_unref0 (self->priv->_new_file_input_stream); #line 7 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - g_object_notify ((GObject *) self, "new-file-input-stream"); -#line 1475 "gitg-diff-view-file-info.c" + self->priv->_new_file_input_stream = _tmp1_; +#line 7 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" + g_object_notify ((GObject *) self, "new-file-input-stream"); +#line 1490 "gitg-diff-view-file-info.c" + } } @@ -1486,26 +1502,30 @@ result = _tmp0_; #line 8 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" return result; -#line 1490 "gitg-diff-view-file-info.c" +#line 1506 "gitg-diff-view-file-info.c" } static void gitg_diff_view_file_info_set_new_file_content_type (GitgDiffViewFileInfo* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; #line 8 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" g_return_if_fail (self != NULL); #line 8 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - _tmp0_ = value; + if (g_strcmp0 (value, gitg_diff_view_file_info_get_new_file_content_type (self)) != 0) { +#line 1515 "gitg-diff-view-file-info.c" + const gchar* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; #line 8 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = value; #line 8 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - _g_free0 (self->priv->_new_file_content_type); + _tmp1_ = g_strdup (_tmp0_); #line 8 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - self->priv->_new_file_content_type = _tmp1_; + _g_free0 (self->priv->_new_file_content_type); #line 8 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - g_object_notify ((GObject *) self, "new-file-content-type"); -#line 1509 "gitg-diff-view-file-info.c" + self->priv->_new_file_content_type = _tmp1_; +#line 8 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" + g_object_notify ((GObject *) self, "new-file-content-type"); +#line 1528 "gitg-diff-view-file-info.c" + } } @@ -1527,21 +1547,21 @@ #line 1 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_DIFF_VIEW_FILE_INFO_REPOSITORY, g_param_spec_object ("repository", "repository", "repository", GITG_TYPE_REPOSITORY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); #line 1 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_DIFF_VIEW_FILE_INFO_NEW_FILE_INPUT_STREAM, g_param_spec_object ("new-file-input-stream", "new-file-input-stream", "new-file-input-stream", G_TYPE_INPUT_STREAM, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_DIFF_VIEW_FILE_INFO_NEW_FILE_INPUT_STREAM, g_param_spec_object ("new-file-input-stream", "new-file-input-stream", "new-file-input-stream", g_input_stream_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); #line 1 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_DIFF_VIEW_FILE_INFO_NEW_FILE_CONTENT_TYPE, g_param_spec_string ("new-file-content-type", "new-file-content-type", "new-file-content-type", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1534 "gitg-diff-view-file-info.c" +#line 1554 "gitg-diff-view-file-info.c" } static void gitg_diff_view_file_info_instance_init (GitgDiffViewFileInfo * self) { #line 1 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" self->priv = GITG_DIFF_VIEW_FILE_INFO_GET_PRIVATE (self); -#line 1541 "gitg-diff-view-file-info.c" +#line 1561 "gitg-diff-view-file-info.c" } -static void gitg_diff_view_file_info_finalize (GObject* obj) { +static void gitg_diff_view_file_info_finalize (GObject * obj) { GitgDiffViewFileInfo * self; #line 1 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_DIFF_VIEW_FILE_INFO, GitgDiffViewFileInfo); @@ -1555,7 +1575,7 @@ _g_free0 (self->priv->_new_file_content_type); #line 1 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" G_OBJECT_CLASS (gitg_diff_view_file_info_parent_class)->finalize (obj); -#line 1559 "gitg-diff-view-file-info.c" +#line 1579 "gitg-diff-view-file-info.c" } @@ -1606,13 +1626,13 @@ g_value_set_string (value, gitg_diff_view_file_info_get_new_file_content_type (self)); #line 1 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" break; -#line 1610 "gitg-diff-view-file-info.c" +#line 1630 "gitg-diff-view-file-info.c" default: #line 1 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 1 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" break; -#line 1616 "gitg-diff-view-file-info.c" +#line 1636 "gitg-diff-view-file-info.c" } } @@ -1652,13 +1672,13 @@ gitg_diff_view_file_info_set_new_file_content_type (self, g_value_get_string (value)); #line 1 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" break; -#line 1656 "gitg-diff-view-file-info.c" +#line 1676 "gitg-diff-view-file-info.c" default: #line 1 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 1 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-info.vala" break; -#line 1662 "gitg-diff-view-file-info.c" +#line 1682 "gitg-diff-view-file-info.c" } } diff -Nru gitg-3.22.0/libgitg/gitg-diff-view-file-renderer-binary.c gitg-3.23.0/libgitg/gitg-diff-view-file-renderer-binary.c --- gitg-3.22.0/libgitg/gitg-diff-view-file-renderer-binary.c 2016-08-15 13:35:06.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-view-file-renderer-binary.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-diff-view-file-renderer-binary.c generated by valac 0.32.1, the Vala compiler +/* gitg-diff-view-file-renderer-binary.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-diff-view-file-renderer-binary.vala, do not modify */ /* @@ -62,7 +62,7 @@ static gpointer gitg_diff_view_file_renderer_binary_parent_class = NULL; -static GitgDiffViewFileRendererIface* gitg_diff_view_file_renderer_binary_gitg_diff_view_file_renderer_parent_iface = NULL; +static GitgDiffViewFileRendererIface * gitg_diff_view_file_renderer_binary_gitg_diff_view_file_renderer_parent_iface = NULL; GType gitg_diff_view_file_renderer_get_type (void) G_GNUC_CONST; GType gitg_diff_view_file_renderer_binary_get_type (void) G_GNUC_CONST; @@ -116,7 +116,7 @@ #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-binary.vala" gitg_diff_view_file_renderer_binary_gitg_diff_view_file_renderer_parent_iface = g_type_interface_peek_parent (iface); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-binary.vala" - iface->add_hunk = (void (*)(GitgDiffViewFileRenderer*, GgitDiffHunk*, GeeArrayList*)) gitg_diff_view_file_renderer_binary_real_add_hunk; + iface->add_hunk = (void (*) (GitgDiffViewFileRenderer *, GgitDiffHunk*, GeeArrayList*)) gitg_diff_view_file_renderer_binary_real_add_hunk; #line 121 "gitg-diff-view-file-renderer-binary.c" } diff -Nru gitg-3.22.0/libgitg/gitg-diff-view-file-renderer.c gitg-3.23.0/libgitg/gitg-diff-view-file-renderer.c --- gitg-3.22.0/libgitg/gitg-diff-view-file-renderer.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-view-file-renderer.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-diff-view-file-renderer.c generated by valac 0.32.1, the Vala compiler +/* gitg-diff-view-file-renderer.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-diff-view-file-renderer.vala, do not modify */ /* diff -Nru gitg-3.22.0/libgitg/gitg-diff-view-file-renderer-image.c gitg-3.23.0/libgitg/gitg-diff-view-file-renderer-image.c --- gitg-3.22.0/libgitg/gitg-diff-view-file-renderer-image.c 1970-01-01 00:00:00.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-view-file-renderer-image.c 2016-11-26 12:23:15.000000000 +0000 @@ -0,0 +1,1426 @@ +/* gitg-diff-view-file-renderer-image.c generated by valac 0.34.0.108-f56ac, the Vala compiler + * generated from gitg-diff-view-file-renderer-image.vala, do not modify */ + +/* + * This file is part of gitg + * + * Copyright (C) 2016 - Jesse van den Kieboom + * + * gitg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * gitg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gitg. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +#define GITG_TYPE_DIFF_VIEW_FILE_RENDERER (gitg_diff_view_file_renderer_get_type ()) +#define GITG_DIFF_VIEW_FILE_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_VIEW_FILE_RENDERER, GitgDiffViewFileRenderer)) +#define GITG_IS_DIFF_VIEW_FILE_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_VIEW_FILE_RENDERER)) +#define GITG_DIFF_VIEW_FILE_RENDERER_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GITG_TYPE_DIFF_VIEW_FILE_RENDERER, GitgDiffViewFileRendererIface)) + +typedef struct _GitgDiffViewFileRenderer GitgDiffViewFileRenderer; +typedef struct _GitgDiffViewFileRendererIface GitgDiffViewFileRendererIface; + +#define GITG_TYPE_DIFF_VIEW_FILE_RENDERER_IMAGE (gitg_diff_view_file_renderer_image_get_type ()) +#define GITG_DIFF_VIEW_FILE_RENDERER_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_VIEW_FILE_RENDERER_IMAGE, GitgDiffViewFileRendererImage)) +#define GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GITG_TYPE_DIFF_VIEW_FILE_RENDERER_IMAGE, GitgDiffViewFileRendererImageClass)) +#define GITG_IS_DIFF_VIEW_FILE_RENDERER_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_VIEW_FILE_RENDERER_IMAGE)) +#define GITG_IS_DIFF_VIEW_FILE_RENDERER_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GITG_TYPE_DIFF_VIEW_FILE_RENDERER_IMAGE)) +#define GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GITG_TYPE_DIFF_VIEW_FILE_RENDERER_IMAGE, GitgDiffViewFileRendererImageClass)) + +typedef struct _GitgDiffViewFileRendererImage GitgDiffViewFileRendererImage; +typedef struct _GitgDiffViewFileRendererImageClass GitgDiffViewFileRendererImageClass; +typedef struct _GitgDiffViewFileRendererImagePrivate GitgDiffViewFileRendererImagePrivate; + +#define GITG_TYPE_REPOSITORY (gitg_repository_get_type ()) +#define GITG_REPOSITORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_REPOSITORY, GitgRepository)) +#define GITG_REPOSITORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GITG_TYPE_REPOSITORY, GitgRepositoryClass)) +#define GITG_IS_REPOSITORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_REPOSITORY)) +#define GITG_IS_REPOSITORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GITG_TYPE_REPOSITORY)) +#define GITG_REPOSITORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GITG_TYPE_REPOSITORY, GitgRepositoryClass)) + +typedef struct _GitgRepository GitgRepository; +typedef struct _GitgRepositoryClass GitgRepositoryClass; + +#define GITG_TYPE_DIFF_IMAGE_SIDE_BY_SIDE (gitg_diff_image_side_by_side_get_type ()) +#define GITG_DIFF_IMAGE_SIDE_BY_SIDE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_IMAGE_SIDE_BY_SIDE, GitgDiffImageSideBySide)) +#define GITG_DIFF_IMAGE_SIDE_BY_SIDE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GITG_TYPE_DIFF_IMAGE_SIDE_BY_SIDE, GitgDiffImageSideBySideClass)) +#define GITG_IS_DIFF_IMAGE_SIDE_BY_SIDE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_IMAGE_SIDE_BY_SIDE)) +#define GITG_IS_DIFF_IMAGE_SIDE_BY_SIDE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GITG_TYPE_DIFF_IMAGE_SIDE_BY_SIDE)) +#define GITG_DIFF_IMAGE_SIDE_BY_SIDE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GITG_TYPE_DIFF_IMAGE_SIDE_BY_SIDE, GitgDiffImageSideBySideClass)) + +typedef struct _GitgDiffImageSideBySide GitgDiffImageSideBySide; +typedef struct _GitgDiffImageSideBySideClass GitgDiffImageSideBySideClass; + +#define GITG_TYPE_DIFF_IMAGE_COMPOSITE (gitg_diff_image_composite_get_type ()) +#define GITG_DIFF_IMAGE_COMPOSITE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageComposite)) +#define GITG_DIFF_IMAGE_COMPOSITE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageCompositeClass)) +#define GITG_IS_DIFF_IMAGE_COMPOSITE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_IMAGE_COMPOSITE)) +#define GITG_IS_DIFF_IMAGE_COMPOSITE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GITG_TYPE_DIFF_IMAGE_COMPOSITE)) +#define GITG_DIFF_IMAGE_COMPOSITE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GITG_TYPE_DIFF_IMAGE_COMPOSITE, GitgDiffImageCompositeClass)) + +typedef struct _GitgDiffImageComposite GitgDiffImageComposite; +typedef struct _GitgDiffImageCompositeClass GitgDiffImageCompositeClass; + +#define GITG_TYPE_DIFF_IMAGE_SLIDER (gitg_diff_image_slider_get_type ()) +#define GITG_DIFF_IMAGE_SLIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_IMAGE_SLIDER, GitgDiffImageSlider)) +#define GITG_DIFF_IMAGE_SLIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GITG_TYPE_DIFF_IMAGE_SLIDER, GitgDiffImageSliderClass)) +#define GITG_IS_DIFF_IMAGE_SLIDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_IMAGE_SLIDER)) +#define GITG_IS_DIFF_IMAGE_SLIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GITG_TYPE_DIFF_IMAGE_SLIDER)) +#define GITG_DIFF_IMAGE_SLIDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GITG_TYPE_DIFF_IMAGE_SLIDER, GitgDiffImageSliderClass)) + +typedef struct _GitgDiffImageSlider GitgDiffImageSlider; +typedef struct _GitgDiffImageSliderClass GitgDiffImageSliderClass; + +#define GITG_TYPE_DIFF_IMAGE_OVERLAY (gitg_diff_image_overlay_get_type ()) +#define GITG_DIFF_IMAGE_OVERLAY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_IMAGE_OVERLAY, GitgDiffImageOverlay)) +#define GITG_DIFF_IMAGE_OVERLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GITG_TYPE_DIFF_IMAGE_OVERLAY, GitgDiffImageOverlayClass)) +#define GITG_IS_DIFF_IMAGE_OVERLAY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_IMAGE_OVERLAY)) +#define GITG_IS_DIFF_IMAGE_OVERLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GITG_TYPE_DIFF_IMAGE_OVERLAY)) +#define GITG_DIFF_IMAGE_OVERLAY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GITG_TYPE_DIFF_IMAGE_OVERLAY, GitgDiffImageOverlayClass)) + +typedef struct _GitgDiffImageOverlay GitgDiffImageOverlay; +typedef struct _GitgDiffImageOverlayClass GitgDiffImageOverlayClass; + +#define GITG_TYPE_DIFF_IMAGE_DIFFERENCE (gitg_diff_image_difference_get_type ()) +#define GITG_DIFF_IMAGE_DIFFERENCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_IMAGE_DIFFERENCE, GitgDiffImageDifference)) +#define GITG_DIFF_IMAGE_DIFFERENCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GITG_TYPE_DIFF_IMAGE_DIFFERENCE, GitgDiffImageDifferenceClass)) +#define GITG_IS_DIFF_IMAGE_DIFFERENCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_IMAGE_DIFFERENCE)) +#define GITG_IS_DIFF_IMAGE_DIFFERENCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GITG_TYPE_DIFF_IMAGE_DIFFERENCE)) +#define GITG_DIFF_IMAGE_DIFFERENCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GITG_TYPE_DIFF_IMAGE_DIFFERENCE, GitgDiffImageDifferenceClass)) + +typedef struct _GitgDiffImageDifference GitgDiffImageDifference; +typedef struct _GitgDiffImageDifferenceClass GitgDiffImageDifferenceClass; + +#define GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_TYPE_SURFACE_CACHE (gitg_diff_view_file_renderer_image_surface_cache_get_type ()) +#define GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_SURFACE_CACHE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_TYPE_SURFACE_CACHE, GitgDiffViewFileRendererImageSurfaceCache)) +#define GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_SURFACE_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_TYPE_SURFACE_CACHE, GitgDiffViewFileRendererImageSurfaceCacheClass)) +#define GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_IS_SURFACE_CACHE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_TYPE_SURFACE_CACHE)) +#define GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_IS_SURFACE_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_TYPE_SURFACE_CACHE)) +#define GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_SURFACE_CACHE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_TYPE_SURFACE_CACHE, GitgDiffViewFileRendererImageSurfaceCacheClass)) + +typedef struct _GitgDiffViewFileRendererImageSurfaceCache GitgDiffViewFileRendererImageSurfaceCache; +typedef struct _GitgDiffViewFileRendererImageSurfaceCacheClass GitgDiffViewFileRendererImageSurfaceCacheClass; +#define _ggit_diff_delta_unref0(var) ((var == NULL) ? NULL : (var = (ggit_diff_delta_unref (var), NULL))) +#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) +#define _g_free0(var) (var = (g_free (var), NULL)) +#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) + +#define GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE (gitg_diff_image_surface_cache_get_type ()) +#define GITG_DIFF_IMAGE_SURFACE_CACHE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE, GitgDiffImageSurfaceCache)) +#define GITG_IS_DIFF_IMAGE_SURFACE_CACHE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE)) +#define GITG_DIFF_IMAGE_SURFACE_CACHE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE, GitgDiffImageSurfaceCacheIface)) + +typedef struct _GitgDiffImageSurfaceCache GitgDiffImageSurfaceCache; +typedef struct _GitgDiffImageSurfaceCacheIface GitgDiffImageSurfaceCacheIface; +typedef struct _GitgDiffViewFileRendererImageSurfaceCachePrivate GitgDiffViewFileRendererImageSurfaceCachePrivate; +#define _cairo_surface_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_surface_destroy (var), NULL))) + +struct _GitgDiffViewFileRendererIface { + GTypeInterface parent_iface; + void (*add_hunk) (GitgDiffViewFileRenderer* self, GgitDiffHunk* hunk, GeeArrayList* lines); +}; + +struct _GitgDiffViewFileRendererImage { + GtkGrid parent_instance; + GitgDiffViewFileRendererImagePrivate * priv; +}; + +struct _GitgDiffViewFileRendererImageClass { + GtkGridClass parent_class; +}; + +struct _GitgDiffViewFileRendererImagePrivate { + GgitDiffDelta* _delta; + GitgRepository* _repository; + GitgDiffImageSideBySide* d_diff_image_side_by_side; + GitgDiffImageSlider* d_diff_image_slider; + GtkAdjustment* d_scale_slider_adjustment; + GitgDiffImageOverlay* d_diff_image_overlay; + GtkAdjustment* d_scale_overlay_adjustment; + GitgDiffImageDifference* d_diff_image_difference; + GtkStackSwitcher* d_stack_switcher; + GitgDiffViewFileRendererImageSurfaceCache* d_cache; +}; + +struct _GitgDiffImageSurfaceCacheIface { + GTypeInterface parent_iface; + cairo_surface_t* (*get_old_surface) (GitgDiffImageSurfaceCache* self, GdkWindow* window); + cairo_surface_t* (*get_new_surface) (GitgDiffImageSurfaceCache* self, GdkWindow* window); + GdkPixbuf* (*get_old_pixbuf) (GitgDiffImageSurfaceCache* self); + void (*set_old_pixbuf) (GitgDiffImageSurfaceCache* self, GdkPixbuf* value); + GdkPixbuf* (*get_new_pixbuf) (GitgDiffImageSurfaceCache* self); + void (*set_new_pixbuf) (GitgDiffImageSurfaceCache* self, GdkPixbuf* value); + GdkWindow* (*get_window) (GitgDiffImageSurfaceCache* self); + void (*set_window) (GitgDiffImageSurfaceCache* self, GdkWindow* value); +}; + +struct _GitgDiffViewFileRendererImageSurfaceCache { + GObject parent_instance; + GitgDiffViewFileRendererImageSurfaceCachePrivate * priv; +}; + +struct _GitgDiffViewFileRendererImageSurfaceCacheClass { + GObjectClass parent_class; +}; + +struct _GitgDiffViewFileRendererImageSurfaceCachePrivate { + cairo_surface_t* d_old_surface; + cairo_surface_t* d_new_surface; + GdkPixbuf* _old_pixbuf; + GdkPixbuf* _new_pixbuf; + GdkWindow* _window; +}; + + +static gpointer gitg_diff_view_file_renderer_image_parent_class = NULL; +static gpointer gitg_diff_view_file_renderer_image_surface_cache_parent_class = NULL; +static GitgDiffImageSurfaceCacheIface * gitg_diff_view_file_renderer_image_surface_cache_gitg_diff_image_surface_cache_parent_iface = NULL; +static GitgDiffViewFileRendererIface * gitg_diff_view_file_renderer_image_gitg_diff_view_file_renderer_parent_iface = NULL; + +GType gitg_diff_view_file_renderer_get_type (void) G_GNUC_CONST; +GType gitg_diff_view_file_renderer_image_get_type (void) G_GNUC_CONST; +GType gitg_repository_get_type (void) G_GNUC_CONST; +GType gitg_diff_image_side_by_side_get_type (void) G_GNUC_CONST; +GType gitg_diff_image_composite_get_type (void) G_GNUC_CONST; +GType gitg_diff_image_slider_get_type (void) G_GNUC_CONST; +GType gitg_diff_image_overlay_get_type (void) G_GNUC_CONST; +GType gitg_diff_image_difference_get_type (void) G_GNUC_CONST; +static GType gitg_diff_view_file_renderer_image_surface_cache_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; +#define GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_DIFF_VIEW_FILE_RENDERER_IMAGE, GitgDiffViewFileRendererImagePrivate)) +enum { + GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_DUMMY_PROPERTY, + GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_DELTA, + GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_REPOSITORY +}; +GitgDiffViewFileRendererImage* gitg_diff_view_file_renderer_image_new (GitgRepository* repository, GgitDiffDelta* delta); +GitgDiffViewFileRendererImage* gitg_diff_view_file_renderer_image_construct (GType object_type, GitgRepository* repository, GgitDiffDelta* delta); +static GdkPixbuf* gitg_diff_view_file_renderer_image_pixbuf_for_file (GitgDiffViewFileRendererImage* self, GgitDiffFile* file); +GitgRepository* gitg_diff_view_file_renderer_image_get_repository (GitgDiffViewFileRendererImage* self); +gpointer gitg_repository_lookup (GitgRepository* self, GType t_type, GBoxedCopyFunc t_dup_func, GDestroyNotify t_destroy_func, GgitOId* id, GError** error); +static guint8* _vala_array_dup12 (guint8* self, int length); +static void gitg_diff_view_file_renderer_image_real_add_hunk (GitgDiffViewFileRenderer* base, GgitDiffHunk* hunk, GeeArrayList* lines); +GgitDiffDelta* gitg_diff_view_file_renderer_image_get_delta (GitgDiffViewFileRendererImage* self); +void gitg_diff_view_file_renderer_image_set_delta (GitgDiffViewFileRendererImage* self, GgitDiffDelta* value); +void gitg_diff_view_file_renderer_image_set_repository (GitgDiffViewFileRendererImage* self, GitgRepository* value); +static GObject * gitg_diff_view_file_renderer_image_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); +static GitgDiffViewFileRendererImageSurfaceCache* gitg_diff_view_file_renderer_image_surface_cache_new (GdkPixbuf* old_pixbuf, GdkPixbuf* new_pixbuf); +static GitgDiffViewFileRendererImageSurfaceCache* gitg_diff_view_file_renderer_image_surface_cache_construct (GType object_type, GdkPixbuf* old_pixbuf, GdkPixbuf* new_pixbuf); +GType gitg_diff_image_surface_cache_get_type (void) G_GNUC_CONST; +void gitg_diff_image_side_by_side_set_cache (GitgDiffImageSideBySide* self, GitgDiffImageSurfaceCache* value); +void gitg_diff_image_composite_set_cache (GitgDiffImageComposite* self, GitgDiffImageSurfaceCache* value); +GdkPixbuf* gitg_diff_image_surface_cache_get_old_pixbuf (GitgDiffImageSurfaceCache* self); +GdkPixbuf* gitg_diff_image_surface_cache_get_new_pixbuf (GitgDiffImageSurfaceCache* self); +#define GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_SURFACE_CACHE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_TYPE_SURFACE_CACHE, GitgDiffViewFileRendererImageSurfaceCachePrivate)) +enum { + GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_SURFACE_CACHE_DUMMY_PROPERTY, + GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_SURFACE_CACHE_OLD_PIXBUF, + GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_SURFACE_CACHE_NEW_PIXBUF, + GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_SURFACE_CACHE_WINDOW +}; +static cairo_surface_t* gitg_diff_view_file_renderer_image_surface_cache_real_get_old_surface (GitgDiffImageSurfaceCache* base, GdkWindow* window); +static cairo_surface_t* gitg_diff_view_file_renderer_image_surface_cache_get_cached_surface (GitgDiffViewFileRendererImageSurfaceCache* self, GdkWindow* window, GdkPixbuf* pixbuf, cairo_surface_t* * cached); +static cairo_surface_t* gitg_diff_view_file_renderer_image_surface_cache_real_get_new_surface (GitgDiffImageSurfaceCache* base, GdkWindow* window); +static void gitg_diff_view_file_renderer_image_surface_cache_finalize (GObject * obj); +GdkWindow* gitg_diff_image_surface_cache_get_window (GitgDiffImageSurfaceCache* self); +static void _vala_gitg_diff_view_file_renderer_image_surface_cache_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); +void gitg_diff_image_surface_cache_set_old_pixbuf (GitgDiffImageSurfaceCache* self, GdkPixbuf* value); +void gitg_diff_image_surface_cache_set_new_pixbuf (GitgDiffImageSurfaceCache* self, GdkPixbuf* value); +void gitg_diff_image_surface_cache_set_window (GitgDiffImageSurfaceCache* self, GdkWindow* value); +static void _vala_gitg_diff_view_file_renderer_image_surface_cache_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); +static void gitg_diff_view_file_renderer_image_finalize (GObject * obj); +static void _vala_gitg_diff_view_file_renderer_image_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); +static void _vala_gitg_diff_view_file_renderer_image_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); + + +GitgDiffViewFileRendererImage* gitg_diff_view_file_renderer_image_construct (GType object_type, GitgRepository* repository, GgitDiffDelta* delta) { + GitgDiffViewFileRendererImage * self = NULL; + GitgRepository* _tmp0_ = NULL; + GgitDiffDelta* _tmp1_ = NULL; +#line 49 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_return_val_if_fail (repository != NULL, NULL); +#line 49 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_return_val_if_fail (delta != NULL, NULL); +#line 51 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp0_ = repository; +#line 51 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp1_ = delta; +#line 51 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + self = (GitgDiffViewFileRendererImage*) g_object_new (object_type, "repository", _tmp0_, "delta", _tmp1_, NULL); +#line 49 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return self; +#line 274 "gitg-diff-view-file-renderer-image.c" +} + + +GitgDiffViewFileRendererImage* gitg_diff_view_file_renderer_image_new (GitgRepository* repository, GgitDiffDelta* delta) { +#line 49 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return gitg_diff_view_file_renderer_image_construct (GITG_TYPE_DIFF_VIEW_FILE_RENDERER_IMAGE, repository, delta); +#line 281 "gitg-diff-view-file-renderer-image.c" +} + + +static const gchar* string_to_string (const gchar* self) { + const gchar* result = NULL; +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + g_return_val_if_fail (self != NULL, NULL); +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + result = self; +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + return result; +#line 293 "gitg-diff-view-file-renderer-image.c" +} + + +static guint8* _vala_array_dup12 (guint8* self, int length) { +#line 94 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return g_memdup (self, length * sizeof (guint8)); +#line 300 "gitg-diff-view-file-renderer-image.c" +} + + +static GdkPixbuf* gitg_diff_view_file_renderer_image_pixbuf_for_file (GitgDiffViewFileRendererImage* self, GgitDiffFile* file) { + GdkPixbuf* result = NULL; + gboolean _tmp0_ = FALSE; + GgitDiffFile* _tmp1_ = NULL; + GgitDiffFlag _tmp2_ = 0; + GgitBlob* blob = NULL; + GMemoryInputStream* stream = NULL; + GgitBlob* _tmp18_ = NULL; + gsize _tmp19_; + guint8* _tmp20_ = NULL; + guint8* _tmp21_ = NULL; + gint _tmp21__length1 = 0; + GMemoryInputStream* _tmp22_ = NULL; + GError * _inner_error_ = NULL; +#line 75 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_return_val_if_fail (self != NULL, NULL); +#line 75 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_return_val_if_fail (file != NULL, NULL); +#line 77 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp1_ = file; +#line 77 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp2_ = ggit_diff_file_get_flags (_tmp1_); +#line 77 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + if ((_tmp2_ & GGIT_DIFF_FLAG_VALID_ID) == 0) { +#line 77 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp0_ = TRUE; +#line 330 "gitg-diff-view-file-renderer-image.c" + } else { + GgitDiffFile* _tmp3_ = NULL; + GgitOId* _tmp4_ = NULL; + gboolean _tmp5_ = FALSE; +#line 77 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp3_ = file; +#line 77 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp4_ = ggit_diff_file_get_oid (_tmp3_); +#line 77 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp5_ = ggit_oid_is_zero (_tmp4_); +#line 77 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp0_ = _tmp5_; +#line 343 "gitg-diff-view-file-renderer-image.c" + } +#line 77 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + if (_tmp0_) { +#line 79 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + result = NULL; +#line 79 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return result; +#line 351 "gitg-diff-view-file-renderer-image.c" + } + { + GgitBlob* _tmp6_ = NULL; + GitgRepository* _tmp7_ = NULL; + GgitDiffFile* _tmp8_ = NULL; + GgitOId* _tmp9_ = NULL; + gpointer _tmp10_ = NULL; + GgitBlob* _tmp11_ = NULL; +#line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp7_ = self->priv->_repository; +#line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp8_ = file; +#line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp9_ = ggit_diff_file_get_oid (_tmp8_); +#line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp10_ = gitg_repository_lookup (_tmp7_, ggit_blob_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp9_, &_inner_error_); +#line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp6_ = (GgitBlob*) _tmp10_; +#line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 372 "gitg-diff-view-file-renderer-image.c" + goto __catch46_g_error; + } +#line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp11_ = _tmp6_; +#line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp6_ = NULL; +#line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (blob); +#line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + blob = _tmp11_; +#line 84 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (_tmp6_); +#line 385 "gitg-diff-view-file-renderer-image.c" + } + goto __finally46; + __catch46_g_error: + { + GError* e = NULL; + FILE* _tmp12_ = NULL; + GError* _tmp13_ = NULL; + const gchar* _tmp14_ = NULL; + const gchar* _tmp15_ = NULL; + gchar* _tmp16_ = NULL; + gchar* _tmp17_ = NULL; +#line 84 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + e = _inner_error_; +#line 84 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _inner_error_ = NULL; +#line 90 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp12_ = stderr; +#line 90 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp13_ = e; +#line 90 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp14_ = _tmp13_->message; +#line 90 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp15_ = string_to_string (_tmp14_); +#line 90 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp16_ = g_strconcat ("ERROR: failed to load image blob: ", _tmp15_, "\n", NULL); +#line 90 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp17_ = _tmp16_; +#line 90 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + fprintf (_tmp12_, "%s", _tmp17_); +#line 90 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_free0 (_tmp17_); +#line 91 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + result = NULL; +#line 91 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_error_free0 (e); +#line 91 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (blob); +#line 91 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return result; +#line 425 "gitg-diff-view-file-renderer-image.c" + } + __finally46: +#line 84 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 84 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (blob); +#line 84 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.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 84 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_clear_error (&_inner_error_); +#line 84 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return NULL; +#line 438 "gitg-diff-view-file-renderer-image.c" + } +#line 94 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp18_ = blob; +#line 94 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp20_ = ggit_blob_get_raw_content (_tmp18_, &_tmp19_); +#line 94 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp21_ = (_tmp20_ != NULL) ? _vala_array_dup12 (_tmp20_, _tmp19_) : ((gpointer) _tmp20_); +#line 94 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp21__length1 = _tmp19_; +#line 94 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp22_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp21_, _tmp21__length1, NULL); +#line 94 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + stream = _tmp22_; +#line 452 "gitg-diff-view-file-renderer-image.c" + { + GdkPixbuf* _tmp23_ = NULL; + GMemoryInputStream* _tmp24_ = NULL; + GdkPixbuf* _tmp25_ = NULL; + GdkPixbuf* _tmp26_ = NULL; +#line 98 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp24_ = stream; +#line 98 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp25_ = gdk_pixbuf_new_from_stream ((GInputStream*) _tmp24_, NULL, &_inner_error_); +#line 98 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp23_ = _tmp25_; +#line 98 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 466 "gitg-diff-view-file-renderer-image.c" + goto __catch47_g_error; + } +#line 98 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp26_ = _tmp23_; +#line 98 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp23_ = NULL; +#line 98 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + result = _tmp26_; +#line 98 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (_tmp23_); +#line 98 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (stream); +#line 98 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (blob); +#line 98 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return result; +#line 483 "gitg-diff-view-file-renderer-image.c" + } + goto __finally47; + __catch47_g_error: + { + GError* e = NULL; + FILE* _tmp27_ = NULL; + GError* _tmp28_ = NULL; + const gchar* _tmp29_ = NULL; + const gchar* _tmp30_ = NULL; + gchar* _tmp31_ = NULL; + gchar* _tmp32_ = NULL; +#line 96 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + e = _inner_error_; +#line 96 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _inner_error_ = NULL; +#line 102 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp27_ = stderr; +#line 102 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp28_ = e; +#line 102 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp29_ = _tmp28_->message; +#line 102 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp30_ = string_to_string (_tmp29_); +#line 102 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp31_ = g_strconcat ("ERROR: failed to create pixbuf: ", _tmp30_, "\n", NULL); +#line 102 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp32_ = _tmp31_; +#line 102 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + fprintf (_tmp27_, "%s", _tmp32_); +#line 102 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_free0 (_tmp32_); +#line 103 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + result = NULL; +#line 103 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_error_free0 (e); +#line 103 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (stream); +#line 103 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (blob); +#line 103 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return result; +#line 525 "gitg-diff-view-file-renderer-image.c" + } + __finally47: +#line 96 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (stream); +#line 96 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (blob); +#line 96 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.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 96 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_clear_error (&_inner_error_); +#line 96 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return NULL; +#line 538 "gitg-diff-view-file-renderer-image.c" +} + + +static void gitg_diff_view_file_renderer_image_real_add_hunk (GitgDiffViewFileRenderer* base, GgitDiffHunk* hunk, GeeArrayList* lines) { + GitgDiffViewFileRendererImage * self; +#line 107 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + self = (GitgDiffViewFileRendererImage*) base; +#line 107 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_return_if_fail (hunk != NULL); +#line 107 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_return_if_fail (lines != NULL); +#line 550 "gitg-diff-view-file-renderer-image.c" +} + + +GgitDiffDelta* gitg_diff_view_file_renderer_image_get_delta (GitgDiffViewFileRendererImage* self) { + GgitDiffDelta* result; + GgitDiffDelta* _tmp0_ = NULL; +#line 23 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_return_val_if_fail (self != NULL, NULL); +#line 23 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp0_ = self->priv->_delta; +#line 23 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + result = _tmp0_; +#line 23 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return result; +#line 565 "gitg-diff-view-file-renderer-image.c" +} + + +static gpointer _ggit_diff_delta_ref0 (gpointer self) { +#line 23 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return self ? ggit_diff_delta_ref (self) : NULL; +#line 572 "gitg-diff-view-file-renderer-image.c" +} + + +void gitg_diff_view_file_renderer_image_set_delta (GitgDiffViewFileRendererImage* self, GgitDiffDelta* value) { +#line 23 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_return_if_fail (self != NULL); +#line 23 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + if (gitg_diff_view_file_renderer_image_get_delta (self) != value) { +#line 581 "gitg-diff-view-file-renderer-image.c" + GgitDiffDelta* _tmp0_ = NULL; + GgitDiffDelta* _tmp1_ = NULL; +#line 23 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp0_ = value; +#line 23 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp1_ = _ggit_diff_delta_ref0 (_tmp0_); +#line 23 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _ggit_diff_delta_unref0 (self->priv->_delta); +#line 23 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + self->priv->_delta = _tmp1_; +#line 23 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_object_notify ((GObject *) self, "delta"); +#line 594 "gitg-diff-view-file-renderer-image.c" + } +} + + +GitgRepository* gitg_diff_view_file_renderer_image_get_repository (GitgDiffViewFileRendererImage* self) { + GitgRepository* result; + GitgRepository* _tmp0_ = NULL; +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_return_val_if_fail (self != NULL, NULL); +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp0_ = self->priv->_repository; +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + result = _tmp0_; +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return result; +#line 610 "gitg-diff-view-file-renderer-image.c" +} + + +static gpointer _g_object_ref0 (gpointer self) { +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return self ? g_object_ref (self) : NULL; +#line 617 "gitg-diff-view-file-renderer-image.c" +} + + +void gitg_diff_view_file_renderer_image_set_repository (GitgDiffViewFileRendererImage* self, GitgRepository* value) { +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_return_if_fail (self != NULL); +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + if (gitg_diff_view_file_renderer_image_get_repository (self) != value) { +#line 626 "gitg-diff-view-file-renderer-image.c" + GitgRepository* _tmp0_ = NULL; + GitgRepository* _tmp1_ = NULL; +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp0_ = value; +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (self->priv->_repository); +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + self->priv->_repository = _tmp1_; +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_object_notify ((GObject *) self, "repository"); +#line 639 "gitg-diff-view-file-renderer-image.c" + } +} + + +static GObject * gitg_diff_view_file_renderer_image_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties) { + GObject * obj; + GObjectClass * parent_class; + GitgDiffViewFileRendererImage * self; + GgitDiffDelta* _tmp0_ = NULL; + GgitDiffFile* _tmp1_ = NULL; + GdkPixbuf* _tmp2_ = NULL; + GdkPixbuf* _tmp3_ = NULL; + GgitDiffDelta* _tmp4_ = NULL; + GgitDiffFile* _tmp5_ = NULL; + GdkPixbuf* _tmp6_ = NULL; + GdkPixbuf* _tmp7_ = NULL; + GitgDiffViewFileRendererImageSurfaceCache* _tmp8_ = NULL; + GitgDiffImageSideBySide* _tmp9_ = NULL; + GitgDiffViewFileRendererImageSurfaceCache* _tmp10_ = NULL; + GitgDiffImageSlider* _tmp11_ = NULL; + GitgDiffViewFileRendererImageSurfaceCache* _tmp12_ = NULL; + GitgDiffImageOverlay* _tmp13_ = NULL; + GitgDiffViewFileRendererImageSurfaceCache* _tmp14_ = NULL; + GitgDiffImageDifference* _tmp15_ = NULL; + GitgDiffViewFileRendererImageSurfaceCache* _tmp16_ = NULL; + gboolean _tmp17_ = FALSE; + gboolean _tmp18_ = FALSE; + gboolean _tmp19_ = FALSE; + GitgDiffViewFileRendererImageSurfaceCache* _tmp20_ = NULL; + GdkPixbuf* _tmp21_ = NULL; + GdkPixbuf* _tmp22_ = NULL; + GtkAdjustment* _tmp43_ = NULL; + GitgDiffImageSlider* _tmp44_ = NULL; + GtkAdjustment* _tmp45_ = NULL; + GitgDiffImageOverlay* _tmp46_ = NULL; +#line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + parent_class = G_OBJECT_CLASS (gitg_diff_view_file_renderer_image_parent_class); +#line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + obj = parent_class->constructor (type, n_construct_properties, construct_properties); +#line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_DIFF_VIEW_FILE_RENDERER_IMAGE, GitgDiffViewFileRendererImage); +#line 56 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp0_ = self->priv->_delta; +#line 56 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp1_ = ggit_diff_delta_get_old_file (_tmp0_); +#line 56 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp2_ = gitg_diff_view_file_renderer_image_pixbuf_for_file (self, _tmp1_); +#line 56 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp3_ = _tmp2_; +#line 56 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp4_ = self->priv->_delta; +#line 56 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp5_ = ggit_diff_delta_get_new_file (_tmp4_); +#line 56 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp6_ = gitg_diff_view_file_renderer_image_pixbuf_for_file (self, _tmp5_); +#line 56 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp7_ = _tmp6_; +#line 56 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp8_ = gitg_diff_view_file_renderer_image_surface_cache_new (_tmp3_, _tmp7_); +#line 56 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (self->priv->d_cache); +#line 56 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + self->priv->d_cache = _tmp8_; +#line 56 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (_tmp7_); +#line 56 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (_tmp3_); +#line 59 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp9_ = self->priv->d_diff_image_side_by_side; +#line 59 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp10_ = self->priv->d_cache; +#line 59 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gitg_diff_image_side_by_side_set_cache (_tmp9_, (GitgDiffImageSurfaceCache*) _tmp10_); +#line 60 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp11_ = self->priv->d_diff_image_slider; +#line 60 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp12_ = self->priv->d_cache; +#line 60 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gitg_diff_image_composite_set_cache ((GitgDiffImageComposite*) _tmp11_, (GitgDiffImageSurfaceCache*) _tmp12_); +#line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp13_ = self->priv->d_diff_image_overlay; +#line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp14_ = self->priv->d_cache; +#line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gitg_diff_image_composite_set_cache ((GitgDiffImageComposite*) _tmp13_, (GitgDiffImageSurfaceCache*) _tmp14_); +#line 62 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp15_ = self->priv->d_diff_image_difference; +#line 62 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp16_ = self->priv->d_cache; +#line 62 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gitg_diff_image_composite_set_cache ((GitgDiffImageComposite*) _tmp15_, (GitgDiffImageSurfaceCache*) _tmp16_); +#line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp20_ = self->priv->d_cache; +#line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp21_ = gitg_diff_image_surface_cache_get_old_pixbuf ((GitgDiffImageSurfaceCache*) _tmp20_); +#line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp22_ = _tmp21_; +#line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + if (_tmp22_ == NULL) { +#line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp19_ = TRUE; +#line 741 "gitg-diff-view-file-renderer-image.c" + } else { + GitgDiffViewFileRendererImageSurfaceCache* _tmp23_ = NULL; + GdkPixbuf* _tmp24_ = NULL; + GdkPixbuf* _tmp25_ = NULL; +#line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp23_ = self->priv->d_cache; +#line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp24_ = gitg_diff_image_surface_cache_get_new_pixbuf ((GitgDiffImageSurfaceCache*) _tmp23_); +#line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp25_ = _tmp24_; +#line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp19_ = _tmp25_ == NULL; +#line 754 "gitg-diff-view-file-renderer-image.c" + } +#line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + if (_tmp19_) { +#line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp18_ = TRUE; +#line 760 "gitg-diff-view-file-renderer-image.c" + } else { + GitgDiffViewFileRendererImageSurfaceCache* _tmp26_ = NULL; + GdkPixbuf* _tmp27_ = NULL; + GdkPixbuf* _tmp28_ = NULL; + gint _tmp29_ = 0; + GitgDiffViewFileRendererImageSurfaceCache* _tmp30_ = NULL; + GdkPixbuf* _tmp31_ = NULL; + GdkPixbuf* _tmp32_ = NULL; + gint _tmp33_ = 0; +#line 65 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp26_ = self->priv->d_cache; +#line 65 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp27_ = gitg_diff_image_surface_cache_get_old_pixbuf ((GitgDiffImageSurfaceCache*) _tmp26_); +#line 65 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp28_ = _tmp27_; +#line 65 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp29_ = gdk_pixbuf_get_width (_tmp28_); +#line 65 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp30_ = self->priv->d_cache; +#line 65 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp31_ = gitg_diff_image_surface_cache_get_new_pixbuf ((GitgDiffImageSurfaceCache*) _tmp30_); +#line 65 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp32_ = _tmp31_; +#line 65 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp33_ = gdk_pixbuf_get_width (_tmp32_); +#line 65 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp18_ = _tmp29_ != _tmp33_; +#line 788 "gitg-diff-view-file-renderer-image.c" + } +#line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + if (_tmp18_) { +#line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp17_ = TRUE; +#line 794 "gitg-diff-view-file-renderer-image.c" + } else { + GitgDiffViewFileRendererImageSurfaceCache* _tmp34_ = NULL; + GdkPixbuf* _tmp35_ = NULL; + GdkPixbuf* _tmp36_ = NULL; + gint _tmp37_ = 0; + GitgDiffViewFileRendererImageSurfaceCache* _tmp38_ = NULL; + GdkPixbuf* _tmp39_ = NULL; + GdkPixbuf* _tmp40_ = NULL; + gint _tmp41_ = 0; +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp34_ = self->priv->d_cache; +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp35_ = gitg_diff_image_surface_cache_get_old_pixbuf ((GitgDiffImageSurfaceCache*) _tmp34_); +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp36_ = _tmp35_; +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp37_ = gdk_pixbuf_get_height (_tmp36_); +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp38_ = self->priv->d_cache; +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp39_ = gitg_diff_image_surface_cache_get_new_pixbuf ((GitgDiffImageSurfaceCache*) _tmp38_); +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp40_ = _tmp39_; +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp41_ = gdk_pixbuf_get_height (_tmp40_); +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp17_ = _tmp37_ != _tmp41_; +#line 822 "gitg-diff-view-file-renderer-image.c" + } +#line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + if (_tmp17_) { +#line 826 "gitg-diff-view-file-renderer-image.c" + GtkStackSwitcher* _tmp42_ = NULL; +#line 68 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp42_ = self->priv->d_stack_switcher; +#line 68 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gtk_widget_set_sensitive ((GtkWidget*) _tmp42_, FALSE); +#line 832 "gitg-diff-view-file-renderer-image.c" + } +#line 71 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp43_ = self->priv->d_scale_slider_adjustment; +#line 71 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp44_ = self->priv->d_diff_image_slider; +#line 71 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_object_bind_property_with_closures ((GObject*) _tmp43_, "value", (GObject*) _tmp44_, "position", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); +#line 72 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp45_ = self->priv->d_scale_overlay_adjustment; +#line 72 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp46_ = self->priv->d_diff_image_overlay; +#line 72 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_object_bind_property_with_closures ((GObject*) _tmp45_, "value", (GObject*) _tmp46_, "alpha", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); +#line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return obj; +#line 848 "gitg-diff-view-file-renderer-image.c" +} + + +static GitgDiffViewFileRendererImageSurfaceCache* gitg_diff_view_file_renderer_image_surface_cache_construct (GType object_type, GdkPixbuf* old_pixbuf, GdkPixbuf* new_pixbuf) { + GitgDiffViewFileRendererImageSurfaceCache * self = NULL; + GdkPixbuf* _tmp0_ = NULL; + GdkPixbuf* _tmp1_ = NULL; +#line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp0_ = old_pixbuf; +#line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp1_ = new_pixbuf; +#line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + self = (GitgDiffViewFileRendererImageSurfaceCache*) g_object_new (object_type, "old-pixbuf", _tmp0_, "new-pixbuf", _tmp1_, NULL); +#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return self; +#line 864 "gitg-diff-view-file-renderer-image.c" +} + + +static GitgDiffViewFileRendererImageSurfaceCache* gitg_diff_view_file_renderer_image_surface_cache_new (GdkPixbuf* old_pixbuf, GdkPixbuf* new_pixbuf) { +#line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return gitg_diff_view_file_renderer_image_surface_cache_construct (GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_TYPE_SURFACE_CACHE, old_pixbuf, new_pixbuf); +#line 871 "gitg-diff-view-file-renderer-image.c" +} + + +static cairo_surface_t* gitg_diff_view_file_renderer_image_surface_cache_real_get_old_surface (GitgDiffImageSurfaceCache* base, GdkWindow* window) { + GitgDiffViewFileRendererImageSurfaceCache * self; + cairo_surface_t* result = NULL; + GdkWindow* _tmp0_ = NULL; + GdkPixbuf* _tmp1_ = NULL; + GdkPixbuf* _tmp2_ = NULL; + cairo_surface_t* _tmp3_ = NULL; +#line 125 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + self = (GitgDiffViewFileRendererImageSurfaceCache*) base; +#line 125 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_return_val_if_fail (window != NULL, NULL); +#line 127 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp0_ = window; +#line 127 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp1_ = gitg_diff_image_surface_cache_get_old_pixbuf ((GitgDiffImageSurfaceCache*) self); +#line 127 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp2_ = _tmp1_; +#line 127 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp3_ = gitg_diff_view_file_renderer_image_surface_cache_get_cached_surface (self, _tmp0_, _tmp2_, &self->priv->d_old_surface); +#line 127 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + result = _tmp3_; +#line 127 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return result; +#line 898 "gitg-diff-view-file-renderer-image.c" +} + + +static cairo_surface_t* gitg_diff_view_file_renderer_image_surface_cache_real_get_new_surface (GitgDiffImageSurfaceCache* base, GdkWindow* window) { + GitgDiffViewFileRendererImageSurfaceCache * self; + cairo_surface_t* result = NULL; + GdkWindow* _tmp0_ = NULL; + GdkPixbuf* _tmp1_ = NULL; + GdkPixbuf* _tmp2_ = NULL; + cairo_surface_t* _tmp3_ = NULL; +#line 130 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + self = (GitgDiffViewFileRendererImageSurfaceCache*) base; +#line 130 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_return_val_if_fail (window != NULL, NULL); +#line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp0_ = window; +#line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp1_ = gitg_diff_image_surface_cache_get_new_pixbuf ((GitgDiffImageSurfaceCache*) self); +#line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp2_ = _tmp1_; +#line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp3_ = gitg_diff_view_file_renderer_image_surface_cache_get_cached_surface (self, _tmp0_, _tmp2_, &self->priv->d_new_surface); +#line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + result = _tmp3_; +#line 132 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return result; +#line 925 "gitg-diff-view-file-renderer-image.c" +} + + +static gpointer _cairo_surface_reference0 (gpointer self) { +#line 147 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return self ? cairo_surface_reference (self) : NULL; +#line 932 "gitg-diff-view-file-renderer-image.c" +} + + +static cairo_surface_t* gitg_diff_view_file_renderer_image_surface_cache_get_cached_surface (GitgDiffViewFileRendererImageSurfaceCache* self, GdkWindow* window, GdkPixbuf* pixbuf, cairo_surface_t* * cached) { + cairo_surface_t* result = NULL; + GdkPixbuf* _tmp0_ = NULL; + cairo_surface_t* _tmp1_ = NULL; + cairo_surface_t* _tmp5_ = NULL; + cairo_surface_t* _tmp6_ = NULL; +#line 135 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_return_val_if_fail (self != NULL, NULL); +#line 135 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_return_val_if_fail (window != NULL, NULL); +#line 137 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp0_ = pixbuf; +#line 137 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + if (_tmp0_ == NULL) { +#line 139 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + result = NULL; +#line 139 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return result; +#line 954 "gitg-diff-view-file-renderer-image.c" + } +#line 142 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp1_ = *cached; +#line 142 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + if (_tmp1_ == NULL) { +#line 960 "gitg-diff-view-file-renderer-image.c" + GdkPixbuf* _tmp2_ = NULL; + GdkWindow* _tmp3_ = NULL; + cairo_surface_t* _tmp4_ = NULL; +#line 144 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp2_ = pixbuf; +#line 144 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp3_ = window; +#line 144 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp4_ = gdk_cairo_surface_create_from_pixbuf (_tmp2_, 0, _tmp3_); +#line 144 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _cairo_surface_destroy0 (*cached); +#line 144 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + *cached = _tmp4_; +#line 974 "gitg-diff-view-file-renderer-image.c" + } +#line 147 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp5_ = *cached; +#line 147 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp6_ = _cairo_surface_reference0 (_tmp5_); +#line 147 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + result = _tmp6_; +#line 147 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return result; +#line 984 "gitg-diff-view-file-renderer-image.c" +} + + +static GdkPixbuf* gitg_diff_view_file_renderer_image_surface_cache_real_get_old_pixbuf (GitgDiffImageSurfaceCache* base) { + GdkPixbuf* result; + GitgDiffViewFileRendererImageSurfaceCache* self; + GdkPixbuf* _tmp0_ = NULL; +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + self = (GitgDiffViewFileRendererImageSurfaceCache*) base; +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp0_ = self->priv->_old_pixbuf; +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + result = _tmp0_; +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return result; +#line 1000 "gitg-diff-view-file-renderer-image.c" +} + + +static void gitg_diff_view_file_renderer_image_surface_cache_real_set_old_pixbuf (GitgDiffImageSurfaceCache* base, GdkPixbuf* value) { + GitgDiffViewFileRendererImageSurfaceCache* self; +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + self = (GitgDiffViewFileRendererImageSurfaceCache*) base; +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + if (gitg_diff_view_file_renderer_image_surface_cache_real_get_old_pixbuf (self) != value) { +#line 1010 "gitg-diff-view-file-renderer-image.c" + GdkPixbuf* _tmp0_ = NULL; + GdkPixbuf* _tmp1_ = NULL; +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp0_ = value; +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (self->priv->_old_pixbuf); +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + self->priv->_old_pixbuf = _tmp1_; +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_object_notify ((GObject *) self, "old-pixbuf"); +#line 1023 "gitg-diff-view-file-renderer-image.c" + } +} + + +static GdkPixbuf* gitg_diff_view_file_renderer_image_surface_cache_real_get_new_pixbuf (GitgDiffImageSurfaceCache* base) { + GdkPixbuf* result; + GitgDiffViewFileRendererImageSurfaceCache* self; + GdkPixbuf* _tmp0_ = NULL; +#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + self = (GitgDiffViewFileRendererImageSurfaceCache*) base; +#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp0_ = self->priv->_new_pixbuf; +#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + result = _tmp0_; +#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return result; +#line 1040 "gitg-diff-view-file-renderer-image.c" +} + + +static void gitg_diff_view_file_renderer_image_surface_cache_real_set_new_pixbuf (GitgDiffImageSurfaceCache* base, GdkPixbuf* value) { + GitgDiffViewFileRendererImageSurfaceCache* self; +#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + self = (GitgDiffViewFileRendererImageSurfaceCache*) base; +#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + if (gitg_diff_view_file_renderer_image_surface_cache_real_get_new_pixbuf (self) != value) { +#line 1050 "gitg-diff-view-file-renderer-image.c" + GdkPixbuf* _tmp0_ = NULL; + GdkPixbuf* _tmp1_ = NULL; +#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp0_ = value; +#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (self->priv->_new_pixbuf); +#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + self->priv->_new_pixbuf = _tmp1_; +#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_object_notify ((GObject *) self, "new-pixbuf"); +#line 1063 "gitg-diff-view-file-renderer-image.c" + } +} + + +static GdkWindow* gitg_diff_view_file_renderer_image_surface_cache_real_get_window (GitgDiffImageSurfaceCache* base) { + GdkWindow* result; + GitgDiffViewFileRendererImageSurfaceCache* self; + GdkWindow* _tmp0_ = NULL; +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + self = (GitgDiffViewFileRendererImageSurfaceCache*) base; +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp0_ = self->priv->_window; +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + result = _tmp0_; +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + return result; +#line 1080 "gitg-diff-view-file-renderer-image.c" +} + + +static void gitg_diff_view_file_renderer_image_surface_cache_real_set_window (GitgDiffImageSurfaceCache* base, GdkWindow* value) { + GitgDiffViewFileRendererImageSurfaceCache* self; +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + self = (GitgDiffViewFileRendererImageSurfaceCache*) base; +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + if (gitg_diff_view_file_renderer_image_surface_cache_real_get_window (self) != value) { +#line 1090 "gitg-diff-view-file-renderer-image.c" + GdkWindow* _tmp0_ = NULL; + GdkWindow* _tmp1_ = NULL; +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp0_ = value; +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (self->priv->_window); +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + self->priv->_window = _tmp1_; +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_object_notify ((GObject *) self, "window"); +#line 1103 "gitg-diff-view-file-renderer-image.c" + } +} + + +static void gitg_diff_view_file_renderer_image_surface_cache_class_init (GitgDiffViewFileRendererImageSurfaceCacheClass * klass) { +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gitg_diff_view_file_renderer_image_surface_cache_parent_class = g_type_class_peek_parent (klass); +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_type_class_add_private (klass, sizeof (GitgDiffViewFileRendererImageSurfaceCachePrivate)); +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + G_OBJECT_CLASS (klass)->get_property = _vala_gitg_diff_view_file_renderer_image_surface_cache_get_property; +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + G_OBJECT_CLASS (klass)->set_property = _vala_gitg_diff_view_file_renderer_image_surface_cache_set_property; +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + G_OBJECT_CLASS (klass)->finalize = gitg_diff_view_file_renderer_image_surface_cache_finalize; +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_SURFACE_CACHE_OLD_PIXBUF, g_param_spec_object ("old-pixbuf", "old-pixbuf", "old-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_SURFACE_CACHE_NEW_PIXBUF, g_param_spec_object ("new-pixbuf", "new-pixbuf", "new-pixbuf", gdk_pixbuf_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_SURFACE_CACHE_WINDOW, g_param_spec_object ("window", "window", "window", gdk_window_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); +#line 1125 "gitg-diff-view-file-renderer-image.c" +} + + +static void gitg_diff_view_file_renderer_image_surface_cache_gitg_diff_image_surface_cache_interface_init (GitgDiffImageSurfaceCacheIface * iface) { +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gitg_diff_view_file_renderer_image_surface_cache_gitg_diff_image_surface_cache_parent_iface = g_type_interface_peek_parent (iface); +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + iface->get_old_surface = (cairo_surface_t* (*) (GitgDiffImageSurfaceCache *, GdkWindow*)) gitg_diff_view_file_renderer_image_surface_cache_real_get_old_surface; +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + iface->get_new_surface = (cairo_surface_t* (*) (GitgDiffImageSurfaceCache *, GdkWindow*)) gitg_diff_view_file_renderer_image_surface_cache_real_get_new_surface; +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + iface->get_old_pixbuf = gitg_diff_view_file_renderer_image_surface_cache_real_get_old_pixbuf; +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + iface->set_old_pixbuf = gitg_diff_view_file_renderer_image_surface_cache_real_set_old_pixbuf; +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + iface->get_new_pixbuf = gitg_diff_view_file_renderer_image_surface_cache_real_get_new_pixbuf; +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + iface->set_new_pixbuf = gitg_diff_view_file_renderer_image_surface_cache_real_set_new_pixbuf; +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + iface->get_window = gitg_diff_view_file_renderer_image_surface_cache_real_get_window; +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + iface->set_window = gitg_diff_view_file_renderer_image_surface_cache_real_set_window; +#line 1148 "gitg-diff-view-file-renderer-image.c" +} + + +static void gitg_diff_view_file_renderer_image_surface_cache_instance_init (GitgDiffViewFileRendererImageSurfaceCache * self) { +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + self->priv = GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_SURFACE_CACHE_GET_PRIVATE (self); +#line 1155 "gitg-diff-view-file-renderer-image.c" +} + + +static void gitg_diff_view_file_renderer_image_surface_cache_finalize (GObject * obj) { + GitgDiffViewFileRendererImageSurfaceCache * self; +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_TYPE_SURFACE_CACHE, GitgDiffViewFileRendererImageSurfaceCache); +#line 112 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _cairo_surface_destroy0 (self->priv->d_old_surface); +#line 113 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _cairo_surface_destroy0 (self->priv->d_new_surface); +#line 115 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (self->priv->_old_pixbuf); +#line 116 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (self->priv->_new_pixbuf); +#line 118 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (self->priv->_window); +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + G_OBJECT_CLASS (gitg_diff_view_file_renderer_image_surface_cache_parent_class)->finalize (obj); +#line 1175 "gitg-diff-view-file-renderer-image.c" +} + + +static GType gitg_diff_view_file_renderer_image_surface_cache_get_type (void) { + static volatile gsize gitg_diff_view_file_renderer_image_surface_cache_type_id__volatile = 0; + if (g_once_init_enter (&gitg_diff_view_file_renderer_image_surface_cache_type_id__volatile)) { + static const GTypeInfo g_define_type_info = { sizeof (GitgDiffViewFileRendererImageSurfaceCacheClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) gitg_diff_view_file_renderer_image_surface_cache_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (GitgDiffViewFileRendererImageSurfaceCache), 0, (GInstanceInitFunc) gitg_diff_view_file_renderer_image_surface_cache_instance_init, NULL }; + static const GInterfaceInfo gitg_diff_image_surface_cache_info = { (GInterfaceInitFunc) gitg_diff_view_file_renderer_image_surface_cache_gitg_diff_image_surface_cache_interface_init, (GInterfaceFinalizeFunc) NULL, NULL}; + GType gitg_diff_view_file_renderer_image_surface_cache_type_id; + gitg_diff_view_file_renderer_image_surface_cache_type_id = g_type_register_static (G_TYPE_OBJECT, "GitgDiffViewFileRendererImageSurfaceCache", &g_define_type_info, 0); + g_type_add_interface_static (gitg_diff_view_file_renderer_image_surface_cache_type_id, GITG_TYPE_DIFF_IMAGE_SURFACE_CACHE, &gitg_diff_image_surface_cache_info); + g_once_init_leave (&gitg_diff_view_file_renderer_image_surface_cache_type_id__volatile, gitg_diff_view_file_renderer_image_surface_cache_type_id); + } + return gitg_diff_view_file_renderer_image_surface_cache_type_id__volatile; +} + + +static void _vala_gitg_diff_view_file_renderer_image_surface_cache_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { + GitgDiffViewFileRendererImageSurfaceCache * self; + self = G_TYPE_CHECK_INSTANCE_CAST (object, GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_TYPE_SURFACE_CACHE, GitgDiffViewFileRendererImageSurfaceCache); +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + switch (property_id) { +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + case GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_SURFACE_CACHE_OLD_PIXBUF: +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_value_set_object (value, gitg_diff_image_surface_cache_get_old_pixbuf ((GitgDiffImageSurfaceCache*) self)); +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + break; +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + case GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_SURFACE_CACHE_NEW_PIXBUF: +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_value_set_object (value, gitg_diff_image_surface_cache_get_new_pixbuf ((GitgDiffImageSurfaceCache*) self)); +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + break; +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + case GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_SURFACE_CACHE_WINDOW: +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_value_set_object (value, gitg_diff_image_surface_cache_get_window ((GitgDiffImageSurfaceCache*) self)); +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + break; +#line 1216 "gitg-diff-view-file-renderer-image.c" + default: +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + break; +#line 1222 "gitg-diff-view-file-renderer-image.c" + } +} + + +static void _vala_gitg_diff_view_file_renderer_image_surface_cache_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { + GitgDiffViewFileRendererImageSurfaceCache * self; + self = G_TYPE_CHECK_INSTANCE_CAST (object, GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_TYPE_SURFACE_CACHE, GitgDiffViewFileRendererImageSurfaceCache); +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + switch (property_id) { +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + case GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_SURFACE_CACHE_OLD_PIXBUF: +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gitg_diff_image_surface_cache_set_old_pixbuf ((GitgDiffImageSurfaceCache*) self, g_value_get_object (value)); +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + break; +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + case GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_SURFACE_CACHE_NEW_PIXBUF: +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gitg_diff_image_surface_cache_set_new_pixbuf ((GitgDiffImageSurfaceCache*) self, g_value_get_object (value)); +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + break; +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + case GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_SURFACE_CACHE_WINDOW: +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gitg_diff_image_surface_cache_set_window ((GitgDiffImageSurfaceCache*) self, g_value_get_object (value)); +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + break; +#line 1250 "gitg-diff-view-file-renderer-image.c" + default: +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +#line 111 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + break; +#line 1256 "gitg-diff-view-file-renderer-image.c" + } +} + + +static void gitg_diff_view_file_renderer_image_class_init (GitgDiffViewFileRendererImageClass * klass) { + gint GitgDiffViewFileRendererImage_private_offset; +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gitg_diff_view_file_renderer_image_parent_class = g_type_class_peek_parent (klass); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_type_class_add_private (klass, sizeof (GitgDiffViewFileRendererImagePrivate)); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + G_OBJECT_CLASS (klass)->get_property = _vala_gitg_diff_view_file_renderer_image_get_property; +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + G_OBJECT_CLASS (klass)->set_property = _vala_gitg_diff_view_file_renderer_image_set_property; +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + G_OBJECT_CLASS (klass)->constructor = gitg_diff_view_file_renderer_image_constructor; +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + G_OBJECT_CLASS (klass)->finalize = gitg_diff_view_file_renderer_image_finalize; +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_DELTA, g_param_spec_boxed ("delta", "delta", "delta", ggit_diff_delta_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_REPOSITORY, g_param_spec_object ("repository", "repository", "repository", GITG_TYPE_REPOSITORY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + GitgDiffViewFileRendererImage_private_offset = g_type_class_get_instance_private_offset (klass); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/gitg/ui/gitg-diff-view-file-renderer-image.ui"); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "diff_image_side_by_side", FALSE, GitgDiffViewFileRendererImage_private_offset + G_STRUCT_OFFSET (GitgDiffViewFileRendererImagePrivate, d_diff_image_side_by_side)); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "diff_image_slider", FALSE, GitgDiffViewFileRendererImage_private_offset + G_STRUCT_OFFSET (GitgDiffViewFileRendererImagePrivate, d_diff_image_slider)); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "scale_slider_adjustment", FALSE, GitgDiffViewFileRendererImage_private_offset + G_STRUCT_OFFSET (GitgDiffViewFileRendererImagePrivate, d_scale_slider_adjustment)); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "diff_image_overlay", FALSE, GitgDiffViewFileRendererImage_private_offset + G_STRUCT_OFFSET (GitgDiffViewFileRendererImagePrivate, d_diff_image_overlay)); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "scale_overlay_adjustment", FALSE, GitgDiffViewFileRendererImage_private_offset + G_STRUCT_OFFSET (GitgDiffViewFileRendererImagePrivate, d_scale_overlay_adjustment)); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "diff_image_difference", FALSE, GitgDiffViewFileRendererImage_private_offset + G_STRUCT_OFFSET (GitgDiffViewFileRendererImagePrivate, d_diff_image_difference)); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "stack_switcher", FALSE, GitgDiffViewFileRendererImage_private_offset + G_STRUCT_OFFSET (GitgDiffViewFileRendererImagePrivate, d_stack_switcher)); +#line 1297 "gitg-diff-view-file-renderer-image.c" +} + + +static void gitg_diff_view_file_renderer_image_gitg_diff_view_file_renderer_interface_init (GitgDiffViewFileRendererIface * iface) { +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gitg_diff_view_file_renderer_image_gitg_diff_view_file_renderer_parent_iface = g_type_interface_peek_parent (iface); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + iface->add_hunk = (void (*) (GitgDiffViewFileRenderer *, GgitDiffHunk*, GeeArrayList*)) gitg_diff_view_file_renderer_image_real_add_hunk; +#line 1306 "gitg-diff-view-file-renderer-image.c" +} + + +static void gitg_diff_view_file_renderer_image_instance_init (GitgDiffViewFileRendererImage * self) { +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + self->priv = GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_GET_PRIVATE (self); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_type_ensure (GITG_TYPE_DIFF_IMAGE_OVERLAY); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_type_ensure (GITG_TYPE_DIFF_IMAGE_DIFFERENCE); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_type_ensure (GITG_TYPE_DIFF_IMAGE_SIDE_BY_SIDE); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_type_ensure (GITG_TYPE_DIFF_IMAGE_SLIDER); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gtk_widget_init_template (GTK_WIDGET (self)); +#line 1323 "gitg-diff-view-file-renderer-image.c" +} + + +static void gitg_diff_view_file_renderer_image_finalize (GObject * obj) { + GitgDiffViewFileRendererImage * self; +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_DIFF_VIEW_FILE_RENDERER_IMAGE, GitgDiffViewFileRendererImage); +#line 23 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _ggit_diff_delta_unref0 (self->priv->_delta); +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (self->priv->_repository); +#line 27 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (self->priv->d_diff_image_side_by_side); +#line 30 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (self->priv->d_diff_image_slider); +#line 33 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (self->priv->d_scale_slider_adjustment); +#line 36 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (self->priv->d_diff_image_overlay); +#line 39 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (self->priv->d_scale_overlay_adjustment); +#line 42 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (self->priv->d_diff_image_difference); +#line 45 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (self->priv->d_stack_switcher); +#line 47 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + _g_object_unref0 (self->priv->d_cache); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + G_OBJECT_CLASS (gitg_diff_view_file_renderer_image_parent_class)->finalize (obj); +#line 1353 "gitg-diff-view-file-renderer-image.c" +} + + +GType gitg_diff_view_file_renderer_image_get_type (void) { + static volatile gsize gitg_diff_view_file_renderer_image_type_id__volatile = 0; + if (g_once_init_enter (&gitg_diff_view_file_renderer_image_type_id__volatile)) { + static const GTypeInfo g_define_type_info = { sizeof (GitgDiffViewFileRendererImageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) gitg_diff_view_file_renderer_image_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (GitgDiffViewFileRendererImage), 0, (GInstanceInitFunc) gitg_diff_view_file_renderer_image_instance_init, NULL }; + static const GInterfaceInfo gitg_diff_view_file_renderer_info = { (GInterfaceInitFunc) gitg_diff_view_file_renderer_image_gitg_diff_view_file_renderer_interface_init, (GInterfaceFinalizeFunc) NULL, NULL}; + GType gitg_diff_view_file_renderer_image_type_id; + gitg_diff_view_file_renderer_image_type_id = g_type_register_static (gtk_grid_get_type (), "GitgDiffViewFileRendererImage", &g_define_type_info, 0); + g_type_add_interface_static (gitg_diff_view_file_renderer_image_type_id, GITG_TYPE_DIFF_VIEW_FILE_RENDERER, &gitg_diff_view_file_renderer_info); + g_once_init_leave (&gitg_diff_view_file_renderer_image_type_id__volatile, gitg_diff_view_file_renderer_image_type_id); + } + return gitg_diff_view_file_renderer_image_type_id__volatile; +} + + +static void _vala_gitg_diff_view_file_renderer_image_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { + GitgDiffViewFileRendererImage * self; + self = G_TYPE_CHECK_INSTANCE_CAST (object, GITG_TYPE_DIFF_VIEW_FILE_RENDERER_IMAGE, GitgDiffViewFileRendererImage); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + switch (property_id) { +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + case GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_DELTA: +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_value_set_boxed (value, gitg_diff_view_file_renderer_image_get_delta (self)); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + break; +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + case GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_REPOSITORY: +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + g_value_set_object (value, gitg_diff_view_file_renderer_image_get_repository (self)); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + break; +#line 1388 "gitg-diff-view-file-renderer-image.c" + default: +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + break; +#line 1394 "gitg-diff-view-file-renderer-image.c" + } +} + + +static void _vala_gitg_diff_view_file_renderer_image_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { + GitgDiffViewFileRendererImage * self; + self = G_TYPE_CHECK_INSTANCE_CAST (object, GITG_TYPE_DIFF_VIEW_FILE_RENDERER_IMAGE, GitgDiffViewFileRendererImage); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + switch (property_id) { +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + case GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_DELTA: +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gitg_diff_view_file_renderer_image_set_delta (self, g_value_get_boxed (value)); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + break; +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + case GITG_DIFF_VIEW_FILE_RENDERER_IMAGE_REPOSITORY: +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + gitg_diff_view_file_renderer_image_set_repository (self, g_value_get_object (value)); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + break; +#line 1416 "gitg-diff-view-file-renderer-image.c" + default: +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +#line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-image.vala" + break; +#line 1422 "gitg-diff-view-file-renderer-image.c" + } +} + + + diff -Nru gitg-3.22.0/libgitg/gitg-diff-view-file-renderer-image.vala gitg-3.23.0/libgitg/gitg-diff-view-file-renderer-image.vala --- gitg-3.22.0/libgitg/gitg-diff-view-file-renderer-image.vala 1970-01-01 00:00:00.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-view-file-renderer-image.vala 2016-11-26 08:32:25.000000000 +0000 @@ -0,0 +1,152 @@ +/* + * This file is part of gitg + * + * Copyright (C) 2016 - Jesse van den Kieboom + * + * gitg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * gitg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gitg. If not, see . + */ + +[GtkTemplate (ui = "/org/gnome/gitg/ui/gitg-diff-view-file-renderer-image.ui")] +class Gitg.DiffViewFileRendererImage : Gtk.Grid, DiffViewFileRenderer +{ + public Ggit.DiffDelta? delta { get; construct set; } + public Repository repository { get; construct set; } + + [GtkChild( name = "diff_image_side_by_side" )] + private Gitg.DiffImageSideBySide d_diff_image_side_by_side; + + [GtkChild( name = "diff_image_slider" )] + private Gitg.DiffImageSlider d_diff_image_slider; + + [GtkChild( name = "scale_slider_adjustment" )] + private Gtk.Adjustment d_scale_slider_adjustment; + + [GtkChild( name = "diff_image_overlay" )] + private Gitg.DiffImageOverlay d_diff_image_overlay; + + [GtkChild( name = "scale_overlay_adjustment" )] + private Gtk.Adjustment d_scale_overlay_adjustment; + + [GtkChild( name = "diff_image_difference" )] + private Gitg.DiffImageDifference d_diff_image_difference; + + [GtkChild( name = "stack_switcher" )] + private Gtk.StackSwitcher d_stack_switcher; + + private SurfaceCache d_cache; + + public DiffViewFileRendererImage(Repository repository, Ggit.DiffDelta delta) + { + Object(repository: repository, delta: delta); + } + + construct + { + d_cache = new SurfaceCache(pixbuf_for_file(delta.get_old_file()), + pixbuf_for_file(delta.get_new_file())); + + d_diff_image_side_by_side.cache = d_cache; + d_diff_image_slider.cache = d_cache; + d_diff_image_overlay.cache = d_cache; + d_diff_image_difference.cache = d_cache; + + if (d_cache.old_pixbuf == null || d_cache.new_pixbuf == null || + d_cache.old_pixbuf.get_width() != d_cache.new_pixbuf.get_width() || + d_cache.old_pixbuf.get_height() != d_cache.new_pixbuf.get_height()) + { + d_stack_switcher.sensitive = false; + } + + d_scale_slider_adjustment.bind_property("value", d_diff_image_slider, "position", BindingFlags.DEFAULT | BindingFlags.SYNC_CREATE); + d_scale_overlay_adjustment.bind_property("value", d_diff_image_overlay, "alpha", BindingFlags.DEFAULT | BindingFlags.SYNC_CREATE); + } + + private Gdk.Pixbuf? pixbuf_for_file(Ggit.DiffFile file) + { + if ((file.get_flags() & Ggit.DiffFlag.VALID_ID) == 0 || file.get_oid().is_zero()) + { + return null; + } + + Ggit.Blob blob; + + try + { + blob = repository.lookup(file.get_oid()); + } + catch (Error e) + { + stderr.printf(@"ERROR: failed to load image blob: $(e.message)\n"); + return null; + } + + var stream = new MemoryInputStream.from_data(blob.get_raw_content(), null); + + try + { + return new Gdk.Pixbuf.from_stream(stream); + } + catch (Error e) + { + stderr.printf(@"ERROR: failed to create pixbuf: $(e.message)\n"); + return null; + } + } + + public void add_hunk(Ggit.DiffHunk hunk, Gee.ArrayList lines) + { + } + + private class SurfaceCache : Object, Gitg.DiffImageSurfaceCache { + private Cairo.Surface? d_old_surface; + private Cairo.Surface? d_new_surface; + + public Gdk.Pixbuf? old_pixbuf { get; construct set; } + public Gdk.Pixbuf? new_pixbuf { get; construct set; } + + public Gdk.Window window { get; construct set; } + + public SurfaceCache(Gdk.Pixbuf? old_pixbuf, Gdk.Pixbuf? new_pixbuf) + { + Object(old_pixbuf: old_pixbuf, new_pixbuf: new_pixbuf); + } + + public Cairo.Surface? get_old_surface(Gdk.Window window) + { + return get_cached_surface(window, old_pixbuf, ref d_old_surface); + } + + public Cairo.Surface? get_new_surface(Gdk.Window window) + { + return get_cached_surface(window, new_pixbuf, ref d_new_surface); + } + + private Cairo.Surface? get_cached_surface(Gdk.Window window, Gdk.Pixbuf? pixbuf, ref Cairo.Surface? cached) + { + if (pixbuf == null) + { + return null; + } + + if (cached == null) + { + cached = Gdk.cairo_surface_create_from_pixbuf(pixbuf, 0, window); + } + + return cached; + } + } +} + +// ex:ts=4 noet diff -Nru gitg-3.22.0/libgitg/gitg-diff-view-file-renderer-text.c gitg-3.23.0/libgitg/gitg-diff-view-file-renderer-text.c --- gitg-3.22.0/libgitg/gitg-diff-view-file-renderer-text.c 2016-09-18 12:01:41.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-view-file-renderer-text.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-diff-view-file-renderer-text.c generated by valac 0.32.1, the Vala compiler +/* gitg-diff-view-file-renderer-text.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-diff-view-file-renderer-text.vala, do not modify */ /* @@ -444,8 +444,8 @@ static gpointer gitg_diff_view_file_renderer_text_parent_class = NULL; -static GitgDiffSelectableIface* gitg_diff_view_file_renderer_text_gitg_diff_selectable_parent_iface = NULL; -static GitgDiffViewFileRendererIface* gitg_diff_view_file_renderer_text_gitg_diff_view_file_renderer_parent_iface = NULL; +static GitgDiffSelectableIface * gitg_diff_view_file_renderer_text_gitg_diff_selectable_parent_iface = NULL; +static GitgDiffViewFileRendererIface * gitg_diff_view_file_renderer_text_gitg_diff_view_file_renderer_parent_iface = NULL; gpointer gitg_patch_set_ref (gpointer instance); void gitg_patch_set_unref (gpointer instance); @@ -537,9 +537,9 @@ void gitg_diff_view_file_renderer_text_set_added (GitgDiffViewFileRendererText* self, guint value); guint gitg_diff_view_file_renderer_text_get_removed (GitgDiffViewFileRendererText* self); void gitg_diff_view_file_renderer_text_set_removed (GitgDiffViewFileRendererText* self, guint value); -static void _vala_array_add4 (GitgDiffViewFileRendererTextRegion** array, int* length, int* size, const GitgDiffViewFileRendererTextRegion* value); +static void _vala_array_add4 (GitgDiffViewFileRendererTextRegion* * array, int* length, int* size, const GitgDiffViewFileRendererTextRegion* value); static guint8* _vala_array_dup10 (guint8* self, int length); -static void _vala_array_add5 (GitgDiffViewFileRendererTextRegion** array, int* length, int* size, const GitgDiffViewFileRendererTextRegion* value); +static void _vala_array_add5 (GitgDiffViewFileRendererTextRegion* * array, int* length, int* size, const GitgDiffViewFileRendererTextRegion* value); void gitg_diff_view_lines_renderer_add_hunk (GitgDiffViewLinesRenderer* self, gint buffer_line_start, gint buffer_line_end, GgitDiffHunk* hunk, GeeArrayList* lines); gboolean gitg_diff_view_file_renderer_text_get_new_is_workdir (GitgDiffViewFileRendererText* self); void gitg_diff_view_file_renderer_text_set_new_is_workdir (GitgDiffViewFileRendererText* self, gboolean value); @@ -557,8 +557,8 @@ GitgPatchSet* gitg_patch_set_construct (GType object_type); gboolean gitg_diff_selectable_get_can_select (GitgDiffSelectable* self); gint* gitg_diff_view_file_selectable_get_selected_lines (GitgDiffViewFileSelectable* self, int* result_length1); -static void _vala_array_add6 (GitgPatchSetPatch** array, int* length, int* size, const GitgPatchSetPatch* value); -static void _vala_array_add7 (GitgPatchSetPatch** array, int* length, int* size, const GitgPatchSetPatch* value); +static void _vala_array_add6 (GitgPatchSetPatch* * array, int* length, int* size, const GitgPatchSetPatch* value); +static void _vala_array_add7 (GitgPatchSetPatch* * array, int* length, int* size, const GitgPatchSetPatch* value); static GitgPatchSetPatch* _vala_array_dup11 (GitgPatchSetPatch* self, int length); static GObject * gitg_diff_view_file_renderer_text_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); GType gitg_diff_view_lines_renderer_style_get_type (void) G_GNUC_CONST; @@ -570,7 +570,7 @@ static void _gitg_diff_view_file_renderer_text____lambda53_ (GitgDiffViewFileRendererText* self); gboolean gitg_diff_view_file_selectable_get_has_selection (GitgDiffViewFileSelectable* self); static void __gitg_diff_view_file_renderer_text____lambda53__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); -static void gitg_diff_view_file_renderer_text_finalize (GObject* obj); +static void gitg_diff_view_file_renderer_text_finalize (GObject * obj); gboolean gitg_diff_selectable_get_has_selection (GitgDiffSelectable* self); GitgPatchSet* gitg_diff_selectable_get_selection (GitgDiffSelectable* self); static void _vala_gitg_diff_view_file_renderer_text_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); @@ -2099,11 +2099,11 @@ static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 2109 "gitg-diff-view-file-renderer-text.c" } @@ -3396,35 +3396,35 @@ const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 997 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1013 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 997 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1013 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, 0); -#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1014 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1014 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = needle; -#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1014 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = g_strrstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_); -#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1014 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1000 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1016 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 1000 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1016 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { #line 3416 "gitg-diff-view-file-renderer-text.c" gchar* _tmp4_ = NULL; -#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1017 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1017 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1017 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 3424 "gitg-diff-view-file-renderer-text.c" } else { -#line 1003 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1019 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = -1; -#line 1003 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1019 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 3430 "gitg-diff-view-file-renderer-text.c" } @@ -3438,37 +3438,37 @@ glong _tmp1_ = 0L; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1315 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1315 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { #line 3454 "gitg-diff-view-file-renderer-text.c" glong _tmp4_ = 0L; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = maxlen; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 3462 "gitg-diff-view-file-renderer-text.c" } else { gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = (glong) (_tmp5_ - _tmp6_); -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 3474 "gitg-diff-view-file-renderer-text.c" } @@ -3488,112 +3488,112 @@ glong _tmp20_ = 0L; glong _tmp21_ = 0L; gchar* _tmp22_ = NULL; -#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1325 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = offset; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { #line 3498 "gitg-diff-view-file-renderer-text.c" glong _tmp2_ = 0L; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = len; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); #line 3504 "gitg-diff-view-file-renderer-text.c" } else { -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = FALSE; #line 3508 "gitg-diff-view-file-renderer-text.c" } -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_) { #line 3512 "gitg-diff-view-file-renderer-text.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; glong _tmp5_ = 0L; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = offset; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = len; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = _tmp5_; #line 3524 "gitg-diff-view-file-renderer-text.c" } else { gint _tmp6_ = 0; gint _tmp7_ = 0; -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = strlen (self); -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = _tmp6_; -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; #line 3534 "gitg-diff-view-file-renderer-text.c" } -#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = offset; -#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { #line 3540 "gitg-diff-view-file-renderer-text.c" glong _tmp9_ = 0L; glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1335 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = string_length; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1335 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = offset; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1335 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" offset = _tmp9_ + _tmp10_; -#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = offset; -#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); #line 3554 "gitg-diff-view-file-renderer-text.c" } else { glong _tmp12_ = 0L; glong _tmp13_ = 0L; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = offset; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = string_length; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); #line 3564 "gitg-diff-view-file-renderer-text.c" } -#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1340 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = len; -#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1340 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { #line 3570 "gitg-diff-view-file-renderer-text.c" glong _tmp15_ = 0L; glong _tmp16_ = 0L; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1341 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1341 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = offset; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1341 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; #line 3579 "gitg-diff-view-file-renderer-text.c" } -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = offset; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = len; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = string_length; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = offset; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = len; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp22_; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 3599 "gitg-diff-view-file-renderer-text.c" } @@ -3604,19 +3604,19 @@ gchar* _result_ = NULL; gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; -#line 1199 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1218 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1200 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1219 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1200 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1219 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1201 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1220 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1201 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1220 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_strchug (_tmp1_); -#line 1202 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1221 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _result_; -#line 1202 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1221 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 3622 "gitg-diff-view-file-renderer-text.c" } @@ -3627,19 +3627,19 @@ gchar* _result_ = NULL; gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; -#line 1191 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1210 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1192 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1211 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1192 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1211 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1193 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1212 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1193 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1212 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_strchomp (_tmp1_); -#line 1194 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1213 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _result_; -#line 1194 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1213 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 3645 "gitg-diff-view-file-renderer-text.c" } @@ -3647,143 +3647,185 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1399 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1399 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1399 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 3658 "gitg-diff-view-file-renderer-text.c" +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + if ((*((gchar*) self)) == '\0') { +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = TRUE; +#line 3664 "gitg-diff-view-file-renderer-text.c" + } else { + const gchar* _tmp2_ = NULL; +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp2_ = old; +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; +#line 3671 "gitg-diff-view-file-renderer-text.c" + } +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + if (_tmp1_) { +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp0_ = TRUE; +#line 3677 "gitg-diff-view-file-renderer-text.c" + } else { + const gchar* _tmp3_ = NULL; + const gchar* _tmp4_ = NULL; +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp3_ = old; +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp4_ = replacement; +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; +#line 3687 "gitg-diff-view-file-renderer-text.c" + } +#line 1400 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + if (_tmp0_) { +#line 3691 "gitg-diff-view-file-renderer-text.c" + gchar* _tmp5_ = NULL; +#line 1401 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp5_ = g_strdup (self); +#line 1401 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp5_; +#line 1401 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + return result; +#line 3699 "gitg-diff-view-file-renderer-text.c" + } { GRegex* regex = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - GRegex* _tmp3_ = NULL; - GRegex* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - GRegex* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; + const gchar* _tmp6_ = NULL; + gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp0_ = old; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp2_ = _tmp1_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - regex = _tmp4_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" + GRegex* _tmp9_ = NULL; + GRegex* _tmp10_ = NULL; + gchar* _tmp11_ = NULL; + GRegex* _tmp12_ = NULL; + const gchar* _tmp13_ = NULL; + gchar* _tmp14_ = NULL; + gchar* _tmp15_ = NULL; +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp6_ = old; +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp7_ = g_regex_escape_string (_tmp6_, -1); +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp8_ = _tmp7_; +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp10_ = _tmp9_; +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp8_); +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + regex = _tmp10_; +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 3689 "gitg-diff-view-file-renderer-text.c" +#line 3731 "gitg-diff-view-file-renderer-text.c" goto __catch45_g_regex_error; } -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1404 "/home/jesse/.local/share/vala-0.36/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 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1404 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 3698 "gitg-diff-view-file-renderer-text.c" +#line 3740 "gitg-diff-view-file-renderer-text.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp7_ = replacement; -#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 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp12_ = regex; +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp13_ = replacement; +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = _tmp14_; +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 3714 "gitg-diff-view-file-renderer-text.c" +#line 3756 "gitg-diff-view-file-renderer-text.c" goto __catch45_g_regex_error; } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/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 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 3725 "gitg-diff-view-file-renderer-text.c" +#line 3767 "gitg-diff-view-file-renderer-text.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - result = _tmp9_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" - _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp15_ = _tmp11_; +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = NULL; +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp15_; +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp11_); +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1405 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3739 "gitg-diff-view-file-renderer-text.c" +#line 3781 "gitg-diff-view-file-renderer-text.c" } goto __finally45; __catch45_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1403 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1403 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1407 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1403 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 3753 "gitg-diff-view-file-renderer-text.c" +#line 3795 "gitg-diff-view-file-renderer-text.c" } __finally45: -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1403 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1403 "/home/jesse/.local/share/vala-0.36/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 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1403 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1403 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 3764 "gitg-diff-view-file-renderer-text.c" +#line 3806 "gitg-diff-view-file-renderer-text.c" } } -static void _vala_array_add4 (GitgDiffViewFileRendererTextRegion** array, int* length, int* size, const GitgDiffViewFileRendererTextRegion* value) { +static void _vala_array_add4 (GitgDiffViewFileRendererTextRegion* * array, int* length, int* size, const GitgDiffViewFileRendererTextRegion* value) { #line 657 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if ((*length) == (*size)) { #line 657 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" *size = (*size) ? (2 * (*size)) : 4; #line 657 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" *array = g_renew (GitgDiffViewFileRendererTextRegion, *array, *size); -#line 3776 "gitg-diff-view-file-renderer-text.c" +#line 3818 "gitg-diff-view-file-renderer-text.c" } #line 657 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" (*array)[(*length)++] = *value; -#line 3780 "gitg-diff-view-file-renderer-text.c" +#line 3822 "gitg-diff-view-file-renderer-text.c" } static guint8* _vala_array_dup10 (guint8* self, int length) { #line 684 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" return g_memdup (self, length * sizeof (guint8)); -#line 3787 "gitg-diff-view-file-renderer-text.c" +#line 3829 "gitg-diff-view-file-renderer-text.c" } @@ -3791,17 +3833,17 @@ gchar result = '\0'; glong _tmp0_ = 0L; gchar _tmp1_ = '\0'; -#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1102 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1103 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = index; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1103 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1103 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1103 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3805 "gitg-diff-view-file-renderer-text.c" +#line 3847 "gitg-diff-view-file-renderer-text.c" } @@ -3822,120 +3864,120 @@ glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1347 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { -#line 3838 "gitg-diff-view-file-renderer-text.c" +#line 3880 "gitg-diff-view-file-renderer-text.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; -#line 3847 "gitg-diff-view-file-renderer-text.c" +#line 3889 "gitg-diff-view-file-renderer-text.c" } -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { -#line 3853 "gitg-diff-view-file-renderer-text.c" +#line 3895 "gitg-diff-view-file-renderer-text.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; -#line 3862 "gitg-diff-view-file-renderer-text.c" +#line 3904 "gitg-diff-view-file-renderer-text.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { -#line 3868 "gitg-diff-view-file-renderer-text.c" +#line 3910 "gitg-diff-view-file-renderer-text.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; -#line 3877 "gitg-diff-view-file-renderer-text.c" +#line 3919 "gitg-diff-view-file-renderer-text.c" } else { -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = FALSE; -#line 3881 "gitg-diff-view-file-renderer-text.c" +#line 3923 "gitg-diff-view-file-renderer-text.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { -#line 3889 "gitg-diff-view-file-renderer-text.c" +#line 3931 "gitg-diff-view-file-renderer-text.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; -#line 3898 "gitg-diff-view-file-renderer-text.c" +#line 3940 "gitg-diff-view-file-renderer-text.c" } else { -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 3902 "gitg-diff-view-file-renderer-text.c" +#line 3944 "gitg-diff-view-file-renderer-text.c" } -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3924 "gitg-diff-view-file-renderer-text.c" +#line 3966 "gitg-diff-view-file-renderer-text.c" } -static void _vala_array_add5 (GitgDiffViewFileRendererTextRegion** array, int* length, int* size, const GitgDiffViewFileRendererTextRegion* value) { +static void _vala_array_add5 (GitgDiffViewFileRendererTextRegion* * array, int* length, int* size, const GitgDiffViewFileRendererTextRegion* value) { #line 717 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if ((*length) == (*size)) { #line 717 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" *size = (*size) ? (2 * (*size)) : 4; #line 717 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" *array = g_renew (GitgDiffViewFileRendererTextRegion, *array, *size); -#line 3935 "gitg-diff-view-file-renderer-text.c" +#line 3977 "gitg-diff-view-file-renderer-text.c" } #line 717 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" (*array)[(*length)++] = *value; -#line 3939 "gitg-diff-view-file-renderer-text.c" +#line 3981 "gitg-diff-view-file-renderer-text.c" } @@ -3951,41 +3993,41 @@ gint _tmp3__length1 = 0; guint8* _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 4711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 4830 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 4712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 4831 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = self->str; -#line 4712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 4831 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" res = (guint8*) _tmp0_; -#line 4712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 4831 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" res_length1 = -1; -#line 4712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 4831 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _res_size_ = res_length1; -#line 4713 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 4832 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = self->len; -#line 4713 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 4832 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" res_length1 = (gint) _tmp1_; -#line 4713 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 4832 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = res_length1; -#line 4714 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 4833 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = res; -#line 4714 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 4833 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = res_length1; -#line 4714 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 4833 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 4714 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 4833 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = _tmp3__length1; -#line 4714 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 4833 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (result_length1) { -#line 4714 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 4833 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" *result_length1 = _tmp4__length1; -#line 3983 "gitg-diff-view-file-renderer-text.c" +#line 4025 "gitg-diff-view-file-renderer-text.c" } -#line 4714 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 4833 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 4714 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 4833 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3989 "gitg-diff-view-file-renderer-text.c" +#line 4031 "gitg-diff-view-file-renderer-text.c" } @@ -4098,7 +4140,7 @@ _tmp8_ = pos; #line 587 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if (_tmp8_ >= 0) { -#line 4102 "gitg-diff-view-file-renderer-text.c" +#line 4144 "gitg-diff-view-file-renderer-text.c" const gchar* _tmp9_ = NULL; gint _tmp10_ = 0; gchar* _tmp11_ = NULL; @@ -4120,7 +4162,7 @@ h = _tmp13_; #line 589 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _g_free0 (_tmp12_); -#line 4124 "gitg-diff-view-file-renderer-text.c" +#line 4166 "gitg-diff-view-file-renderer-text.c" } #line 592 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp14_ = h; @@ -4140,13 +4182,13 @@ _tmp18_ = gtk_text_iter_is_start (&iter); #line 597 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if (!_tmp18_) { -#line 4144 "gitg-diff-view-file-renderer-text.c" +#line 4186 "gitg-diff-view-file-renderer-text.c" GtkSourceBuffer* _tmp19_ = NULL; #line 599 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp19_ = buffer; #line 599 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" gtk_text_buffer_insert ((GtkTextBuffer*) _tmp19_, &iter, "\n", 1); -#line 4150 "gitg-diff-view-file-renderer-text.c" +#line 4192 "gitg-diff-view-file-renderer-text.c" } #line 602 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" gtk_text_iter_set_line_offset (&iter, 0); @@ -4234,19 +4276,19 @@ region = _tmp46_; #line 620 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" g_object_freeze_notify ((GObject*) self); -#line 4238 "gitg-diff-view-file-renderer-text.c" +#line 4280 "gitg-diff-view-file-renderer-text.c" { gint i = 0; #line 622 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" i = 0; -#line 4243 "gitg-diff-view-file-renderer-text.c" +#line 4285 "gitg-diff-view-file-renderer-text.c" { gboolean _tmp47_ = FALSE; #line 622 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp47_ = TRUE; #line 622 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" while (TRUE) { -#line 4250 "gitg-diff-view-file-renderer-text.c" +#line 4292 "gitg-diff-view-file-renderer-text.c" gint _tmp49_ = 0; GeeArrayList* _tmp50_ = NULL; gint _tmp51_ = 0; @@ -4282,13 +4324,13 @@ gint _tmp136_ = 0; #line 622 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if (!_tmp47_) { -#line 4286 "gitg-diff-view-file-renderer-text.c" +#line 4328 "gitg-diff-view-file-renderer-text.c" gint _tmp48_ = 0; #line 622 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp48_ = i; #line 622 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" i = _tmp48_ + 1; -#line 4292 "gitg-diff-view-file-renderer-text.c" +#line 4334 "gitg-diff-view-file-renderer-text.c" } #line 622 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp47_ = FALSE; @@ -4304,7 +4346,7 @@ if (!(_tmp49_ < _tmp52_)) { #line 622 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" break; -#line 4308 "gitg-diff-view-file-renderer-text.c" +#line 4350 "gitg-diff-view-file-renderer-text.c" } #line 624 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp53_ = lines; @@ -4340,7 +4382,7 @@ switch (_tmp61_) { #line 632 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" case GGIT_DIFF_LINE_ADDITION: -#line 4344 "gitg-diff-view-file-renderer-text.c" +#line 4386 "gitg-diff-view-file-renderer-text.c" { guint _tmp62_ = 0U; #line 635 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" @@ -4353,11 +4395,11 @@ rtype = GITG_DIFF_VIEW_FILE_RENDERER_TEXT_REGION_TYPE_ADDED; #line 639 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" break; -#line 4357 "gitg-diff-view-file-renderer-text.c" +#line 4399 "gitg-diff-view-file-renderer-text.c" } #line 632 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" case GGIT_DIFF_LINE_DELETION: -#line 4361 "gitg-diff-view-file-renderer-text.c" +#line 4403 "gitg-diff-view-file-renderer-text.c" { guint _tmp63_ = 0U; #line 641 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" @@ -4370,7 +4412,7 @@ rtype = GITG_DIFF_VIEW_FILE_RENDERER_TEXT_REGION_TYPE_REMOVED; #line 645 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" break; -#line 4374 "gitg-diff-view-file-renderer-text.c" +#line 4416 "gitg-diff-view-file-renderer-text.c" } #line 632 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" case GGIT_DIFF_LINE_CONTEXT_EOFNL: @@ -4378,7 +4420,7 @@ case GGIT_DIFF_LINE_ADD_EOFNL: #line 632 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" case GGIT_DIFF_LINE_DEL_EOFNL: -#line 4382 "gitg-diff-view-file-renderer-text.c" +#line 4424 "gitg-diff-view-file-renderer-text.c" { const gchar* _tmp64_ = NULL; gchar* _tmp65_ = NULL; @@ -4392,12 +4434,12 @@ text = _tmp65_; #line 650 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" break; -#line 4396 "gitg-diff-view-file-renderer-text.c" +#line 4438 "gitg-diff-view-file-renderer-text.c" } default: #line 632 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" break; -#line 4401 "gitg-diff-view-file-renderer-text.c" +#line 4443 "gitg-diff-view-file-renderer-text.c" } #line 653 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp67_ = i; @@ -4405,7 +4447,7 @@ if (_tmp67_ == 0) { #line 653 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp66_ = TRUE; -#line 4409 "gitg-diff-view-file-renderer-text.c" +#line 4451 "gitg-diff-view-file-renderer-text.c" } else { GitgDiffViewFileRendererTextRegionType _tmp68_ = 0; GitgDiffViewFileRendererTextRegion _tmp69_ = {0}; @@ -4418,11 +4460,11 @@ _tmp70_ = _tmp69_.type; #line 653 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp66_ = _tmp68_ != _tmp70_; -#line 4422 "gitg-diff-view-file-renderer-text.c" +#line 4464 "gitg-diff-view-file-renderer-text.c" } #line 653 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if (_tmp66_) { -#line 4426 "gitg-diff-view-file-renderer-text.c" +#line 4468 "gitg-diff-view-file-renderer-text.c" gint _tmp71_ = 0; gint source_line_start = 0; GitgDiffViewFileRendererTextRegionType _tmp74_ = 0; @@ -4435,7 +4477,7 @@ _tmp71_ = i; #line 655 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if (_tmp71_ != 0) { -#line 4439 "gitg-diff-view-file-renderer-text.c" +#line 4481 "gitg-diff-view-file-renderer-text.c" GitgDiffViewFileRendererTextRegion* _tmp72_ = NULL; gint _tmp72__length1 = 0; GitgDiffViewFileRendererTextRegion _tmp73_ = {0}; @@ -4447,13 +4489,13 @@ _tmp73_ = region; #line 657 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _vala_array_add4 (&self->priv->d_regions, &self->priv->d_regions_length1, &self->priv->_d_regions_size_, &_tmp73_); -#line 4451 "gitg-diff-view-file-renderer-text.c" +#line 4493 "gitg-diff-view-file-renderer-text.c" } #line 662 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp74_ = rtype; #line 662 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if (_tmp74_ == GITG_DIFF_VIEW_FILE_RENDERER_TEXT_REGION_TYPE_REMOVED) { -#line 4457 "gitg-diff-view-file-renderer-text.c" +#line 4499 "gitg-diff-view-file-renderer-text.c" GgitDiffLine* _tmp75_ = NULL; gint _tmp76_ = 0; #line 664 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" @@ -4462,7 +4504,7 @@ _tmp76_ = ggit_diff_line_get_old_lineno (_tmp75_); #line 664 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" source_line_start = _tmp76_ - 1; -#line 4466 "gitg-diff-view-file-renderer-text.c" +#line 4508 "gitg-diff-view-file-renderer-text.c" } else { GgitDiffLine* _tmp77_ = NULL; gint _tmp78_ = 0; @@ -4472,7 +4514,7 @@ _tmp78_ = ggit_diff_line_get_new_lineno (_tmp77_); #line 668 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" source_line_start = _tmp78_ - 1; -#line 4476 "gitg-diff-view-file-renderer-text.c" +#line 4518 "gitg-diff-view-file-renderer-text.c" } #line 671 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp79_ = rtype; @@ -4494,7 +4536,7 @@ region = _tmp82_; #line 671 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp83_ = region; -#line 4498 "gitg-diff-view-file-renderer-text.c" +#line 4540 "gitg-diff-view-file-renderer-text.c" } #line 679 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp84_ = region.length; @@ -4506,18 +4548,18 @@ if (_tmp86_) { #line 681 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp85_ = TRUE; -#line 4510 "gitg-diff-view-file-renderer-text.c" +#line 4552 "gitg-diff-view-file-renderer-text.c" } else { gboolean _tmp87_ = FALSE; #line 681 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp87_ = removed; #line 681 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp85_ = _tmp87_; -#line 4517 "gitg-diff-view-file-renderer-text.c" +#line 4559 "gitg-diff-view-file-renderer-text.c" } #line 681 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if (_tmp85_) { -#line 4521 "gitg-diff-view-file-renderer-text.c" +#line 4563 "gitg-diff-view-file-renderer-text.c" gsize offset = 0UL; GgitDiffLine* _tmp88_ = NULL; gint64 _tmp89_ = 0LL; @@ -4570,11 +4612,11 @@ if (_tmp95_) { #line 687 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp94_ = GITG_PATCH_SET_TYPE_ADD; -#line 4574 "gitg-diff-view-file-renderer-text.c" +#line 4616 "gitg-diff-view-file-renderer-text.c" } else { #line 687 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp94_ = GITG_PATCH_SET_TYPE_REMOVE; -#line 4578 "gitg-diff-view-file-renderer-text.c" +#line 4620 "gitg-diff-view-file-renderer-text.c" } #line 686 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp96_ = offset; @@ -4600,7 +4642,7 @@ _tmp100_ = added; #line 693 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if (_tmp100_) { -#line 4604 "gitg-diff-view-file-renderer-text.c" +#line 4646 "gitg-diff-view-file-renderer-text.c" GitgPatchSetPatch _tmp101_ = {0}; gsize _tmp102_ = 0UL; gint64 _tmp103_ = 0LL; @@ -4612,7 +4654,7 @@ _tmp103_ = self->priv->d_doffset; #line 695 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" pset.old_offset = (gsize) (((gint64) _tmp102_) - _tmp103_); -#line 4616 "gitg-diff-view-file-renderer-text.c" +#line 4658 "gitg-diff-view-file-renderer-text.c" } else { GitgPatchSetPatch _tmp104_ = {0}; gsize _tmp105_ = 0UL; @@ -4625,7 +4667,7 @@ _tmp106_ = self->priv->d_doffset; #line 699 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" pset.new_offset = (gsize) (((gint64) _tmp105_) + _tmp106_); -#line 4629 "gitg-diff-view-file-renderer-text.c" +#line 4671 "gitg-diff-view-file-renderer-text.c" } #line 702 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp107_ = self->priv->d_lines; @@ -4639,7 +4681,7 @@ _tmp111_ = added; #line 703 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if (_tmp111_) { -#line 4643 "gitg-diff-view-file-renderer-text.c" +#line 4685 "gitg-diff-view-file-renderer-text.c" guint8* _tmp112_ = NULL; gint _tmp112__length1 = 0; #line 703 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" @@ -4648,7 +4690,7 @@ _tmp112__length1 = bytes_length1; #line 703 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp110_ = (gint64) _tmp112__length1; -#line 4652 "gitg-diff-view-file-renderer-text.c" +#line 4694 "gitg-diff-view-file-renderer-text.c" } else { guint8* _tmp113_ = NULL; gint _tmp113__length1 = 0; @@ -4658,7 +4700,7 @@ _tmp113__length1 = bytes_length1; #line 703 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp110_ = -((gint64) _tmp113__length1); -#line 4662 "gitg-diff-view-file-renderer-text.c" +#line 4704 "gitg-diff-view-file-renderer-text.c" } #line 703 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp114_ = self->priv->d_doffset; @@ -4666,7 +4708,7 @@ self->priv->d_doffset = _tmp114_ + _tmp110_; #line 681 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" bytes = (g_free (bytes), NULL); -#line 4670 "gitg-diff-view-file-renderer-text.c" +#line 4712 "gitg-diff-view-file-renderer-text.c" } #line 706 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp117_ = i; @@ -4678,7 +4720,7 @@ _tmp120_ = _tmp119_; #line 706 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if (_tmp117_ == (_tmp120_ - 1)) { -#line 4682 "gitg-diff-view-file-renderer-text.c" +#line 4724 "gitg-diff-view-file-renderer-text.c" const gchar* _tmp121_ = NULL; gint _tmp122_ = 0; gint _tmp123_ = 0; @@ -4690,15 +4732,15 @@ _tmp123_ = _tmp122_; #line 706 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp116_ = _tmp123_ > 0; -#line 4694 "gitg-diff-view-file-renderer-text.c" +#line 4736 "gitg-diff-view-file-renderer-text.c" } else { #line 706 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp116_ = FALSE; -#line 4698 "gitg-diff-view-file-renderer-text.c" +#line 4740 "gitg-diff-view-file-renderer-text.c" } #line 706 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if (_tmp116_) { -#line 4702 "gitg-diff-view-file-renderer-text.c" +#line 4744 "gitg-diff-view-file-renderer-text.c" const gchar* _tmp124_ = NULL; const gchar* _tmp125_ = NULL; gint _tmp126_ = 0; @@ -4716,15 +4758,15 @@ _tmp128_ = string_get (_tmp124_, (glong) (_tmp127_ - 1)); #line 706 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp115_ = _tmp128_ == '\n'; -#line 4720 "gitg-diff-view-file-renderer-text.c" +#line 4762 "gitg-diff-view-file-renderer-text.c" } else { #line 706 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp115_ = FALSE; -#line 4724 "gitg-diff-view-file-renderer-text.c" +#line 4766 "gitg-diff-view-file-renderer-text.c" } #line 706 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if (_tmp115_) { -#line 4728 "gitg-diff-view-file-renderer-text.c" +#line 4770 "gitg-diff-view-file-renderer-text.c" const gchar* _tmp129_ = NULL; const gchar* _tmp130_ = NULL; gint _tmp131_ = 0; @@ -4744,7 +4786,7 @@ _g_free0 (text); #line 708 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" text = _tmp133_; -#line 4748 "gitg-diff-view-file-renderer-text.c" +#line 4790 "gitg-diff-view-file-renderer-text.c" } #line 711 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp134_ = content; @@ -4760,7 +4802,7 @@ _g_free0 (text); #line 622 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _ggit_diff_line_unref0 (line); -#line 4764 "gitg-diff-view-file-renderer-text.c" +#line 4806 "gitg-diff-view-file-renderer-text.c" } } } @@ -4772,7 +4814,7 @@ _tmp139_ = _tmp138_; #line 715 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if (_tmp139_ != 0) { -#line 4776 "gitg-diff-view-file-renderer-text.c" +#line 4818 "gitg-diff-view-file-renderer-text.c" GitgDiffViewFileRendererTextRegion* _tmp140_ = NULL; gint _tmp140__length1 = 0; GitgDiffViewFileRendererTextRegion _tmp141_ = {0}; @@ -4784,7 +4826,7 @@ _tmp141_ = region; #line 717 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _vala_array_add5 (&self->priv->d_regions, &self->priv->d_regions_length1, &self->priv->_d_regions_size_, &_tmp141_); -#line 4788 "gitg-diff-view-file-renderer-text.c" +#line 4830 "gitg-diff-view-file-renderer-text.c" } #line 720 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp142_ = gtk_text_iter_get_line (&iter); @@ -4838,19 +4880,19 @@ _tmp161_ = lines; #line 726 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" gitg_diff_view_lines_renderer_add_hunk (_tmp157_, _tmp158_, _tmp159_, _tmp160_, _tmp161_); -#line 4842 "gitg-diff-view-file-renderer-text.c" +#line 4884 "gitg-diff-view-file-renderer-text.c" { gint i = 0; #line 728 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" i = 0; -#line 4847 "gitg-diff-view-file-renderer-text.c" +#line 4889 "gitg-diff-view-file-renderer-text.c" { gboolean _tmp162_ = FALSE; #line 728 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp162_ = TRUE; #line 728 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" while (TRUE) { -#line 4854 "gitg-diff-view-file-renderer-text.c" +#line 4896 "gitg-diff-view-file-renderer-text.c" gint _tmp164_ = 0; GeeArrayList* _tmp165_ = NULL; gint _tmp166_ = 0; @@ -4865,13 +4907,13 @@ const gchar* _tmp175_ = NULL; #line 728 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if (!_tmp162_) { -#line 4869 "gitg-diff-view-file-renderer-text.c" +#line 4911 "gitg-diff-view-file-renderer-text.c" gint _tmp163_ = 0; #line 728 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp163_ = i; #line 728 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" i = _tmp163_ + 1; -#line 4875 "gitg-diff-view-file-renderer-text.c" +#line 4917 "gitg-diff-view-file-renderer-text.c" } #line 728 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp162_ = FALSE; @@ -4887,7 +4929,7 @@ if (!(_tmp164_ < _tmp167_)) { #line 728 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" break; -#line 4891 "gitg-diff-view-file-renderer-text.c" +#line 4933 "gitg-diff-view-file-renderer-text.c" } #line 730 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp168_ = lines; @@ -4907,7 +4949,7 @@ switch (_tmp172_) { #line 733 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" case GGIT_DIFF_LINE_ADDITION: -#line 4911 "gitg-diff-view-file-renderer-text.c" +#line 4953 "gitg-diff-view-file-renderer-text.c" { gchar* _tmp173_ = NULL; #line 736 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" @@ -4918,11 +4960,11 @@ category = _tmp173_; #line 737 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" break; -#line 4922 "gitg-diff-view-file-renderer-text.c" +#line 4964 "gitg-diff-view-file-renderer-text.c" } #line 733 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" case GGIT_DIFF_LINE_DELETION: -#line 4926 "gitg-diff-view-file-renderer-text.c" +#line 4968 "gitg-diff-view-file-renderer-text.c" { gchar* _tmp174_ = NULL; #line 739 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" @@ -4933,18 +4975,18 @@ category = _tmp174_; #line 740 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" break; -#line 4937 "gitg-diff-view-file-renderer-text.c" +#line 4979 "gitg-diff-view-file-renderer-text.c" } default: #line 733 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" break; -#line 4942 "gitg-diff-view-file-renderer-text.c" +#line 4984 "gitg-diff-view-file-renderer-text.c" } #line 743 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp175_ = category; #line 743 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if (_tmp175_ != NULL) { -#line 4948 "gitg-diff-view-file-renderer-text.c" +#line 4990 "gitg-diff-view-file-renderer-text.c" GtkSourceBuffer* _tmp176_ = NULL; gint _tmp177_ = 0; gint _tmp178_ = 0; @@ -4970,13 +5012,13 @@ _tmp182_ = iter; #line 746 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" gtk_source_buffer_create_source_mark (_tmp180_, NULL, _tmp181_, &_tmp182_); -#line 4974 "gitg-diff-view-file-renderer-text.c" +#line 5016 "gitg-diff-view-file-renderer-text.c" } #line 728 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _g_free0 (category); #line 728 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _ggit_diff_line_unref0 (line); -#line 4980 "gitg-diff-view-file-renderer-text.c" +#line 5022 "gitg-diff-view-file-renderer-text.c" } } } @@ -4992,7 +5034,7 @@ _g_free0 (h); #line 579 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _g_object_unref0 (buffer); -#line 4996 "gitg-diff-view-file-renderer-text.c" +#line 5038 "gitg-diff-view-file-renderer-text.c" } @@ -5007,21 +5049,25 @@ result = _tmp0_; #line 38 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" return result; -#line 5011 "gitg-diff-view-file-renderer-text.c" +#line 5053 "gitg-diff-view-file-renderer-text.c" } void gitg_diff_view_file_renderer_text_set_added (GitgDiffViewFileRendererText* self, guint value) { - guint _tmp0_ = 0U; #line 38 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" g_return_if_fail (self != NULL); #line 38 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - _tmp0_ = value; + if (gitg_diff_view_file_renderer_text_get_added (self) != value) { +#line 5062 "gitg-diff-view-file-renderer-text.c" + guint _tmp0_ = 0U; #line 38 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - self->priv->_added = _tmp0_; + _tmp0_ = value; #line 38 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - g_object_notify ((GObject *) self, "added"); -#line 5025 "gitg-diff-view-file-renderer-text.c" + self->priv->_added = _tmp0_; +#line 38 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" + g_object_notify ((GObject *) self, "added"); +#line 5070 "gitg-diff-view-file-renderer-text.c" + } } @@ -5036,21 +5082,25 @@ result = _tmp0_; #line 39 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" return result; -#line 5040 "gitg-diff-view-file-renderer-text.c" +#line 5086 "gitg-diff-view-file-renderer-text.c" } void gitg_diff_view_file_renderer_text_set_removed (GitgDiffViewFileRendererText* self, guint value) { - guint _tmp0_ = 0U; #line 39 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" g_return_if_fail (self != NULL); #line 39 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - _tmp0_ = value; + if (gitg_diff_view_file_renderer_text_get_removed (self) != value) { +#line 5095 "gitg-diff-view-file-renderer-text.c" + guint _tmp0_ = 0U; +#line 39 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" + _tmp0_ = value; #line 39 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - self->priv->_removed = _tmp0_; + self->priv->_removed = _tmp0_; #line 39 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - g_object_notify ((GObject *) self, "removed"); -#line 5054 "gitg-diff-view-file-renderer-text.c" + g_object_notify ((GObject *) self, "removed"); +#line 5103 "gitg-diff-view-file-renderer-text.c" + } } @@ -5065,21 +5115,25 @@ result = _tmp0_; #line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" return result; -#line 5069 "gitg-diff-view-file-renderer-text.c" +#line 5119 "gitg-diff-view-file-renderer-text.c" } void gitg_diff_view_file_renderer_text_set_new_is_workdir (GitgDiffViewFileRendererText* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" g_return_if_fail (self != NULL); #line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - _tmp0_ = value; + if (gitg_diff_view_file_renderer_text_get_new_is_workdir (self) != value) { +#line 5128 "gitg-diff-view-file-renderer-text.c" + gboolean _tmp0_ = FALSE; +#line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" + _tmp0_ = value; #line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - self->priv->_new_is_workdir = _tmp0_; + self->priv->_new_is_workdir = _tmp0_; #line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - g_object_notify ((GObject *) self, "new-is-workdir"); -#line 5083 "gitg-diff-view-file-renderer-text.c" + g_object_notify ((GObject *) self, "new-is-workdir"); +#line 5136 "gitg-diff-view-file-renderer-text.c" + } } @@ -5097,29 +5151,33 @@ result = _tmp1_ != GTK_WRAP_NONE; #line 65 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" return result; -#line 5101 "gitg-diff-view-file-renderer-text.c" +#line 5155 "gitg-diff-view-file-renderer-text.c" } void gitg_diff_view_file_renderer_text_set_wrap_lines (GitgDiffViewFileRendererText* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" g_return_if_fail (self != NULL); +#line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" + if (gitg_diff_view_file_renderer_text_get_wrap_lines (self) != value) { +#line 5164 "gitg-diff-view-file-renderer-text.c" + gboolean _tmp0_ = FALSE; #line 68 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - _tmp0_ = value; + _tmp0_ = value; #line 68 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - if (_tmp0_) { + if (_tmp0_) { #line 70 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - gtk_text_view_set_wrap_mode ((GtkTextView*) self, GTK_WRAP_WORD_CHAR); -#line 5115 "gitg-diff-view-file-renderer-text.c" - } else { + gtk_text_view_set_wrap_mode ((GtkTextView*) self, GTK_WRAP_WORD_CHAR); +#line 5172 "gitg-diff-view-file-renderer-text.c" + } else { #line 74 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - gtk_text_view_set_wrap_mode ((GtkTextView*) self, GTK_WRAP_NONE); -#line 5119 "gitg-diff-view-file-renderer-text.c" - } + gtk_text_view_set_wrap_mode ((GtkTextView*) self, GTK_WRAP_NONE); +#line 5176 "gitg-diff-view-file-renderer-text.c" + } #line 66 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - g_object_notify ((GObject *) self, "wrap-lines"); -#line 5123 "gitg-diff-view-file-renderer-text.c" + g_object_notify ((GObject *) self, "wrap-lines"); +#line 5180 "gitg-diff-view-file-renderer-text.c" + } } @@ -5134,21 +5192,25 @@ result = (gint) _tmp0_; #line 81 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" return result; -#line 5138 "gitg-diff-view-file-renderer-text.c" +#line 5196 "gitg-diff-view-file-renderer-text.c" } void gitg_diff_view_file_renderer_text_set_tab_width (GitgDiffViewFileRendererText* self, gint value) { - gint _tmp0_ = 0; #line 82 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" g_return_if_fail (self != NULL); #line 82 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - _tmp0_ = value; + if (gitg_diff_view_file_renderer_text_get_tab_width (self) != value) { +#line 5205 "gitg-diff-view-file-renderer-text.c" + gint _tmp0_ = 0; +#line 82 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" + _tmp0_ = value; #line 82 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - gtk_source_view_set_tab_width ((GtkSourceView*) self, (guint) _tmp0_); + gtk_source_view_set_tab_width ((GtkSourceView*) self, (guint) _tmp0_); #line 82 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - g_object_notify ((GObject *) self, "tab-width"); -#line 5152 "gitg-diff-view-file-renderer-text.c" + g_object_notify ((GObject *) self, "tab-width"); +#line 5213 "gitg-diff-view-file-renderer-text.c" + } } @@ -5163,21 +5225,25 @@ result = _tmp0_; #line 85 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" return result; -#line 5167 "gitg-diff-view-file-renderer-text.c" +#line 5229 "gitg-diff-view-file-renderer-text.c" } void gitg_diff_view_file_renderer_text_set_maxlines (GitgDiffViewFileRendererText* self, gint value) { - gint _tmp0_ = 0; #line 85 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" g_return_if_fail (self != NULL); #line 85 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - _tmp0_ = value; + if (gitg_diff_view_file_renderer_text_get_maxlines (self) != value) { +#line 5238 "gitg-diff-view-file-renderer-text.c" + gint _tmp0_ = 0; #line 85 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - self->priv->_maxlines = _tmp0_; + _tmp0_ = value; #line 85 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - g_object_notify ((GObject *) self, "maxlines"); -#line 5181 "gitg-diff-view-file-renderer-text.c" + self->priv->_maxlines = _tmp0_; +#line 85 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" + g_object_notify ((GObject *) self, "maxlines"); +#line 5246 "gitg-diff-view-file-renderer-text.c" + } } @@ -5192,26 +5258,30 @@ result = _tmp0_; #line 87 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" return result; -#line 5196 "gitg-diff-view-file-renderer-text.c" +#line 5262 "gitg-diff-view-file-renderer-text.c" } void gitg_diff_view_file_renderer_text_set_info (GitgDiffViewFileRendererText* self, GitgDiffViewFileInfo* value) { - GitgDiffViewFileInfo* _tmp0_ = NULL; - GitgDiffViewFileInfo* _tmp1_ = NULL; #line 87 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" g_return_if_fail (self != NULL); #line 87 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - _tmp0_ = value; + if (gitg_diff_view_file_renderer_text_get_info (self) != value) { +#line 5271 "gitg-diff-view-file-renderer-text.c" + GitgDiffViewFileInfo* _tmp0_ = NULL; + GitgDiffViewFileInfo* _tmp1_ = NULL; #line 87 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 87 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - _g_object_unref0 (self->priv->_info); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 87 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" + _g_object_unref0 (self->priv->_info); #line 87 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - self->priv->_info = _tmp1_; + self->priv->_info = _tmp1_; #line 87 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - g_object_notify ((GObject *) self, "info"); -#line 5215 "gitg-diff-view-file-renderer-text.c" + g_object_notify ((GObject *) self, "info"); +#line 5284 "gitg-diff-view-file-renderer-text.c" + } } @@ -5232,7 +5302,7 @@ result = _tmp2_; #line 91 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" return result; -#line 5236 "gitg-diff-view-file-renderer-text.c" +#line 5306 "gitg-diff-view-file-renderer-text.c" } @@ -5253,7 +5323,7 @@ result = _tmp2_; #line 96 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" return result; -#line 5257 "gitg-diff-view-file-renderer-text.c" +#line 5327 "gitg-diff-view-file-renderer-text.c" } @@ -5268,34 +5338,38 @@ result = _tmp0_; #line 101 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" return result; -#line 5272 "gitg-diff-view-file-renderer-text.c" +#line 5342 "gitg-diff-view-file-renderer-text.c" } void gitg_diff_view_file_renderer_text_set_highlight (GitgDiffViewFileRendererText* self, gboolean value) { - gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; #line 103 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" g_return_if_fail (self != NULL); +#line 103 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" + if (gitg_diff_view_file_renderer_text_get_highlight (self) != value) { +#line 5351 "gitg-diff-view-file-renderer-text.c" + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; #line 105 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - _tmp0_ = self->priv->d_highlight; + _tmp0_ = self->priv->d_highlight; #line 105 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - _tmp1_ = value; + _tmp1_ = value; #line 105 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - if (_tmp0_ != _tmp1_) { -#line 5287 "gitg-diff-view-file-renderer-text.c" - gboolean _tmp2_ = FALSE; + if (_tmp0_ != _tmp1_) { +#line 5360 "gitg-diff-view-file-renderer-text.c" + gboolean _tmp2_ = FALSE; #line 107 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - _tmp2_ = value; + _tmp2_ = value; #line 107 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - self->priv->d_highlight = _tmp2_; + self->priv->d_highlight = _tmp2_; #line 108 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - gitg_diff_view_file_renderer_text_update_highlight (self); -#line 5295 "gitg-diff-view-file-renderer-text.c" - } + gitg_diff_view_file_renderer_text_update_highlight (self); +#line 5368 "gitg-diff-view-file-renderer-text.c" + } #line 103 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - g_object_notify ((GObject *) self, "highlight"); -#line 5299 "gitg-diff-view-file-renderer-text.c" + g_object_notify ((GObject *) self, "highlight"); +#line 5372 "gitg-diff-view-file-renderer-text.c" + } } @@ -5311,7 +5385,7 @@ result = _tmp0_; #line 119 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" return result; -#line 5315 "gitg-diff-view-file-renderer-text.c" +#line 5389 "gitg-diff-view-file-renderer-text.c" } @@ -5327,59 +5401,63 @@ result = _tmp0_; #line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" return result; -#line 5331 "gitg-diff-view-file-renderer-text.c" +#line 5405 "gitg-diff-view-file-renderer-text.c" } static void gitg_diff_view_file_renderer_text_real_set_can_select (GitgDiffSelectable* base, gboolean value) { GitgDiffViewFileRendererText* self; - gboolean _tmp0_ = FALSE; #line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" self = (GitgDiffViewFileRendererText*) base; #line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - _tmp0_ = value; + if (gitg_diff_view_file_renderer_text_real_get_can_select (self) != value) { +#line 5415 "gitg-diff-view-file-renderer-text.c" + gboolean _tmp0_ = FALSE; +#line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" + _tmp0_ = value; #line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - self->priv->_can_select = _tmp0_; + self->priv->_can_select = _tmp0_; #line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - g_object_notify ((GObject *) self, "can-select"); -#line 5346 "gitg-diff-view-file-renderer-text.c" + g_object_notify ((GObject *) self, "can-select"); +#line 5423 "gitg-diff-view-file-renderer-text.c" + } } -static void _vala_array_add6 (GitgPatchSetPatch** array, int* length, int* size, const GitgPatchSetPatch* value) { +static void _vala_array_add6 (GitgPatchSetPatch* * array, int* length, int* size, const GitgPatchSetPatch* value) { #line 148 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if ((*length) == (*size)) { #line 148 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" *size = (*size) ? (2 * (*size)) : 4; #line 148 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" *array = g_renew (GitgPatchSetPatch, *array, *size); -#line 5357 "gitg-diff-view-file-renderer-text.c" +#line 5435 "gitg-diff-view-file-renderer-text.c" } #line 148 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" (*array)[(*length)++] = *value; -#line 5361 "gitg-diff-view-file-renderer-text.c" +#line 5439 "gitg-diff-view-file-renderer-text.c" } -static void _vala_array_add7 (GitgPatchSetPatch** array, int* length, int* size, const GitgPatchSetPatch* value) { +static void _vala_array_add7 (GitgPatchSetPatch* * array, int* length, int* size, const GitgPatchSetPatch* value) { #line 162 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if ((*length) == (*size)) { #line 162 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" *size = (*size) ? (2 * (*size)) : 4; #line 162 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" *array = g_renew (GitgPatchSetPatch, *array, *size); -#line 5372 "gitg-diff-view-file-renderer-text.c" +#line 5450 "gitg-diff-view-file-renderer-text.c" } #line 162 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" (*array)[(*length)++] = *value; -#line 5376 "gitg-diff-view-file-renderer-text.c" +#line 5454 "gitg-diff-view-file-renderer-text.c" } static GitgPatchSetPatch* _vala_array_dup11 (GitgPatchSetPatch* self, int length) { #line 166 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" return g_memdup (self, length * sizeof (GitgPatchSetPatch)); -#line 5383 "gitg-diff-view-file-renderer-text.c" +#line 5461 "gitg-diff-view-file-renderer-text.c" } @@ -5455,7 +5533,7 @@ patches = (g_free (patches), NULL); #line 136 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" return result; -#line 5459 "gitg-diff-view-file-renderer-text.c" +#line 5537 "gitg-diff-view-file-renderer-text.c" } #line 139 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp10_ = self->priv->d_selectable; @@ -5471,19 +5549,19 @@ selected_length1 = _tmp12__length1; #line 139 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _selected_size_ = selected_length1; -#line 5475 "gitg-diff-view-file-renderer-text.c" +#line 5553 "gitg-diff-view-file-renderer-text.c" { gint i = 0; #line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" i = 0; -#line 5480 "gitg-diff-view-file-renderer-text.c" +#line 5558 "gitg-diff-view-file-renderer-text.c" { gboolean _tmp13_ = FALSE; #line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp13_ = TRUE; #line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" while (TRUE) { -#line 5487 "gitg-diff-view-file-renderer-text.c" +#line 5565 "gitg-diff-view-file-renderer-text.c" gint _tmp15_ = 0; gint* _tmp16_ = NULL; gint _tmp16__length1 = 0; @@ -5512,13 +5590,13 @@ gsize _tmp36_ = 0UL; #line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if (!_tmp13_) { -#line 5516 "gitg-diff-view-file-renderer-text.c" +#line 5594 "gitg-diff-view-file-renderer-text.c" gint _tmp14_ = 0; #line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp14_ = i; #line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" i = _tmp14_ + 1; -#line 5522 "gitg-diff-view-file-renderer-text.c" +#line 5600 "gitg-diff-view-file-renderer-text.c" } #line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp13_ = FALSE; @@ -5532,7 +5610,7 @@ if (!(_tmp15_ < _tmp16__length1)) { #line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" break; -#line 5536 "gitg-diff-view-file-renderer-text.c" +#line 5614 "gitg-diff-view-file-renderer-text.c" } #line 143 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp17_ = selected; @@ -5556,7 +5634,7 @@ _tmp23_ = i; #line 146 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if (_tmp23_ == 0) { -#line 5560 "gitg-diff-view-file-renderer-text.c" +#line 5638 "gitg-diff-view-file-renderer-text.c" GitgPatchSetPatch* _tmp24_ = NULL; gint _tmp24__length1 = 0; GitgPatchSetPatch* _tmp25_ = NULL; @@ -5575,7 +5653,7 @@ _gitg_patch_set_patch_free0 (pset); #line 149 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" continue; -#line 5579 "gitg-diff-view-file-renderer-text.c" +#line 5657 "gitg-diff-view-file-renderer-text.c" } #line 152 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp27_ = patches; @@ -5603,7 +5681,7 @@ _tmp36_ = (*_tmp35_).new_offset; #line 154 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if ((_tmp32_ + _tmp34_) == _tmp36_) { -#line 5607 "gitg-diff-view-file-renderer-text.c" +#line 5685 "gitg-diff-view-file-renderer-text.c" GitgPatchSetPatch _tmp37_ = {0}; GitgPatchSetType _tmp38_ = 0; GitgPatchSetPatch* _tmp39_ = NULL; @@ -5618,15 +5696,15 @@ _tmp40_ = (*_tmp39_).type; #line 155 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp30_ = _tmp38_ == _tmp40_; -#line 5622 "gitg-diff-view-file-renderer-text.c" +#line 5700 "gitg-diff-view-file-renderer-text.c" } else { #line 154 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp30_ = FALSE; -#line 5626 "gitg-diff-view-file-renderer-text.c" +#line 5704 "gitg-diff-view-file-renderer-text.c" } #line 154 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if (_tmp30_) { -#line 5630 "gitg-diff-view-file-renderer-text.c" +#line 5708 "gitg-diff-view-file-renderer-text.c" gsize _tmp41_ = 0UL; GitgPatchSetPatch* _tmp42_ = NULL; gsize _tmp43_ = 0UL; @@ -5658,7 +5736,7 @@ _tmp44_[_tmp45__length1 - 1] = _tmp46_; #line 158 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp47_ = _tmp44_[_tmp45__length1 - 1]; -#line 5662 "gitg-diff-view-file-renderer-text.c" +#line 5740 "gitg-diff-view-file-renderer-text.c" } else { GitgPatchSetPatch* _tmp48_ = NULL; gint _tmp48__length1 = 0; @@ -5674,11 +5752,11 @@ _tmp50_ = *_tmp49_; #line 162 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _vala_array_add7 (&patches, &patches_length1, &_patches_size_, &_tmp50_); -#line 5678 "gitg-diff-view-file-renderer-text.c" +#line 5756 "gitg-diff-view-file-renderer-text.c" } #line 141 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _gitg_patch_set_patch_free0 (pset); -#line 5682 "gitg-diff-view-file-renderer-text.c" +#line 5760 "gitg-diff-view-file-renderer-text.c" } } } @@ -5706,14 +5784,14 @@ patches = (g_free (patches), NULL); #line 167 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" return result; -#line 5710 "gitg-diff-view-file-renderer-text.c" +#line 5788 "gitg-diff-view-file-renderer-text.c" } static void _gitg_diff_view_file_renderer_text_update_theme_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 198 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" gitg_diff_view_file_renderer_text_update_theme ((GitgDiffViewFileRendererText*) self); -#line 5717 "gitg-diff-view-file-renderer-text.c" +#line 5795 "gitg-diff-view-file-renderer-text.c" } @@ -5731,14 +5809,14 @@ self->priv->d_has_selection = _tmp2_; #line 208 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" g_object_notify ((GObject*) self, "has-selection"); -#line 5735 "gitg-diff-view-file-renderer-text.c" +#line 5813 "gitg-diff-view-file-renderer-text.c" } static void __gitg_diff_view_file_renderer_text____lambda53__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 206 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _gitg_diff_view_file_renderer_text____lambda53_ ((GitgDiffViewFileRendererText*) self); -#line 5742 "gitg-diff-view-file-renderer-text.c" +#line 5820 "gitg-diff-view-file-renderer-text.c" } @@ -5864,7 +5942,7 @@ _tmp20_ = _tmp19_; #line 202 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" if (_tmp20_) { -#line 5868 "gitg-diff-view-file-renderer-text.c" +#line 5946 "gitg-diff-view-file-renderer-text.c" GitgDiffViewFileSelectable* _tmp21_ = NULL; GitgDiffViewFileSelectable* _tmp22_ = NULL; #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" @@ -5877,7 +5955,7 @@ _tmp22_ = self->priv->d_selectable; #line 206 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" g_signal_connect_object ((GObject*) _tmp22_, "notify::has-selection", (GCallback) __gitg_diff_view_file_renderer_text____lambda53__g_object_notify, self, 0); -#line 5881 "gitg-diff-view-file-renderer-text.c" +#line 5959 "gitg-diff-view-file-renderer-text.c" } #line 212 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" _tmp23_ = gee_hash_map_new (G_TYPE_INT, NULL, NULL, GITG_PATCH_SET_TYPE_PATCH, (GBoxedCopyFunc) gitg_patch_set_patch_dup, gitg_patch_set_patch_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); @@ -5891,7 +5969,7 @@ _g_object_unref0 (gutter); #line 176 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" return obj; -#line 5895 "gitg-diff-view-file-renderer-text.c" +#line 5973 "gitg-diff-view-file-renderer-text.c" } @@ -5903,14 +5981,14 @@ memcpy (dup, self, sizeof (GitgDiffViewFileRendererTextRegion)); #line 30 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" return dup; -#line 5907 "gitg-diff-view-file-renderer-text.c" +#line 5985 "gitg-diff-view-file-renderer-text.c" } static void gitg_diff_view_file_renderer_text_region_free (GitgDiffViewFileRendererTextRegion* self) { #line 30 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" g_free (self); -#line 5914 "gitg-diff-view-file-renderer-text.c" +#line 5992 "gitg-diff-view-file-renderer-text.c" } @@ -5975,7 +6053,7 @@ GitgDiffViewFileRendererText_private_offset = g_type_class_get_instance_private_offset (klass); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/gitg/ui/gitg-diff-view-file-renderer-text.ui"); -#line 5979 "gitg-diff-view-file-renderer-text.c" +#line 6057 "gitg-diff-view-file-renderer-text.c" } @@ -5990,7 +6068,7 @@ iface->set_can_select = gitg_diff_view_file_renderer_text_real_set_can_select; #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" iface->get_selection = gitg_diff_view_file_renderer_text_real_get_selection; -#line 5994 "gitg-diff-view-file-renderer-text.c" +#line 6072 "gitg-diff-view-file-renderer-text.c" } @@ -5998,8 +6076,8 @@ #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" gitg_diff_view_file_renderer_text_gitg_diff_view_file_renderer_parent_iface = g_type_interface_peek_parent (iface); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" - iface->add_hunk = (void (*)(GitgDiffViewFileRenderer*, GgitDiffHunk*, GeeArrayList*)) gitg_diff_view_file_renderer_text_real_add_hunk; -#line 6003 "gitg-diff-view-file-renderer-text.c" + iface->add_hunk = (void (*) (GitgDiffViewFileRenderer *, GgitDiffHunk*, GeeArrayList*)) gitg_diff_view_file_renderer_text_real_add_hunk; +#line 6081 "gitg-diff-view-file-renderer-text.c" } @@ -6008,11 +6086,11 @@ self->priv = GITG_DIFF_VIEW_FILE_RENDERER_TEXT_GET_PRIVATE (self); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 6012 "gitg-diff-view-file-renderer-text.c" +#line 6090 "gitg-diff-view-file-renderer-text.c" } -static void gitg_diff_view_file_renderer_text_finalize (GObject* obj) { +static void gitg_diff_view_file_renderer_text_finalize (GObject * obj) { GitgDiffViewFileRendererText * self; #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_DIFF_VIEW_FILE_RENDERER_TEXT, GitgDiffViewFileRendererText); @@ -6038,7 +6116,7 @@ _g_object_unref0 (self->priv->_info); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" G_OBJECT_CLASS (gitg_diff_view_file_renderer_text_parent_class)->finalize (obj); -#line 6042 "gitg-diff-view-file-renderer-text.c" +#line 6120 "gitg-diff-view-file-renderer-text.c" } @@ -6141,13 +6219,13 @@ gitg_value_take_patch_set (value, gitg_diff_selectable_get_selection ((GitgDiffSelectable*) self)); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" break; -#line 6145 "gitg-diff-view-file-renderer-text.c" +#line 6223 "gitg-diff-view-file-renderer-text.c" default: #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" break; -#line 6151 "gitg-diff-view-file-renderer-text.c" +#line 6229 "gitg-diff-view-file-renderer-text.c" } } @@ -6211,13 +6289,13 @@ gitg_diff_selectable_set_can_select ((GitgDiffSelectable*) self, g_value_get_boolean (value)); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" break; -#line 6215 "gitg-diff-view-file-renderer-text.c" +#line 6293 "gitg-diff-view-file-renderer-text.c" default: #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-renderer-text.vala" break; -#line 6221 "gitg-diff-view-file-renderer-text.c" +#line 6299 "gitg-diff-view-file-renderer-text.c" } } diff -Nru gitg-3.22.0/libgitg/gitg-diff-view-file-selectable.c gitg-3.23.0/libgitg/gitg-diff-view-file-selectable.c --- gitg-3.22.0/libgitg/gitg-diff-view-file-selectable.c 2016-09-18 12:01:41.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-view-file-selectable.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-diff-view-file-selectable.c generated by valac 0.32.1, the Vala compiler +/* gitg-diff-view-file-selectable.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-diff-view-file-selectable.vala, do not modify */ /* @@ -115,7 +115,7 @@ static gboolean gitg_diff_view_file_selectable_button_release_event_on_view (GitgDiffViewFileSelectable* self, GdkEventButton* event); void gitg_diff_view_file_selectable_set_source_view (GitgDiffViewFileSelectable* self, GtkSourceView* value); gint* gitg_diff_view_file_selectable_get_selected_lines (GitgDiffViewFileSelectable* self, int* result_length1); -static void _vala_array_add3 (gint** array, int* length, int* size, gint value); +static void _vala_array_add3 (gint* * array, int* length, int* size, gint value); static GObject * gitg_diff_view_file_selectable_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); static gboolean _gitg_diff_view_file_selectable_button_press_event_on_view_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); static gboolean _gitg_diff_view_file_selectable_motion_notify_event_on_view_gtk_widget_motion_notify_event (GtkWidget* _sender, GdkEventMotion* event, gpointer self); @@ -127,7 +127,7 @@ static void _gitg_diff_view_file_selectable___lambda50_ (GitgDiffViewFileSelectable* self); static void __gitg_diff_view_file_selectable___lambda50__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); static void _gitg_diff_view_file_selectable_update_theme_gtk_widget_style_updated (GtkWidget* _sender, gpointer self); -static void gitg_diff_view_file_selectable_finalize (GObject* obj); +static void gitg_diff_view_file_selectable_finalize (GObject * obj); static void _vala_gitg_diff_view_file_selectable_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_diff_view_file_selectable_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -1849,21 +1849,25 @@ void gitg_diff_view_file_selectable_set_source_view (GitgDiffViewFileSelectable* self, GtkSourceView* value) { - GtkSourceView* _tmp0_ = NULL; - GtkSourceView* _tmp1_ = NULL; #line 40 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" g_return_if_fail (self != NULL); #line 40 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" - _tmp0_ = value; + if (gitg_diff_view_file_selectable_get_source_view (self) != value) { +#line 1857 "gitg-diff-view-file-selectable.c" + GtkSourceView* _tmp0_ = NULL; + GtkSourceView* _tmp1_ = NULL; +#line 40 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" + _tmp0_ = value; #line 40 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 40 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" - _g_object_unref0 (self->priv->_source_view); + _g_object_unref0 (self->priv->_source_view); #line 40 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" - self->priv->_source_view = _tmp1_; + self->priv->_source_view = _tmp1_; #line 40 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" - g_object_notify ((GObject *) self, "source-view"); -#line 1867 "gitg-diff-view-file-selectable.c" + g_object_notify ((GObject *) self, "source-view"); +#line 1870 "gitg-diff-view-file-selectable.c" + } } @@ -1878,36 +1882,40 @@ result = _tmp0_; #line 45 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" return result; -#line 1882 "gitg-diff-view-file-selectable.c" +#line 1886 "gitg-diff-view-file-selectable.c" } static void gitg_diff_view_file_selectable_set_has_selection (GitgDiffViewFileSelectable* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 45 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" g_return_if_fail (self != NULL); #line 45 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" - _tmp0_ = value; + if (gitg_diff_view_file_selectable_get_has_selection (self) != value) { +#line 1895 "gitg-diff-view-file-selectable.c" + gboolean _tmp0_ = FALSE; +#line 45 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" + _tmp0_ = value; #line 45 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" - self->priv->_has_selection = _tmp0_; + self->priv->_has_selection = _tmp0_; #line 45 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" - g_object_notify ((GObject *) self, "has-selection"); -#line 1896 "gitg-diff-view-file-selectable.c" + g_object_notify ((GObject *) self, "has-selection"); +#line 1903 "gitg-diff-view-file-selectable.c" + } } -static void _vala_array_add3 (gint** array, int* length, int* size, gint value) { +static void _vala_array_add3 (gint* * array, int* length, int* size, gint value) { #line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" if ((*length) == (*size)) { #line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" *size = (*size) ? (2 * (*size)) : 4; #line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" *array = g_renew (gint, *array, *size); -#line 1907 "gitg-diff-view-file-selectable.c" +#line 1915 "gitg-diff-view-file-selectable.c" } #line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" (*array)[(*length)++] = value; -#line 1911 "gitg-diff-view-file-selectable.c" +#line 1919 "gitg-diff-view-file-selectable.c" } @@ -1955,7 +1963,7 @@ iter = _tmp6_; #line 59 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" while (TRUE) { -#line 1959 "gitg-diff-view-file-selectable.c" +#line 1967 "gitg-diff-view-file-selectable.c" GtkSourceBuffer* _tmp7_ = NULL; const gchar* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; @@ -1972,7 +1980,7 @@ if (!_tmp9_) { #line 59 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" break; -#line 1976 "gitg-diff-view-file-selectable.c" +#line 1984 "gitg-diff-view-file-selectable.c" } #line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" _tmp10_ = ret; @@ -1982,7 +1990,7 @@ _tmp11_ = gtk_text_iter_get_line (&iter); #line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" _vala_array_add3 (&ret, &ret_length1, &_ret_size_, _tmp11_); -#line 1986 "gitg-diff-view-file-selectable.c" +#line 1994 "gitg-diff-view-file-selectable.c" } #line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" _tmp12_ = ret; @@ -1992,7 +2000,7 @@ if (result_length1) { #line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" *result_length1 = _tmp12__length1; -#line 1996 "gitg-diff-view-file-selectable.c" +#line 2004 "gitg-diff-view-file-selectable.c" } #line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" result = _tmp12_; @@ -2000,7 +2008,7 @@ _g_object_unref0 (buffer); #line 64 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" return result; -#line 2004 "gitg-diff-view-file-selectable.c" +#line 2012 "gitg-diff-view-file-selectable.c" } @@ -2015,7 +2023,7 @@ _tmp0_ = self->priv->d_cursor_ptr; #line 107 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" if (_tmp0_ == NULL) { -#line 2019 "gitg-diff-view-file-selectable.c" +#line 2027 "gitg-diff-view-file-selectable.c" GtkSourceView* _tmp1_ = NULL; GdkDisplay* _tmp2_ = NULL; GdkCursor* _tmp3_ = NULL; @@ -2029,7 +2037,7 @@ _g_object_unref0 (self->priv->d_cursor_ptr); #line 109 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" self->priv->d_cursor_ptr = _tmp3_; -#line 2033 "gitg-diff-view-file-selectable.c" +#line 2041 "gitg-diff-view-file-selectable.c" } #line 112 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" _tmp4_ = self->priv->d_cursor_ptr; @@ -2039,7 +2047,7 @@ result = _tmp5_; #line 112 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" return result; -#line 2043 "gitg-diff-view-file-selectable.c" +#line 2051 "gitg-diff-view-file-selectable.c" } @@ -2054,7 +2062,7 @@ _tmp0_ = self->priv->d_cursor_hand; #line 120 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" if (_tmp0_ == NULL) { -#line 2058 "gitg-diff-view-file-selectable.c" +#line 2066 "gitg-diff-view-file-selectable.c" GtkSourceView* _tmp1_ = NULL; GdkDisplay* _tmp2_ = NULL; GdkCursor* _tmp3_ = NULL; @@ -2068,7 +2076,7 @@ _g_object_unref0 (self->priv->d_cursor_hand); #line 122 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" self->priv->d_cursor_hand = _tmp3_; -#line 2072 "gitg-diff-view-file-selectable.c" +#line 2080 "gitg-diff-view-file-selectable.c" } #line 125 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" _tmp4_ = self->priv->d_cursor_hand; @@ -2078,7 +2086,7 @@ result = _tmp5_; #line 125 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" return result; -#line 2082 "gitg-diff-view-file-selectable.c" +#line 2090 "gitg-diff-view-file-selectable.c" } @@ -2087,7 +2095,7 @@ result = gitg_diff_view_file_selectable_button_press_event_on_view ((GitgDiffViewFileSelectable*) self, event); #line 75 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" return result; -#line 2091 "gitg-diff-view-file-selectable.c" +#line 2099 "gitg-diff-view-file-selectable.c" } @@ -2096,7 +2104,7 @@ result = gitg_diff_view_file_selectable_motion_notify_event_on_view ((GitgDiffViewFileSelectable*) self, event); #line 76 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" return result; -#line 2100 "gitg-diff-view-file-selectable.c" +#line 2108 "gitg-diff-view-file-selectable.c" } @@ -2105,7 +2113,7 @@ result = gitg_diff_view_file_selectable_leave_notify_event_on_view ((GitgDiffViewFileSelectable*) self, event); #line 77 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" return result; -#line 2109 "gitg-diff-view-file-selectable.c" +#line 2117 "gitg-diff-view-file-selectable.c" } @@ -2114,7 +2122,7 @@ result = gitg_diff_view_file_selectable_enter_notify_event_on_view ((GitgDiffViewFileSelectable*) self, event); #line 78 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" return result; -#line 2118 "gitg-diff-view-file-selectable.c" +#line 2126 "gitg-diff-view-file-selectable.c" } @@ -2123,7 +2131,7 @@ result = gitg_diff_view_file_selectable_button_release_event_on_view ((GitgDiffViewFileSelectable*) self, event); #line 79 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" return result; -#line 2127 "gitg-diff-view-file-selectable.c" +#line 2135 "gitg-diff-view-file-selectable.c" } @@ -2141,14 +2149,14 @@ gitg_diff_view_file_selectable_update_cursor (self, _tmp2_); #line 82 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" _g_object_unref0 (_tmp2_); -#line 2145 "gitg-diff-view-file-selectable.c" +#line 2153 "gitg-diff-view-file-selectable.c" } static void __gitg_diff_view_file_selectable___lambda49__gtk_widget_realize (GtkWidget* _sender, gpointer self) { #line 81 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" _gitg_diff_view_file_selectable___lambda49_ ((GitgDiffViewFileSelectable*) self); -#line 2152 "gitg-diff-view-file-selectable.c" +#line 2160 "gitg-diff-view-file-selectable.c" } @@ -2166,21 +2174,21 @@ gitg_diff_view_file_selectable_update_cursor (self, _tmp2_); #line 86 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" _g_object_unref0 (_tmp2_); -#line 2170 "gitg-diff-view-file-selectable.c" +#line 2178 "gitg-diff-view-file-selectable.c" } static void __gitg_diff_view_file_selectable___lambda50__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 85 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" _gitg_diff_view_file_selectable___lambda50_ ((GitgDiffViewFileSelectable*) self); -#line 2177 "gitg-diff-view-file-selectable.c" +#line 2185 "gitg-diff-view-file-selectable.c" } static void _gitg_diff_view_file_selectable_update_theme_gtk_widget_style_updated (GtkWidget* _sender, gpointer self) { #line 91 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" gitg_diff_view_file_selectable_update_theme ((GitgDiffViewFileSelectable*) self); -#line 2184 "gitg-diff-view-file-selectable.c" +#line 2192 "gitg-diff-view-file-selectable.c" } @@ -2323,7 +2331,7 @@ self->priv->d_end_selection_mark = _tmp29_; #line 73 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" return obj; -#line 2327 "gitg-diff-view-file-selectable.c" +#line 2335 "gitg-diff-view-file-selectable.c" } @@ -2344,7 +2352,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_DIFF_VIEW_FILE_SELECTABLE_SOURCE_VIEW, g_param_spec_object ("source-view", "source-view", "source-view", gtk_source_view_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); #line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_DIFF_VIEW_FILE_SELECTABLE_HAS_SELECTION, g_param_spec_boolean ("has-selection", "has-selection", "has-selection", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 2348 "gitg-diff-view-file-selectable.c" +#line 2356 "gitg-diff-view-file-selectable.c" } @@ -2356,11 +2364,11 @@ _tmp0_ = g_strdup ("selection"); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" self->priv->d_selection_category = _tmp0_; -#line 2360 "gitg-diff-view-file-selectable.c" +#line 2368 "gitg-diff-view-file-selectable.c" } -static void gitg_diff_view_file_selectable_finalize (GObject* obj) { +static void gitg_diff_view_file_selectable_finalize (GObject * obj) { GitgDiffViewFileSelectable * self; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_DIFF_VIEW_FILE_SELECTABLE, GitgDiffViewFileSelectable); @@ -2382,7 +2390,7 @@ _g_object_unref0 (self->priv->_source_view); #line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" G_OBJECT_CLASS (gitg_diff_view_file_selectable_parent_class)->finalize (obj); -#line 2386 "gitg-diff-view-file-selectable.c" +#line 2394 "gitg-diff-view-file-selectable.c" } @@ -2415,13 +2423,13 @@ g_value_set_boolean (value, gitg_diff_view_file_selectable_get_has_selection (self)); #line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" break; -#line 2419 "gitg-diff-view-file-selectable.c" +#line 2427 "gitg-diff-view-file-selectable.c" default: #line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" break; -#line 2425 "gitg-diff-view-file-selectable.c" +#line 2433 "gitg-diff-view-file-selectable.c" } } @@ -2443,13 +2451,13 @@ gitg_diff_view_file_selectable_set_has_selection (self, g_value_get_boolean (value)); #line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" break; -#line 2447 "gitg-diff-view-file-selectable.c" +#line 2455 "gitg-diff-view-file-selectable.c" default: #line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 26 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-file-selectable.vala" break; -#line 2453 "gitg-diff-view-file-selectable.c" +#line 2461 "gitg-diff-view-file-selectable.c" } } diff -Nru gitg-3.22.0/libgitg/gitg-diff-view-file.vala gitg-3.23.0/libgitg/gitg-diff-view-file.vala --- gitg-3.22.0/libgitg/gitg-diff-view-file.vala 2016-09-18 11:59:28.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-view-file.vala 2016-11-26 08:32:25.000000000 +0000 @@ -128,6 +128,11 @@ public DiffViewFile.image(Repository? repository, Ggit.DiffDelta delta) { this(repository, delta); + + this.renderer = new DiffViewFileRendererImage(repository, delta); + this.renderer.show(); + + d_diff_stat_file.hide(); } protected override void constructed() diff -Nru gitg-3.22.0/libgitg/gitg-diff-view-lines-renderer.c gitg-3.23.0/libgitg/gitg-diff-view-lines-renderer.c --- gitg-3.22.0/libgitg/gitg-diff-view-lines-renderer.c 2016-09-03 14:31:12.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-view-lines-renderer.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-diff-view-lines-renderer.c generated by valac 0.32.1, the Vala compiler +/* gitg-diff-view-lines-renderer.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-diff-view-lines-renderer.vala, do not modify */ /* @@ -118,8 +118,8 @@ void gitg_diff_view_lines_renderer_set_maxlines (GitgDiffViewLinesRenderer* self, gint value); GtkTextBuffer* gitg_diff_view_lines_renderer_get_buffer (GitgDiffViewLinesRenderer* self); static GObject * gitg_diff_view_lines_renderer_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); -static gchar** _vala_array_dup12 (gchar** self, int length); -static void gitg_diff_view_lines_renderer_finalize (GObject* obj); +static gchar** _vala_array_dup13 (gchar** self, int length); +static void gitg_diff_view_lines_renderer_finalize (GObject * obj); static void _vala_gitg_diff_view_lines_renderer_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_diff_view_lines_renderer_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -500,11 +500,11 @@ static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 510 "gitg-diff-view-lines-renderer.c" } @@ -1185,16 +1185,20 @@ void gitg_diff_view_lines_renderer_set_style (GitgDiffViewLinesRenderer* self, GitgDiffViewLinesRendererStyle value) { - GitgDiffViewLinesRendererStyle _tmp0_ = 0; #line 47 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" g_return_if_fail (self != NULL); #line 47 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" - _tmp0_ = value; + if (gitg_diff_view_lines_renderer_get_style (self) != value) { +#line 1193 "gitg-diff-view-lines-renderer.c" + GitgDiffViewLinesRendererStyle _tmp0_ = 0; +#line 47 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" + _tmp0_ = value; #line 47 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" - self->priv->_style = _tmp0_; + self->priv->_style = _tmp0_; #line 47 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" - g_object_notify ((GObject *) self, "style"); -#line 1198 "gitg-diff-view-lines-renderer.c" + g_object_notify ((GObject *) self, "style"); +#line 1201 "gitg-diff-view-lines-renderer.c" + } } @@ -1209,36 +1213,40 @@ result = _tmp0_; #line 54 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" return result; -#line 1213 "gitg-diff-view-lines-renderer.c" +#line 1217 "gitg-diff-view-lines-renderer.c" } void gitg_diff_view_lines_renderer_set_maxlines (GitgDiffViewLinesRenderer* self, gint value) { - gint _tmp0_ = 0; - gint _tmp1_ = 0; #line 55 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" g_return_if_fail (self != NULL); +#line 55 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" + if (gitg_diff_view_lines_renderer_get_maxlines (self) != value) { +#line 1226 "gitg-diff-view-lines-renderer.c" + gint _tmp0_ = 0; + gint _tmp1_ = 0; #line 57 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" - _tmp0_ = value; + _tmp0_ = value; #line 57 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" - _tmp1_ = self->priv->d_maxlines; + _tmp1_ = self->priv->d_maxlines; #line 57 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" - if (_tmp0_ > _tmp1_) { -#line 1228 "gitg-diff-view-lines-renderer.c" - gint _tmp2_ = 0; + if (_tmp0_ > _tmp1_) { +#line 1235 "gitg-diff-view-lines-renderer.c" + gint _tmp2_ = 0; #line 59 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" - _tmp2_ = value; + _tmp2_ = value; #line 59 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" - self->priv->d_maxlines = _tmp2_; + self->priv->d_maxlines = _tmp2_; #line 61 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" - gitg_diff_view_lines_renderer_calculate_num_digits (self); + gitg_diff_view_lines_renderer_calculate_num_digits (self); #line 62 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" - gitg_diff_view_lines_renderer_recalculate_size (self); -#line 1238 "gitg-diff-view-lines-renderer.c" - } + gitg_diff_view_lines_renderer_recalculate_size (self); +#line 1245 "gitg-diff-view-lines-renderer.c" + } #line 55 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" - g_object_notify ((GObject *) self, "maxlines"); -#line 1242 "gitg-diff-view-lines-renderer.c" + g_object_notify ((GObject *) self, "maxlines"); +#line 1249 "gitg-diff-view-lines-renderer.c" + } } @@ -1259,7 +1267,7 @@ result = _tmp2_; #line 82 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" return result; -#line 1263 "gitg-diff-view-lines-renderer.c" +#line 1271 "gitg-diff-view-lines-renderer.c" } @@ -1286,28 +1294,28 @@ gitg_diff_view_lines_renderer_calculate_num_digits (self); #line 72 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" return obj; -#line 1290 "gitg-diff-view-lines-renderer.c" +#line 1298 "gitg-diff-view-lines-renderer.c" } -static gchar** _vala_array_dup12 (gchar** self, int length) { +static gchar** _vala_array_dup13 (gchar** self, int length) { gchar** result; int i; #line 34 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" result = g_new0 (gchar*, length + 1); #line 34 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" for (i = 0; i < length; i++) { -#line 1301 "gitg-diff-view-lines-renderer.c" +#line 1309 "gitg-diff-view-lines-renderer.c" gchar* _tmp0_ = NULL; #line 34 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" _tmp0_ = g_strdup (self[i]); #line 34 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" result[i] = _tmp0_; -#line 1307 "gitg-diff-view-lines-renderer.c" +#line 1315 "gitg-diff-view-lines-renderer.c" } #line 34 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" return result; -#line 1311 "gitg-diff-view-lines-renderer.c" +#line 1319 "gitg-diff-view-lines-renderer.c" } @@ -1346,7 +1354,7 @@ #line 34 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" _tmp5__length1 = (*self).line_infos_length1; #line 34 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" - _tmp6_ = (_tmp5_ != NULL) ? _vala_array_dup12 (_tmp5_, _tmp5__length1) : ((gpointer) _tmp5_); + _tmp6_ = (_tmp5_ != NULL) ? _vala_array_dup13 (_tmp5_, _tmp5__length1) : ((gpointer) _tmp5_); #line 34 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" _tmp6__length1 = _tmp5__length1; #line 34 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" @@ -1357,7 +1365,7 @@ (*dest).line_infos_length1 = _tmp6__length1; #line 34 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" (*dest)._line_infos_size_ = (*dest).line_infos_length1; -#line 1361 "gitg-diff-view-lines-renderer.c" +#line 1369 "gitg-diff-view-lines-renderer.c" } @@ -1366,7 +1374,7 @@ _ggit_diff_hunk_unref0 ((*self).hunk); #line 40 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" (*self).line_infos = (_vala_array_free ((*self).line_infos, (*self).line_infos_length1, (GDestroyNotify) g_free), NULL); -#line 1370 "gitg-diff-view-lines-renderer.c" +#line 1378 "gitg-diff-view-lines-renderer.c" } @@ -1378,7 +1386,7 @@ gitg_diff_view_lines_renderer_hunk_info_copy (self, dup); #line 34 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" return dup; -#line 1382 "gitg-diff-view-lines-renderer.c" +#line 1390 "gitg-diff-view-lines-renderer.c" } @@ -1387,7 +1395,7 @@ gitg_diff_view_lines_renderer_hunk_info_destroy (self); #line 34 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" g_free (self); -#line 1391 "gitg-diff-view-lines-renderer.c" +#line 1399 "gitg-diff-view-lines-renderer.c" } @@ -1425,18 +1433,18 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_DIFF_VIEW_LINES_RENDERER_MAXLINES, g_param_spec_int ("maxlines", "maxlines", "maxlines", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); #line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_DIFF_VIEW_LINES_RENDERER_BUFFER, g_param_spec_object ("buffer", "buffer", "buffer", gtk_text_buffer_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1429 "gitg-diff-view-lines-renderer.c" +#line 1437 "gitg-diff-view-lines-renderer.c" } static void gitg_diff_view_lines_renderer_instance_init (GitgDiffViewLinesRenderer * self) { #line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" self->priv = GITG_DIFF_VIEW_LINES_RENDERER_GET_PRIVATE (self); -#line 1436 "gitg-diff-view-lines-renderer.c" +#line 1444 "gitg-diff-view-lines-renderer.c" } -static void gitg_diff_view_lines_renderer_finalize (GObject* obj) { +static void gitg_diff_view_lines_renderer_finalize (GObject * obj) { GitgDiffViewLinesRenderer * self; #line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_DIFF_VIEW_LINES_RENDERER, GitgDiffViewLinesRenderer); @@ -1448,7 +1456,7 @@ _g_object_unref0 (self->priv->d_hunks_list); #line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" G_OBJECT_CLASS (gitg_diff_view_lines_renderer_parent_class)->finalize (obj); -#line 1452 "gitg-diff-view-lines-renderer.c" +#line 1460 "gitg-diff-view-lines-renderer.c" } @@ -1487,13 +1495,13 @@ g_value_set_object (value, gitg_diff_view_lines_renderer_get_buffer (self)); #line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" break; -#line 1491 "gitg-diff-view-lines-renderer.c" +#line 1499 "gitg-diff-view-lines-renderer.c" default: #line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" break; -#line 1497 "gitg-diff-view-lines-renderer.c" +#line 1505 "gitg-diff-view-lines-renderer.c" } } @@ -1515,13 +1523,13 @@ gitg_diff_view_lines_renderer_set_maxlines (self, g_value_get_int (value)); #line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" break; -#line 1519 "gitg-diff-view-lines-renderer.c" +#line 1527 "gitg-diff-view-lines-renderer.c" default: #line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 20 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-lines-renderer.vala" break; -#line 1525 "gitg-diff-view-lines-renderer.c" +#line 1533 "gitg-diff-view-lines-renderer.c" } } diff -Nru gitg-3.22.0/libgitg/gitg-diff-view-options.c gitg-3.23.0/libgitg/gitg-diff-view-options.c --- gitg-3.22.0/libgitg/gitg-diff-view-options.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-view-options.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-diff-view-options.c generated by valac 0.32.1, the Vala compiler +/* gitg-diff-view-options.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-diff-view-options.vala, do not modify */ /* @@ -176,7 +176,7 @@ static GObject * gitg_diff_view_options_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); GitgDiffViewOptionsSpacing* gitg_diff_view_options_spacing_new (void); GitgDiffViewOptionsSpacing* gitg_diff_view_options_spacing_construct (GType object_type); -static void gitg_diff_view_options_finalize (GObject* obj); +static void gitg_diff_view_options_finalize (GObject * obj); static void _vala_gitg_diff_view_options_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_diff_view_options_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); #define GITG_DIFF_VIEW_OPTIONS_SPACING_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_DIFF_VIEW_OPTIONS_SPACING, GitgDiffViewOptionsSpacingPrivate)) @@ -195,7 +195,7 @@ gint gitg_diff_view_options_spacing_get_tab_width (GitgDiffViewOptionsSpacing* self); void gitg_diff_view_options_spacing_set_tab_width (GitgDiffViewOptionsSpacing* self, gint value); gboolean gitg_diff_view_options_spacing_get_ignore_whitespace_visible (GitgDiffViewOptionsSpacing* self); -static void gitg_diff_view_options_spacing_finalize (GObject* obj); +static void gitg_diff_view_options_spacing_finalize (GObject * obj); static void _vala_gitg_diff_view_options_spacing_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_diff_view_options_spacing_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); gpointer gitg_transforms_ref (gpointer instance); @@ -210,7 +210,7 @@ }; GitgTransforms* gitg_transforms_new (void); GitgTransforms* gitg_transforms_construct (GType object_type); -static void gitg_transforms_finalize (GitgTransforms* obj); +static void gitg_transforms_finalize (GitgTransforms * obj); GitgDiffViewOptions* gitg_diff_view_options_construct (GType object_type, GitgDiffView* view) { @@ -544,16 +544,20 @@ void gitg_diff_view_options_set_context_lines (GitgDiffViewOptions* self, gint value) { - gint _tmp0_ = 0; #line 29 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" g_return_if_fail (self != NULL); #line 29 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - _tmp0_ = value; + if (gitg_diff_view_options_get_context_lines (self) != value) { +#line 552 "gitg-diff-view-options.c" + gint _tmp0_ = 0; +#line 29 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" + _tmp0_ = value; #line 29 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - self->priv->_context_lines = _tmp0_; + self->priv->_context_lines = _tmp0_; #line 29 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - g_object_notify ((GObject *) self, "context-lines"); -#line 557 "gitg-diff-view-options.c" + g_object_notify ((GObject *) self, "context-lines"); +#line 560 "gitg-diff-view-options.c" + } } @@ -568,54 +572,58 @@ result = _tmp0_; #line 39 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" return result; -#line 572 "gitg-diff-view-options.c" +#line 576 "gitg-diff-view-options.c" } void gitg_diff_view_options_set_view (GitgDiffViewOptions* self, GitgDiffView* value) { - GitgDiffView* _tmp0_ = NULL; - GitgDiffView* _tmp1_ = NULL; - GitgDiffView* old_view = NULL; - GitgDiffView* _tmp2_ = NULL; - GitgDiffView* _tmp3_ = NULL; - GitgDiffView* _tmp4_ = NULL; - GitgDiffView* _tmp5_ = NULL; - GitgDiffView* _tmp6_ = NULL; #line 41 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" g_return_if_fail (self != NULL); +#line 41 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" + if (gitg_diff_view_options_get_view (self) != value) { +#line 585 "gitg-diff-view-options.c" + GitgDiffView* _tmp0_ = NULL; + GitgDiffView* _tmp1_ = NULL; + GitgDiffView* old_view = NULL; + GitgDiffView* _tmp2_ = NULL; + GitgDiffView* _tmp3_ = NULL; + GitgDiffView* _tmp4_ = NULL; + GitgDiffView* _tmp5_ = NULL; + GitgDiffView* _tmp6_ = NULL; #line 43 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - _tmp0_ = self->priv->d_view; + _tmp0_ = self->priv->d_view; #line 43 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - _tmp1_ = value; + _tmp1_ = value; #line 43 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - if (_tmp0_ == _tmp1_) { + if (_tmp0_ == _tmp1_) { #line 45 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - return; -#line 595 "gitg-diff-view-options.c" - } + return; +#line 602 "gitg-diff-view-options.c" + } #line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - _tmp2_ = self->priv->d_view; + _tmp2_ = self->priv->d_view; #line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp3_ = _g_object_ref0 (_tmp2_); #line 48 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - old_view = _tmp3_; + old_view = _tmp3_; #line 49 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - _tmp4_ = value; + _tmp4_ = value; #line 49 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - _tmp5_ = _g_object_ref0 (_tmp4_); + _tmp5_ = _g_object_ref0 (_tmp4_); #line 49 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - _g_object_unref0 (self->priv->d_view); + _g_object_unref0 (self->priv->d_view); #line 49 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - self->priv->d_view = _tmp5_; + self->priv->d_view = _tmp5_; #line 51 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - _tmp6_ = old_view; + _tmp6_ = old_view; #line 51 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - gitg_diff_view_options_view_changed (self, _tmp6_); + gitg_diff_view_options_view_changed (self, _tmp6_); #line 41 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - _g_object_unref0 (old_view); + _g_object_unref0 (old_view); #line 41 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - g_object_notify ((GObject *) self, "view"); -#line 619 "gitg-diff-view-options.c" + g_object_notify ((GObject *) self, "view"); +#line 626 "gitg-diff-view-options.c" + } } @@ -655,7 +663,7 @@ gtk_popover_set_relative_to ((GtkPopover*) _tmp2_, (GtkWidget*) _tmp3_); #line 60 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" return obj; -#line 659 "gitg-diff-view-options.c" +#line 667 "gitg-diff-view-options.c" } @@ -691,7 +699,7 @@ gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "tool_button_spacing", FALSE, GitgDiffViewOptions_private_offset + G_STRUCT_OFFSET (GitgDiffViewOptionsPrivate, d_tool_button_spacing)); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "clicked_on_tool_button_spacing", G_CALLBACK(_gitg_diff_view_options_clicked_on_tool_button_spacing_gtk_tool_button_clicked)); -#line 695 "gitg-diff-view-options.c" +#line 703 "gitg-diff-view-options.c" } @@ -700,11 +708,11 @@ self->priv = GITG_DIFF_VIEW_OPTIONS_GET_PRIVATE (self); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 704 "gitg-diff-view-options.c" +#line 712 "gitg-diff-view-options.c" } -static void gitg_diff_view_options_finalize (GObject* obj) { +static void gitg_diff_view_options_finalize (GObject * obj) { GitgDiffViewOptions * self; #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_DIFF_VIEW_OPTIONS, GitgDiffViewOptions); @@ -720,7 +728,7 @@ _g_object_unref0 (self->priv->d_popover_spacing); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" G_OBJECT_CLASS (gitg_diff_view_options_parent_class)->finalize (obj); -#line 724 "gitg-diff-view-options.c" +#line 732 "gitg-diff-view-options.c" } @@ -753,13 +761,13 @@ g_value_set_object (value, gitg_diff_view_options_get_view (self)); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" break; -#line 757 "gitg-diff-view-options.c" +#line 765 "gitg-diff-view-options.c" default: #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" break; -#line 763 "gitg-diff-view-options.c" +#line 771 "gitg-diff-view-options.c" } } @@ -781,13 +789,13 @@ gitg_diff_view_options_set_view (self, g_value_get_object (value)); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" break; -#line 785 "gitg-diff-view-options.c" +#line 793 "gitg-diff-view-options.c" default: #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 21 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" break; -#line 791 "gitg-diff-view-options.c" +#line 799 "gitg-diff-view-options.c" } } @@ -821,7 +829,7 @@ _tmp4_ = self->priv->d_label_ignore_whitespace; #line 197 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" g_object_bind_property_with_closures ((GObject*) self, "ignore-whitespace-visible", (GObject*) _tmp4_, "visible", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); -#line 825 "gitg-diff-view-options.c" +#line 833 "gitg-diff-view-options.c" } @@ -831,14 +839,14 @@ self = (GitgDiffViewOptionsSpacing*) g_object_new (object_type, NULL); #line 153 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" return self; -#line 835 "gitg-diff-view-options.c" +#line 843 "gitg-diff-view-options.c" } GitgDiffViewOptionsSpacing* gitg_diff_view_options_spacing_new (void) { #line 153 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" return gitg_diff_view_options_spacing_construct (GITG_TYPE_DIFF_VIEW_OPTIONS_SPACING); -#line 842 "gitg-diff-view-options.c" +#line 850 "gitg-diff-view-options.c" } @@ -853,21 +861,25 @@ result = _tmp0_; #line 167 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" return result; -#line 857 "gitg-diff-view-options.c" +#line 865 "gitg-diff-view-options.c" } void gitg_diff_view_options_spacing_set_ignore_whitespace (GitgDiffViewOptionsSpacing* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 167 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" g_return_if_fail (self != NULL); #line 167 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - _tmp0_ = value; + if (gitg_diff_view_options_spacing_get_ignore_whitespace (self) != value) { +#line 874 "gitg-diff-view-options.c" + gboolean _tmp0_ = FALSE; #line 167 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - self->priv->_ignore_whitespace = _tmp0_; + _tmp0_ = value; #line 167 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - g_object_notify ((GObject *) self, "ignore-whitespace"); -#line 871 "gitg-diff-view-options.c" + self->priv->_ignore_whitespace = _tmp0_; +#line 167 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" + g_object_notify ((GObject *) self, "ignore-whitespace"); +#line 882 "gitg-diff-view-options.c" + } } @@ -882,21 +894,25 @@ result = _tmp0_; #line 168 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" return result; -#line 886 "gitg-diff-view-options.c" +#line 898 "gitg-diff-view-options.c" } void gitg_diff_view_options_spacing_set_wrap_lines (GitgDiffViewOptionsSpacing* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 168 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" g_return_if_fail (self != NULL); #line 168 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - _tmp0_ = value; + if (gitg_diff_view_options_spacing_get_wrap_lines (self) != value) { +#line 907 "gitg-diff-view-options.c" + gboolean _tmp0_ = FALSE; +#line 168 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" + _tmp0_ = value; #line 168 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - self->priv->_wrap_lines = _tmp0_; + self->priv->_wrap_lines = _tmp0_; #line 168 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - g_object_notify ((GObject *) self, "wrap-lines"); -#line 900 "gitg-diff-view-options.c" + g_object_notify ((GObject *) self, "wrap-lines"); +#line 915 "gitg-diff-view-options.c" + } } @@ -911,21 +927,25 @@ result = _tmp0_; #line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" return result; -#line 915 "gitg-diff-view-options.c" +#line 931 "gitg-diff-view-options.c" } void gitg_diff_view_options_spacing_set_tab_width (GitgDiffViewOptionsSpacing* self, gint value) { - gint _tmp0_ = 0; #line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" g_return_if_fail (self != NULL); #line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - _tmp0_ = value; + if (gitg_diff_view_options_spacing_get_tab_width (self) != value) { +#line 940 "gitg-diff-view-options.c" + gint _tmp0_ = 0; +#line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" + _tmp0_ = value; #line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - self->priv->_tab_width = _tmp0_; + self->priv->_tab_width = _tmp0_; #line 169 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - g_object_notify ((GObject *) self, "tab-width"); -#line 929 "gitg-diff-view-options.c" + g_object_notify ((GObject *) self, "tab-width"); +#line 948 "gitg-diff-view-options.c" + } } @@ -940,21 +960,25 @@ result = _tmp0_; #line 171 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" return result; -#line 944 "gitg-diff-view-options.c" +#line 964 "gitg-diff-view-options.c" } void gitg_diff_view_options_spacing_set_ignore_whitespace_visible (GitgDiffViewOptionsSpacing* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 171 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" g_return_if_fail (self != NULL); #line 171 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - _tmp0_ = value; + if (gitg_diff_view_options_spacing_get_ignore_whitespace_visible (self) != value) { +#line 973 "gitg-diff-view-options.c" + gboolean _tmp0_ = FALSE; #line 171 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - self->priv->_ignore_whitespace_visible = _tmp0_; + _tmp0_ = value; #line 171 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" - g_object_notify ((GObject *) self, "ignore-whitespace-visible"); -#line 958 "gitg-diff-view-options.c" + self->priv->_ignore_whitespace_visible = _tmp0_; +#line 171 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" + g_object_notify ((GObject *) self, "ignore-whitespace-visible"); +#line 981 "gitg-diff-view-options.c" + } } @@ -992,7 +1016,7 @@ gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "switch_wrap_lines", FALSE, GitgDiffViewOptionsSpacing_private_offset + G_STRUCT_OFFSET (GitgDiffViewOptionsSpacingPrivate, d_switch_wrap_lines)); #line 153 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "adjustment_tab_width", FALSE, GitgDiffViewOptionsSpacing_private_offset + G_STRUCT_OFFSET (GitgDiffViewOptionsSpacingPrivate, d_adjustment_tab_width)); -#line 996 "gitg-diff-view-options.c" +#line 1020 "gitg-diff-view-options.c" } @@ -1001,11 +1025,11 @@ self->priv = GITG_DIFF_VIEW_OPTIONS_SPACING_GET_PRIVATE (self); #line 153 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 1005 "gitg-diff-view-options.c" +#line 1029 "gitg-diff-view-options.c" } -static void gitg_diff_view_options_spacing_finalize (GObject* obj) { +static void gitg_diff_view_options_spacing_finalize (GObject * obj) { GitgDiffViewOptionsSpacing * self; #line 153 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_DIFF_VIEW_OPTIONS_SPACING, GitgDiffViewOptionsSpacing); @@ -1019,7 +1043,7 @@ _g_object_unref0 (self->priv->d_adjustment_tab_width); #line 153 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" G_OBJECT_CLASS (gitg_diff_view_options_spacing_parent_class)->finalize (obj); -#line 1023 "gitg-diff-view-options.c" +#line 1047 "gitg-diff-view-options.c" } @@ -1064,13 +1088,13 @@ g_value_set_boolean (value, gitg_diff_view_options_spacing_get_ignore_whitespace_visible (self)); #line 153 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" break; -#line 1068 "gitg-diff-view-options.c" +#line 1092 "gitg-diff-view-options.c" default: #line 153 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 153 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" break; -#line 1074 "gitg-diff-view-options.c" +#line 1098 "gitg-diff-view-options.c" } } @@ -1104,13 +1128,13 @@ gitg_diff_view_options_spacing_set_ignore_whitespace_visible (self, g_value_get_boolean (value)); #line 153 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" break; -#line 1108 "gitg-diff-view-options.c" +#line 1132 "gitg-diff-view-options.c" default: #line 153 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 153 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" break; -#line 1114 "gitg-diff-view-options.c" +#line 1138 "gitg-diff-view-options.c" } } @@ -1132,7 +1156,7 @@ result = TRUE; #line 211 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" return result; -#line 1136 "gitg-diff-view-options.c" +#line 1160 "gitg-diff-view-options.c" } @@ -1153,7 +1177,7 @@ result = TRUE; #line 219 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" return result; -#line 1157 "gitg-diff-view-options.c" +#line 1181 "gitg-diff-view-options.c" } @@ -1163,21 +1187,21 @@ self = (GitgTransforms*) g_type_create_instance (object_type); #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" return self; -#line 1167 "gitg-diff-view-options.c" +#line 1191 "gitg-diff-view-options.c" } GitgTransforms* gitg_transforms_new (void) { #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" return gitg_transforms_construct (GITG_TYPE_TRANSFORMS); -#line 1174 "gitg-diff-view-options.c" +#line 1198 "gitg-diff-view-options.c" } static void gitg_value_transforms_init (GValue* value) { #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" value->data[0].v_pointer = NULL; -#line 1181 "gitg-diff-view-options.c" +#line 1205 "gitg-diff-view-options.c" } @@ -1186,7 +1210,7 @@ if (value->data[0].v_pointer) { #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" gitg_transforms_unref (value->data[0].v_pointer); -#line 1190 "gitg-diff-view-options.c" +#line 1214 "gitg-diff-view-options.c" } } @@ -1196,11 +1220,11 @@ if (src_value->data[0].v_pointer) { #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" dest_value->data[0].v_pointer = gitg_transforms_ref (src_value->data[0].v_pointer); -#line 1200 "gitg-diff-view-options.c" +#line 1224 "gitg-diff-view-options.c" } else { #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" dest_value->data[0].v_pointer = NULL; -#line 1204 "gitg-diff-view-options.c" +#line 1228 "gitg-diff-view-options.c" } } @@ -1208,66 +1232,66 @@ static gpointer gitg_value_transforms_peek_pointer (const GValue* value) { #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" return value->data[0].v_pointer; -#line 1212 "gitg-diff-view-options.c" +#line 1236 "gitg-diff-view-options.c" } static gchar* gitg_value_transforms_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" if (collect_values[0].v_pointer) { -#line 1219 "gitg-diff-view-options.c" - GitgTransforms* object; +#line 1243 "gitg-diff-view-options.c" + GitgTransforms * object; object = collect_values[0].v_pointer; #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" if (object->parent_instance.g_class == NULL) { #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1226 "gitg-diff-view-options.c" +#line 1250 "gitg-diff-view-options.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1230 "gitg-diff-view-options.c" +#line 1254 "gitg-diff-view-options.c" } #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" value->data[0].v_pointer = gitg_transforms_ref (object); -#line 1234 "gitg-diff-view-options.c" +#line 1258 "gitg-diff-view-options.c" } else { #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" value->data[0].v_pointer = NULL; -#line 1238 "gitg-diff-view-options.c" +#line 1262 "gitg-diff-view-options.c" } #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" return NULL; -#line 1242 "gitg-diff-view-options.c" +#line 1266 "gitg-diff-view-options.c" } static gchar* gitg_value_transforms_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GitgTransforms** object_p; + GitgTransforms ** object_p; object_p = collect_values[0].v_pointer; #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" if (!object_p) { #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1253 "gitg-diff-view-options.c" +#line 1277 "gitg-diff-view-options.c" } #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" if (!value->data[0].v_pointer) { #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" *object_p = NULL; -#line 1259 "gitg-diff-view-options.c" +#line 1283 "gitg-diff-view-options.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" *object_p = value->data[0].v_pointer; -#line 1263 "gitg-diff-view-options.c" +#line 1287 "gitg-diff-view-options.c" } else { #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" *object_p = gitg_transforms_ref (value->data[0].v_pointer); -#line 1267 "gitg-diff-view-options.c" +#line 1291 "gitg-diff-view-options.c" } #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" return NULL; -#line 1271 "gitg-diff-view-options.c" +#line 1295 "gitg-diff-view-options.c" } @@ -1281,7 +1305,7 @@ G_PARAM_SPEC (spec)->value_type = object_type; #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" return G_PARAM_SPEC (spec); -#line 1285 "gitg-diff-view-options.c" +#line 1309 "gitg-diff-view-options.c" } @@ -1290,12 +1314,12 @@ g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_TRANSFORMS), NULL); #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" return value->data[0].v_pointer; -#line 1294 "gitg-diff-view-options.c" +#line 1318 "gitg-diff-view-options.c" } void gitg_value_set_transforms (GValue* value, gpointer v_object) { - GitgTransforms* old; + GitgTransforms * old; #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_TRANSFORMS)); #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" @@ -1310,23 +1334,23 @@ value->data[0].v_pointer = v_object; #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" gitg_transforms_ref (value->data[0].v_pointer); -#line 1314 "gitg-diff-view-options.c" +#line 1338 "gitg-diff-view-options.c" } else { #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" value->data[0].v_pointer = NULL; -#line 1318 "gitg-diff-view-options.c" +#line 1342 "gitg-diff-view-options.c" } #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" if (old) { #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" gitg_transforms_unref (old); -#line 1324 "gitg-diff-view-options.c" +#line 1348 "gitg-diff-view-options.c" } } void gitg_value_take_transforms (GValue* value, gpointer v_object) { - GitgTransforms* old; + GitgTransforms * old; #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_TRANSFORMS)); #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" @@ -1339,17 +1363,17 @@ g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" value->data[0].v_pointer = v_object; -#line 1343 "gitg-diff-view-options.c" +#line 1367 "gitg-diff-view-options.c" } else { #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" value->data[0].v_pointer = NULL; -#line 1347 "gitg-diff-view-options.c" +#line 1371 "gitg-diff-view-options.c" } #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" if (old) { #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" gitg_transforms_unref (old); -#line 1353 "gitg-diff-view-options.c" +#line 1377 "gitg-diff-view-options.c" } } @@ -1359,24 +1383,24 @@ gitg_transforms_parent_class = g_type_class_peek_parent (klass); #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" ((GitgTransformsClass *) klass)->finalize = gitg_transforms_finalize; -#line 1363 "gitg-diff-view-options.c" +#line 1387 "gitg-diff-view-options.c" } static void gitg_transforms_instance_init (GitgTransforms * self) { #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" self->ref_count = 1; -#line 1370 "gitg-diff-view-options.c" +#line 1394 "gitg-diff-view-options.c" } -static void gitg_transforms_finalize (GitgTransforms* obj) { +static void gitg_transforms_finalize (GitgTransforms * obj) { GitgTransforms * self; #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_TRANSFORMS, GitgTransforms); #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" g_signal_handlers_destroy (self); -#line 1380 "gitg-diff-view-options.c" +#line 1404 "gitg-diff-view-options.c" } @@ -1395,18 +1419,18 @@ gpointer gitg_transforms_ref (gpointer instance) { - GitgTransforms* self; + GitgTransforms * self; self = instance; #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" g_atomic_int_inc (&self->ref_count); #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" return instance; -#line 1405 "gitg-diff-view-options.c" +#line 1429 "gitg-diff-view-options.c" } void gitg_transforms_unref (gpointer instance) { - GitgTransforms* self; + GitgTransforms * self; self = instance; #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1414,7 +1438,7 @@ GITG_TRANSFORMS_GET_CLASS (self)->finalize (self); #line 204 "/home/jesse/dev/gitg/libgitg/gitg-diff-view-options.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1418 "gitg-diff-view-options.c" +#line 1442 "gitg-diff-view-options.c" } } diff -Nru gitg-3.22.0/libgitg/gitg-diff-view.vala gitg-3.23.0/libgitg/gitg-diff-view.vala --- gitg-3.22.0/libgitg/gitg-diff-view.vala 2016-09-18 11:59:28.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-diff-view.vala 2016-11-26 08:32:25.000000000 +0000 @@ -52,6 +52,8 @@ private uint d_reveal_options_timeout; private uint d_unreveal_options_timeout; + private static Gee.HashSet s_image_mime_types; + public Ggit.DiffOptions options { get @@ -224,6 +226,16 @@ static construct { + s_image_mime_types = new Gee.HashSet(); + + foreach (var format in Gdk.Pixbuf.get_formats()) + { + foreach (var mime_type in format.get_mime_types()) + { + s_image_mime_types.add(mime_type); + } + } + try { s_message_regexp = new Regex(".*[\\R\\s]*(?P(?:.|\\R)*?)\\s*$"); @@ -336,13 +348,13 @@ } } - private string? primary_path(Gitg.DiffViewFile f) + private string? primary_path(Ggit.DiffDelta delta) { - var path = f.delta.get_old_file().get_path(); + var path = delta.get_old_file().get_path(); if (path == null) { - path = f.delta.get_new_file().get_path(); + path = delta.get_new_file().get_path(); } return path; @@ -479,7 +491,34 @@ current_is_binary = true; } - if (current_is_binary) + string? mime_type_for_image = null; + + if (info == null || info.new_file_content_type == null) + { + // Guess mime type from old file name in the case of a deleted file + var oldpath = delta.get_old_file().get_path(); + + if (oldpath != null) + { + bool uncertain; + var ctype = ContentType.guess(Path.get_basename(oldpath), null, out uncertain); + + if (ctype != null) + { + mime_type_for_image = ContentType.get_mime_type(ctype); + } + } + } + else + { + mime_type_for_image = ContentType.get_mime_type(info.new_file_content_type); + } + + if (mime_type_for_image != null && s_image_mime_types.contains(mime_type_for_image)) + { + current_file = new Gitg.DiffViewFile.image(repository, delta); + } + else if (current_is_binary) { current_file = new Gitg.DiffViewFile.binary(repository, delta); } @@ -550,7 +589,7 @@ if (preserve_expanded && f.expanded) { - var path = primary_path(f); + var path = primary_path(f.delta); if (path != null) { @@ -567,7 +606,7 @@ for (var i = 0; i < files.size; i++) { var file = files[i]; - var path = primary_path(file); + var path = primary_path(file.delta); file.expanded = d_commit_details.expanded || (path != null && was_expanded.contains(path)); diff -Nru gitg-3.22.0/libgitg/gitg-hook.c gitg-3.23.0/libgitg/gitg-hook.c --- gitg-3.22.0/libgitg/gitg-hook.c 2016-09-18 12:01:42.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-hook.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-hook.c generated by valac 0.32.1, the Vala compiler +/* gitg-hook.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-hook.vala, do not modify */ /* @@ -172,16 +172,16 @@ GitgHook* gitg_hook_new (const gchar* name); GitgHook* gitg_hook_construct (GType object_type, const gchar* name); void gitg_hook_add_argument (GitgHook* self, const gchar* arg); -static void _vala_array_add8 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add8 (gchar** * array, int* length, int* size, gchar* value); static gchar** gitg_hook_flat_environment (GitgHook* self, int* result_length1); GeeHashMap* gitg_hook_get_environment (GitgHook* self); -static void _vala_array_add9 (gchar*** array, int* length, int* size, gchar* value); -static void _vala_array_add10 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add9 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add10 (gchar** * array, int* length, int* size, gchar* value); static void gitg_hook_stream_read_async (GitgHook* self, GDataInputStream* stream); static Block12Data* block12_data_ref (Block12Data* _data12_); static void block12_data_unref (void * _userdata_); static void __lambda12_ (Block12Data* _data12_, GObject* obj, GAsyncResult* res); -static void _vala_array_add11 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add11 (gchar** * array, int* length, int* size, gchar* value); static void ___lambda12__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); static void gitg_hook_read_from_fd (GitgHook* self, gint fd); static GFile* gitg_hook_hook_file (GitgHook* self, GgitRepository* repository); @@ -200,17 +200,17 @@ static void block14_data_unref (void * _userdata_); static gboolean _gitg_hook_run_co_gsource_func (gpointer self); GFile* gitg_hook_get_working_directory (GitgHook* self); -static void _vala_array_add12 (gchar*** array, int* length, int* size, gchar* value); -static void _vala_array_add13 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add12 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add13 (gchar** * array, int* length, int* size, gchar* value); static void __lambda13_ (Block14Data* _data14_, GPid p, gint st); static void ___lambda13__gchild_watch_func (GPid pid, gint status, gpointer self); void gitg_hook_set_environment (GitgHook* self, GeeHashMap* value); void gitg_hook_set_name (GitgHook* self, const gchar* value); void gitg_hook_set_working_directory (GitgHook* self, GFile* value); gchar** gitg_hook_get_output (GitgHook* self, int* result_length1); -static gchar** _vala_array_dup13 (gchar** self, int length); +static gchar** _vala_array_dup14 (gchar** self, int length); static GObject * gitg_hook_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); -static void gitg_hook_finalize (GObject* obj); +static void gitg_hook_finalize (GObject * obj); static void _vala_gitg_hook_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_hook_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -240,7 +240,7 @@ } -static void _vala_array_add8 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add8 (gchar** * array, int* length, int* size, gchar* value) { #line 49 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" if ((*length) == (*size)) { #line 49 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" @@ -280,7 +280,7 @@ } -static void _vala_array_add9 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add9 (gchar** * array, int* length, int* size, gchar* value) { #line 68 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" if ((*length) == (*size)) { #line 68 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" @@ -297,7 +297,7 @@ } -static void _vala_array_add10 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add10 (gchar** * array, int* length, int* size, gchar* value) { #line 74 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" if ((*length) == (*size)) { #line 74 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" @@ -602,7 +602,7 @@ } -static void _vala_array_add11 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add11 (gchar** * array, int* length, int* size, gchar* value) { #line 91 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" if ((*length) == (*size)) { #line 91 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" @@ -643,7 +643,7 @@ #line 85 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 646 "gitg-hook.c" - goto __catch46_g_error; + goto __catch48_g_error; } #line 87 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" if (s != NULL) { @@ -678,8 +678,8 @@ _g_free0 (s); #line 680 "gitg-hook.c" } - goto __finally46; - __catch46_g_error: + goto __finally48; + __catch48_g_error: { #line 83 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" g_clear_error (&_inner_error_); @@ -687,7 +687,7 @@ _inner_error_ = NULL; #line 689 "gitg-hook.c" } - __finally46: + __finally48: #line 83 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 83 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" @@ -846,7 +846,7 @@ #line 124 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 849 "gitg-hook.c" - goto __catch47_g_error; + goto __catch49_g_error; } #line 127 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" _tmp3_ = g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE); @@ -860,8 +860,8 @@ return result; #line 862 "gitg-hook.c" } - goto __finally47; - __catch47_g_error: + goto __finally49; + __catch49_g_error: { #line 122 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" g_clear_error (&_inner_error_); @@ -875,7 +875,7 @@ return result; #line 877 "gitg-hook.c" } - __finally47: + __finally49: #line 122 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" _g_object_unref0 (script); #line 122 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" @@ -950,7 +950,7 @@ #line 144 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" if (_inner_error_->domain == G_SPAWN_ERROR) { #line 953 "gitg-hook.c" - goto __catch48_g_spawn_error; + goto __catch50_g_spawn_error; } #line 144 "/home/jesse/dev/gitg/libgitg/gitg-hook.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); @@ -964,8 +964,8 @@ _data13_->status = _tmp0_; #line 966 "gitg-hook.c" } - goto __finally48; - __catch48_g_spawn_error: + goto __finally50; + __catch50_g_spawn_error: { GError* err = NULL; GError* _tmp3_ = NULL; @@ -986,7 +986,7 @@ _g_error_free0 (err); #line 988 "gitg-hook.c" } - __finally48: + __finally50: #line 142 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 142 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" @@ -1206,7 +1206,7 @@ } -static void _vala_array_add12 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add12 (gchar** * array, int* length, int* size, gchar* value) { #line 187 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" if ((*length) == (*size)) { #line 187 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" @@ -1223,7 +1223,7 @@ } -static void _vala_array_add13 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add13 (gchar** * array, int* length, int* size, gchar* value) { #line 191 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" if ((*length) == (*size)) { #line 191 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" @@ -1666,21 +1666,25 @@ void gitg_hook_set_environment (GitgHook* self, GeeHashMap* value) { - GeeHashMap* _tmp0_ = NULL; - GeeHashMap* _tmp1_ = NULL; #line 25 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" g_return_if_fail (self != NULL); #line 25 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" - _tmp0_ = value; + if (gitg_hook_get_environment (self) != value) { +#line 1674 "gitg-hook.c" + GeeHashMap* _tmp0_ = NULL; + GeeHashMap* _tmp1_ = NULL; #line 25 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 25 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" - _g_object_unref0 (self->priv->_environment); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 25 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" + _g_object_unref0 (self->priv->_environment); #line 25 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" - self->priv->_environment = _tmp1_; + self->priv->_environment = _tmp1_; #line 25 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" - g_object_notify ((GObject *) self, "environment"); -#line 1684 "gitg-hook.c" + g_object_notify ((GObject *) self, "environment"); +#line 1687 "gitg-hook.c" + } } @@ -1695,26 +1699,30 @@ result = _tmp0_; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" return result; -#line 1699 "gitg-hook.c" +#line 1703 "gitg-hook.c" } void gitg_hook_set_name (GitgHook* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" g_return_if_fail (self != NULL); #line 26 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" - _tmp0_ = value; + if (g_strcmp0 (value, gitg_hook_get_name (self)) != 0) { +#line 1712 "gitg-hook.c" + const gchar* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = value; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" - _g_free0 (self->priv->_name); + _tmp1_ = g_strdup (_tmp0_); +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" + _g_free0 (self->priv->_name); #line 26 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" - self->priv->_name = _tmp1_; + self->priv->_name = _tmp1_; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" - g_object_notify ((GObject *) self, "name"); -#line 1718 "gitg-hook.c" + g_object_notify ((GObject *) self, "name"); +#line 1725 "gitg-hook.c" + } } @@ -1729,47 +1737,51 @@ result = _tmp0_; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" return result; -#line 1733 "gitg-hook.c" +#line 1741 "gitg-hook.c" } void gitg_hook_set_working_directory (GitgHook* self, GFile* value) { - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" g_return_if_fail (self != NULL); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" - _tmp0_ = value; + if (gitg_hook_get_working_directory (self) != value) { +#line 1750 "gitg-hook.c" + GFile* _tmp0_ = NULL; + GFile* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" - _g_object_unref0 (self->priv->_working_directory); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 28 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" + _g_object_unref0 (self->priv->_working_directory); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" - self->priv->_working_directory = _tmp1_; + self->priv->_working_directory = _tmp1_; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" - g_object_notify ((GObject *) self, "working-directory"); -#line 1752 "gitg-hook.c" + g_object_notify ((GObject *) self, "working-directory"); +#line 1763 "gitg-hook.c" + } } -static gchar** _vala_array_dup13 (gchar** self, int length) { +static gchar** _vala_array_dup14 (gchar** self, int length) { gchar** result; int i; #line 34 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" result = g_new0 (gchar*, length + 1); #line 34 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" for (i = 0; i < length; i++) { -#line 1763 "gitg-hook.c" +#line 1775 "gitg-hook.c" gchar* _tmp0_ = NULL; #line 34 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" _tmp0_ = g_strdup (self[i]); #line 34 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" result[i] = _tmp0_; -#line 1769 "gitg-hook.c" +#line 1781 "gitg-hook.c" } #line 34 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" return result; -#line 1773 "gitg-hook.c" +#line 1785 "gitg-hook.c" } @@ -1788,7 +1800,7 @@ #line 34 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" _tmp0__length1 = self->priv->d_output_length1; #line 34 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup13 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); + _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup14 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); #line 34 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" _tmp1__length1 = _tmp0__length1; #line 34 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" @@ -1799,13 +1811,13 @@ if (result_length1) { #line 34 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" *result_length1 = _tmp2__length1; -#line 1803 "gitg-hook.c" +#line 1815 "gitg-hook.c" } #line 34 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" result = _tmp2_; #line 34 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" return result; -#line 1809 "gitg-hook.c" +#line 1821 "gitg-hook.c" } @@ -1831,7 +1843,7 @@ _g_object_unref0 (_tmp1_); #line 37 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" return obj; -#line 1835 "gitg-hook.c" +#line 1847 "gitg-hook.c" } @@ -1853,21 +1865,21 @@ #line 23 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_HOOK_NAME, g_param_spec_string ("name", "name", "name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); #line 23 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_HOOK_WORKING_DIRECTORY, g_param_spec_object ("working-directory", "working-directory", "working-directory", G_TYPE_FILE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_HOOK_WORKING_DIRECTORY, g_param_spec_object ("working-directory", "working-directory", "working-directory", g_file_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); #line 23 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_HOOK_OUTPUT, g_param_spec_boxed ("output", "output", "output", G_TYPE_STRV, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1860 "gitg-hook.c" +#line 1872 "gitg-hook.c" } static void gitg_hook_instance_init (GitgHook * self) { #line 23 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" self->priv = GITG_HOOK_GET_PRIVATE (self); -#line 1867 "gitg-hook.c" +#line 1879 "gitg-hook.c" } -static void gitg_hook_finalize (GObject* obj) { +static void gitg_hook_finalize (GObject * obj) { GitgHook * self; #line 23 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_HOOK, GitgHook); @@ -1883,7 +1895,7 @@ self->priv->d_output = (_vala_array_free (self->priv->d_output, self->priv->d_output_length1, (GDestroyNotify) g_free), NULL); #line 23 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" G_OBJECT_CLASS (gitg_hook_parent_class)->finalize (obj); -#line 1887 "gitg-hook.c" +#line 1899 "gitg-hook.c" } @@ -1924,22 +1936,22 @@ break; #line 23 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" case GITG_HOOK_OUTPUT: -#line 1928 "gitg-hook.c" +#line 1940 "gitg-hook.c" { int length; #line 23 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" g_value_take_boxed (value, gitg_hook_get_output (self, &length)); -#line 1933 "gitg-hook.c" +#line 1945 "gitg-hook.c" } #line 23 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" break; -#line 1937 "gitg-hook.c" +#line 1949 "gitg-hook.c" default: #line 23 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" break; -#line 1943 "gitg-hook.c" +#line 1955 "gitg-hook.c" } } @@ -1967,13 +1979,13 @@ gitg_hook_set_working_directory (self, g_value_get_object (value)); #line 23 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" break; -#line 1971 "gitg-hook.c" +#line 1983 "gitg-hook.c" default: #line 23 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/libgitg/gitg-hook.vala" break; -#line 1977 "gitg-hook.c" +#line 1989 "gitg-hook.c" } } diff -Nru gitg-3.22.0/libgitg/gitg-init.c gitg-3.23.0/libgitg/gitg-init.c --- gitg-3.22.0/libgitg/gitg-init.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-init.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-init.c generated by valac 0.32.1, the Vala compiler +/* gitg-init.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-init.vala, do not modify */ /* diff -Nru gitg-3.22.0/libgitg/gitg-label-renderer.c gitg-3.23.0/libgitg/gitg-label-renderer.c --- gitg-3.22.0/libgitg/gitg-label-renderer.c 2016-09-03 14:31:12.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-label-renderer.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-label-renderer.c generated by valac 0.32.1, the Vala compiler +/* gitg-label-renderer.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-label-renderer.vala, do not modify */ /* @@ -158,11 +158,11 @@ static guchar gitg_label_renderer_convert_color_channel (guchar color, guchar alpha); static void gitg_label_renderer_convert_bgra_to_rgba (guchar* src, int src_length1, guchar* dst, int dst_length1, gint width, gint height); GdkPixbuf* gitg_label_renderer_render_ref (GtkWidget* widget, PangoFontDescription* font, GitgRef* r, gint height, gint minwidth); -static guchar* _vala_array_dup14 (guchar* self, int length); -static guint8* _vala_array_dup15 (guint8* self, int length); +static guchar* _vala_array_dup15 (guchar* self, int length); +static guint8* _vala_array_dup16 (guint8* self, int length); GitgLabelRenderer* gitg_label_renderer_new (void); GitgLabelRenderer* gitg_label_renderer_construct (GType object_type); -static void gitg_label_renderer_finalize (GitgLabelRenderer* obj); +static void gitg_label_renderer_finalize (GitgLabelRenderer * obj); static gchar* gitg_label_renderer_label_text (GitgRef* r) { @@ -1311,14 +1311,14 @@ } -static guchar* _vala_array_dup14 (guchar* self, int length) { +static guchar* _vala_array_dup15 (guchar* self, int length) { #line 284 "/home/jesse/dev/gitg/libgitg/gitg-label-renderer.vala" return g_memdup (self, length * sizeof (guchar)); #line 1318 "gitg-label-renderer.c" } -static guint8* _vala_array_dup15 (guint8* self, int length) { +static guint8* _vala_array_dup16 (guint8* self, int length) { #line 292 "/home/jesse/dev/gitg/libgitg/gitg-label-renderer.vala" return g_memdup (self, length * sizeof (guint8)); #line 1325 "gitg-label-renderer.c" @@ -1418,7 +1418,7 @@ #line 284 "/home/jesse/dev/gitg/libgitg/gitg-label-renderer.vala" _tmp15_ = cairo_image_surface_get_data (surface); #line 284 "/home/jesse/dev/gitg/libgitg/gitg-label-renderer.vala" - _tmp16_ = (_tmp15_ != NULL) ? _vala_array_dup14 (_tmp15_, -1) : ((gpointer) _tmp15_); + _tmp16_ = (_tmp15_ != NULL) ? _vala_array_dup15 (_tmp15_, -1) : ((gpointer) _tmp15_); #line 284 "/home/jesse/dev/gitg/libgitg/gitg-label-renderer.vala" _tmp16__length1 = -1; #line 284 "/home/jesse/dev/gitg/libgitg/gitg-label-renderer.vala" @@ -1436,7 +1436,7 @@ #line 292 "/home/jesse/dev/gitg/libgitg/gitg-label-renderer.vala" _tmp19_ = gdk_pixbuf_get_pixels (ret); #line 292 "/home/jesse/dev/gitg/libgitg/gitg-label-renderer.vala" - _tmp20_ = (_tmp19_ != NULL) ? _vala_array_dup15 (_tmp19_, -1) : ((gpointer) _tmp19_); + _tmp20_ = (_tmp19_ != NULL) ? _vala_array_dup16 (_tmp19_, -1) : ((gpointer) _tmp19_); #line 292 "/home/jesse/dev/gitg/libgitg/gitg-label-renderer.vala" _tmp20__length1 = -1; #line 292 "/home/jesse/dev/gitg/libgitg/gitg-label-renderer.vala" @@ -1528,7 +1528,7 @@ #line 22 "/home/jesse/dev/gitg/libgitg/gitg-label-renderer.vala" if (collect_values[0].v_pointer) { #line 1531 "gitg-label-renderer.c" - GitgLabelRenderer* object; + GitgLabelRenderer * object; object = collect_values[0].v_pointer; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-label-renderer.vala" if (object->parent_instance.g_class == NULL) { @@ -1555,7 +1555,7 @@ static gchar* gitg_value_label_renderer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GitgLabelRenderer** object_p; + GitgLabelRenderer ** object_p; object_p = collect_values[0].v_pointer; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-label-renderer.vala" if (!object_p) { @@ -1607,7 +1607,7 @@ void gitg_value_set_label_renderer (GValue* value, gpointer v_object) { - GitgLabelRenderer* old; + GitgLabelRenderer * old; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-label-renderer.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_LABEL_RENDERER)); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-label-renderer.vala" @@ -1638,7 +1638,7 @@ void gitg_value_take_label_renderer (GValue* value, gpointer v_object) { - GitgLabelRenderer* old; + GitgLabelRenderer * old; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-label-renderer.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_LABEL_RENDERER)); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-label-renderer.vala" @@ -1682,7 +1682,7 @@ } -static void gitg_label_renderer_finalize (GitgLabelRenderer* obj) { +static void gitg_label_renderer_finalize (GitgLabelRenderer * obj) { GitgLabelRenderer * self; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-label-renderer.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_LABEL_RENDERER, GitgLabelRenderer); @@ -1707,7 +1707,7 @@ gpointer gitg_label_renderer_ref (gpointer instance) { - GitgLabelRenderer* self; + GitgLabelRenderer * self; self = instance; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-label-renderer.vala" g_atomic_int_inc (&self->ref_count); @@ -1718,7 +1718,7 @@ void gitg_label_renderer_unref (gpointer instance) { - GitgLabelRenderer* self; + GitgLabelRenderer * self; self = instance; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-label-renderer.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { diff -Nru gitg-3.22.0/libgitg/gitg-lane.c gitg-3.23.0/libgitg/gitg-lane.c --- gitg-3.22.0/libgitg/gitg-lane.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-lane.c 2016-11-26 12:23:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-lane.c generated by valac 0.32.1, the Vala compiler +/* gitg-lane.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-lane.vala, do not modify */ /* @@ -93,7 +93,7 @@ static GgitOId* _vala_GgitOId_copy (GgitOId* self); GitgLane* gitg_lane_dup (GitgLane* self); GitgColor* gitg_color_copy (GitgColor* self); -static void gitg_lane_finalize (GObject* obj); +static void gitg_lane_finalize (GObject * obj); GType gitg_lane_tag_get_type (void) { @@ -313,7 +313,7 @@ } -static void gitg_lane_finalize (GObject* obj) { +static void gitg_lane_finalize (GObject * obj) { GitgLane * self; #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lane.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_LANE, GitgLane); diff -Nru gitg-3.22.0/libgitg/gitg-lanes.c gitg-3.23.0/libgitg/gitg-lanes.c --- gitg-3.22.0/libgitg/gitg-lanes.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-lanes.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-lanes.c generated by valac 0.32.1, the Vala compiler +/* gitg-lanes.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-lanes.vala, do not modify */ /* @@ -174,7 +174,7 @@ static void gitg_lanes_value_take_lane_container (GValue* value, gpointer v_object) G_GNUC_UNUSED; static gpointer gitg_lanes_value_get_lane_container (const GValue* value) G_GNUC_UNUSED; static GType gitg_lanes_lane_container_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -static void gitg_lanes_collapsed_lane_free (GitgLanesCollapsedLane* self); +static void gitg_lanes_collapsed_lane_free (GitgLanesCollapsedLane * self); #define GITG_LANES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_LANES, GitgLanesPrivate)) enum { GITG_LANES_DUMMY_PROPERTY, @@ -197,7 +197,7 @@ static GitgLanesLaneContainer* gitg_lanes_lane_container_construct (GType object_type, GgitOId* from, GgitOId* to); GType gitg_lane_get_type (void) G_GNUC_CONST; static void gitg_lanes_lane_container_set_is_hidden (GitgLanesLaneContainer* self, gboolean value); -gboolean gitg_lanes_next (GitgLanes* self, GitgCommit* next, GSList** lanes, gint* nextpos); +gboolean gitg_lanes_next (GitgLanes* self, GitgCommit* next, GSList* * lanes, gint* nextpos); gboolean gitg_lanes_get_inactive_enabled (GitgLanes* self); static void gitg_lanes_collapse_lanes (GitgLanes* self); static void gitg_lanes_expand_lanes (GitgLanes* self, GitgCommit* commit); @@ -242,9 +242,9 @@ enum { GITG_LANES_LANE_CONTAINER_DUMMY_PROPERTY }; -static void gitg_lanes_lane_container_finalize (GitgLanesLaneContainer* obj); +static void gitg_lanes_lane_container_finalize (GitgLanesLaneContainer * obj); static void gitg_lanes_collapsed_lane_instance_init (GitgLanesCollapsedLane * self); -static void gitg_lanes_finalize (GObject* obj); +static void gitg_lanes_finalize (GObject * obj); static void _vala_gitg_lanes_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_lanes_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -470,7 +470,7 @@ } -gboolean gitg_lanes_next (GitgLanes* self, GitgCommit* next, GSList** lanes, gint* nextpos) { +gboolean gitg_lanes_next (GitgLanes* self, GitgCommit* next, GSList* * lanes, gint* nextpos) { GSList* _vala_lanes = NULL; gint _vala_nextpos = 0; gboolean result = FALSE; @@ -2800,16 +2800,20 @@ void gitg_lanes_set_inactive_max (GitgLanes* self, gint value) { - gint _tmp0_ = 0; #line 25 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" g_return_if_fail (self != NULL); #line 25 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" - _tmp0_ = value; + if (gitg_lanes_get_inactive_max (self) != value) { +#line 2808 "gitg-lanes.c" + gint _tmp0_ = 0; #line 25 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" - self->priv->_inactive_max = _tmp0_; + _tmp0_ = value; #line 25 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" - g_object_notify ((GObject *) self, "inactive-max"); -#line 2813 "gitg-lanes.c" + self->priv->_inactive_max = _tmp0_; +#line 25 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" + g_object_notify ((GObject *) self, "inactive-max"); +#line 2816 "gitg-lanes.c" + } } @@ -2824,21 +2828,25 @@ result = _tmp0_; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" return result; -#line 2828 "gitg-lanes.c" +#line 2832 "gitg-lanes.c" } void gitg_lanes_set_inactive_collapse (GitgLanes* self, gint value) { - gint _tmp0_ = 0; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" g_return_if_fail (self != NULL); #line 26 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" - _tmp0_ = value; + if (gitg_lanes_get_inactive_collapse (self) != value) { +#line 2841 "gitg-lanes.c" + gint _tmp0_ = 0; +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" + _tmp0_ = value; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" - self->priv->_inactive_collapse = _tmp0_; + self->priv->_inactive_collapse = _tmp0_; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" - g_object_notify ((GObject *) self, "inactive-collapse"); -#line 2842 "gitg-lanes.c" + g_object_notify ((GObject *) self, "inactive-collapse"); +#line 2849 "gitg-lanes.c" + } } @@ -2853,21 +2861,25 @@ result = _tmp0_; #line 27 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" return result; -#line 2857 "gitg-lanes.c" +#line 2865 "gitg-lanes.c" } void gitg_lanes_set_inactive_gap (GitgLanes* self, gint value) { - gint _tmp0_ = 0; #line 27 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" g_return_if_fail (self != NULL); #line 27 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" - _tmp0_ = value; + if (gitg_lanes_get_inactive_gap (self) != value) { +#line 2874 "gitg-lanes.c" + gint _tmp0_ = 0; +#line 27 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" + _tmp0_ = value; #line 27 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" - self->priv->_inactive_gap = _tmp0_; + self->priv->_inactive_gap = _tmp0_; #line 27 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" - g_object_notify ((GObject *) self, "inactive-gap"); -#line 2871 "gitg-lanes.c" + g_object_notify ((GObject *) self, "inactive-gap"); +#line 2882 "gitg-lanes.c" + } } @@ -2882,21 +2894,25 @@ result = _tmp0_; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" return result; -#line 2886 "gitg-lanes.c" +#line 2898 "gitg-lanes.c" } void gitg_lanes_set_inactive_enabled (GitgLanes* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" g_return_if_fail (self != NULL); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" - _tmp0_ = value; + if (gitg_lanes_get_inactive_enabled (self) != value) { +#line 2907 "gitg-lanes.c" + gboolean _tmp0_ = FALSE; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" - self->priv->_inactive_enabled = _tmp0_; + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" - g_object_notify ((GObject *) self, "inactive-enabled"); -#line 2900 "gitg-lanes.c" + self->priv->_inactive_enabled = _tmp0_; +#line 28 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" + g_object_notify ((GObject *) self, "inactive-enabled"); +#line 2915 "gitg-lanes.c" + } } @@ -2938,14 +2954,14 @@ self->inactive = 0; #line 42 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" return self; -#line 2942 "gitg-lanes.c" +#line 2958 "gitg-lanes.c" } static GitgLanesLaneContainer* gitg_lanes_lane_container_new_with_color (GgitOId* from, GgitOId* to, GitgColor* color) { #line 42 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" return gitg_lanes_lane_container_construct_with_color (GITG_LANES_TYPE_LANE_CONTAINER, from, to, color); -#line 2949 "gitg-lanes.c" +#line 2965 "gitg-lanes.c" } @@ -2961,14 +2977,14 @@ self = (GitgLanesLaneContainer*) gitg_lanes_lane_container_construct_with_color (object_type, _tmp0_, _tmp1_, NULL); #line 52 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" return self; -#line 2965 "gitg-lanes.c" +#line 2981 "gitg-lanes.c" } static GitgLanesLaneContainer* gitg_lanes_lane_container_new (GgitOId* from, GgitOId* to) { #line 52 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" return gitg_lanes_lane_container_construct (GITG_LANES_TYPE_LANE_CONTAINER, from, to); -#line 2972 "gitg-lanes.c" +#line 2988 "gitg-lanes.c" } @@ -3014,7 +3030,7 @@ _tmp6_ = hidden; #line 66 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" if (!_tmp6_) { -#line 3018 "gitg-lanes.c" +#line 3034 "gitg-lanes.c" GitgLane* _tmp7_ = NULL; gint _tmp8_ = 0; #line 68 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" @@ -3023,7 +3039,7 @@ _tmp8_ = index; #line 68 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" _tmp7_->from = g_slist_prepend (_tmp7_->from, (gpointer) ((gintptr) _tmp8_)); -#line 3027 "gitg-lanes.c" +#line 3043 "gitg-lanes.c" } #line 71 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" _tmp9_ = hidden; @@ -3033,27 +3049,27 @@ _tmp11_ = self->to; #line 73 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" if (_tmp11_ != NULL) { -#line 3037 "gitg-lanes.c" +#line 3053 "gitg-lanes.c" gint _tmp12_ = 0; #line 73 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" _tmp12_ = self->inactive; #line 73 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" _tmp10_ = _tmp12_ >= 0; -#line 3043 "gitg-lanes.c" +#line 3059 "gitg-lanes.c" } else { #line 73 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" _tmp10_ = FALSE; -#line 3047 "gitg-lanes.c" +#line 3063 "gitg-lanes.c" } #line 73 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" if (_tmp10_) { -#line 3051 "gitg-lanes.c" +#line 3067 "gitg-lanes.c" gint _tmp13_ = 0; #line 75 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" _tmp13_ = self->inactive; #line 75 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" self->inactive = _tmp13_ + 1; -#line 3057 "gitg-lanes.c" +#line 3073 "gitg-lanes.c" } } @@ -3072,7 +3088,7 @@ result = (_tmp1_ & GITG_LANE_TAG_HIDDEN) != 0; #line 81 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" return result; -#line 3076 "gitg-lanes.c" +#line 3092 "gitg-lanes.c" } @@ -3084,7 +3100,7 @@ _tmp0_ = value; #line 84 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" if (_tmp0_) { -#line 3088 "gitg-lanes.c" +#line 3104 "gitg-lanes.c" GitgLane* _tmp1_ = NULL; GitgLane* _tmp2_ = NULL; GitgLaneTag _tmp3_ = 0; @@ -3096,7 +3112,7 @@ _tmp3_ = _tmp2_->tag; #line 86 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" _tmp2_->tag = _tmp3_ | GITG_LANE_TAG_HIDDEN; -#line 3100 "gitg-lanes.c" +#line 3116 "gitg-lanes.c" } else { GitgLane* _tmp4_ = NULL; GitgLane* _tmp5_ = NULL; @@ -3109,7 +3125,7 @@ _tmp6_ = _tmp5_->tag; #line 90 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" _tmp5_->tag = _tmp6_ & (~GITG_LANE_TAG_HIDDEN); -#line 3113 "gitg-lanes.c" +#line 3129 "gitg-lanes.c" } } @@ -3117,7 +3133,7 @@ static void gitg_lanes_value_lane_container_init (GValue* value) { #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" value->data[0].v_pointer = NULL; -#line 3121 "gitg-lanes.c" +#line 3137 "gitg-lanes.c" } @@ -3126,7 +3142,7 @@ if (value->data[0].v_pointer) { #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" gitg_lanes_lane_container_unref (value->data[0].v_pointer); -#line 3130 "gitg-lanes.c" +#line 3146 "gitg-lanes.c" } } @@ -3136,11 +3152,11 @@ if (src_value->data[0].v_pointer) { #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" dest_value->data[0].v_pointer = gitg_lanes_lane_container_ref (src_value->data[0].v_pointer); -#line 3140 "gitg-lanes.c" +#line 3156 "gitg-lanes.c" } else { #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" dest_value->data[0].v_pointer = NULL; -#line 3144 "gitg-lanes.c" +#line 3160 "gitg-lanes.c" } } @@ -3148,66 +3164,66 @@ static gpointer gitg_lanes_value_lane_container_peek_pointer (const GValue* value) { #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" return value->data[0].v_pointer; -#line 3152 "gitg-lanes.c" +#line 3168 "gitg-lanes.c" } static gchar* gitg_lanes_value_lane_container_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" if (collect_values[0].v_pointer) { -#line 3159 "gitg-lanes.c" - GitgLanesLaneContainer* object; +#line 3175 "gitg-lanes.c" + GitgLanesLaneContainer * object; object = collect_values[0].v_pointer; #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" if (object->parent_instance.g_class == NULL) { #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3166 "gitg-lanes.c" +#line 3182 "gitg-lanes.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3170 "gitg-lanes.c" +#line 3186 "gitg-lanes.c" } #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" value->data[0].v_pointer = gitg_lanes_lane_container_ref (object); -#line 3174 "gitg-lanes.c" +#line 3190 "gitg-lanes.c" } else { #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" value->data[0].v_pointer = NULL; -#line 3178 "gitg-lanes.c" +#line 3194 "gitg-lanes.c" } #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" return NULL; -#line 3182 "gitg-lanes.c" +#line 3198 "gitg-lanes.c" } static gchar* gitg_lanes_value_lane_container_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GitgLanesLaneContainer** object_p; + GitgLanesLaneContainer ** object_p; object_p = collect_values[0].v_pointer; #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" if (!object_p) { #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3193 "gitg-lanes.c" +#line 3209 "gitg-lanes.c" } #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" if (!value->data[0].v_pointer) { #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" *object_p = NULL; -#line 3199 "gitg-lanes.c" +#line 3215 "gitg-lanes.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" *object_p = value->data[0].v_pointer; -#line 3203 "gitg-lanes.c" +#line 3219 "gitg-lanes.c" } else { #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" *object_p = gitg_lanes_lane_container_ref (value->data[0].v_pointer); -#line 3207 "gitg-lanes.c" +#line 3223 "gitg-lanes.c" } #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" return NULL; -#line 3211 "gitg-lanes.c" +#line 3227 "gitg-lanes.c" } @@ -3221,7 +3237,7 @@ G_PARAM_SPEC (spec)->value_type = object_type; #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" return G_PARAM_SPEC (spec); -#line 3225 "gitg-lanes.c" +#line 3241 "gitg-lanes.c" } @@ -3230,12 +3246,12 @@ g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_LANES_TYPE_LANE_CONTAINER), NULL); #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" return value->data[0].v_pointer; -#line 3234 "gitg-lanes.c" +#line 3250 "gitg-lanes.c" } static void gitg_lanes_value_set_lane_container (GValue* value, gpointer v_object) { - GitgLanesLaneContainer* old; + GitgLanesLaneContainer * old; #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_LANES_TYPE_LANE_CONTAINER)); #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" @@ -3250,23 +3266,23 @@ value->data[0].v_pointer = v_object; #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" gitg_lanes_lane_container_ref (value->data[0].v_pointer); -#line 3254 "gitg-lanes.c" +#line 3270 "gitg-lanes.c" } else { #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" value->data[0].v_pointer = NULL; -#line 3258 "gitg-lanes.c" +#line 3274 "gitg-lanes.c" } #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" if (old) { #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" gitg_lanes_lane_container_unref (old); -#line 3264 "gitg-lanes.c" +#line 3280 "gitg-lanes.c" } } static void gitg_lanes_value_take_lane_container (GValue* value, gpointer v_object) { - GitgLanesLaneContainer* old; + GitgLanesLaneContainer * old; #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_LANES_TYPE_LANE_CONTAINER)); #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" @@ -3279,17 +3295,17 @@ g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" value->data[0].v_pointer = v_object; -#line 3283 "gitg-lanes.c" +#line 3299 "gitg-lanes.c" } else { #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" value->data[0].v_pointer = NULL; -#line 3287 "gitg-lanes.c" +#line 3303 "gitg-lanes.c" } #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" if (old) { #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" gitg_lanes_lane_container_unref (old); -#line 3293 "gitg-lanes.c" +#line 3309 "gitg-lanes.c" } } @@ -3299,18 +3315,18 @@ gitg_lanes_lane_container_parent_class = g_type_class_peek_parent (klass); #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" ((GitgLanesLaneContainerClass *) klass)->finalize = gitg_lanes_lane_container_finalize; -#line 3303 "gitg-lanes.c" +#line 3319 "gitg-lanes.c" } static void gitg_lanes_lane_container_instance_init (GitgLanesLaneContainer * self) { #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" self->ref_count = 1; -#line 3310 "gitg-lanes.c" +#line 3326 "gitg-lanes.c" } -static void gitg_lanes_lane_container_finalize (GitgLanesLaneContainer* obj) { +static void gitg_lanes_lane_container_finalize (GitgLanesLaneContainer * obj) { GitgLanesLaneContainer * self; #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_LANES_TYPE_LANE_CONTAINER, GitgLanesLaneContainer); @@ -3322,7 +3338,7 @@ __vala_GgitOId_free0 (self->from); #line 40 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" __vala_GgitOId_free0 (self->to); -#line 3326 "gitg-lanes.c" +#line 3342 "gitg-lanes.c" } @@ -3341,18 +3357,18 @@ static gpointer gitg_lanes_lane_container_ref (gpointer instance) { - GitgLanesLaneContainer* self; + GitgLanesLaneContainer * self; self = instance; #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" g_atomic_int_inc (&self->ref_count); #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" return instance; -#line 3351 "gitg-lanes.c" +#line 3367 "gitg-lanes.c" } static void gitg_lanes_lane_container_unref (gpointer instance) { - GitgLanesLaneContainer* self; + GitgLanesLaneContainer * self; self = instance; #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -3360,7 +3376,7 @@ GITG_LANES_LANE_CONTAINER_GET_CLASS (self)->finalize (self); #line 35 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3364 "gitg-lanes.c" +#line 3380 "gitg-lanes.c" } } @@ -3417,7 +3433,7 @@ self->to = _tmp9_; #line 104 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" return self; -#line 3421 "gitg-lanes.c" +#line 3437 "gitg-lanes.c" } @@ -3425,7 +3441,7 @@ } -static void gitg_lanes_collapsed_lane_free (GitgLanesCollapsedLane* self) { +static void gitg_lanes_collapsed_lane_free (GitgLanesCollapsedLane * self) { #line 99 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" _g_object_unref0 (self->color); #line 101 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" @@ -3434,7 +3450,7 @@ __vala_GgitOId_free0 (self->to); #line 97 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" g_slice_free (GitgLanesCollapsedLane, self); -#line 3438 "gitg-lanes.c" +#line 3454 "gitg-lanes.c" } @@ -3457,7 +3473,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_LANES_INACTIVE_GAP, g_param_spec_int ("inactive-gap", "inactive-gap", "inactive-gap", G_MININT, G_MAXINT, 10, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); #line 23 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_LANES_INACTIVE_ENABLED, g_param_spec_boolean ("inactive-enabled", "inactive-enabled", "inactive-enabled", TRUE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); -#line 3461 "gitg-lanes.c" +#line 3477 "gitg-lanes.c" } @@ -3472,11 +3488,11 @@ self->priv->_inactive_gap = 10; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" self->priv->_inactive_enabled = TRUE; -#line 3476 "gitg-lanes.c" +#line 3492 "gitg-lanes.c" } -static void gitg_lanes_finalize (GObject* obj) { +static void gitg_lanes_finalize (GObject * obj) { GitgLanes * self; #line 23 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_LANES, GitgLanes); @@ -3490,7 +3506,7 @@ _g_object_unref0 (self->priv->d_roots); #line 23 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" G_OBJECT_CLASS (gitg_lanes_parent_class)->finalize (obj); -#line 3494 "gitg-lanes.c" +#line 3510 "gitg-lanes.c" } @@ -3535,13 +3551,13 @@ g_value_set_boolean (value, gitg_lanes_get_inactive_enabled (self)); #line 23 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" break; -#line 3539 "gitg-lanes.c" +#line 3555 "gitg-lanes.c" default: #line 23 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" break; -#line 3545 "gitg-lanes.c" +#line 3561 "gitg-lanes.c" } } @@ -3575,13 +3591,13 @@ gitg_lanes_set_inactive_enabled (self, g_value_get_boolean (value)); #line 23 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" break; -#line 3579 "gitg-lanes.c" +#line 3595 "gitg-lanes.c" default: #line 23 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/libgitg/gitg-lanes.vala" break; -#line 3585 "gitg-lanes.c" +#line 3601 "gitg-lanes.c" } } diff -Nru gitg-3.22.0/libgitg/gitg-progress-bin.c gitg-3.23.0/libgitg/gitg-progress-bin.c --- gitg-3.22.0/libgitg/gitg-progress-bin.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-progress-bin.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-progress-bin.c generated by valac 0.32.1, the Vala compiler +/* gitg-progress-bin.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-progress-bin.vala, do not modify */ /* @@ -71,7 +71,7 @@ gdouble gitg_progress_bin_get_fraction (GitgProgressBin* self); void gitg_progress_bin_set_fraction (GitgProgressBin* self, gdouble value); static GObject * gitg_progress_bin_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); -static void gitg_progress_bin_finalize (GObject* obj); +static void gitg_progress_bin_finalize (GObject * obj); static void _vala_gitg_progress_bin_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_progress_bin_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -444,18 +444,22 @@ void gitg_progress_bin_set_fraction (GitgProgressBin* self, gdouble value) { - gdouble _tmp0_ = 0.0; #line 29 "/home/jesse/dev/gitg/libgitg/gitg-progress-bin.vala" g_return_if_fail (self != NULL); +#line 29 "/home/jesse/dev/gitg/libgitg/gitg-progress-bin.vala" + if (gitg_progress_bin_get_fraction (self) != value) { +#line 452 "gitg-progress-bin.c" + gdouble _tmp0_ = 0.0; #line 31 "/home/jesse/dev/gitg/libgitg/gitg-progress-bin.vala" - _tmp0_ = value; + _tmp0_ = value; #line 31 "/home/jesse/dev/gitg/libgitg/gitg-progress-bin.vala" - self->priv->d_fraction = _tmp0_; + self->priv->d_fraction = _tmp0_; #line 32 "/home/jesse/dev/gitg/libgitg/gitg-progress-bin.vala" - gtk_widget_queue_draw ((GtkWidget*) self); + gtk_widget_queue_draw ((GtkWidget*) self); #line 29 "/home/jesse/dev/gitg/libgitg/gitg-progress-bin.vala" - g_object_notify ((GObject *) self, "fraction"); -#line 459 "gitg-progress-bin.c" + g_object_notify ((GObject *) self, "fraction"); +#line 462 "gitg-progress-bin.c" + } } @@ -475,7 +479,7 @@ gtk_widget_set_redraw_on_allocate ((GtkWidget*) self, FALSE); #line 36 "/home/jesse/dev/gitg/libgitg/gitg-progress-bin.vala" return obj; -#line 479 "gitg-progress-bin.c" +#line 483 "gitg-progress-bin.c" } @@ -500,24 +504,24 @@ G_OBJECT_CLASS (klass)->finalize = gitg_progress_bin_finalize; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-progress-bin.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_PROGRESS_BIN_FRACTION, g_param_spec_double ("fraction", "fraction", "fraction", -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); -#line 504 "gitg-progress-bin.c" +#line 508 "gitg-progress-bin.c" } static void gitg_progress_bin_instance_init (GitgProgressBin * self) { #line 22 "/home/jesse/dev/gitg/libgitg/gitg-progress-bin.vala" self->priv = GITG_PROGRESS_BIN_GET_PRIVATE (self); -#line 511 "gitg-progress-bin.c" +#line 515 "gitg-progress-bin.c" } -static void gitg_progress_bin_finalize (GObject* obj) { +static void gitg_progress_bin_finalize (GObject * obj) { GitgProgressBin * self; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-progress-bin.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_PROGRESS_BIN, GitgProgressBin); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-progress-bin.vala" G_OBJECT_CLASS (gitg_progress_bin_parent_class)->finalize (obj); -#line 521 "gitg-progress-bin.c" +#line 525 "gitg-progress-bin.c" } @@ -544,13 +548,13 @@ g_value_set_double (value, gitg_progress_bin_get_fraction (self)); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-progress-bin.vala" break; -#line 548 "gitg-progress-bin.c" +#line 552 "gitg-progress-bin.c" default: #line 22 "/home/jesse/dev/gitg/libgitg/gitg-progress-bin.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-progress-bin.vala" break; -#line 554 "gitg-progress-bin.c" +#line 558 "gitg-progress-bin.c" } } @@ -566,13 +570,13 @@ gitg_progress_bin_set_fraction (self, g_value_get_double (value)); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-progress-bin.vala" break; -#line 570 "gitg-progress-bin.c" +#line 574 "gitg-progress-bin.c" default: #line 22 "/home/jesse/dev/gitg/libgitg/gitg-progress-bin.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-progress-bin.vala" break; -#line 576 "gitg-progress-bin.c" +#line 580 "gitg-progress-bin.c" } } diff -Nru gitg-3.22.0/libgitg/gitg-ref-base.c gitg-3.23.0/libgitg/gitg-ref-base.c --- gitg-3.22.0/libgitg/gitg-ref-base.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-ref-base.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ref-base.c generated by valac 0.32.1, the Vala compiler +/* gitg-ref-base.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ref-base.vala, do not modify */ /* @@ -105,7 +105,7 @@ static gpointer gitg_ref_base_parent_class = NULL; -static GitgRefIface* gitg_ref_base_gitg_ref_parent_iface = NULL; +static GitgRefIface * gitg_ref_base_gitg_ref_parent_iface = NULL; GType gitg_repository_get_type (void) G_GNUC_CONST; GType gitg_parsed_ref_name_get_type (void) G_GNUC_CONST; @@ -125,7 +125,7 @@ static GitgRepository* gitg_ref_base_real_get_owner (GitgRef* base); GitgRefBase* gitg_ref_base_new (void); GitgRefBase* gitg_ref_base_construct (GType object_type); -static void gitg_ref_base_finalize (GObject* obj); +static void gitg_ref_base_finalize (GObject * obj); GitgParsedRefName* gitg_ref_get_d_parsed_name (GitgRef* self); GList* gitg_ref_get_d_pushes (GitgRef* self); GitgRefState gitg_ref_get_state (GitgRef* self); @@ -212,21 +212,25 @@ static void gitg_ref_base_real_set_d_parsed_name (GitgRef* base, GitgParsedRefName* value) { GitgRefBase* self; - GitgParsedRefName* _tmp0_ = NULL; - GitgParsedRefName* _tmp1_ = NULL; #line 24 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" self = (GitgRefBase*) base; #line 24 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" - _tmp0_ = value; + if (gitg_ref_base_real_get_d_parsed_name (self) != value) { +#line 220 "gitg-ref-base.c" + GitgParsedRefName* _tmp0_ = NULL; + GitgParsedRefName* _tmp1_ = NULL; #line 24 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 24 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" - _g_object_unref0 (self->priv->_d_parsed_name); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 24 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" - self->priv->_d_parsed_name = _tmp1_; + _g_object_unref0 (self->priv->_d_parsed_name); #line 24 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" - g_object_notify ((GObject *) self, "d-parsed-name"); -#line 230 "gitg-ref-base.c" + self->priv->_d_parsed_name = _tmp1_; +#line 24 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" + g_object_notify ((GObject *) self, "d-parsed-name"); +#line 233 "gitg-ref-base.c" + } } @@ -242,28 +246,32 @@ result = _tmp0_; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" return result; -#line 246 "gitg-ref-base.c" +#line 250 "gitg-ref-base.c" } static void gitg_ref_base_real_set_d_pushes (GitgRef* base, GList* value) { GitgRefBase* self; - GList* _tmp0_ = NULL; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" self = (GitgRefBase*) base; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" - _tmp0_ = value; + if (gitg_ref_base_real_get_d_pushes (self) != value) { +#line 260 "gitg-ref-base.c" + GList* _tmp0_ = NULL; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" - value = NULL; + _tmp0_ = value; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" - __g_list_free__g_object_unref0_0 (self->priv->_d_pushes); + value = NULL; +#line 26 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" + __g_list_free__g_object_unref0_0 (self->priv->_d_pushes); #line 26 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" - self->priv->_d_pushes = _tmp0_; + self->priv->_d_pushes = _tmp0_; #line 26 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" - __g_list_free__g_object_unref0_0 (value); + __g_list_free__g_object_unref0_0 (value); #line 26 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" - g_object_notify ((GObject *) self, "d-pushes"); -#line 267 "gitg-ref-base.c" + g_object_notify ((GObject *) self, "d-pushes"); +#line 274 "gitg-ref-base.c" + } } @@ -279,22 +287,26 @@ result = _tmp0_; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" return result; -#line 283 "gitg-ref-base.c" +#line 291 "gitg-ref-base.c" } static void gitg_ref_base_real_set_state (GitgRef* base, GitgRefState value) { GitgRefBase* self; - GitgRefState _tmp0_ = 0; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" self = (GitgRefBase*) base; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" - _tmp0_ = value; + if (gitg_ref_base_real_get_state (self) != value) { +#line 301 "gitg-ref-base.c" + GitgRefState _tmp0_ = 0; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" - self->priv->_state = _tmp0_; + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" - g_object_notify ((GObject *) self, "state"); -#line 298 "gitg-ref-base.c" + self->priv->_state = _tmp0_; +#line 28 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" + g_object_notify ((GObject *) self, "state"); +#line 309 "gitg-ref-base.c" + } } @@ -310,22 +322,26 @@ result = _tmp0_; #line 29 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" return result; -#line 314 "gitg-ref-base.c" +#line 326 "gitg-ref-base.c" } static void gitg_ref_base_real_set_working (GitgRef* base, gboolean value) { GitgRefBase* self; - gboolean _tmp0_ = FALSE; #line 29 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" self = (GitgRefBase*) base; #line 29 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" - _tmp0_ = value; + if (gitg_ref_base_real_get_working (self) != value) { +#line 336 "gitg-ref-base.c" + gboolean _tmp0_ = FALSE; +#line 29 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" + _tmp0_ = value; #line 29 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" - self->priv->_working = _tmp0_; + self->priv->_working = _tmp0_; #line 29 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" - g_object_notify ((GObject *) self, "working"); -#line 329 "gitg-ref-base.c" + g_object_notify ((GObject *) self, "working"); +#line 344 "gitg-ref-base.c" + } } @@ -348,7 +364,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REF_BASE_STATE, g_param_spec_enum ("state", "state", "state", GITG_TYPE_REF_STATE, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REF_BASE_WORKING, g_param_spec_boolean ("working", "working", "working", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); -#line 352 "gitg-ref-base.c" +#line 368 "gitg-ref-base.c" } @@ -356,7 +372,7 @@ #line 22 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" gitg_ref_base_gitg_ref_parent_iface = g_type_interface_peek_parent (iface); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" - iface->get_owner = (GitgRepository* (*)(GitgRef*)) gitg_ref_base_real_get_owner; + iface->get_owner = (GitgRepository* (*) (GitgRef *)) gitg_ref_base_real_get_owner; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" iface->get_d_parsed_name = gitg_ref_base_real_get_d_parsed_name; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" @@ -373,18 +389,18 @@ iface->get_working = gitg_ref_base_real_get_working; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" iface->set_working = gitg_ref_base_real_set_working; -#line 377 "gitg-ref-base.c" +#line 393 "gitg-ref-base.c" } static void gitg_ref_base_instance_init (GitgRefBase * self) { #line 22 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" self->priv = GITG_REF_BASE_GET_PRIVATE (self); -#line 384 "gitg-ref-base.c" +#line 400 "gitg-ref-base.c" } -static void gitg_ref_base_finalize (GObject* obj) { +static void gitg_ref_base_finalize (GObject * obj) { GitgRefBase * self; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_REF_BASE, GitgRefBase); @@ -394,7 +410,7 @@ __g_list_free__g_object_unref0_0 (self->priv->_d_pushes); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" G_OBJECT_CLASS (gitg_ref_base_parent_class)->finalize (obj); -#line 398 "gitg-ref-base.c" +#line 414 "gitg-ref-base.c" } @@ -441,13 +457,13 @@ g_value_set_boolean (value, gitg_ref_get_working ((GitgRef*) self)); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" break; -#line 445 "gitg-ref-base.c" +#line 461 "gitg-ref-base.c" default: #line 22 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" break; -#line 451 "gitg-ref-base.c" +#line 467 "gitg-ref-base.c" } } @@ -481,13 +497,13 @@ gitg_ref_set_working ((GitgRef*) self, g_value_get_boolean (value)); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" break; -#line 485 "gitg-ref-base.c" +#line 501 "gitg-ref-base.c" default: #line 22 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-ref-base.vala" break; -#line 491 "gitg-ref-base.c" +#line 507 "gitg-ref-base.c" } } diff -Nru gitg-3.22.0/libgitg/gitg-ref.c gitg-3.23.0/libgitg/gitg-ref.c --- gitg-3.22.0/libgitg/gitg-ref.c 2016-09-18 12:01:42.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-ref.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ref.c generated by valac 0.32.1, the Vala compiler +/* gitg-ref.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ref.vala, do not modify */ /* @@ -144,7 +144,7 @@ gchar* gitg_parsed_ref_name_get_remote_name (GitgParsedRefName* self); gchar* gitg_parsed_ref_name_get_remote_branch (GitgParsedRefName* self); const gchar* gitg_parsed_ref_name_get_prefix (GitgParsedRefName* self); -static void gitg_parsed_ref_name_finalize (GObject* obj); +static void gitg_parsed_ref_name_finalize (GObject * obj); static void _vala_gitg_parsed_ref_name_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_parsed_ref_name_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); GType gitg_repository_get_type (void) G_GNUC_CONST; @@ -241,103 +241,103 @@ glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1347 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { #line 257 "gitg-ref.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; #line 266 "gitg-ref.c" } -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { #line 272 "gitg-ref.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; #line 281 "gitg-ref.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { #line 287 "gitg-ref.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; #line 296 "gitg-ref.c" } else { -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = FALSE; #line 300 "gitg-ref.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { #line 308 "gitg-ref.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; #line 317 "gitg-ref.c" } else { -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 321 "gitg-ref.c" } -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 343 "gitg-ref.c" } @@ -350,33 +350,33 @@ gunichar _tmp1_ = 0U; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1007 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1023 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1024 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1024 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = c; -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1024 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_); -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1024 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1026 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1026 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { #line 368 "gitg-ref.c" gchar* _tmp4_ = NULL; -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1027 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1027 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1027 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 376 "gitg-ref.c" } else { -#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1029 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = -1; -#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1029 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 382 "gitg-ref.c" } @@ -390,37 +390,37 @@ glong _tmp1_ = 0L; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1315 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1315 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { #line 406 "gitg-ref.c" glong _tmp4_ = 0L; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = maxlen; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 414 "gitg-ref.c" } else { gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = (glong) (_tmp5_ - _tmp6_); -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 426 "gitg-ref.c" } @@ -440,112 +440,112 @@ glong _tmp20_ = 0L; glong _tmp21_ = 0L; gchar* _tmp22_ = NULL; -#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1325 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = offset; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { #line 450 "gitg-ref.c" glong _tmp2_ = 0L; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = len; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); #line 456 "gitg-ref.c" } else { -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = FALSE; #line 460 "gitg-ref.c" } -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_) { #line 464 "gitg-ref.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; glong _tmp5_ = 0L; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = offset; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = len; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = _tmp5_; #line 476 "gitg-ref.c" } else { gint _tmp6_ = 0; gint _tmp7_ = 0; -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = strlen (self); -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = _tmp6_; -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; #line 486 "gitg-ref.c" } -#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = offset; -#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { #line 492 "gitg-ref.c" glong _tmp9_ = 0L; glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1335 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = string_length; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1335 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = offset; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1335 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" offset = _tmp9_ + _tmp10_; -#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = offset; -#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); #line 506 "gitg-ref.c" } else { glong _tmp12_ = 0L; glong _tmp13_ = 0L; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = offset; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = string_length; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); #line 516 "gitg-ref.c" } -#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1340 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = len; -#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1340 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { #line 522 "gitg-ref.c" glong _tmp15_ = 0L; glong _tmp16_ = 0L; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1341 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1341 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = offset; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1341 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; #line 531 "gitg-ref.c" } -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = offset; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = len; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = string_length; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = offset; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = len; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp22_; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 551 "gitg-ref.c" } @@ -847,16 +847,20 @@ static void gitg_parsed_ref_name_set_rtype (GitgParsedRefName* self, GitgRefType value) { - GitgRefType _tmp0_ = 0; #line 56 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" g_return_if_fail (self != NULL); #line 56 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" - _tmp0_ = value; + if (gitg_parsed_ref_name_get_rtype (self) != value) { +#line 855 "gitg-ref.c" + GitgRefType _tmp0_ = 0; +#line 56 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" + _tmp0_ = value; #line 56 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" - self->priv->_rtype = _tmp0_; + self->priv->_rtype = _tmp0_; #line 56 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" - g_object_notify ((GObject *) self, "rtype"); -#line 860 "gitg-ref.c" + g_object_notify ((GObject *) self, "rtype"); +#line 863 "gitg-ref.c" + } } @@ -874,7 +878,7 @@ result = _tmp1_; #line 63 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return result; -#line 878 "gitg-ref.c" +#line 882 "gitg-ref.c" } @@ -892,7 +896,7 @@ result = _tmp1_; #line 72 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return result; -#line 896 "gitg-ref.c" +#line 900 "gitg-ref.c" } @@ -910,7 +914,7 @@ result = _tmp1_; #line 80 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return result; -#line 914 "gitg-ref.c" +#line 918 "gitg-ref.c" } @@ -928,7 +932,7 @@ result = _tmp1_; #line 88 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return result; -#line 932 "gitg-ref.c" +#line 936 "gitg-ref.c" } @@ -943,7 +947,7 @@ result = _tmp0_; #line 98 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return result; -#line 947 "gitg-ref.c" +#line 951 "gitg-ref.c" } @@ -958,32 +962,32 @@ G_OBJECT_CLASS (klass)->set_property = _vala_gitg_parsed_ref_name_set_property; #line 45 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" G_OBJECT_CLASS (klass)->finalize = gitg_parsed_ref_name_finalize; -#line 962 "gitg-ref.c" +#line 966 "gitg-ref.c" /** * The type of ref. */ #line 45 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_PARSED_REF_NAME_RTYPE, g_param_spec_enum ("rtype", "rtype", "rtype", GITG_TYPE_REF_TYPE, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 968 "gitg-ref.c" +#line 972 "gitg-ref.c" /** * The full name of the ref. */ #line 45 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_PARSED_REF_NAME_NAME, g_param_spec_string ("name", "name", "name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 974 "gitg-ref.c" +#line 978 "gitg-ref.c" /** * The short name of the ref. This represents the name of the ref * without the information of the type of ref. */ #line 45 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_PARSED_REF_NAME_SHORTNAME, g_param_spec_string ("shortname", "shortname", "shortname", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 981 "gitg-ref.c" +#line 985 "gitg-ref.c" /** * The remote name of the ref (only for remote refs) */ #line 45 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_PARSED_REF_NAME_REMOTE_NAME, g_param_spec_string ("remote-name", "remote-name", "remote-name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 987 "gitg-ref.c" +#line 991 "gitg-ref.c" /** * The remote branch name of the ref (only for remote refs) */ @@ -991,18 +995,18 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_PARSED_REF_NAME_REMOTE_BRANCH, g_param_spec_string ("remote-branch", "remote-branch", "remote-branch", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 45 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_PARSED_REF_NAME_PREFIX, g_param_spec_string ("prefix", "prefix", "prefix", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 995 "gitg-ref.c" +#line 999 "gitg-ref.c" } static void gitg_parsed_ref_name_instance_init (GitgParsedRefName * self) { #line 45 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" self->priv = GITG_PARSED_REF_NAME_GET_PRIVATE (self); -#line 1002 "gitg-ref.c" +#line 1006 "gitg-ref.c" } -static void gitg_parsed_ref_name_finalize (GObject* obj) { +static void gitg_parsed_ref_name_finalize (GObject * obj) { GitgParsedRefName * self; #line 45 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_PARSED_REF_NAME, GitgParsedRefName); @@ -1018,7 +1022,7 @@ _g_free0 (self->priv->d_prefix); #line 45 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" G_OBJECT_CLASS (gitg_parsed_ref_name_parent_class)->finalize (obj); -#line 1022 "gitg-ref.c" +#line 1026 "gitg-ref.c" } @@ -1081,13 +1085,13 @@ g_value_set_string (value, gitg_parsed_ref_name_get_prefix (self)); #line 45 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" break; -#line 1085 "gitg-ref.c" +#line 1089 "gitg-ref.c" default: #line 45 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 45 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" break; -#line 1091 "gitg-ref.c" +#line 1095 "gitg-ref.c" } } @@ -1103,13 +1107,13 @@ gitg_parsed_ref_name_set_rtype (self, g_value_get_enum (value)); #line 45 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" break; -#line 1107 "gitg-ref.c" +#line 1111 "gitg-ref.c" default: #line 45 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 45 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" break; -#line 1113 "gitg-ref.c" +#line 1117 "gitg-ref.c" } } @@ -1119,7 +1123,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 182 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return GITG_REF_GET_INTERFACE (self)->get_owner (self); -#line 1123 "gitg-ref.c" +#line 1127 "gitg-ref.c" } @@ -1148,7 +1152,7 @@ result = _tmp4_; #line 194 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return result; -#line 1152 "gitg-ref.c" +#line 1156 "gitg-ref.c" } @@ -1157,14 +1161,14 @@ result = __lambda30_ ((GitgRef*) a, (GitgRef*) b); #line 193 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return result; -#line 1161 "gitg-ref.c" +#line 1165 "gitg-ref.c" } static gpointer _g_object_ref0 (gpointer self) { #line 197 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return self ? g_object_ref (self) : NULL; -#line 1168 "gitg-ref.c" +#line 1172 "gitg-ref.c" } @@ -1177,7 +1181,7 @@ GError * _inner_error_ = NULL; #line 184 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" g_return_if_fail (spec != NULL); -#line 1181 "gitg-ref.c" +#line 1185 "gitg-ref.c" { GitgRef* _tmp0_ = NULL; GitgRepository* _tmp1_ = NULL; @@ -1202,8 +1206,8 @@ _tmp0_ = _tmp5_; #line 190 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1206 "gitg-ref.c" - goto __catch49_g_error; +#line 1210 "gitg-ref.c" + goto __catch51_g_error; } #line 190 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _tmp6_ = _tmp0_; @@ -1215,10 +1219,10 @@ rf = _tmp6_; #line 188 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _g_object_unref0 (_tmp0_); -#line 1219 "gitg-ref.c" +#line 1223 "gitg-ref.c" } - goto __finally49; - __catch49_g_error: + goto __finally51; + __catch51_g_error: { #line 188 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" g_clear_error (&_inner_error_); @@ -1228,9 +1232,9 @@ _g_object_unref0 (rf); #line 191 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return; -#line 1232 "gitg-ref.c" +#line 1236 "gitg-ref.c" } - __finally49: + __finally51: #line 188 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 188 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" @@ -1241,7 +1245,7 @@ g_clear_error (&_inner_error_); #line 188 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return; -#line 1245 "gitg-ref.c" +#line 1249 "gitg-ref.c" } #line 193 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _tmp7_ = gitg_ref_get_d_pushes (self); @@ -1253,7 +1257,7 @@ _tmp10_ = g_list_find_custom (_tmp8_, _tmp9_, ___lambda30__gcompare_func); #line 193 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" if (_tmp10_ == NULL) { -#line 1257 "gitg-ref.c" +#line 1261 "gitg-ref.c" GList* _tmp11_ = NULL; GList* _tmp12_ = NULL; GitgRef* _tmp13_ = NULL; @@ -1268,23 +1272,23 @@ _tmp14_ = _g_object_ref0 (_tmp13_); #line 197 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" gitg_ref_set_d_pushes (self, g_list_append (_tmp12_, _tmp14_)); -#line 1272 "gitg-ref.c" +#line 1276 "gitg-ref.c" } #line 184 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _g_object_unref0 (rf); -#line 1276 "gitg-ref.c" +#line 1280 "gitg-ref.c" } static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1288 "gitg-ref.c" +#line 1292 "gitg-ref.c" } @@ -1306,7 +1310,7 @@ GError * _inner_error_ = NULL; #line 201 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" g_return_if_fail (cfg != NULL); -#line 1310 "gitg-ref.c" +#line 1314 "gitg-ref.c" { const gchar* _tmp0_ = NULL; GgitConfig* _tmp1_ = NULL; @@ -1370,8 +1374,8 @@ _tmp0_ = _tmp12_; #line 208 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1374 "gitg-ref.c" - goto __catch50_g_error; +#line 1378 "gitg-ref.c" + goto __catch52_g_error; } #line 208 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _tmp13_ = g_strdup (_tmp0_); @@ -1413,8 +1417,8 @@ _tmp14_ = _tmp26_; #line 209 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1417 "gitg-ref.c" - goto __catch50_g_error; +#line 1421 "gitg-ref.c" + goto __catch52_g_error; } #line 209 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _tmp27_ = g_strdup (_tmp14_); @@ -1422,10 +1426,10 @@ _g_free0 (merge); #line 209 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" merge = _tmp27_; -#line 1426 "gitg-ref.c" +#line 1430 "gitg-ref.c" } - goto __finally50; - __catch50_g_error: + goto __finally52; + __catch52_g_error: { #line 206 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" g_clear_error (&_inner_error_); @@ -1437,9 +1441,9 @@ _g_free0 (remote); #line 210 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return; -#line 1441 "gitg-ref.c" +#line 1445 "gitg-ref.c" } - __finally50: + __finally52: #line 206 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 206 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" @@ -1452,7 +1456,7 @@ g_clear_error (&_inner_error_); #line 206 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return; -#line 1456 "gitg-ref.c" +#line 1460 "gitg-ref.c" } #line 212 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _tmp28_ = merge; @@ -1490,7 +1494,7 @@ _g_free0 (merge); #line 201 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _g_free0 (remote); -#line 1494 "gitg-ref.c" +#line 1498 "gitg-ref.c" } @@ -1499,7 +1503,7 @@ g_atomic_int_inc (&_data15_->_ref_count_); #line 217 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return _data15_; -#line 1503 "gitg-ref.c" +#line 1507 "gitg-ref.c" } @@ -1508,7 +1512,7 @@ _data15_ = (Block15Data*) _userdata_; #line 217 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" if (g_atomic_int_dec_and_test (&_data15_->_ref_count_)) { -#line 1512 "gitg-ref.c" +#line 1516 "gitg-ref.c" GitgRef* self; #line 217 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" self = _data15_->self; @@ -1518,7 +1522,7 @@ _g_object_unref0 (self); #line 217 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" g_slice_free (Block15Data, _data15_); -#line 1522 "gitg-ref.c" +#line 1526 "gitg-ref.c" } } @@ -1567,7 +1571,7 @@ _g_match_info_unref0 (vinfo); #line 235 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return result; -#line 1571 "gitg-ref.c" +#line 1575 "gitg-ref.c" } #line 238 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _tmp4_ = info; @@ -1607,7 +1611,7 @@ _g_match_info_unref0 (vinfo); #line 242 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return result; -#line 1611 "gitg-ref.c" +#line 1615 "gitg-ref.c" } @@ -1616,7 +1620,7 @@ result = ___lambda31_ (self, match_info, value); #line 230 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return result; -#line 1620 "gitg-ref.c" +#line 1624 "gitg-ref.c" } @@ -1631,7 +1635,7 @@ _data15_->_ref_count_ = 1; #line 217 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _data15_->self = g_object_ref (self); -#line 1635 "gitg-ref.c" +#line 1639 "gitg-ref.c" { GRegex* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; @@ -1667,8 +1671,8 @@ _tmp0_ = _tmp7_; #line 223 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1671 "gitg-ref.c" - goto __catch51_g_error; +#line 1675 "gitg-ref.c" + goto __catch53_g_error; } #line 223 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _tmp8_ = _tmp0_; @@ -1682,7 +1686,7 @@ _tmp9_ = gitg_ref_s_remote_key_regex; #line 225 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" if (_tmp9_ == NULL) { -#line 1686 "gitg-ref.c" +#line 1690 "gitg-ref.c" GRegex* _tmp10_ = NULL; GRegex* _tmp11_ = NULL; GRegex* _tmp12_ = NULL; @@ -1694,8 +1698,8 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 227 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _g_regex_unref0 (_tmp0_); -#line 1698 "gitg-ref.c" - goto __catch51_g_error; +#line 1702 "gitg-ref.c" + goto __catch53_g_error; } #line 227 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _tmp12_ = _tmp10_; @@ -1707,7 +1711,7 @@ gitg_ref_s_remote_key_regex = _tmp12_; #line 225 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _g_regex_unref0 (_tmp10_); -#line 1711 "gitg-ref.c" +#line 1715 "gitg-ref.c" } #line 230 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _tmp13_ = cfg; @@ -1719,15 +1723,15 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 230 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _g_regex_unref0 (_tmp0_); -#line 1723 "gitg-ref.c" - goto __catch51_g_error; +#line 1727 "gitg-ref.c" + goto __catch53_g_error; } #line 221 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _g_regex_unref0 (_tmp0_); -#line 1728 "gitg-ref.c" +#line 1732 "gitg-ref.c" } - goto __finally51; - __catch51_g_error: + goto __finally53; + __catch53_g_error: { #line 221 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" g_clear_error (&_inner_error_); @@ -1739,9 +1743,9 @@ _data15_ = NULL; #line 245 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return; -#line 1743 "gitg-ref.c" +#line 1747 "gitg-ref.c" } - __finally51: + __finally53: #line 221 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 221 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" @@ -1754,13 +1758,13 @@ g_clear_error (&_inner_error_); #line 221 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return; -#line 1758 "gitg-ref.c" +#line 1762 "gitg-ref.c" } #line 217 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" block15_data_unref (_data15_); #line 217 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _data15_ = NULL; -#line 1764 "gitg-ref.c" +#line 1768 "gitg-ref.c" } @@ -1780,7 +1784,7 @@ GError * _inner_error_ = NULL; #line 248 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" g_return_if_fail (cfg != NULL); -#line 1784 "gitg-ref.c" +#line 1788 "gitg-ref.c" { const gchar* _tmp0_ = NULL; GgitConfig* _tmp1_ = NULL; @@ -1830,8 +1834,8 @@ _tmp0_ = _tmp12_; #line 254 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1834 "gitg-ref.c" - goto __catch52_g_error; +#line 1838 "gitg-ref.c" + goto __catch54_g_error; } #line 254 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _tmp13_ = g_strdup (_tmp0_); @@ -1839,10 +1843,10 @@ _g_free0 (remote); #line 254 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" remote = _tmp13_; -#line 1843 "gitg-ref.c" +#line 1847 "gitg-ref.c" } - goto __finally52; - __catch52_g_error: + goto __finally54; + __catch54_g_error: { #line 252 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" g_clear_error (&_inner_error_); @@ -1852,9 +1856,9 @@ _g_free0 (remote); #line 255 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return; -#line 1856 "gitg-ref.c" +#line 1860 "gitg-ref.c" } - __finally52: + __finally54: #line 252 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 252 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" @@ -1865,7 +1869,7 @@ g_clear_error (&_inner_error_); #line 252 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return; -#line 1869 "gitg-ref.c" +#line 1873 "gitg-ref.c" } #line 257 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _tmp14_ = remote; @@ -1899,7 +1903,7 @@ _g_object_unref0 (_tmp18_); #line 248 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _g_free0 (remote); -#line 1903 "gitg-ref.c" +#line 1907 "gitg-ref.c" } @@ -1911,7 +1915,7 @@ GError * _inner_error_ = NULL; #line 262 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" gitg_ref_set_d_pushes (self, NULL); -#line 1915 "gitg-ref.c" +#line 1919 "gitg-ref.c" { GgitConfig* _tmp0_ = NULL; GitgRepository* _tmp1_ = NULL; @@ -1933,8 +1937,8 @@ _tmp0_ = _tmp4_; #line 268 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1937 "gitg-ref.c" - goto __catch53_g_error; +#line 1941 "gitg-ref.c" + goto __catch55_g_error; } #line 268 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _tmp5_ = _tmp0_; @@ -1946,10 +1950,10 @@ cfg = _tmp5_; #line 266 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _g_object_unref0 (_tmp0_); -#line 1950 "gitg-ref.c" +#line 1954 "gitg-ref.c" } - goto __finally53; - __catch53_g_error: + goto __finally55; + __catch55_g_error: { #line 266 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" g_clear_error (&_inner_error_); @@ -1959,9 +1963,9 @@ _g_object_unref0 (cfg); #line 269 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return; -#line 1963 "gitg-ref.c" +#line 1967 "gitg-ref.c" } - __finally53: + __finally55: #line 266 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 266 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" @@ -1972,7 +1976,7 @@ g_clear_error (&_inner_error_); #line 266 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return; -#line 1976 "gitg-ref.c" +#line 1980 "gitg-ref.c" } #line 292 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _tmp6_ = cfg; @@ -1988,7 +1992,7 @@ gitg_ref_add_branch_same_name_push (self, _tmp8_); #line 260 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _g_object_unref0 (cfg); -#line 1992 "gitg-ref.c" +#line 1996 "gitg-ref.c" } @@ -1997,7 +2001,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 163 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return GITG_REF_GET_INTERFACE (self)->get_d_parsed_name (self); -#line 2001 "gitg-ref.c" +#line 2005 "gitg-ref.c" } @@ -2006,7 +2010,7 @@ g_return_if_fail (self != NULL); #line 163 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" GITG_REF_GET_INTERFACE (self)->set_d_parsed_name (self, value); -#line 2010 "gitg-ref.c" +#line 2014 "gitg-ref.c" } @@ -2015,7 +2019,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 164 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return GITG_REF_GET_INTERFACE (self)->get_d_pushes (self); -#line 2019 "gitg-ref.c" +#line 2023 "gitg-ref.c" } @@ -2024,7 +2028,7 @@ g_return_if_fail (self != NULL); #line 164 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" GITG_REF_GET_INTERFACE (self)->set_d_pushes (self, value); -#line 2028 "gitg-ref.c" +#line 2032 "gitg-ref.c" } @@ -2033,7 +2037,7 @@ g_return_val_if_fail (self != NULL, 0); #line 166 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return GITG_REF_GET_INTERFACE (self)->get_state (self); -#line 2037 "gitg-ref.c" +#line 2041 "gitg-ref.c" } @@ -2042,7 +2046,7 @@ g_return_if_fail (self != NULL); #line 166 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" GITG_REF_GET_INTERFACE (self)->set_state (self, value); -#line 2046 "gitg-ref.c" +#line 2050 "gitg-ref.c" } @@ -2051,7 +2055,7 @@ g_return_val_if_fail (self != NULL, FALSE); #line 167 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return GITG_REF_GET_INTERFACE (self)->get_working (self); -#line 2055 "gitg-ref.c" +#line 2059 "gitg-ref.c" } @@ -2060,7 +2064,7 @@ g_return_if_fail (self != NULL); #line 167 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" GITG_REF_GET_INTERFACE (self)->set_working (self, value); -#line 2064 "gitg-ref.c" +#line 2068 "gitg-ref.c" } @@ -2079,7 +2083,7 @@ _tmp1_ = _tmp0_; #line 173 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" if (_tmp1_ == NULL) { -#line 2083 "gitg-ref.c" +#line 2087 "gitg-ref.c" const gchar* _tmp2_ = NULL; GitgParsedRefName* _tmp3_ = NULL; GitgParsedRefName* _tmp4_ = NULL; @@ -2093,7 +2097,7 @@ gitg_ref_set_d_parsed_name (self, _tmp4_); #line 175 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _g_object_unref0 (_tmp4_); -#line 2097 "gitg-ref.c" +#line 2101 "gitg-ref.c" } #line 178 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _tmp5_ = gitg_ref_get_d_parsed_name (self); @@ -2105,7 +2109,7 @@ result = _tmp7_; #line 178 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return result; -#line 2109 "gitg-ref.c" +#line 2113 "gitg-ref.c" } @@ -2125,7 +2129,7 @@ if (_tmp1_ == NULL) { #line 307 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" gitg_ref_compose_pushes (self); -#line 2129 "gitg-ref.c" +#line 2133 "gitg-ref.c" } #line 310 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" _tmp2_ = gitg_ref_get_d_pushes (self); @@ -2135,7 +2139,7 @@ result = _tmp3_; #line 310 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" return result; -#line 2139 "gitg-ref.c" +#line 2143 "gitg-ref.c" } @@ -2154,7 +2158,7 @@ g_object_interface_install_property (iface, g_param_spec_enum ("state", "state", "state", GITG_TYPE_REF_STATE, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); #line 159 "/home/jesse/dev/gitg/libgitg/gitg-ref.vala" g_object_interface_install_property (iface, g_param_spec_boolean ("working", "working", "working", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); -#line 2158 "gitg-ref.c" +#line 2162 "gitg-ref.c" } } diff -Nru gitg-3.22.0/libgitg/gitg-remote.c gitg-3.23.0/libgitg/gitg-remote.c --- gitg-3.22.0/libgitg/gitg-remote.c 2016-09-18 12:01:42.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-remote.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-remote.c generated by valac 0.32.1, the Vala compiler +/* gitg-remote.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-remote.vala, do not modify */ /* @@ -72,6 +72,11 @@ typedef struct _GitgRemoteDownloadData GitgRemoteDownloadData; typedef struct _GitgRemoteFetchData GitgRemoteFetchData; typedef struct _GitgRemoteCallbacksPrivate GitgRemoteCallbacksPrivate; +enum { + GITG_REMOTE_TIP_UPDATED_SIGNAL, + GITG_REMOTE_LAST_SIGNAL +}; +static guint gitg_remote_signals[GITG_REMOTE_LAST_SIGNAL] = {0}; typedef enum { GITG_REMOTE_STATE_DISCONNECTED, @@ -328,13 +333,13 @@ GitgRemote* gitg_remote_construct (GType object_type); gdouble gitg_remote_get_transfer_progress (GitgRemote* self); gchar** gitg_remote_get_fetch_specs (GitgRemote* self, int* result_length1); -static gchar** _vala_array_dup16 (gchar** self, int length); -void gitg_remote_set_fetch_specs (GitgRemote* self, gchar** value, int value_length1); static gchar** _vala_array_dup17 (gchar** self, int length); -gchar** gitg_remote_get_push_specs (GitgRemote* self, int* result_length1); +void gitg_remote_set_fetch_specs (GitgRemote* self, gchar** value, int value_length1); static gchar** _vala_array_dup18 (gchar** self, int length); -void gitg_remote_set_push_specs (GitgRemote* self, gchar** value, int value_length1); +gchar** gitg_remote_get_push_specs (GitgRemote* self, int* result_length1); static gchar** _vala_array_dup19 (gchar** self, int length); +void gitg_remote_set_push_specs (GitgRemote* self, gchar** value, int value_length1); +static gchar** _vala_array_dup20 (gchar** self, int length); GitgCredentialsProvider* gitg_remote_get_credentials_provider (GitgRemote* self); void gitg_remote_set_credentials_provider (GitgRemote* self, GitgCredentialsProvider* value); static void g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); @@ -347,8 +352,8 @@ static void gitg_remote_callbacks_real_update_tips (GgitRemoteCallbacks* base, const gchar* refname, GgitOId* a, GgitOId* b); static void gitg_remote_callbacks_real_completion (GgitRemoteCallbacks* base, GgitRemoteCompletionType type); static GgitCred* gitg_remote_callbacks_real_credentials (GgitRemoteCallbacks* base, const gchar* url, const gchar* username_from_url, GgitCredtype allowed_types, GError** error); -static void gitg_remote_callbacks_finalize (GObject* obj); -static void gitg_remote_finalize (GObject* obj); +static void gitg_remote_callbacks_finalize (GObject * obj); +static void gitg_remote_finalize (GObject * obj); static void _vala_gitg_remote_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_remote_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -378,7 +383,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 41 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return GITG_CREDENTIALS_PROVIDER_GET_INTERFACE (self)->credentials (self, url, username_from_url, allowed_types, error); -#line 382 "gitg-remote.c" +#line 387 "gitg-remote.c" } @@ -389,7 +394,7 @@ if (!initialized) { #line 39 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" initialized = TRUE; -#line 393 "gitg-remote.c" +#line 398 "gitg-remote.c" } } @@ -416,7 +421,7 @@ _tmp0_ = self->priv->d_reset_transfer_progress_timeout; #line 132 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (_tmp0_ != ((guint) 0)) { -#line 420 "gitg-remote.c" +#line 425 "gitg-remote.c" guint _tmp1_ = 0U; #line 134 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp1_ = self->priv->d_reset_transfer_progress_timeout; @@ -424,11 +429,11 @@ g_source_remove (_tmp1_); #line 135 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" self->priv->d_reset_transfer_progress_timeout = (guint) 0; -#line 428 "gitg-remote.c" +#line 433 "gitg-remote.c" } #line 138 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" G_OBJECT_CLASS (gitg_remote_parent_class)->dispose ((GObject*) G_TYPE_CHECK_INSTANCE_CAST (self, ggit_remote_get_type (), GgitRemote)); -#line 432 "gitg-remote.c" +#line 437 "gitg-remote.c" } @@ -441,7 +446,7 @@ self->priv->d_transfer_progress = 0.0; #line 163 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_object_notify ((GObject*) self, "transfer-progress"); -#line 445 "gitg-remote.c" +#line 450 "gitg-remote.c" } @@ -453,7 +458,7 @@ result = FALSE; #line 177 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return result; -#line 457 "gitg-remote.c" +#line 462 "gitg-remote.c" } @@ -462,7 +467,7 @@ result = ___lambda66_ ((GitgRemote*) self); #line 175 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return result; -#line 466 "gitg-remote.c" +#line 471 "gitg-remote.c" } @@ -477,19 +482,19 @@ if (_tmp0_ == ((gdouble) 0)) { #line 170 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return; -#line 481 "gitg-remote.c" +#line 486 "gitg-remote.c" } #line 173 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp1_ = with_delay; #line 173 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (_tmp1_) { -#line 487 "gitg-remote.c" +#line 492 "gitg-remote.c" guint _tmp2_ = 0U; #line 175 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp2_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, ____lambda66__gsource_func, g_object_ref (self), g_object_unref); #line 175 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" self->priv->d_reset_transfer_progress_timeout = _tmp2_; -#line 493 "gitg-remote.c" +#line 498 "gitg-remote.c" } else { guint _tmp3_ = 0U; #line 180 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" @@ -498,7 +503,7 @@ if (_tmp3_ == ((guint) 0)) { #line 182 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_do_reset_transfer_progress (self); -#line 502 "gitg-remote.c" +#line 507 "gitg-remote.c" } } } @@ -561,7 +566,7 @@ _tmp12_ = total; #line 195 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (_tmp11_ == _tmp12_) { -#line 565 "gitg-remote.c" +#line 570 "gitg-remote.c" guint _tmp13_ = 0U; guint _tmp14_ = 0U; #line 195 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" @@ -570,17 +575,17 @@ _tmp14_ = total; #line 195 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp10_ = _tmp13_ == _tmp14_; -#line 574 "gitg-remote.c" +#line 579 "gitg-remote.c" } else { #line 195 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp10_ = FALSE; -#line 578 "gitg-remote.c" +#line 583 "gitg-remote.c" } #line 195 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (_tmp10_) { #line 197 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_reset_transfer_progress (self, TRUE); -#line 584 "gitg-remote.c" +#line 589 "gitg-remote.c" } } @@ -589,7 +594,7 @@ GError * _inner_error_ = NULL; #line 207 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_return_if_fail (res != NULL); -#line 593 "gitg-remote.c" +#line 598 "gitg-remote.c" { GAsyncResult* _tmp0_ = NULL; #line 210 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" @@ -598,20 +603,20 @@ gitg_remote_disconnect_finish (self, _tmp0_, &_inner_error_); #line 210 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 602 "gitg-remote.c" - goto __catch54_g_error; +#line 607 "gitg-remote.c" + goto __catch56_g_error; } } - goto __finally54; - __catch54_g_error: + goto __finally56; + __catch56_g_error: { #line 208 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_clear_error (&_inner_error_); #line 208 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _inner_error_ = NULL; -#line 613 "gitg-remote.c" +#line 618 "gitg-remote.c" } - __finally54: + __finally56: #line 208 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 208 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" @@ -620,7 +625,7 @@ g_clear_error (&_inner_error_); #line 208 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return; -#line 624 "gitg-remote.c" +#line 629 "gitg-remote.c" } } @@ -630,7 +635,7 @@ ____lambda68_ ((GitgRemote*) self, source_object, res); #line 207 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_object_unref (self); -#line 634 "gitg-remote.c" +#line 639 "gitg-remote.c" } @@ -642,7 +647,7 @@ _tmp0_ = ggit_remote_get_connected ((GgitRemote*) self); #line 203 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (_tmp0_) { -#line 646 "gitg-remote.c" +#line 651 "gitg-remote.c" gboolean _tmp1_ = FALSE; #line 205 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp1_ = force_disconnect; @@ -650,16 +655,16 @@ if (_tmp1_) { #line 207 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_disconnect (self, _____lambda68__gasync_ready_callback, g_object_ref (self)); -#line 654 "gitg-remote.c" +#line 659 "gitg-remote.c" } else { #line 216 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_set_state (self, GITG_REMOTE_STATE_CONNECTED); -#line 658 "gitg-remote.c" +#line 663 "gitg-remote.c" } } else { #line 221 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_set_state (self, GITG_REMOTE_STATE_DISCONNECTED); -#line 663 "gitg-remote.c" +#line 668 "gitg-remote.c" } } @@ -673,14 +678,14 @@ _g_object_unref0 (_data_->self); #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_slice_free (GitgRemoteConnectData, _data_); -#line 677 "gitg-remote.c" +#line 682 "gitg-remote.c" } static gpointer _g_object_ref0 (gpointer self) { #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return self ? g_object_ref (self) : NULL; -#line 684 "gitg-remote.c" +#line 689 "gitg-remote.c" } @@ -714,7 +719,7 @@ _data_->callbacks = _tmp3_; #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_connect_co (_data_); -#line 718 "gitg-remote.c" +#line 723 "gitg-remote.c" } @@ -724,11 +729,11 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return; -#line 728 "gitg-remote.c" +#line 733 "gitg-remote.c" } #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 732 "gitg-remote.c" +#line 737 "gitg-remote.c" } @@ -737,7 +742,7 @@ g_atomic_int_inc (&_data16_->_ref_count_); #line 225 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return _data16_; -#line 741 "gitg-remote.c" +#line 746 "gitg-remote.c" } @@ -746,7 +751,7 @@ _data16_ = (Block16Data*) _userdata_; #line 225 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (g_atomic_int_dec_and_test (&_data16_->_ref_count_)) { -#line 750 "gitg-remote.c" +#line 755 "gitg-remote.c" GitgRemote* self; #line 225 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" self = _data16_->self; @@ -754,7 +759,7 @@ _g_object_unref0 (self); #line 225 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_slice_free (Block16Data, _data16_); -#line 758 "gitg-remote.c" +#line 763 "gitg-remote.c" } } @@ -762,7 +767,7 @@ static void _gitg_remote_update_transfer_progress_gitg_remote_callbacks_transfer_progress (GgitTransferProgress* stats, gpointer self) { #line 251 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_update_transfer_progress ((GitgRemote*) self, stats); -#line 766 "gitg-remote.c" +#line 771 "gitg-remote.c" } @@ -785,7 +790,7 @@ g_propagate_error (error, _inner_error_); #line 254 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return; -#line 789 "gitg-remote.c" +#line 794 "gitg-remote.c" } } @@ -793,7 +798,7 @@ static void _____lambda69__gitg_async_thread_func (gpointer self, GError** error) { #line 253 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" ____lambda69_ (self, error); -#line 797 "gitg-remote.c" +#line 802 "gitg-remote.c" } @@ -807,14 +812,14 @@ _data_->_res_ = _res_; #line 253 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_connect_co (_data_); -#line 811 "gitg-remote.c" +#line 816 "gitg-remote.c" } static gpointer _g_error_copy0 (gpointer self) { #line 272 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return self ? g_error_copy (self) : NULL; -#line 818 "gitg-remote.c" +#line 823 "gitg-remote.c" } @@ -823,16 +828,16 @@ switch (_data_->_state_) { #line 225 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" case 0: -#line 827 "gitg-remote.c" +#line 832 "gitg-remote.c" goto _state_0; #line 225 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" case 1: -#line 831 "gitg-remote.c" +#line 836 "gitg-remote.c" goto _state_1; default: #line 225 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_assert_not_reached (); -#line 836 "gitg-remote.c" +#line 841 "gitg-remote.c" } _state_0: #line 225 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" @@ -867,7 +872,7 @@ if (_data_->_tmp3_ != GITG_REMOTE_STATE_CONNECTED) { #line 231 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_set_state (_data_->self, GITG_REMOTE_STATE_CONNECTED); -#line 871 "gitg-remote.c" +#line 876 "gitg-remote.c" } #line 234 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_->_tmp4_ = NULL; @@ -887,17 +892,17 @@ if (_data_->_state_ == 0) { #line 234 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 891 "gitg-remote.c" +#line 896 "gitg-remote.c" } else { #line 234 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete (_data_->_async_result); -#line 895 "gitg-remote.c" +#line 900 "gitg-remote.c" } #line 234 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_object_unref (_data_->_async_result); #line 234 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return FALSE; -#line 901 "gitg-remote.c" +#line 906 "gitg-remote.c" } else { #line 236 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_->_tmp5_ = 0; @@ -927,28 +932,28 @@ if (_data_->_state_ == 0) { #line 238 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 931 "gitg-remote.c" +#line 936 "gitg-remote.c" } else { #line 238 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete (_data_->_async_result); -#line 935 "gitg-remote.c" +#line 940 "gitg-remote.c" } #line 238 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_object_unref (_data_->_async_result); #line 238 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return FALSE; -#line 941 "gitg-remote.c" +#line 946 "gitg-remote.c" } else { #line 242 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_reset_transfer_progress (_data_->self, FALSE); -#line 945 "gitg-remote.c" +#line 950 "gitg-remote.c" } } #line 245 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_set_state (_data_->self, GITG_REMOTE_STATE_CONNECTING); #line 247 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" while (TRUE) { -#line 952 "gitg-remote.c" +#line 957 "gitg-remote.c" { #line 251 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_->_tmp8_ = NULL; @@ -968,18 +973,18 @@ gitg_async_thread (_____lambda69__gitg_async_thread_func, _data_->_data16_, gitg_remote_connect_ready, _data_); #line 253 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return FALSE; -#line 972 "gitg-remote.c" +#line 977 "gitg-remote.c" _state_1: #line 253 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_async_thread_finish (_data_->_res_, &_data_->_inner_error_); #line 253 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 978 "gitg-remote.c" - goto __catch55_g_error; +#line 983 "gitg-remote.c" + goto __catch57_g_error; } } - goto __finally55; - __catch55_g_error: + goto __finally57; + __catch57_g_error: { #line 249 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_->e = _data_->_inner_error_; @@ -1001,7 +1006,7 @@ if (g_strcmp0 (_data_->_tmp12_, "Unexpected HTTP status code: 401") == 0) { #line 264 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_->_tmp10_ = TRUE; -#line 1005 "gitg-remote.c" +#line 1010 "gitg-remote.c" } else { #line 265 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_->_tmp13_ = NULL; @@ -1013,7 +1018,7 @@ _data_->_tmp14_ = _data_->_tmp13_->message; #line 265 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_->_tmp10_ = g_strcmp0 (_data_->_tmp14_, "error authenticating: Username/PublicKey combination invalid") == 0; -#line 1017 "gitg-remote.c" +#line 1022 "gitg-remote.c" } #line 264 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (_data_->_tmp10_) { @@ -1021,7 +1026,7 @@ _g_error_free0 (_data_->e); #line 267 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" continue; -#line 1025 "gitg-remote.c" +#line 1030 "gitg-remote.c" } else { #line 271 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_update_state (_data_->self, FALSE); @@ -1037,14 +1042,14 @@ _data_->_inner_error_ = _data_->_tmp16_; #line 272 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _g_error_free0 (_data_->e); -#line 1041 "gitg-remote.c" - goto __finally55; +#line 1046 "gitg-remote.c" + goto __finally57; } #line 249 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _g_error_free0 (_data_->e); -#line 1046 "gitg-remote.c" +#line 1051 "gitg-remote.c" } - __finally55: + __finally57: #line 249 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 249 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" @@ -1059,21 +1064,21 @@ if (_data_->_state_ == 0) { #line 249 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1063 "gitg-remote.c" +#line 1068 "gitg-remote.c" } else { #line 249 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1067 "gitg-remote.c" +#line 1072 "gitg-remote.c" } #line 249 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_object_unref (_data_->_async_result); #line 249 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return FALSE; -#line 1073 "gitg-remote.c" +#line 1078 "gitg-remote.c" } #line 276 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" break; -#line 1077 "gitg-remote.c" +#line 1082 "gitg-remote.c" } #line 279 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_update_state (_data_->self, FALSE); @@ -1085,17 +1090,17 @@ if (_data_->_state_ == 0) { #line 225 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1089 "gitg-remote.c" +#line 1094 "gitg-remote.c" } else { #line 225 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1093 "gitg-remote.c" +#line 1098 "gitg-remote.c" } #line 225 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_object_unref (_data_->_async_result); #line 225 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return FALSE; -#line 1099 "gitg-remote.c" +#line 1104 "gitg-remote.c" } @@ -1106,7 +1111,7 @@ _g_object_unref0 (_data_->self); #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_slice_free (GitgRemoteDisconnectData, _data_); -#line 1110 "gitg-remote.c" +#line 1115 "gitg-remote.c" } @@ -1125,7 +1130,7 @@ _data_->self = _tmp0_; #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_disconnect_co (_data_); -#line 1129 "gitg-remote.c" +#line 1134 "gitg-remote.c" } @@ -1135,25 +1140,25 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return; -#line 1139 "gitg-remote.c" +#line 1144 "gitg-remote.c" } #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 1143 "gitg-remote.c" +#line 1148 "gitg-remote.c" } static void ___lambda67_ (GitgRemote* self, GError** error) { #line 297 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" ggit_remote_disconnect (G_TYPE_CHECK_INSTANCE_CAST (self, ggit_remote_get_type (), GgitRemote)); -#line 1150 "gitg-remote.c" +#line 1155 "gitg-remote.c" } static void ____lambda67__gitg_async_thread_func (gpointer self, GError** error) { #line 296 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" ___lambda67_ ((GitgRemote*) self, error); -#line 1157 "gitg-remote.c" +#line 1162 "gitg-remote.c" } @@ -1167,7 +1172,7 @@ _data_->_res_ = _res_; #line 296 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_disconnect_co (_data_); -#line 1171 "gitg-remote.c" +#line 1176 "gitg-remote.c" } @@ -1176,16 +1181,16 @@ switch (_data_->_state_) { #line 282 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" case 0: -#line 1180 "gitg-remote.c" +#line 1185 "gitg-remote.c" goto _state_0; #line 282 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" case 1: -#line 1184 "gitg-remote.c" +#line 1189 "gitg-remote.c" goto _state_1; default: #line 282 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_assert_not_reached (); -#line 1189 "gitg-remote.c" +#line 1194 "gitg-remote.c" } _state_0: #line 284 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" @@ -1206,7 +1211,7 @@ if (_data_->_tmp2_ != GITG_REMOTE_STATE_DISCONNECTED) { #line 288 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_set_state (_data_->self, GITG_REMOTE_STATE_DISCONNECTED); -#line 1210 "gitg-remote.c" +#line 1215 "gitg-remote.c" } #line 291 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_->_tmp3_ = NULL; @@ -1222,17 +1227,17 @@ if (_data_->_state_ == 0) { #line 291 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1226 "gitg-remote.c" +#line 1231 "gitg-remote.c" } else { #line 291 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1230 "gitg-remote.c" +#line 1235 "gitg-remote.c" } #line 291 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_object_unref (_data_->_async_result); #line 291 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return FALSE; -#line 1236 "gitg-remote.c" +#line 1241 "gitg-remote.c" } { #line 296 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" @@ -1241,18 +1246,18 @@ gitg_async_thread (____lambda67__gitg_async_thread_func, _data_->self, gitg_remote_disconnect_ready, _data_); #line 296 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return FALSE; -#line 1245 "gitg-remote.c" +#line 1250 "gitg-remote.c" _state_1: #line 296 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_async_thread_finish (_data_->_res_, &_data_->_inner_error_); #line 296 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 1251 "gitg-remote.c" - goto __catch56_g_error; +#line 1256 "gitg-remote.c" + goto __catch58_g_error; } } - goto __finally56; - __catch56_g_error: + goto __finally58; + __catch58_g_error: { #line 294 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_->e = _data_->_inner_error_; @@ -1274,10 +1279,10 @@ _data_->_inner_error_ = _data_->_tmp5_; #line 305 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _g_error_free0 (_data_->e); -#line 1278 "gitg-remote.c" - goto __finally56; +#line 1283 "gitg-remote.c" + goto __finally58; } - __finally56: + __finally58: #line 294 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 294 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" @@ -1288,17 +1293,17 @@ if (_data_->_state_ == 0) { #line 294 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1292 "gitg-remote.c" +#line 1297 "gitg-remote.c" } else { #line 294 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1296 "gitg-remote.c" +#line 1301 "gitg-remote.c" } #line 294 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_object_unref (_data_->_async_result); #line 294 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return FALSE; -#line 1302 "gitg-remote.c" +#line 1307 "gitg-remote.c" } #line 308 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_update_state (_data_->self, FALSE); @@ -1308,17 +1313,17 @@ if (_data_->_state_ == 0) { #line 282 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1312 "gitg-remote.c" +#line 1317 "gitg-remote.c" } else { #line 282 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1316 "gitg-remote.c" +#line 1321 "gitg-remote.c" } #line 282 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_object_unref (_data_->_async_result); #line 282 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return FALSE; -#line 1322 "gitg-remote.c" +#line 1327 "gitg-remote.c" } @@ -1331,7 +1336,7 @@ _g_object_unref0 (_data_->self); #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_slice_free (GitgRemoteDownloadInternData, _data_); -#line 1335 "gitg-remote.c" +#line 1340 "gitg-remote.c" } @@ -1370,7 +1375,7 @@ _data_->callbacks = _tmp4_; #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_download_intern_co (_data_); -#line 1374 "gitg-remote.c" +#line 1379 "gitg-remote.c" } @@ -1380,11 +1385,11 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return; -#line 1384 "gitg-remote.c" +#line 1389 "gitg-remote.c" } #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 1388 "gitg-remote.c" +#line 1393 "gitg-remote.c" } @@ -1393,7 +1398,7 @@ g_atomic_int_inc (&_data17_->_ref_count_); #line 312 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return _data17_; -#line 1397 "gitg-remote.c" +#line 1402 "gitg-remote.c" } @@ -1402,7 +1407,7 @@ _data17_ = (Block17Data*) _userdata_; #line 312 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (g_atomic_int_dec_and_test (&_data17_->_ref_count_)) { -#line 1406 "gitg-remote.c" +#line 1411 "gitg-remote.c" GitgRemote* self; #line 312 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" self = _data17_->self; @@ -1412,7 +1417,7 @@ _g_object_unref0 (self); #line 312 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_slice_free (Block17Data, _data17_); -#line 1416 "gitg-remote.c" +#line 1421 "gitg-remote.c" } } @@ -1427,14 +1432,14 @@ _data_->_res_ = _res_; #line 319 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_download_intern_co (_data_); -#line 1431 "gitg-remote.c" +#line 1436 "gitg-remote.c" } static void _vala_GgitFetchOptions_free (GgitFetchOptions* self) { #line 331 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_boxed_free (ggit_fetch_options_get_type (), self); -#line 1438 "gitg-remote.c" +#line 1443 "gitg-remote.c" } @@ -1471,13 +1476,13 @@ __vala_GgitFetchOptions_free0 (options); #line 331 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return; -#line 1475 "gitg-remote.c" +#line 1480 "gitg-remote.c" } #line 333 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp4_ = _data17_->message; #line 333 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (_tmp4_ != NULL) { -#line 1481 "gitg-remote.c" +#line 1486 "gitg-remote.c" GitgRemoteCallbacks* _tmp5_ = NULL; GgitFetchOptions* _tmp6_ = NULL; GgitRemoteDownloadTagsType _tmp7_ = 0; @@ -1500,19 +1505,19 @@ __vala_GgitFetchOptions_free0 (options); #line 335 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return; -#line 1504 "gitg-remote.c" +#line 1509 "gitg-remote.c" } } #line 327 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" __vala_GgitFetchOptions_free0 (options); -#line 1509 "gitg-remote.c" +#line 1514 "gitg-remote.c" } static void ____lambda70__gitg_async_thread_func (gpointer self, GError** error) { #line 327 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" ___lambda70_ (self, error); -#line 1516 "gitg-remote.c" +#line 1521 "gitg-remote.c" } @@ -1521,20 +1526,20 @@ switch (_data_->_state_) { #line 312 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" case 0: -#line 1525 "gitg-remote.c" +#line 1530 "gitg-remote.c" goto _state_0; #line 312 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" case 1: -#line 1529 "gitg-remote.c" +#line 1534 "gitg-remote.c" goto _state_1; #line 312 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" case 2: -#line 1533 "gitg-remote.c" +#line 1538 "gitg-remote.c" goto _state_2; default: #line 312 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_assert_not_reached (); -#line 1538 "gitg-remote.c" +#line 1543 "gitg-remote.c" } _state_0: #line 312 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" @@ -1573,7 +1578,7 @@ gitg_remote_connect (_data_->self, GGIT_DIRECTION_FETCH, _data_->_tmp2_, gitg_remote_download_intern_ready, _data_); #line 319 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return FALSE; -#line 1577 "gitg-remote.c" +#line 1582 "gitg-remote.c" _state_1: #line 319 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_connect_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); @@ -1591,24 +1596,24 @@ if (_data_->_state_ == 0) { #line 319 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1595 "gitg-remote.c" +#line 1600 "gitg-remote.c" } else { #line 319 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1599 "gitg-remote.c" +#line 1604 "gitg-remote.c" } #line 319 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_object_unref (_data_->_async_result); #line 319 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return FALSE; -#line 1605 "gitg-remote.c" +#line 1610 "gitg-remote.c" } } #line 322 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_set_state (_data_->self, GITG_REMOTE_STATE_TRANSFERRING); #line 323 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_reset_transfer_progress (_data_->self, FALSE); -#line 1612 "gitg-remote.c" +#line 1617 "gitg-remote.c" { #line 327 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_->_state_ = 2; @@ -1616,18 +1621,18 @@ gitg_async_thread (____lambda70__gitg_async_thread_func, _data_->_data17_, gitg_remote_download_intern_ready, _data_); #line 327 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return FALSE; -#line 1620 "gitg-remote.c" +#line 1625 "gitg-remote.c" _state_2: #line 327 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_async_thread_finish (_data_->_res_, &_data_->_inner_error_); #line 327 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 1626 "gitg-remote.c" - goto __catch57_g_error; +#line 1631 "gitg-remote.c" + goto __catch59_g_error; } } - goto __finally57; - __catch57_g_error: + goto __finally59; + __catch59_g_error: { #line 325 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_->e = _data_->_inner_error_; @@ -1653,10 +1658,10 @@ _data_->_inner_error_ = _data_->_tmp5_; #line 343 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _g_error_free0 (_data_->e); -#line 1657 "gitg-remote.c" - goto __finally57; +#line 1662 "gitg-remote.c" + goto __finally59; } - __finally57: + __finally59: #line 325 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 325 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" @@ -1671,17 +1676,17 @@ if (_data_->_state_ == 0) { #line 325 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1675 "gitg-remote.c" +#line 1680 "gitg-remote.c" } else { #line 325 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1679 "gitg-remote.c" +#line 1684 "gitg-remote.c" } #line 325 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_object_unref (_data_->_async_result); #line 325 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return FALSE; -#line 1685 "gitg-remote.c" +#line 1690 "gitg-remote.c" } #line 346 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_->_tmp6_ = FALSE; @@ -1699,17 +1704,17 @@ if (_data_->_state_ == 0) { #line 312 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1703 "gitg-remote.c" +#line 1708 "gitg-remote.c" } else { #line 312 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1707 "gitg-remote.c" +#line 1712 "gitg-remote.c" } #line 312 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_object_unref (_data_->_async_result); #line 312 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return FALSE; -#line 1713 "gitg-remote.c" +#line 1718 "gitg-remote.c" } @@ -1722,7 +1727,7 @@ _g_object_unref0 (_data_->self); #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_slice_free (GitgRemoteDownloadData, _data_); -#line 1726 "gitg-remote.c" +#line 1731 "gitg-remote.c" } @@ -1751,7 +1756,7 @@ _data_->callbacks = _tmp2_; #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_download_co (_data_); -#line 1755 "gitg-remote.c" +#line 1760 "gitg-remote.c" } @@ -1761,11 +1766,11 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return; -#line 1765 "gitg-remote.c" +#line 1770 "gitg-remote.c" } #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 1769 "gitg-remote.c" +#line 1774 "gitg-remote.c" } @@ -1779,7 +1784,7 @@ _data_->_res_ = _res_; #line 352 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_download_co (_data_); -#line 1783 "gitg-remote.c" +#line 1788 "gitg-remote.c" } @@ -1788,16 +1793,16 @@ switch (_data_->_state_) { #line 350 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" case 0: -#line 1792 "gitg-remote.c" +#line 1797 "gitg-remote.c" goto _state_0; #line 350 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" case 1: -#line 1796 "gitg-remote.c" +#line 1801 "gitg-remote.c" goto _state_1; default: #line 350 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_assert_not_reached (); -#line 1801 "gitg-remote.c" +#line 1806 "gitg-remote.c" } _state_0: #line 352 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" @@ -1810,7 +1815,7 @@ gitg_remote_download_intern (_data_->self, NULL, _data_->_tmp0_, gitg_remote_download_ready, _data_); #line 352 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return FALSE; -#line 1814 "gitg-remote.c" +#line 1819 "gitg-remote.c" _state_1: #line 352 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_download_intern_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); @@ -1824,33 +1829,33 @@ if (_data_->_state_ == 0) { #line 352 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1828 "gitg-remote.c" +#line 1833 "gitg-remote.c" } else { #line 352 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1832 "gitg-remote.c" +#line 1837 "gitg-remote.c" } #line 352 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_object_unref (_data_->_async_result); #line 352 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return FALSE; -#line 1838 "gitg-remote.c" +#line 1843 "gitg-remote.c" } #line 350 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (_data_->_state_ == 0) { #line 350 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1844 "gitg-remote.c" +#line 1849 "gitg-remote.c" } else { #line 350 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1848 "gitg-remote.c" +#line 1853 "gitg-remote.c" } #line 350 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_object_unref (_data_->_async_result); #line 350 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return FALSE; -#line 1854 "gitg-remote.c" +#line 1859 "gitg-remote.c" } @@ -1865,7 +1870,7 @@ _g_object_unref0 (_data_->self); #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_slice_free (GitgRemoteFetchData, _data_); -#line 1869 "gitg-remote.c" +#line 1874 "gitg-remote.c" } @@ -1904,7 +1909,7 @@ _data_->callbacks = _tmp4_; #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_fetch_co (_data_); -#line 1908 "gitg-remote.c" +#line 1913 "gitg-remote.c" } @@ -1914,11 +1919,11 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return; -#line 1918 "gitg-remote.c" +#line 1923 "gitg-remote.c" } #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 1922 "gitg-remote.c" +#line 1927 "gitg-remote.c" } @@ -1932,7 +1937,7 @@ _data_->_res_ = _res_; #line 378 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_fetch_co (_data_); -#line 1936 "gitg-remote.c" +#line 1941 "gitg-remote.c" } @@ -1941,16 +1946,16 @@ switch (_data_->_state_) { #line 355 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" case 0: -#line 1945 "gitg-remote.c" +#line 1950 "gitg-remote.c" goto _state_0; #line 355 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" case 1: -#line 1949 "gitg-remote.c" +#line 1954 "gitg-remote.c" goto _state_1; default: #line 355 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_assert_not_reached (); -#line 1954 "gitg-remote.c" +#line 1959 "gitg-remote.c" } _state_0: #line 357 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" @@ -1997,7 +2002,7 @@ _g_free0 (_data_->name); #line 365 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_->name = _data_->_tmp7_; -#line 2001 "gitg-remote.c" +#line 2006 "gitg-remote.c" } #line 368 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_->_tmp8_ = NULL; @@ -2017,7 +2022,7 @@ _g_free0 (_data_->msg); #line 370 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_->msg = _data_->_tmp10_; -#line 2021 "gitg-remote.c" +#line 2026 "gitg-remote.c" } else { #line 374 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_->_tmp11_ = NULL; @@ -2027,11 +2032,11 @@ _g_free0 (_data_->msg); #line 374 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_->msg = _data_->_tmp11_; -#line 2031 "gitg-remote.c" +#line 2036 "gitg-remote.c" } #line 359 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _g_free0 (_data_->name); -#line 2035 "gitg-remote.c" +#line 2040 "gitg-remote.c" } #line 378 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _data_->_tmp12_ = NULL; @@ -2047,7 +2052,7 @@ gitg_remote_download_intern (_data_->self, _data_->_tmp12_, _data_->_tmp13_, gitg_remote_fetch_ready, _data_); #line 378 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return FALSE; -#line 2051 "gitg-remote.c" +#line 2056 "gitg-remote.c" _state_1: #line 378 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_download_intern_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); @@ -2063,17 +2068,17 @@ if (_data_->_state_ == 0) { #line 378 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2067 "gitg-remote.c" +#line 2072 "gitg-remote.c" } else { #line 378 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2071 "gitg-remote.c" +#line 2076 "gitg-remote.c" } #line 378 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_object_unref (_data_->_async_result); #line 378 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return FALSE; -#line 2077 "gitg-remote.c" +#line 2082 "gitg-remote.c" } #line 355 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _g_free0 (_data_->msg); @@ -2081,17 +2086,17 @@ if (_data_->_state_ == 0) { #line 355 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2085 "gitg-remote.c" +#line 2090 "gitg-remote.c" } else { #line 355 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2089 "gitg-remote.c" +#line 2094 "gitg-remote.c" } #line 355 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_object_unref (_data_->_async_result); #line 355 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return FALSE; -#line 2095 "gitg-remote.c" +#line 2100 "gitg-remote.c" } @@ -2101,14 +2106,14 @@ self = (GitgRemote*) g_object_new (object_type, NULL); #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return self; -#line 2105 "gitg-remote.c" +#line 2110 "gitg-remote.c" } GitgRemote* gitg_remote_new (void) { #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return gitg_remote_construct (GITG_TYPE_REMOTE); -#line 2112 "gitg-remote.c" +#line 2117 "gitg-remote.c" } @@ -2123,7 +2128,7 @@ result = _tmp0_; #line 143 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return result; -#line 2127 "gitg-remote.c" +#line 2132 "gitg-remote.c" } @@ -2138,55 +2143,59 @@ result = _tmp0_; #line 148 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return result; -#line 2142 "gitg-remote.c" +#line 2147 "gitg-remote.c" } static void gitg_remote_set_state (GitgRemote* self, GitgRemoteState value) { - GitgRemoteState _tmp0_ = 0; - GitgRemoteState _tmp1_ = 0; #line 149 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_return_if_fail (self != NULL); +#line 149 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" + if (gitg_remote_get_state (self) != value) { +#line 2156 "gitg-remote.c" + GitgRemoteState _tmp0_ = 0; + GitgRemoteState _tmp1_ = 0; #line 151 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - _tmp0_ = self->priv->d_state; + _tmp0_ = self->priv->d_state; #line 151 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - _tmp1_ = value; + _tmp1_ = value; #line 151 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - if (_tmp0_ != _tmp1_) { -#line 2157 "gitg-remote.c" - GitgRemoteState _tmp2_ = 0; + if (_tmp0_ != _tmp1_) { +#line 2165 "gitg-remote.c" + GitgRemoteState _tmp2_ = 0; #line 153 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - _tmp2_ = value; + _tmp2_ = value; #line 153 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - self->priv->d_state = _tmp2_; + self->priv->d_state = _tmp2_; #line 154 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - g_object_notify ((GObject*) self, "state"); -#line 2165 "gitg-remote.c" - } + g_object_notify ((GObject*) self, "state"); +#line 2173 "gitg-remote.c" + } #line 149 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - g_object_notify ((GObject *) self, "state"); -#line 2169 "gitg-remote.c" + g_object_notify ((GObject *) self, "state"); +#line 2177 "gitg-remote.c" + } } -static gchar** _vala_array_dup16 (gchar** self, int length) { +static gchar** _vala_array_dup17 (gchar** self, int length) { gchar** result; int i; #line 387 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" result = g_new0 (gchar*, length + 1); #line 387 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" for (i = 0; i < length; i++) { -#line 2180 "gitg-remote.c" +#line 2189 "gitg-remote.c" gchar* _tmp0_ = NULL; #line 387 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp0_ = g_strdup (self[i]); #line 387 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" result[i] = _tmp0_; -#line 2186 "gitg-remote.c" +#line 2195 "gitg-remote.c" } #line 387 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return result; -#line 2190 "gitg-remote.c" +#line 2199 "gitg-remote.c" } @@ -2203,7 +2212,7 @@ _tmp0__length1 = self->priv->d_fetch_specs_length1; #line 385 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (_tmp0_ != NULL) { -#line 2207 "gitg-remote.c" +#line 2216 "gitg-remote.c" gchar** _tmp1_ = NULL; gint _tmp1__length1 = 0; gchar** _tmp2_ = NULL; @@ -2215,7 +2224,7 @@ #line 387 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp1__length1 = self->priv->d_fetch_specs_length1; #line 387 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - _tmp2_ = (_tmp1_ != NULL) ? _vala_array_dup16 (_tmp1_, _tmp1__length1) : ((gpointer) _tmp1_); + _tmp2_ = (_tmp1_ != NULL) ? _vala_array_dup17 (_tmp1_, _tmp1__length1) : ((gpointer) _tmp1_); #line 387 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp2__length1 = _tmp1__length1; #line 387 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" @@ -2226,13 +2235,13 @@ if (result_length1) { #line 387 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" *result_length1 = _tmp3__length1; -#line 2230 "gitg-remote.c" +#line 2239 "gitg-remote.c" } #line 387 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" result = _tmp3_; #line 387 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return result; -#line 2236 "gitg-remote.c" +#line 2245 "gitg-remote.c" } { gchar** _tmp4_ = NULL; @@ -2254,8 +2263,8 @@ __tmp4__size_ = _tmp4__length1; #line 392 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2258 "gitg-remote.c" - goto __catch58_g_error; +#line 2267 "gitg-remote.c" + goto __catch60_g_error; } #line 392 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp7_ = _tmp4_; @@ -2273,7 +2282,7 @@ if (result_length1) { #line 392 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" *result_length1 = _tmp8__length1; -#line 2277 "gitg-remote.c" +#line 2286 "gitg-remote.c" } #line 392 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" result = _tmp8_; @@ -2281,10 +2290,10 @@ _tmp4_ = (_vala_array_free (_tmp4_, _tmp4__length1, (GDestroyNotify) g_free), NULL); #line 392 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return result; -#line 2285 "gitg-remote.c" +#line 2294 "gitg-remote.c" } - goto __finally58; - __catch58_g_error: + goto __finally60; + __catch60_g_error: { GError* e = NULL; gchar** _tmp9_ = NULL; @@ -2301,7 +2310,7 @@ if (result_length1) { #line 396 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" *result_length1 = _tmp9__length1; -#line 2305 "gitg-remote.c" +#line 2314 "gitg-remote.c" } #line 396 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" result = _tmp9_; @@ -2309,87 +2318,92 @@ _g_error_free0 (e); #line 396 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return result; -#line 2313 "gitg-remote.c" +#line 2322 "gitg-remote.c" } - __finally58: + __finally60: #line 390 "/home/jesse/dev/gitg/libgitg/gitg-remote.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 390 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_clear_error (&_inner_error_); #line 390 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return NULL; -#line 2322 "gitg-remote.c" +#line 2331 "gitg-remote.c" } -static gchar** _vala_array_dup17 (gchar** self, int length) { +static gchar** _vala_array_dup18 (gchar** self, int length) { gchar** result; int i; #line 402 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" result = g_new0 (gchar*, length + 1); #line 402 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" for (i = 0; i < length; i++) { -#line 2333 "gitg-remote.c" +#line 2342 "gitg-remote.c" gchar* _tmp0_ = NULL; #line 402 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp0_ = g_strdup (self[i]); #line 402 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" result[i] = _tmp0_; -#line 2339 "gitg-remote.c" +#line 2348 "gitg-remote.c" } #line 402 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return result; -#line 2343 "gitg-remote.c" +#line 2352 "gitg-remote.c" } void gitg_remote_set_fetch_specs (GitgRemote* self, gchar** value, int value_length1) { - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + int old_value_length; #line 400 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_return_if_fail (self != NULL); +#line 400 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" + if (gitg_remote_get_fetch_specs (self, &old_value_length) != value) { +#line 2362 "gitg-remote.c" + gchar** _tmp0_ = NULL; + gint _tmp0__length1 = 0; + gchar** _tmp1_ = NULL; + gint _tmp1__length1 = 0; #line 402 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - _tmp0_ = value; + _tmp0_ = value; #line 402 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - _tmp0__length1 = value_length1; + _tmp0__length1 = value_length1; #line 402 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup17 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); + _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup18 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); #line 402 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - _tmp1__length1 = _tmp0__length1; + _tmp1__length1 = _tmp0__length1; #line 402 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - self->priv->d_fetch_specs = (_vala_array_free (self->priv->d_fetch_specs, self->priv->d_fetch_specs_length1, (GDestroyNotify) g_free), NULL); + self->priv->d_fetch_specs = (_vala_array_free (self->priv->d_fetch_specs, self->priv->d_fetch_specs_length1, (GDestroyNotify) g_free), NULL); #line 402 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - self->priv->d_fetch_specs = _tmp1_; + self->priv->d_fetch_specs = _tmp1_; #line 402 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - self->priv->d_fetch_specs_length1 = _tmp1__length1; + self->priv->d_fetch_specs_length1 = _tmp1__length1; #line 402 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - self->priv->_d_fetch_specs_size_ = self->priv->d_fetch_specs_length1; + self->priv->_d_fetch_specs_size_ = self->priv->d_fetch_specs_length1; #line 400 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - g_object_notify ((GObject *) self, "fetch-specs"); -#line 2372 "gitg-remote.c" + g_object_notify ((GObject *) self, "fetch-specs"); +#line 2385 "gitg-remote.c" + } } -static gchar** _vala_array_dup18 (gchar** self, int length) { +static gchar** _vala_array_dup19 (gchar** self, int length) { gchar** result; int i; #line 412 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" result = g_new0 (gchar*, length + 1); #line 412 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" for (i = 0; i < length; i++) { -#line 2383 "gitg-remote.c" +#line 2397 "gitg-remote.c" gchar* _tmp0_ = NULL; #line 412 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp0_ = g_strdup (self[i]); #line 412 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" result[i] = _tmp0_; -#line 2389 "gitg-remote.c" +#line 2403 "gitg-remote.c" } #line 412 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return result; -#line 2393 "gitg-remote.c" +#line 2407 "gitg-remote.c" } @@ -2406,7 +2420,7 @@ _tmp0__length1 = self->priv->d_push_specs_length1; #line 410 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (_tmp0_ != NULL) { -#line 2410 "gitg-remote.c" +#line 2424 "gitg-remote.c" gchar** _tmp1_ = NULL; gint _tmp1__length1 = 0; gchar** _tmp2_ = NULL; @@ -2418,7 +2432,7 @@ #line 412 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp1__length1 = self->priv->d_push_specs_length1; #line 412 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - _tmp2_ = (_tmp1_ != NULL) ? _vala_array_dup18 (_tmp1_, _tmp1__length1) : ((gpointer) _tmp1_); + _tmp2_ = (_tmp1_ != NULL) ? _vala_array_dup19 (_tmp1_, _tmp1__length1) : ((gpointer) _tmp1_); #line 412 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp2__length1 = _tmp1__length1; #line 412 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" @@ -2429,13 +2443,13 @@ if (result_length1) { #line 412 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" *result_length1 = _tmp3__length1; -#line 2433 "gitg-remote.c" +#line 2447 "gitg-remote.c" } #line 412 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" result = _tmp3_; #line 412 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return result; -#line 2439 "gitg-remote.c" +#line 2453 "gitg-remote.c" } { gchar** _tmp4_ = NULL; @@ -2457,8 +2471,8 @@ __tmp4__size_ = _tmp4__length1; #line 417 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2461 "gitg-remote.c" - goto __catch59_g_error; +#line 2475 "gitg-remote.c" + goto __catch61_g_error; } #line 417 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp7_ = _tmp4_; @@ -2476,7 +2490,7 @@ if (result_length1) { #line 417 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" *result_length1 = _tmp8__length1; -#line 2480 "gitg-remote.c" +#line 2494 "gitg-remote.c" } #line 417 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" result = _tmp8_; @@ -2484,10 +2498,10 @@ _tmp4_ = (_vala_array_free (_tmp4_, _tmp4__length1, (GDestroyNotify) g_free), NULL); #line 417 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return result; -#line 2488 "gitg-remote.c" +#line 2502 "gitg-remote.c" } - goto __finally59; - __catch59_g_error: + goto __finally61; + __catch61_g_error: { GError* e = NULL; gchar** _tmp9_ = NULL; @@ -2504,7 +2518,7 @@ if (result_length1) { #line 421 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" *result_length1 = _tmp9__length1; -#line 2508 "gitg-remote.c" +#line 2522 "gitg-remote.c" } #line 421 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" result = _tmp9_; @@ -2512,66 +2526,71 @@ _g_error_free0 (e); #line 421 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return result; -#line 2516 "gitg-remote.c" +#line 2530 "gitg-remote.c" } - __finally59: + __finally61: #line 415 "/home/jesse/dev/gitg/libgitg/gitg-remote.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 415 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_clear_error (&_inner_error_); #line 415 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return NULL; -#line 2525 "gitg-remote.c" +#line 2539 "gitg-remote.c" } -static gchar** _vala_array_dup19 (gchar** self, int length) { +static gchar** _vala_array_dup20 (gchar** self, int length) { gchar** result; int i; #line 427 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" result = g_new0 (gchar*, length + 1); #line 427 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" for (i = 0; i < length; i++) { -#line 2536 "gitg-remote.c" +#line 2550 "gitg-remote.c" gchar* _tmp0_ = NULL; #line 427 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp0_ = g_strdup (self[i]); #line 427 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" result[i] = _tmp0_; -#line 2542 "gitg-remote.c" +#line 2556 "gitg-remote.c" } #line 427 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return result; -#line 2546 "gitg-remote.c" +#line 2560 "gitg-remote.c" } void gitg_remote_set_push_specs (GitgRemote* self, gchar** value, int value_length1) { - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + int old_value_length; #line 425 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_return_if_fail (self != NULL); +#line 425 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" + if (gitg_remote_get_push_specs (self, &old_value_length) != value) { +#line 2570 "gitg-remote.c" + gchar** _tmp0_ = NULL; + gint _tmp0__length1 = 0; + gchar** _tmp1_ = NULL; + gint _tmp1__length1 = 0; #line 427 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - _tmp0_ = value; + _tmp0_ = value; #line 427 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - _tmp0__length1 = value_length1; + _tmp0__length1 = value_length1; #line 427 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup19 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); + _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup20 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); #line 427 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - _tmp1__length1 = _tmp0__length1; + _tmp1__length1 = _tmp0__length1; #line 427 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - self->priv->d_push_specs = (_vala_array_free (self->priv->d_push_specs, self->priv->d_push_specs_length1, (GDestroyNotify) g_free), NULL); + self->priv->d_push_specs = (_vala_array_free (self->priv->d_push_specs, self->priv->d_push_specs_length1, (GDestroyNotify) g_free), NULL); #line 427 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - self->priv->d_push_specs = _tmp1_; + self->priv->d_push_specs = _tmp1_; #line 427 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - self->priv->d_push_specs_length1 = _tmp1__length1; + self->priv->d_push_specs_length1 = _tmp1__length1; #line 427 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - self->priv->_d_push_specs_size_ = self->priv->d_push_specs_length1; + self->priv->_d_push_specs_size_ = self->priv->d_push_specs_length1; #line 425 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - g_object_notify ((GObject *) self, "push-specs"); -#line 2575 "gitg-remote.c" + g_object_notify ((GObject *) self, "push-specs"); +#line 2593 "gitg-remote.c" + } } @@ -2586,26 +2605,30 @@ result = _tmp0_; #line 433 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return result; -#line 2590 "gitg-remote.c" +#line 2609 "gitg-remote.c" } void gitg_remote_set_credentials_provider (GitgRemote* self, GitgCredentialsProvider* value) { - GitgCredentialsProvider* _tmp0_ = NULL; - GitgCredentialsProvider* _tmp1_ = NULL; #line 433 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_return_if_fail (self != NULL); #line 433 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - _tmp0_ = value; + if (gitg_remote_get_credentials_provider (self) != value) { +#line 2618 "gitg-remote.c" + GitgCredentialsProvider* _tmp0_ = NULL; + GitgCredentialsProvider* _tmp1_ = NULL; #line 433 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 433 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - _g_object_unref0 (self->priv->_credentials_provider); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 433 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - self->priv->_credentials_provider = _tmp1_; + _g_object_unref0 (self->priv->_credentials_provider); #line 433 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - g_object_notify ((GObject *) self, "credentials-provider"); -#line 2609 "gitg-remote.c" + self->priv->_credentials_provider = _tmp1_; +#line 433 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" + g_object_notify ((GObject *) self, "credentials-provider"); +#line 2631 "gitg-remote.c" + } } @@ -2624,19 +2647,19 @@ data1 = closure->data; #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" data2 = param_values->data[0].v_pointer; -#line 2628 "gitg-remote.c" +#line 2651 "gitg-remote.c" } else { #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" data1 = param_values->data[0].v_pointer; #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" data2 = closure->data; -#line 2634 "gitg-remote.c" +#line 2657 "gitg-remote.c" } #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" callback = (GMarshalFunc_VOID__STRING_BOXED_BOXED) (marshal_data ? marshal_data : cc->callback); #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" callback (data1, g_value_get_string (param_values + 1), g_value_get_boxed (param_values + 2), g_value_get_boxed (param_values + 3), data2); -#line 2640 "gitg-remote.c" +#line 2663 "gitg-remote.c" } @@ -2701,14 +2724,14 @@ transfer_progress_target_destroy_notify = NULL; #line 54 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return self; -#line 2705 "gitg-remote.c" +#line 2728 "gitg-remote.c" } static GitgRemoteCallbacks* gitg_remote_callbacks_new (GitgRemote* remote, GgitRemoteCallbacks* proxy, GitgRemoteCallbacksTransferProgress transfer_progress, void* transfer_progress_target, GDestroyNotify transfer_progress_target_destroy_notify) { #line 54 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return gitg_remote_callbacks_construct (GITG_REMOTE_TYPE_CALLBACKS, remote, proxy, transfer_progress, transfer_progress_target, transfer_progress_target_destroy_notify); -#line 2712 "gitg-remote.c" +#line 2735 "gitg-remote.c" } @@ -2723,7 +2746,7 @@ _tmp0_ = self->priv->d_proxy; #line 63 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (_tmp0_ != NULL) { -#line 2727 "gitg-remote.c" +#line 2750 "gitg-remote.c" GgitRemoteCallbacks* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; #line 65 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" @@ -2732,7 +2755,7 @@ _tmp2_ = message; #line 65 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_signal_emit_by_name (_tmp1_, "progress", _tmp2_); -#line 2736 "gitg-remote.c" +#line 2759 "gitg-remote.c" } } @@ -2752,7 +2775,7 @@ _tmp0__target = self->priv->d_transfer_progress_target; #line 71 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (_tmp0_ != NULL) { -#line 2756 "gitg-remote.c" +#line 2779 "gitg-remote.c" GitgRemoteCallbacksTransferProgress _tmp1_ = NULL; void* _tmp1__target = NULL; GgitTransferProgress* _tmp2_ = NULL; @@ -2764,13 +2787,13 @@ _tmp2_ = stats; #line 73 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp1_ (_tmp2_, _tmp1__target); -#line 2768 "gitg-remote.c" +#line 2791 "gitg-remote.c" } #line 76 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp3_ = self->priv->d_proxy; #line 76 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (_tmp3_ != NULL) { -#line 2774 "gitg-remote.c" +#line 2797 "gitg-remote.c" GgitRemoteCallbacks* _tmp4_ = NULL; GgitTransferProgress* _tmp5_ = NULL; #line 78 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" @@ -2779,7 +2802,7 @@ _tmp5_ = stats; #line 78 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_signal_emit_by_name (_tmp4_, "transfer-progress", _tmp5_); -#line 2783 "gitg-remote.c" +#line 2806 "gitg-remote.c" } } @@ -2808,12 +2831,12 @@ #line 84 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp3_ = b; #line 84 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - g_signal_emit_by_name (_tmp0_, "tip-updated", _tmp1_, _tmp2_, _tmp3_); + g_signal_emit (_tmp0_, gitg_remote_signals[GITG_REMOTE_TIP_UPDATED_SIGNAL], 0, _tmp1_, _tmp2_, _tmp3_); #line 86 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp4_ = self->priv->d_proxy; #line 86 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (_tmp4_ != NULL) { -#line 2817 "gitg-remote.c" +#line 2840 "gitg-remote.c" GgitRemoteCallbacks* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; GgitOId* _tmp7_ = NULL; @@ -2828,7 +2851,7 @@ _tmp8_ = b; #line 88 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_signal_emit_by_name (_tmp5_, "update-tips", _tmp6_, _tmp7_, _tmp8_); -#line 2832 "gitg-remote.c" +#line 2855 "gitg-remote.c" } } @@ -2842,7 +2865,7 @@ _tmp0_ = self->priv->d_proxy; #line 94 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (_tmp0_ != NULL) { -#line 2846 "gitg-remote.c" +#line 2869 "gitg-remote.c" GgitRemoteCallbacks* _tmp1_ = NULL; GgitRemoteCompletionType _tmp2_ = 0; #line 96 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" @@ -2851,7 +2874,7 @@ _tmp2_ = type; #line 96 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_signal_emit_by_name (_tmp1_, "completion", _tmp2_); -#line 2855 "gitg-remote.c" +#line 2878 "gitg-remote.c" } } @@ -2889,7 +2912,7 @@ _tmp4_ = provider; #line 106 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (_tmp4_ != NULL) { -#line 2893 "gitg-remote.c" +#line 2916 "gitg-remote.c" GgitCred* _tmp5_ = NULL; GitgCredentialsProvider* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; @@ -2919,7 +2942,7 @@ _g_object_unref0 (ret); #line 108 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return NULL; -#line 2923 "gitg-remote.c" +#line 2946 "gitg-remote.c" } #line 108 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp11_ = _tmp5_; @@ -2931,27 +2954,27 @@ ret = _tmp11_; #line 106 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _g_object_unref0 (_tmp5_); -#line 2935 "gitg-remote.c" +#line 2958 "gitg-remote.c" } #line 111 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp13_ = ret; #line 111 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (_tmp13_ == NULL) { -#line 2941 "gitg-remote.c" +#line 2964 "gitg-remote.c" GgitRemoteCallbacks* _tmp14_ = NULL; #line 111 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp14_ = self->priv->d_proxy; #line 111 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp12_ = _tmp14_ != NULL; -#line 2947 "gitg-remote.c" +#line 2970 "gitg-remote.c" } else { #line 111 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp12_ = FALSE; -#line 2951 "gitg-remote.c" +#line 2974 "gitg-remote.c" } #line 111 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" if (_tmp12_) { -#line 2955 "gitg-remote.c" +#line 2978 "gitg-remote.c" GgitCred* _tmp15_ = NULL; GgitRemoteCallbacks* _tmp16_ = NULL; const gchar* _tmp17_ = NULL; @@ -2981,7 +3004,7 @@ _g_object_unref0 (ret); #line 113 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return NULL; -#line 2985 "gitg-remote.c" +#line 3008 "gitg-remote.c" } #line 113 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _tmp21_ = _tmp15_; @@ -2993,7 +3016,7 @@ ret = _tmp21_; #line 111 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" _g_object_unref0 (_tmp15_); -#line 2997 "gitg-remote.c" +#line 3020 "gitg-remote.c" } #line 116 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" result = ret; @@ -3001,7 +3024,7 @@ _g_object_unref0 (provider); #line 116 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" return result; -#line 3005 "gitg-remote.c" +#line 3028 "gitg-remote.c" } @@ -3022,18 +3045,18 @@ ((GgitRemoteCallbacksClass *) klass)->credentials = gitg_remote_callbacks_real_credentials; #line 46 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" G_OBJECT_CLASS (klass)->finalize = gitg_remote_callbacks_finalize; -#line 3026 "gitg-remote.c" +#line 3049 "gitg-remote.c" } static void gitg_remote_callbacks_instance_init (GitgRemoteCallbacks * self) { #line 46 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" self->priv = GITG_REMOTE_CALLBACKS_GET_PRIVATE (self); -#line 3033 "gitg-remote.c" +#line 3056 "gitg-remote.c" } -static void gitg_remote_callbacks_finalize (GObject* obj) { +static void gitg_remote_callbacks_finalize (GObject * obj) { GitgRemoteCallbacks * self; #line 46 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_REMOTE_TYPE_CALLBACKS, GitgRemoteCallbacks); @@ -3051,7 +3074,7 @@ self->priv->d_transfer_progress_target_destroy_notify = NULL; #line 46 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" G_OBJECT_CLASS (gitg_remote_callbacks_parent_class)->finalize (obj); -#line 3055 "gitg-remote.c" +#line 3078 "gitg-remote.c" } @@ -3091,19 +3114,19 @@ #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REMOTE_CREDENTIALS_PROVIDER, g_param_spec_object ("credentials-provider", "credentials-provider", "credentials-provider", GITG_TYPE_CREDENTIALS_PROVIDER, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" - g_signal_new ("tip_updated", GITG_TYPE_REMOTE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED, G_TYPE_NONE, 3, G_TYPE_STRING, ggit_oid_get_type (), ggit_oid_get_type ()); -#line 3096 "gitg-remote.c" + gitg_remote_signals[GITG_REMOTE_TIP_UPDATED_SIGNAL] = g_signal_new ("tip_updated", GITG_TYPE_REMOTE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED, G_TYPE_NONE, 3, G_TYPE_STRING, ggit_oid_get_type (), ggit_oid_get_type ()); +#line 3119 "gitg-remote.c" } static void gitg_remote_instance_init (GitgRemote * self) { #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" self->priv = GITG_REMOTE_GET_PRIVATE (self); -#line 3103 "gitg-remote.c" +#line 3126 "gitg-remote.c" } -static void gitg_remote_finalize (GObject* obj) { +static void gitg_remote_finalize (GObject * obj) { GitgRemote * self; #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_REMOTE, GitgRemote); @@ -3117,7 +3140,7 @@ _g_object_unref0 (self->priv->_credentials_provider); #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" G_OBJECT_CLASS (gitg_remote_parent_class)->finalize (obj); -#line 3121 "gitg-remote.c" +#line 3144 "gitg-remote.c" } @@ -3152,23 +3175,23 @@ break; #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" case GITG_REMOTE_FETCH_SPECS: -#line 3156 "gitg-remote.c" +#line 3179 "gitg-remote.c" { int length; #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_value_take_boxed (value, gitg_remote_get_fetch_specs (self, &length)); -#line 3161 "gitg-remote.c" +#line 3184 "gitg-remote.c" } #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" break; #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" case GITG_REMOTE_PUSH_SPECS: -#line 3167 "gitg-remote.c" +#line 3190 "gitg-remote.c" { int length; #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" g_value_take_boxed (value, gitg_remote_get_push_specs (self, &length)); -#line 3172 "gitg-remote.c" +#line 3195 "gitg-remote.c" } #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" break; @@ -3178,13 +3201,13 @@ g_value_set_object (value, gitg_remote_get_credentials_provider (self)); #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" break; -#line 3182 "gitg-remote.c" +#line 3205 "gitg-remote.c" default: #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" break; -#line 3188 "gitg-remote.c" +#line 3211 "gitg-remote.c" } } @@ -3202,27 +3225,27 @@ break; #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" case GITG_REMOTE_FETCH_SPECS: -#line 3206 "gitg-remote.c" +#line 3229 "gitg-remote.c" { gpointer boxed; #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" boxed = g_value_get_boxed (value); #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_set_fetch_specs (self, boxed, (boxed == NULL) ? 0 : g_strv_length (boxed)); -#line 3213 "gitg-remote.c" +#line 3236 "gitg-remote.c" } #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" break; #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" case GITG_REMOTE_PUSH_SPECS: -#line 3219 "gitg-remote.c" +#line 3242 "gitg-remote.c" { gpointer boxed; #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" boxed = g_value_get_boxed (value); #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" gitg_remote_set_push_specs (self, boxed, (boxed == NULL) ? 0 : g_strv_length (boxed)); -#line 3226 "gitg-remote.c" +#line 3249 "gitg-remote.c" } #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" break; @@ -3232,13 +3255,13 @@ gitg_remote_set_credentials_provider (self, g_value_get_object (value)); #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" break; -#line 3236 "gitg-remote.c" +#line 3259 "gitg-remote.c" default: #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 44 "/home/jesse/dev/gitg/libgitg/gitg-remote.vala" break; -#line 3242 "gitg-remote.c" +#line 3265 "gitg-remote.c" } } diff -Nru gitg-3.22.0/libgitg/gitg-repository.c gitg-3.23.0/libgitg/gitg-repository.c --- gitg-3.22.0/libgitg/gitg-repository.c 2016-09-18 12:01:42.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-repository.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-repository.c generated by valac 0.32.1, the Vala compiler +/* gitg-repository.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-repository.vala, do not modify */ /* @@ -167,7 +167,7 @@ GitgStage* gitg_repository_get_stage (GitgRepository* self); GitgStage* gitg_stage_new (GitgRepository* repository); GitgStage* gitg_stage_construct (GType object_type, GitgRepository* repository); -static void gitg_repository_finalize (GObject* obj); +static void gitg_repository_finalize (GObject * obj); static void _vala_gitg_repository_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); @@ -185,7 +185,7 @@ #line 39 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" self = (GitgRepository*) g_object_new (object_type, "location", _tmp0_, "workdir", _tmp1_, NULL); #line 42 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" - g_initable_init (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_INITABLE, GInitable), NULL, &_inner_error_); + g_initable_init (G_TYPE_CHECK_INSTANCE_CAST (self, g_initable_get_type (), GInitable), NULL, &_inner_error_); #line 42 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 42 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" @@ -398,7 +398,7 @@ #line 89 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 401 "gitg-repository.c" - goto __catch72_g_error; + goto __catch74_g_error; } #line 89 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" _tmp3_ = _tmp0_; @@ -412,8 +412,8 @@ _g_object_unref0 (_tmp0_); #line 414 "gitg-repository.c" } - goto __finally72; - __catch72_g_error: + goto __finally74; + __catch74_g_error: { #line 87 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" g_clear_error (&_inner_error_); @@ -427,7 +427,7 @@ return result; #line 429 "gitg-repository.c" } - __finally72: + __finally74: #line 87 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 87 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" @@ -495,7 +495,7 @@ #line 111 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 498 "gitg-repository.c" - goto __catch73_g_error; + goto __catch75_g_error; } #line 114 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" _tmp12_ = tag; @@ -524,8 +524,8 @@ _g_object_unref0 (tag); #line 526 "gitg-repository.c" } - goto __finally73; - __catch73_g_error: + goto __finally75; + __catch75_g_error: { #line 109 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" g_clear_error (&_inner_error_); @@ -533,7 +533,7 @@ _inner_error_ = NULL; #line 535 "gitg-repository.c" } - __finally73: + __finally75: #line 109 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 109 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" @@ -596,11 +596,11 @@ #line 84 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 599 "gitg-repository.c" - goto __catch71_g_error; + goto __catch73_g_error; } } - goto __finally71; - __catch71_g_error: + goto __finally73; + __catch73_g_error: { #line 82 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" g_clear_error (&_inner_error_); @@ -608,7 +608,7 @@ _inner_error_ = NULL; #line 610 "gitg-repository.c" } - __finally71: + __finally73: #line 82 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 82 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" @@ -1048,11 +1048,11 @@ static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 1058 "gitg-repository.c" } @@ -1224,7 +1224,7 @@ #line 213 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1227 "gitg-repository.c" - goto __catch74_g_error; + goto __catch76_g_error; } #line 213 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" _tmp31_ = _tmp24_; @@ -1238,8 +1238,8 @@ _g_date_time_unref0 (_tmp24_); #line 1240 "gitg-repository.c" } - goto __finally74; - __catch74_g_error: + goto __finally76; + __catch76_g_error: { #line 211 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" g_clear_error (&_inner_error_); @@ -1247,7 +1247,7 @@ _inner_error_ = NULL; #line 1249 "gitg-repository.c" } - __finally74: + __finally76: #line 211 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 211 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" @@ -1362,7 +1362,7 @@ #line 229 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1365 "gitg-repository.c" - goto __catch75_g_error; + goto __catch77_g_error; } #line 229 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" _tmp44_ = g_strdup (_tmp41_); @@ -1372,8 +1372,8 @@ user = _tmp44_; #line 1374 "gitg-repository.c" } - goto __finally75; - __catch75_g_error: + goto __finally77; + __catch77_g_error: { #line 227 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" g_clear_error (&_inner_error_); @@ -1381,7 +1381,7 @@ _inner_error_ = NULL; #line 1383 "gitg-repository.c" } - __finally75: + __finally77: #line 227 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 227 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" @@ -1426,7 +1426,7 @@ #line 237 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1429 "gitg-repository.c" - goto __catch76_g_error; + goto __catch78_g_error; } #line 237 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" _tmp49_ = g_strdup (_tmp46_); @@ -1436,8 +1436,8 @@ email = _tmp49_; #line 1438 "gitg-repository.c" } - goto __finally76; - __catch76_g_error: + goto __finally78; + __catch78_g_error: { #line 235 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" g_clear_error (&_inner_error_); @@ -1445,7 +1445,7 @@ _inner_error_ = NULL; #line 1447 "gitg-repository.c" } - __finally76: + __finally78: #line 235 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 235 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" @@ -1709,7 +1709,7 @@ } -static void gitg_repository_finalize (GObject* obj) { +static void gitg_repository_finalize (GObject * obj) { GitgRepository * self; #line 23 "/home/jesse/dev/gitg/libgitg/gitg-repository.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_REPOSITORY, GitgRepository); diff -Nru gitg-3.22.0/libgitg/gitg-repository-list-box.c gitg-3.23.0/libgitg/gitg-repository-list-box.c --- gitg-3.22.0/libgitg/gitg-repository-list-box.c 2016-09-18 12:01:42.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-repository-list-box.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-repository-list-box.c generated by valac 0.32.1, the Vala compiler +/* gitg-repository-list-box.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-repository-list-box.vala, do not modify */ /* @@ -112,6 +112,17 @@ #define __vala_GgitOId_free0(var) ((var == NULL) ? NULL : (var = (_vala_GgitOId_free (var), NULL))) #define _ggit_tree_entry_unref0(var) ((var == NULL) ? NULL : (var = (ggit_tree_entry_unref (var), NULL))) #define _pango_attr_list_unref0(var) ((var == NULL) ? NULL : (var = (pango_attr_list_unref (var), NULL))) +enum { + GITG_REPOSITORY_LIST_BOX_ROW_REQUEST_REMOVE_SIGNAL, + GITG_REPOSITORY_LIST_BOX_ROW_LAST_SIGNAL +}; +static guint gitg_repository_list_box_row_signals[GITG_REPOSITORY_LIST_BOX_ROW_LAST_SIGNAL] = {0}; +enum { + GITG_REPOSITORY_LIST_BOX_REPOSITORY_ACTIVATED_SIGNAL, + GITG_REPOSITORY_LIST_BOX_SHOW_ERROR_SIGNAL, + GITG_REPOSITORY_LIST_BOX_LAST_SIGNAL +}; +static guint gitg_repository_list_box_signals[GITG_REPOSITORY_LIST_BOX_LAST_SIGNAL] = {0}; typedef enum { GITG_SELECTION_MODE_NORMAL, @@ -255,7 +266,7 @@ void gitg_repository_list_box_set_bookmarks_from_recent_files (GitgRepositoryListBox* self, gboolean value); void gitg_repository_list_box_set_location (GitgRepositoryListBox* self, GFile* value); GitgRepositoryListBoxRow** gitg_repository_list_box_get_selection (GitgRepositoryListBox* self, int* result_length1); -static void _vala_array_add14 (GitgRepositoryListBoxRow*** array, int* length, int* size, GitgRepositoryListBoxRow* value); +static void _vala_array_add14 (GitgRepositoryListBoxRow** * array, int* length, int* size, GitgRepositoryListBoxRow* value); gboolean gitg_repository_list_box_get_has_selection (GitgRepositoryListBox* self); static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); static GObject * gitg_repository_list_box_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); @@ -298,10 +309,10 @@ const gchar* gitg_repository_list_box_row_get_branch_name (GitgRepositoryListBoxRow* self); gboolean gitg_repository_list_box_row_get_loading (GitgRepositoryListBoxRow* self); static GObject * gitg_repository_list_box_row_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); -static void gitg_repository_list_box_row_finalize (GObject* obj); +static void gitg_repository_list_box_row_finalize (GObject * obj); static void _vala_gitg_repository_list_box_row_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_repository_list_box_row_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); -static void gitg_repository_list_box_finalize (GObject* obj); +static void gitg_repository_list_box_finalize (GObject * obj); static void _vala_gitg_repository_list_box_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_repository_list_box_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -324,21 +335,21 @@ static gpointer _g_object_ref0 (gpointer self) { #line 308 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return self ? g_object_ref (self) : NULL; -#line 328 "gitg-repository-list-box.c" +#line 339 "gitg-repository-list-box.c" } static gpointer _gtk_recent_info_ref0 (gpointer self) { #line 311 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return self ? gtk_recent_info_ref (self) : NULL; -#line 335 "gitg-repository-list-box.c" +#line 346 "gitg-repository-list-box.c" } static void _gtk_recent_info_unref0_ (gpointer var) { #line 327 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" (var == NULL) ? NULL : (var = (gtk_recent_info_unref (var), NULL)); -#line 342 "gitg-repository-list-box.c" +#line 353 "gitg-repository-list-box.c" } @@ -347,7 +358,7 @@ g_list_foreach (self, (GFunc) _gtk_recent_info_unref0_, NULL); #line 327 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_list_free (self); -#line 351 "gitg-repository-list-box.c" +#line 362 "gitg-repository-list-box.c" } @@ -376,7 +387,7 @@ items = _tmp3_; #line 311 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp4_ = items; -#line 380 "gitg-repository-list-box.c" +#line 391 "gitg-repository-list-box.c" { GList* item_collection = NULL; GList* item_it = NULL; @@ -384,14 +395,14 @@ item_collection = _tmp4_; #line 311 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" for (item_it = item_collection; item_it != NULL; item_it = item_it->next) { -#line 388 "gitg-repository-list-box.c" +#line 399 "gitg-repository-list-box.c" GtkRecentInfo* _tmp5_ = NULL; GtkRecentInfo* item = NULL; #line 311 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp5_ = _gtk_recent_info_ref0 ((GtkRecentInfo*) item_it->data); #line 311 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" item = _tmp5_; -#line 395 "gitg-repository-list-box.c" +#line 406 "gitg-repository-list-box.c" { GtkRecentInfo* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; @@ -430,7 +441,7 @@ _gtk_recent_info_unref0 (item); #line 315 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" continue; -#line 434 "gitg-repository-list-box.c" +#line 445 "gitg-repository-list-box.c" } #line 318 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp8_ = item; @@ -488,7 +499,7 @@ _tmp28_ = g_strjoin (" ", _tmp27_, "%f", NULL); #line 325 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" app_exec = _tmp28_; -#line 492 "gitg-repository-list-box.c" +#line 503 "gitg-repository-list-box.c" { GBookmarkFile* _tmp29_ = NULL; const gchar* _tmp30_ = NULL; @@ -506,20 +517,20 @@ g_bookmark_file_set_app_info (_tmp29_, _tmp30_, _tmp31_, _tmp32_, 1, (time_t) -1, &_inner_error_); #line 327 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 510 "gitg-repository-list-box.c" - goto __catch60_g_error; +#line 521 "gitg-repository-list-box.c" + goto __catch62_g_error; } } - goto __finally60; - __catch60_g_error: + goto __finally62; + __catch62_g_error: { #line 327 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_clear_error (&_inner_error_); #line 327 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _inner_error_ = NULL; -#line 521 "gitg-repository-list-box.c" +#line 532 "gitg-repository-list-box.c" } - __finally60: + __finally62: #line 327 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 327 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" @@ -540,7 +551,7 @@ g_clear_error (&_inner_error_); #line 327 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return; -#line 544 "gitg-repository-list-box.c" +#line 555 "gitg-repository-list-box.c" } #line 311 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_free0 (app_exec); @@ -550,7 +561,7 @@ _g_free0 (uri); #line 311 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _gtk_recent_info_unref0 (item); -#line 554 "gitg-repository-list-box.c" +#line 565 "gitg-repository-list-box.c" } } } @@ -560,7 +571,7 @@ __g_list_free__gtk_recent_info_unref0_0 (items); #line 306 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_object_unref0 (manager); -#line 564 "gitg-repository-list-box.c" +#line 575 "gitg-repository-list-box.c" } @@ -588,21 +599,21 @@ _tmp3_ = gdk_event_triggers_context_menu (_tmp2_); #line 337 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp3_) { -#line 592 "gitg-repository-list-box.c" +#line 603 "gitg-repository-list-box.c" GitgSelectionMode _tmp4_ = 0; #line 337 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp4_ = self->priv->_mode; #line 337 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp1_ = _tmp4_ == GITG_SELECTION_MODE_NORMAL; -#line 598 "gitg-repository-list-box.c" +#line 609 "gitg-repository-list-box.c" } else { #line 337 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp1_ = FALSE; -#line 602 "gitg-repository-list-box.c" +#line 613 "gitg-repository-list-box.c" } #line 337 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp1_) { -#line 606 "gitg-repository-list-box.c" +#line 617 "gitg-repository-list-box.c" GitgRepositoryListBoxRow* row = NULL; GdkEventButton* _tmp5_ = NULL; gdouble _tmp6_ = 0.0; @@ -625,13 +636,13 @@ _tmp9_ = row; #line 343 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp9_ != NULL) { -#line 629 "gitg-repository-list-box.c" +#line 640 "gitg-repository-list-box.c" GitgRepositoryListBoxRow* _tmp10_ = NULL; #line 345 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp10_ = row; #line 345 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" gitg_repository_list_box_row_set_selected (_tmp10_, TRUE); -#line 635 "gitg-repository-list-box.c" +#line 646 "gitg-repository-list-box.c" } #line 348 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" result = TRUE; @@ -639,7 +650,7 @@ _g_object_unref0 (row); #line 348 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 643 "gitg-repository-list-box.c" +#line 654 "gitg-repository-list-box.c" } #line 351 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp11_ = event; @@ -649,7 +660,7 @@ result = _tmp12_; #line 351 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 653 "gitg-repository-list-box.c" +#line 664 "gitg-repository-list-box.c" } @@ -676,7 +687,7 @@ _tmp2_ = self->priv->_mode; #line 358 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp2_ == GITG_SELECTION_MODE_SELECTION) { -#line 680 "gitg-repository-list-box.c" +#line 691 "gitg-repository-list-box.c" GitgRepositoryListBoxRow* _tmp3_ = NULL; GitgRepositoryListBoxRow* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; @@ -695,7 +706,7 @@ _g_object_unref0 (r); #line 361 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return; -#line 699 "gitg-repository-list-box.c" +#line 710 "gitg-repository-list-box.c" } #line 364 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp7_ = r; @@ -705,7 +716,7 @@ _tmp9_ = _tmp8_; #line 364 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp9_ != NULL) { -#line 709 "gitg-repository-list-box.c" +#line 720 "gitg-repository-list-box.c" GitgRepositoryListBoxRow* _tmp10_ = NULL; GitgRepository* _tmp11_ = NULL; GitgRepository* _tmp12_ = NULL; @@ -716,12 +727,12 @@ #line 366 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp12_ = _tmp11_; #line 366 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - g_signal_emit_by_name (self, "repository-activated", _tmp12_); -#line 721 "gitg-repository-list-box.c" + g_signal_emit (self, gitg_repository_list_box_signals[GITG_REPOSITORY_LIST_BOX_REPOSITORY_ACTIVATED_SIGNAL], 0, _tmp12_); +#line 732 "gitg-repository-list-box.c" } #line 354 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_object_unref0 (r); -#line 725 "gitg-repository-list-box.c" +#line 736 "gitg-repository-list-box.c" } @@ -737,7 +748,7 @@ _tmp1_ = before; #line 393 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp1_ != NULL) { -#line 741 "gitg-repository-list-box.c" +#line 752 "gitg-repository-list-box.c" GtkSeparator* _tmp2_ = NULL; #line 393 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp2_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); @@ -747,13 +758,13 @@ _g_object_unref0 (_tmp0_); #line 393 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp0_ = _tmp2_; -#line 751 "gitg-repository-list-box.c" +#line 762 "gitg-repository-list-box.c" } else { #line 393 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_object_unref0 (_tmp0_); #line 393 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp0_ = NULL; -#line 757 "gitg-repository-list-box.c" +#line 768 "gitg-repository-list-box.c" } #line 393 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp3_ = row; @@ -761,7 +772,7 @@ gtk_list_box_row_set_header (_tmp3_, (GtkWidget*) _tmp0_); #line 391 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_object_unref0 (_tmp0_); -#line 765 "gitg-repository-list-box.c" +#line 776 "gitg-repository-list-box.c" } @@ -769,19 +780,19 @@ gboolean result = FALSE; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1395 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1395 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1396 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = needle; -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1396 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1396 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_ != NULL; -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1396 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 785 "gitg-repository-list-box.c" +#line 796 "gitg-repository-list-box.c" } @@ -797,7 +808,7 @@ _tmp1_ = self->priv->d_filter_text; #line 398 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp1_ != NULL) { -#line 801 "gitg-repository-list-box.c" +#line 812 "gitg-repository-list-box.c" GtkListBoxRow* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; @@ -815,17 +826,17 @@ _tmp6_ = string_contains (_tmp4_, _tmp5_); #line 398 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp0_ = _tmp6_; -#line 819 "gitg-repository-list-box.c" +#line 830 "gitg-repository-list-box.c" } else { #line 398 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp0_ = TRUE; -#line 823 "gitg-repository-list-box.c" +#line 834 "gitg-repository-list-box.c" } #line 398 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" result = _tmp0_; #line 398 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 829 "gitg-repository-list-box.c" +#line 840 "gitg-repository-list-box.c" } @@ -862,7 +873,7 @@ result = _tmp6_; #line 403 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 866 "gitg-repository-list-box.c" +#line 877 "gitg-repository-list-box.c" } @@ -892,7 +903,7 @@ _tmp3_ = uris; #line 410 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp3__length1 = uris_length1; -#line 896 "gitg-repository-list-box.c" +#line 907 "gitg-repository-list-box.c" { gchar** uri_collection = NULL; gint uri_collection_length1 = 0; @@ -904,14 +915,14 @@ uri_collection_length1 = _tmp3__length1; #line 410 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" for (uri_it = 0; uri_it < _tmp3__length1; uri_it = uri_it + 1) { -#line 908 "gitg-repository-list-box.c" +#line 919 "gitg-repository-list-box.c" gchar* _tmp4_ = NULL; gchar* uri = NULL; #line 410 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp4_ = g_strdup (uri_collection[uri_it]); #line 410 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" uri = _tmp4_; -#line 915 "gitg-repository-list-box.c" +#line 926 "gitg-repository-list-box.c" { GFile* repo_file = NULL; const gchar* _tmp9_ = NULL; @@ -937,8 +948,8 @@ _tmp5_ = _tmp8_; #line 413 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 941 "gitg-repository-list-box.c" - goto __catch61_g_error; +#line 952 "gitg-repository-list-box.c" + goto __catch63_g_error; } #line 413 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (!_tmp5_) { @@ -946,11 +957,11 @@ _g_free0 (uri); #line 415 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" continue; -#line 950 "gitg-repository-list-box.c" +#line 961 "gitg-repository-list-box.c" } } - goto __finally61; - __catch61_g_error: + goto __finally63; + __catch63_g_error: { #line 412 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_clear_error (&_inner_error_); @@ -960,9 +971,9 @@ _g_free0 (uri); #line 417 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" continue; -#line 964 "gitg-repository-list-box.c" +#line 975 "gitg-repository-list-box.c" } - __finally61: + __finally63: #line 412 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 412 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" @@ -975,7 +986,7 @@ g_clear_error (&_inner_error_); #line 412 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return; -#line 979 "gitg-repository-list-box.c" +#line 990 "gitg-repository-list-box.c" } #line 419 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp9_ = uri; @@ -983,7 +994,7 @@ _tmp10_ = g_file_new_for_uri (_tmp9_); #line 419 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" repo_file = _tmp10_; -#line 987 "gitg-repository-list-box.c" +#line 998 "gitg-repository-list-box.c" { GitgRepository* _tmp11_ = NULL; GFile* _tmp12_ = NULL; @@ -997,8 +1008,8 @@ _tmp11_ = _tmp13_; #line 424 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1001 "gitg-repository-list-box.c" - goto __catch62_g_error; +#line 1012 "gitg-repository-list-box.c" + goto __catch64_g_error; } #line 424 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp14_ = _tmp11_; @@ -1010,16 +1021,16 @@ repo = _tmp14_; #line 422 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_object_unref0 (_tmp11_); -#line 1014 "gitg-repository-list-box.c" +#line 1025 "gitg-repository-list-box.c" } - goto __finally62; - __catch62_g_error: + goto __finally64; + __catch64_g_error: { #line 422 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_clear_error (&_inner_error_); #line 422 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _inner_error_ = NULL; -#line 1023 "gitg-repository-list-box.c" +#line 1034 "gitg-repository-list-box.c" { GBookmarkFile* _tmp15_ = NULL; const gchar* _tmp16_ = NULL; @@ -1031,20 +1042,20 @@ g_bookmark_file_remove_item (_tmp15_, _tmp16_, &_inner_error_); #line 430 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1035 "gitg-repository-list-box.c" - goto __catch63_g_error; +#line 1046 "gitg-repository-list-box.c" + goto __catch65_g_error; } } - goto __finally63; - __catch63_g_error: + goto __finally65; + __catch65_g_error: { #line 428 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_clear_error (&_inner_error_); #line 428 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _inner_error_ = NULL; -#line 1046 "gitg-repository-list-box.c" +#line 1057 "gitg-repository-list-box.c" } - __finally63: + __finally65: #line 428 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 428 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" @@ -1061,7 +1072,7 @@ g_clear_error (&_inner_error_); #line 428 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return; -#line 1065 "gitg-repository-list-box.c" +#line 1076 "gitg-repository-list-box.c" } #line 433 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_object_unref0 (repo); @@ -1071,9 +1082,9 @@ _g_free0 (uri); #line 433 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" continue; -#line 1075 "gitg-repository-list-box.c" +#line 1086 "gitg-repository-list-box.c" } - __finally62: + __finally64: #line 422 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 422 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" @@ -1090,11 +1101,11 @@ g_clear_error (&_inner_error_); #line 422 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return; -#line 1094 "gitg-repository-list-box.c" +#line 1105 "gitg-repository-list-box.c" } #line 436 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" visited = NULL; -#line 1098 "gitg-repository-list-box.c" +#line 1109 "gitg-repository-list-box.c" { time_t _tmp17_ = 0; GBookmarkFile* _tmp18_ = NULL; @@ -1111,8 +1122,8 @@ _tmp17_ = _tmp20_; #line 440 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1115 "gitg-repository-list-box.c" - goto __catch64_g_error; +#line 1126 "gitg-repository-list-box.c" + goto __catch66_g_error; } #line 440 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp21_ = g_date_time_new_from_unix_utc ((gint64) _tmp17_); @@ -1120,18 +1131,18 @@ _g_date_time_unref0 (visited); #line 440 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" visited = _tmp21_; -#line 1124 "gitg-repository-list-box.c" +#line 1135 "gitg-repository-list-box.c" } - goto __finally64; - __catch64_g_error: + goto __finally66; + __catch66_g_error: { #line 438 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_clear_error (&_inner_error_); #line 438 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _inner_error_ = NULL; -#line 1133 "gitg-repository-list-box.c" +#line 1144 "gitg-repository-list-box.c" } - __finally64: + __finally66: #line 438 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 438 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" @@ -1150,7 +1161,7 @@ g_clear_error (&_inner_error_); #line 438 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return; -#line 1154 "gitg-repository-list-box.c" +#line 1165 "gitg-repository-list-box.c" } #line 443 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp22_ = repo; @@ -1170,13 +1181,13 @@ _g_object_unref0 (repo_file); #line 410 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_free0 (uri); -#line 1174 "gitg-repository-list-box.c" +#line 1185 "gitg-repository-list-box.c" } } } #line 406 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" uris = (_vala_array_free (uris, uris_length1, (GDestroyNotify) g_free), NULL); -#line 1180 "gitg-repository-list-box.c" +#line 1191 "gitg-repository-list-box.c" } @@ -1192,7 +1203,7 @@ row = NULL; #line 451 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp0_ = gtk_container_get_children ((GtkContainer*) self); -#line 1196 "gitg-repository-list-box.c" +#line 1207 "gitg-repository-list-box.c" { GList* child_collection = NULL; GList* child_it = NULL; @@ -1200,11 +1211,11 @@ child_collection = _tmp0_; #line 451 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" for (child_it = child_collection; child_it != NULL; child_it = child_it->next) { -#line 1204 "gitg-repository-list-box.c" +#line 1215 "gitg-repository-list-box.c" GtkWidget* child = NULL; #line 451 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" child = (GtkWidget*) child_it->data; -#line 1208 "gitg-repository-list-box.c" +#line 1219 "gitg-repository-list-box.c" { GitgRepositoryListBoxRow* d = NULL; GtkWidget* _tmp1_ = NULL; @@ -1251,7 +1262,7 @@ _g_object_unref0 (_tmp7_); #line 455 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp12_) { -#line 1255 "gitg-repository-list-box.c" +#line 1266 "gitg-repository-list-box.c" GitgRepositoryListBoxRow* _tmp13_ = NULL; GitgRepositoryListBoxRow* _tmp14_ = NULL; #line 457 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" @@ -1266,34 +1277,34 @@ _g_object_unref0 (d); #line 458 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" break; -#line 1270 "gitg-repository-list-box.c" +#line 1281 "gitg-repository-list-box.c" } #line 451 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_object_unref0 (d); -#line 1274 "gitg-repository-list-box.c" +#line 1285 "gitg-repository-list-box.c" } } #line 451 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_list_free0 (child_collection); -#line 1279 "gitg-repository-list-box.c" +#line 1290 "gitg-repository-list-box.c" } #line 462 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" result = row; #line 462 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 1285 "gitg-repository-list-box.c" +#line 1296 "gitg-repository-list-box.c" } static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1297 "gitg-repository-list-box.c" +#line 1308 "gitg-repository-list-box.c" } @@ -1316,7 +1327,7 @@ result = FALSE; #line 471 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 1320 "gitg-repository-list-box.c" +#line 1331 "gitg-repository-list-box.c" } { GFile* dir = NULL; @@ -1340,23 +1351,23 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 477 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_object_unref0 (dir); -#line 1344 "gitg-repository-list-box.c" - goto __catch65_g_error; +#line 1355 "gitg-repository-list-box.c" + goto __catch67_g_error; } #line 474 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_object_unref0 (dir); -#line 1349 "gitg-repository-list-box.c" +#line 1360 "gitg-repository-list-box.c" } - goto __finally65; - __catch65_g_error: + goto __finally67; + __catch67_g_error: { #line 474 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_clear_error (&_inner_error_); #line 474 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _inner_error_ = NULL; -#line 1358 "gitg-repository-list-box.c" +#line 1369 "gitg-repository-list-box.c" } - __finally65: + __finally67: #line 474 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 474 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" @@ -1365,7 +1376,7 @@ g_clear_error (&_inner_error_); #line 474 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return FALSE; -#line 1369 "gitg-repository-list-box.c" +#line 1380 "gitg-repository-list-box.c" } { GBookmarkFile* _tmp6_ = NULL; @@ -1389,12 +1400,12 @@ _g_free0 (_tmp10_); #line 482 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1393 "gitg-repository-list-box.c" - goto __catch66_g_error; +#line 1404 "gitg-repository-list-box.c" + goto __catch68_g_error; } } - goto __finally66; - __catch66_g_error: + goto __finally68; + __catch68_g_error: { GError* e = NULL; FILE* _tmp11_ = NULL; @@ -1425,9 +1436,9 @@ _g_free0 (_tmp16_); #line 480 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_error_free0 (e); -#line 1429 "gitg-repository-list-box.c" +#line 1440 "gitg-repository-list-box.c" } - __finally66: + __finally68: #line 480 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 480 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" @@ -1436,13 +1447,13 @@ g_clear_error (&_inner_error_); #line 480 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return FALSE; -#line 1440 "gitg-repository-list-box.c" +#line 1451 "gitg-repository-list-box.c" } #line 489 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" result = FALSE; #line 489 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 1446 "gitg-repository-list-box.c" +#line 1457 "gitg-repository-list-box.c" } @@ -1500,7 +1511,7 @@ if (_tmp8_ == NULL) { #line 496 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp7_ = (time_t) -1; -#line 1504 "gitg-repository-list-box.c" +#line 1515 "gitg-repository-list-box.c" } else { GDateTime* _tmp9_ = NULL; gint64 _tmp10_ = 0LL; @@ -1510,7 +1521,7 @@ _tmp10_ = g_date_time_to_unix (_tmp9_); #line 496 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp7_ = (time_t) _tmp10_; -#line 1514 "gitg-repository-list-box.c" +#line 1525 "gitg-repository-list-box.c" } #line 496 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp11_ = self->priv->d_bookmark_file; @@ -1530,7 +1541,7 @@ _tmp16_ = g_strjoin (" ", _tmp15_, "%f", NULL); #line 499 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" app_exec = _tmp16_; -#line 1534 "gitg-repository-list-box.c" +#line 1545 "gitg-repository-list-box.c" { GBookmarkFile* _tmp17_ = NULL; const gchar* _tmp18_ = NULL; @@ -1542,20 +1553,20 @@ g_bookmark_file_set_app_info (_tmp17_, _tmp18_, app_name, app_exec, 1, (time_t) -1, &_inner_error_); #line 501 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1546 "gitg-repository-list-box.c" - goto __catch67_g_error; +#line 1557 "gitg-repository-list-box.c" + goto __catch69_g_error; } } - goto __finally67; - __catch67_g_error: + goto __finally69; + __catch69_g_error: { #line 501 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_clear_error (&_inner_error_); #line 501 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _inner_error_ = NULL; -#line 1557 "gitg-repository-list-box.c" +#line 1568 "gitg-repository-list-box.c" } - __finally67: + __finally69: #line 501 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 501 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" @@ -1568,7 +1579,7 @@ g_clear_error (&_inner_error_); #line 501 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return; -#line 1572 "gitg-repository-list-box.c" +#line 1583 "gitg-repository-list-box.c" } #line 503 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" gitg_repository_list_box_save_repository_bookmarks_timeout (self); @@ -1576,7 +1587,7 @@ _g_free0 (app_exec); #line 492 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_free0 (app_name); -#line 1580 "gitg-repository-list-box.c" +#line 1591 "gitg-repository-list-box.c" } @@ -1585,7 +1596,7 @@ result = gitg_repository_list_box_save_repository_bookmarks ((GitgRepositoryListBox*) self); #line 513 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 1589 "gitg-repository-list-box.c" +#line 1600 "gitg-repository-list-box.c" } @@ -1600,13 +1611,13 @@ if (_tmp0_ != ((guint) 0)) { #line 510 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return; -#line 1604 "gitg-repository-list-box.c" +#line 1615 "gitg-repository-list-box.c" } #line 513 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp1_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 300, _gitg_repository_list_box_save_repository_bookmarks_gsource_func, g_object_ref (self), g_object_unref); #line 513 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" self->priv->d_save_repository_bookmarks_id = _tmp1_; -#line 1610 "gitg-repository-list-box.c" +#line 1621 "gitg-repository-list-box.c" } @@ -1620,7 +1631,7 @@ _tmp0_ = repository; #line 518 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp0_ != NULL) { -#line 1624 "gitg-repository-list-box.c" +#line 1635 "gitg-repository-list-box.c" GFile* workdir = NULL; GitgRepository* _tmp1_ = NULL; GFile* _tmp2_ = NULL; @@ -1652,7 +1663,7 @@ _tmp6_ = workdir; #line 523 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp6_ != NULL) { -#line 1656 "gitg-repository-list-box.c" +#line 1667 "gitg-repository-list-box.c" GFile* _tmp7_ = NULL; gchar* _tmp8_ = NULL; #line 523 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" @@ -1663,7 +1674,7 @@ _g_free0 (_tmp5_); #line 523 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp5_ = _tmp8_; -#line 1667 "gitg-repository-list-box.c" +#line 1678 "gitg-repository-list-box.c" } else { GFile* _tmp9_ = NULL; gchar* _tmp10_ = NULL; @@ -1675,7 +1686,7 @@ _g_free0 (_tmp5_); #line 523 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp5_ = _tmp10_; -#line 1679 "gitg-repository-list-box.c" +#line 1690 "gitg-repository-list-box.c" } #line 523 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp11_ = g_strdup (_tmp5_); @@ -1707,14 +1718,14 @@ _g_object_unref0 (repo_file); #line 518 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_object_unref0 (workdir); -#line 1711 "gitg-repository-list-box.c" +#line 1722 "gitg-repository-list-box.c" } else { GitgRepositoryListBoxRow* _tmp17_ = NULL; #line 533 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp17_ = row; #line 533 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" gtk_container_remove ((GtkContainer*) self, (GtkWidget*) _tmp17_); -#line 1718 "gitg-repository-list-box.c" +#line 1729 "gitg-repository-list-box.c" } } @@ -1732,7 +1743,6 @@ GFile* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; #line 537 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_return_val_if_fail (self != NULL, NULL); #line 537 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" @@ -1770,9 +1780,7 @@ #line 540 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_free0 (_tmp9_); #line 541 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp10_ = _ ("Cloning…"); -#line 541 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - gitg_repository_list_box_row_set_branch_name (row, _tmp10_); + gitg_repository_list_box_row_set_branch_name (row, _ ("Cloning…")); #line 543 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" gitg_repository_list_box_row_set_loading (row, TRUE); #line 544 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" @@ -1783,7 +1791,7 @@ result = row; #line 547 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 1787 "gitg-repository-list-box.c" +#line 1795 "gitg-repository-list-box.c" } @@ -1792,7 +1800,7 @@ g_atomic_int_inc (&_data18_->_ref_count_); #line 550 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return _data18_; -#line 1796 "gitg-repository-list-box.c" +#line 1804 "gitg-repository-list-box.c" } @@ -1801,7 +1809,7 @@ _data18_ = (Block18Data*) _userdata_; #line 550 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (g_atomic_int_dec_and_test (&_data18_->_ref_count_)) { -#line 1805 "gitg-repository-list-box.c" +#line 1813 "gitg-repository-list-box.c" GitgRepositoryListBox* self; #line 550 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" self = _data18_->self; @@ -1813,7 +1821,7 @@ _g_object_unref0 (self); #line 550 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_slice_free (Block18Data, _data18_); -#line 1817 "gitg-repository-list-box.c" +#line 1825 "gitg-repository-list-box.c" } } @@ -1821,14 +1829,14 @@ static void ___lambda71_ (GitgRepositoryListBox* self) { #line 560 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_object_notify ((GObject*) self, "has-selection"); -#line 1825 "gitg-repository-list-box.c" +#line 1833 "gitg-repository-list-box.c" } static void ____lambda71__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 559 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" ___lambda71_ ((GitgRepositoryListBox*) self); -#line 1832 "gitg-repository-list-box.c" +#line 1840 "gitg-repository-list-box.c" } @@ -1838,7 +1846,7 @@ GError * _inner_error_ = NULL; #line 563 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" self = _data18_->self; -#line 1842 "gitg-repository-list-box.c" +#line 1850 "gitg-repository-list-box.c" { GBookmarkFile* _tmp0_ = NULL; GFile* _tmp1_ = NULL; @@ -1858,20 +1866,20 @@ _g_free0 (_tmp3_); #line 566 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1862 "gitg-repository-list-box.c" - goto __catch68_g_error; +#line 1870 "gitg-repository-list-box.c" + goto __catch70_g_error; } } - goto __finally68; - __catch68_g_error: + goto __finally70; + __catch70_g_error: { #line 564 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_clear_error (&_inner_error_); #line 564 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _inner_error_ = NULL; -#line 1873 "gitg-repository-list-box.c" +#line 1881 "gitg-repository-list-box.c" } - __finally68: + __finally70: #line 564 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 564 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" @@ -1880,20 +1888,20 @@ g_clear_error (&_inner_error_); #line 564 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return; -#line 1884 "gitg-repository-list-box.c" +#line 1892 "gitg-repository-list-box.c" } #line 569 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp4_ = _data18_->row; #line 569 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" gtk_container_remove ((GtkContainer*) self, (GtkWidget*) _tmp4_); -#line 1890 "gitg-repository-list-box.c" +#line 1898 "gitg-repository-list-box.c" } static void ____lambda72__gitg_repository_list_box_row_request_remove (GitgRepositoryListBoxRow* _sender, gpointer self) { #line 563 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" ___lambda72_ (self); -#line 1897 "gitg-repository-list-box.c" +#line 1905 "gitg-repository-list-box.c" } @@ -1956,7 +1964,7 @@ _g_object_unref0 (_tmp10_); #line 553 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp11_) { -#line 1960 "gitg-repository-list-box.c" +#line 1968 "gitg-repository-list-box.c" GitgRepository* _tmp12_ = NULL; GFile* _tmp13_ = NULL; GFile* _tmp14_ = NULL; @@ -1970,7 +1978,7 @@ _g_object_unref0 (_tmp6_); #line 553 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp6_ = _tmp14_; -#line 1974 "gitg-repository-list-box.c" +#line 1982 "gitg-repository-list-box.c" } else { GitgRepository* _tmp15_ = NULL; GFile* _tmp16_ = NULL; @@ -1985,7 +1993,7 @@ _g_object_unref0 (_tmp6_); #line 553 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp6_ = _tmp17_; -#line 1989 "gitg-repository-list-box.c" +#line 1997 "gitg-repository-list-box.c" } #line 553 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp18_ = _g_object_ref0 (_tmp6_); @@ -1995,7 +2003,7 @@ _tmp19_ = _data18_->workdir; #line 555 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp19_ != NULL) { -#line 1999 "gitg-repository-list-box.c" +#line 2007 "gitg-repository-list-box.c" GitgRepositoryListBoxRow* _tmp20_ = NULL; GitgRepositoryListBoxRow* _tmp21_ = NULL; GitgRepositoryListBoxRow* _tmp22_ = NULL; @@ -2016,14 +2024,14 @@ _tmp23_ = _data18_->row; #line 572 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" gitg_repository_list_box_row_set_can_remove (_tmp23_, TRUE); -#line 2020 "gitg-repository-list-box.c" +#line 2028 "gitg-repository-list-box.c" } else { GitgRepositoryListBoxRow* _tmp24_ = NULL; #line 576 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp24_ = _data18_->row; #line 576 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" gitg_repository_list_box_row_set_can_remove (_tmp24_, FALSE); -#line 2027 "gitg-repository-list-box.c" +#line 2035 "gitg-repository-list-box.c" } #line 550 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_object_unref0 (_tmp6_); @@ -2033,14 +2041,14 @@ block18_data_unref (_data18_); #line 550 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _data18_ = NULL; -#line 2037 "gitg-repository-list-box.c" +#line 2045 "gitg-repository-list-box.c" } static gpointer _g_date_time_ref0 (gpointer self) { #line 598 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return self ? g_date_time_ref (self) : NULL; -#line 2044 "gitg-repository-list-box.c" +#line 2052 "gitg-repository-list-box.c" } @@ -2086,7 +2094,7 @@ _g_object_unref0 (_tmp6_); #line 585 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp7_) { -#line 2090 "gitg-repository-list-box.c" +#line 2098 "gitg-repository-list-box.c" GitgRepository* _tmp8_ = NULL; GFile* _tmp9_ = NULL; GFile* _tmp10_ = NULL; @@ -2100,7 +2108,7 @@ _g_object_unref0 (_tmp2_); #line 585 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp2_ = _tmp10_; -#line 2104 "gitg-repository-list-box.c" +#line 2112 "gitg-repository-list-box.c" } else { GitgRepository* _tmp11_ = NULL; GFile* _tmp12_ = NULL; @@ -2115,7 +2123,7 @@ _g_object_unref0 (_tmp2_); #line 585 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp2_ = _tmp13_; -#line 2119 "gitg-repository-list-box.c" +#line 2127 "gitg-repository-list-box.c" } #line 585 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp14_ = _g_object_ref0 (_tmp2_); @@ -2125,7 +2133,7 @@ _tmp15_ = row; #line 587 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp15_ == NULL) { -#line 2129 "gitg-repository-list-box.c" +#line 2137 "gitg-repository-list-box.c" GFile* _tmp16_ = NULL; GitgRepository* _tmp17_ = NULL; GFile* _tmp18_ = NULL; @@ -2157,7 +2165,7 @@ _g_object_unref0 (_tmp20_); #line 589 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp21_) { -#line 2161 "gitg-repository-list-box.c" +#line 2169 "gitg-repository-list-box.c" GitgRepository* _tmp22_ = NULL; GFile* _tmp23_ = NULL; GFile* _tmp24_ = NULL; @@ -2171,7 +2179,7 @@ _g_object_unref0 (_tmp16_); #line 589 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp16_ = _tmp24_; -#line 2175 "gitg-repository-list-box.c" +#line 2183 "gitg-repository-list-box.c" } else { GitgRepository* _tmp25_ = NULL; GFile* _tmp26_ = NULL; @@ -2186,7 +2194,7 @@ _g_object_unref0 (_tmp16_); #line 589 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp16_ = _tmp27_; -#line 2190 "gitg-repository-list-box.c" +#line 2198 "gitg-repository-list-box.c" } #line 589 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp28_ = g_file_get_parent (_tmp16_); @@ -2228,13 +2236,13 @@ _g_free0 (dirname); #line 587 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_object_unref0 (_tmp16_); -#line 2232 "gitg-repository-list-box.c" +#line 2240 "gitg-repository-list-box.c" } #line 598 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp39_ = visited; #line 598 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp39_ != NULL) { -#line 2238 "gitg-repository-list-box.c" +#line 2246 "gitg-repository-list-box.c" GDateTime* _tmp40_ = NULL; GDateTime* _tmp41_ = NULL; #line 598 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" @@ -2245,7 +2253,7 @@ _g_date_time_unref0 (_tmp38_); #line 598 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp38_ = _tmp41_; -#line 2249 "gitg-repository-list-box.c" +#line 2257 "gitg-repository-list-box.c" } else { GDateTime* _tmp42_ = NULL; #line 598 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" @@ -2254,7 +2262,7 @@ _g_date_time_unref0 (_tmp38_); #line 598 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp38_ = _tmp42_; -#line 2258 "gitg-repository-list-box.c" +#line 2266 "gitg-repository-list-box.c" } #line 598 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp43_ = row; @@ -2266,7 +2274,7 @@ _tmp44_ = f; #line 601 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp44_ != NULL) { -#line 2270 "gitg-repository-list-box.c" +#line 2278 "gitg-repository-list-box.c" GFile* _tmp45_ = NULL; gchar* _tmp46_ = NULL; gchar* _tmp47_ = NULL; @@ -2283,7 +2291,7 @@ gitg_repository_list_box_add_repository_to_bookmarks (self, _tmp47_, _tmp48_); #line 603 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_free0 (_tmp47_); -#line 2287 "gitg-repository-list-box.c" +#line 2295 "gitg-repository-list-box.c" } #line 606 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" result = row; @@ -2295,7 +2303,7 @@ _g_object_unref0 (_tmp2_); #line 606 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 2299 "gitg-repository-list-box.c" +#line 2307 "gitg-repository-list-box.c" } @@ -2314,7 +2322,7 @@ self->priv->d_filter_text = _tmp1_; #line 651 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" gtk_list_box_invalidate_filter ((GtkListBox*) self); -#line 2318 "gitg-repository-list-box.c" +#line 2326 "gitg-repository-list-box.c" } @@ -2324,14 +2332,14 @@ self = (GitgRepositoryListBox*) g_object_new (object_type, NULL); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return self; -#line 2328 "gitg-repository-list-box.c" +#line 2336 "gitg-repository-list-box.c" } GitgRepositoryListBox* gitg_repository_list_box_new (void) { #line 28 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return gitg_repository_list_box_construct (GITG_TYPE_REPOSITORY_LIST_BOX); -#line 2335 "gitg-repository-list-box.c" +#line 2343 "gitg-repository-list-box.c" } @@ -2346,21 +2354,25 @@ result = _tmp0_; #line 261 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 2350 "gitg-repository-list-box.c" +#line 2358 "gitg-repository-list-box.c" } void gitg_repository_list_box_set_mode (GitgRepositoryListBox* self, GitgSelectionMode value) { - GitgSelectionMode _tmp0_ = 0; #line 261 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_return_if_fail (self != NULL); #line 261 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp0_ = value; + if (gitg_repository_list_box_get_mode (self) != value) { +#line 2367 "gitg-repository-list-box.c" + GitgSelectionMode _tmp0_ = 0; #line 261 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - self->priv->_mode = _tmp0_; + _tmp0_ = value; #line 261 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - g_object_notify ((GObject *) self, "mode"); -#line 2364 "gitg-repository-list-box.c" + self->priv->_mode = _tmp0_; +#line 261 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" + g_object_notify ((GObject *) self, "mode"); +#line 2375 "gitg-repository-list-box.c" + } } @@ -2375,21 +2387,25 @@ result = _tmp0_; #line 263 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 2379 "gitg-repository-list-box.c" +#line 2391 "gitg-repository-list-box.c" } void gitg_repository_list_box_set_bookmarks_from_recent_files (GitgRepositoryListBox* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 263 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_return_if_fail (self != NULL); #line 263 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp0_ = value; + if (gitg_repository_list_box_get_bookmarks_from_recent_files (self) != value) { +#line 2400 "gitg-repository-list-box.c" + gboolean _tmp0_ = FALSE; #line 263 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - self->priv->_bookmarks_from_recent_files = _tmp0_; + _tmp0_ = value; #line 263 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - g_object_notify ((GObject *) self, "bookmarks-from-recent-files"); -#line 2393 "gitg-repository-list-box.c" + self->priv->_bookmarks_from_recent_files = _tmp0_; +#line 263 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" + g_object_notify ((GObject *) self, "bookmarks-from-recent-files"); +#line 2408 "gitg-repository-list-box.c" + } } @@ -2404,160 +2420,164 @@ result = _tmp0_; #line 273 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 2408 "gitg-repository-list-box.c" +#line 2424 "gitg-repository-list-box.c" } void gitg_repository_list_box_set_location (GitgRepositoryListBox* self, GFile* value) { - guint _tmp0_ = 0U; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - GBookmarkFile* _tmp4_ = NULL; GError * _inner_error_ = NULL; #line 276 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_return_if_fail (self != NULL); +#line 276 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" + if (gitg_repository_list_box_get_location (self) != value) { +#line 2434 "gitg-repository-list-box.c" + guint _tmp0_ = 0U; + GFile* _tmp2_ = NULL; + GFile* _tmp3_ = NULL; + GBookmarkFile* _tmp4_ = NULL; #line 278 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp0_ = self->priv->d_save_repository_bookmarks_id; + _tmp0_ = self->priv->d_save_repository_bookmarks_id; #line 278 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - if (_tmp0_ != ((guint) 0)) { -#line 2424 "gitg-repository-list-box.c" - guint _tmp1_ = 0U; + if (_tmp0_ != ((guint) 0)) { +#line 2443 "gitg-repository-list-box.c" + guint _tmp1_ = 0U; #line 280 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp1_ = self->priv->d_save_repository_bookmarks_id; + _tmp1_ = self->priv->d_save_repository_bookmarks_id; #line 280 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - g_source_remove (_tmp1_); + g_source_remove (_tmp1_); #line 281 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - gitg_repository_list_box_save_repository_bookmarks (self); -#line 2432 "gitg-repository-list-box.c" - } + gitg_repository_list_box_save_repository_bookmarks (self); +#line 2451 "gitg-repository-list-box.c" + } #line 284 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp2_ = value; + _tmp2_ = value; #line 284 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp3_ = _g_object_ref0 (_tmp2_); + _tmp3_ = _g_object_ref0 (_tmp2_); #line 284 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _g_object_unref0 (self->priv->d_location); + _g_object_unref0 (self->priv->d_location); #line 284 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - self->priv->d_location = _tmp3_; + self->priv->d_location = _tmp3_; #line 285 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp4_ = g_bookmark_file_new (); + _tmp4_ = g_bookmark_file_new (); #line 285 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _g_bookmark_file_free0 (self->priv->d_bookmark_file); + _g_bookmark_file_free0 (self->priv->d_bookmark_file); #line 285 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - self->priv->d_bookmark_file = _tmp4_; -#line 2448 "gitg-repository-list-box.c" - { - GBookmarkFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + self->priv->d_bookmark_file = _tmp4_; +#line 2467 "gitg-repository-list-box.c" + { + GBookmarkFile* _tmp5_ = NULL; + GFile* _tmp6_ = NULL; + gchar* _tmp7_ = NULL; + gchar* _tmp8_ = NULL; #line 289 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp5_ = self->priv->d_bookmark_file; + _tmp5_ = self->priv->d_bookmark_file; #line 289 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp6_ = value; + _tmp6_ = value; #line 289 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp7_ = g_file_get_path (_tmp6_); + _tmp7_ = g_file_get_path (_tmp6_); #line 289 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp8_ = _tmp7_; + _tmp8_ = _tmp7_; #line 289 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - g_bookmark_file_load_from_file (_tmp5_, _tmp8_, &_inner_error_); + g_bookmark_file_load_from_file (_tmp5_, _tmp8_, &_inner_error_); #line 289 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp8_); #line 289 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - if (G_UNLIKELY (_inner_error_ != NULL)) { + if (G_UNLIKELY (_inner_error_ != NULL)) { #line 289 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - if (_inner_error_->domain == G_FILE_ERROR) { -#line 2470 "gitg-repository-list-box.c" - goto __catch69_g_file_error; + if (_inner_error_->domain == G_FILE_ERROR) { +#line 2489 "gitg-repository-list-box.c" + goto __catch71_g_file_error; + } + goto __catch71_g_error; } - goto __catch69_g_error; } - } - goto __finally69; - __catch69_g_file_error: - { - GError* e = NULL; - gboolean _tmp9_ = FALSE; + goto __finally71; + __catch71_g_file_error: + { + GError* e = NULL; + gboolean _tmp9_ = FALSE; #line 287 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - e = _inner_error_; + e = _inner_error_; #line 287 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _inner_error_ = NULL; + _inner_error_ = NULL; #line 293 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp9_ = self->priv->_bookmarks_from_recent_files; + _tmp9_ = self->priv->_bookmarks_from_recent_files; #line 293 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - if (_tmp9_) { + if (_tmp9_) { #line 296 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - gitg_repository_list_box_copy_bookmarks_from_recent_files (self); -#line 2491 "gitg-repository-list-box.c" - } + gitg_repository_list_box_copy_bookmarks_from_recent_files (self); +#line 2510 "gitg-repository-list-box.c" + } #line 287 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _g_error_free0 (e); -#line 2495 "gitg-repository-list-box.c" - } - goto __finally69; - __catch69_g_error: - { - GError* e = NULL; - FILE* _tmp10_ = NULL; - GError* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; + _g_error_free0 (e); +#line 2514 "gitg-repository-list-box.c" + } + goto __finally71; + __catch71_g_error: + { + GError* e = NULL; + FILE* _tmp10_ = NULL; + GError* _tmp11_ = NULL; + const gchar* _tmp12_ = NULL; + const gchar* _tmp13_ = NULL; + gchar* _tmp14_ = NULL; + gchar* _tmp15_ = NULL; #line 287 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - e = _inner_error_; + e = _inner_error_; #line 287 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _inner_error_ = NULL; + _inner_error_ = NULL; #line 301 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp10_ = stderr; + _tmp10_ = stderr; #line 301 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp11_ = e; + _tmp11_ = e; #line 301 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp12_ = _tmp11_->message; + _tmp12_ = _tmp11_->message; #line 301 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp13_ = string_to_string (_tmp12_); + _tmp13_ = string_to_string (_tmp12_); #line 301 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp14_ = g_strconcat ("Failed to read repository bookmarks: ", _tmp13_, "\n", NULL); + _tmp14_ = g_strconcat ("Failed to read repository bookmarks: ", _tmp13_, "\n", NULL); #line 301 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp15_ = _tmp14_; + _tmp15_ = _tmp14_; #line 301 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - fprintf (_tmp10_, "%s", _tmp15_); + fprintf (_tmp10_, "%s", _tmp15_); #line 301 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp15_); #line 287 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _g_error_free0 (e); -#line 2529 "gitg-repository-list-box.c" - } - __finally69: + _g_error_free0 (e); +#line 2548 "gitg-repository-list-box.c" + } + __finally71: #line 287 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - if (G_UNLIKELY (_inner_error_ != NULL)) { + if (G_UNLIKELY (_inner_error_ != NULL)) { #line 287 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.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); + 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 287 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - g_clear_error (&_inner_error_); + g_clear_error (&_inner_error_); #line 287 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - return; -#line 2540 "gitg-repository-list-box.c" - } + return; +#line 2559 "gitg-repository-list-box.c" + } #line 276 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - g_object_notify ((GObject *) self, "location"); -#line 2544 "gitg-repository-list-box.c" + g_object_notify ((GObject *) self, "location"); +#line 2563 "gitg-repository-list-box.c" + } } -static void _vala_array_add14 (GitgRepositoryListBoxRow*** array, int* length, int* size, GitgRepositoryListBoxRow* value) { +static void _vala_array_add14 (GitgRepositoryListBoxRow** * array, int* length, int* size, GitgRepositoryListBoxRow* value) { #line 621 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if ((*length) == (*size)) { #line 621 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" *size = (*size) ? (2 * (*size)) : 4; #line 621 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" *array = g_renew (GitgRepositoryListBoxRow*, *array, (*size) + 1); -#line 2555 "gitg-repository-list-box.c" +#line 2575 "gitg-repository-list-box.c" } #line 621 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" (*array)[(*length)++] = value; #line 621 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" (*array)[*length] = NULL; -#line 2561 "gitg-repository-list-box.c" +#line 2581 "gitg-repository-list-box.c" } @@ -2582,7 +2602,7 @@ _ret_size_ = ret_length1; #line 615 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp1_ = gtk_container_get_children ((GtkContainer*) self); -#line 2586 "gitg-repository-list-box.c" +#line 2606 "gitg-repository-list-box.c" { GList* row_collection = NULL; GList* row_it = NULL; @@ -2590,11 +2610,11 @@ row_collection = _tmp1_; #line 615 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" for (row_it = row_collection; row_it != NULL; row_it = row_it->next) { -#line 2594 "gitg-repository-list-box.c" +#line 2614 "gitg-repository-list-box.c" GtkWidget* row = NULL; #line 615 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" row = (GtkWidget*) row_it->data; -#line 2598 "gitg-repository-list-box.c" +#line 2618 "gitg-repository-list-box.c" { GitgRepositoryListBoxRow* r = NULL; GtkWidget* _tmp2_ = NULL; @@ -2616,7 +2636,7 @@ _tmp6_ = _tmp5_; #line 619 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp6_) { -#line 2620 "gitg-repository-list-box.c" +#line 2640 "gitg-repository-list-box.c" GitgRepositoryListBoxRow** _tmp7_ = NULL; gint _tmp7__length1 = 0; GitgRepositoryListBoxRow* _tmp8_ = NULL; @@ -2631,16 +2651,16 @@ _tmp9_ = _g_object_ref0 (_tmp8_); #line 621 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _vala_array_add14 (&ret, &ret_length1, &_ret_size_, _tmp9_); -#line 2635 "gitg-repository-list-box.c" +#line 2655 "gitg-repository-list-box.c" } #line 615 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_object_unref0 (r); -#line 2639 "gitg-repository-list-box.c" +#line 2659 "gitg-repository-list-box.c" } } #line 615 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_list_free0 (row_collection); -#line 2644 "gitg-repository-list-box.c" +#line 2664 "gitg-repository-list-box.c" } #line 625 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp10_ = ret; @@ -2650,13 +2670,13 @@ if (result_length1) { #line 625 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" *result_length1 = _tmp10__length1; -#line 2654 "gitg-repository-list-box.c" +#line 2674 "gitg-repository-list-box.c" } #line 625 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" result = _tmp10_; #line 625 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 2660 "gitg-repository-list-box.c" +#line 2680 "gitg-repository-list-box.c" } @@ -2667,7 +2687,7 @@ g_return_val_if_fail (self != NULL, FALSE); #line 633 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp0_ = gtk_container_get_children ((GtkContainer*) self); -#line 2671 "gitg-repository-list-box.c" +#line 2691 "gitg-repository-list-box.c" { GList* row_collection = NULL; GList* row_it = NULL; @@ -2675,11 +2695,11 @@ row_collection = _tmp0_; #line 633 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" for (row_it = row_collection; row_it != NULL; row_it = row_it->next) { -#line 2679 "gitg-repository-list-box.c" +#line 2699 "gitg-repository-list-box.c" GtkWidget* row = NULL; #line 633 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" row = (GtkWidget*) row_it->data; -#line 2683 "gitg-repository-list-box.c" +#line 2703 "gitg-repository-list-box.c" { GitgRepositoryListBoxRow* r = NULL; GtkWidget* _tmp1_ = NULL; @@ -2709,22 +2729,22 @@ _g_list_free0 (row_collection); #line 639 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 2713 "gitg-repository-list-box.c" +#line 2733 "gitg-repository-list-box.c" } #line 633 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_object_unref0 (r); -#line 2717 "gitg-repository-list-box.c" +#line 2737 "gitg-repository-list-box.c" } } #line 633 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_list_free0 (row_collection); -#line 2722 "gitg-repository-list-box.c" +#line 2742 "gitg-repository-list-box.c" } #line 643 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" result = FALSE; #line 643 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 2728 "gitg-repository-list-box.c" +#line 2748 "gitg-repository-list-box.c" } @@ -2743,26 +2763,26 @@ data1 = closure->data; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" data2 = param_values->data[0].v_pointer; -#line 2747 "gitg-repository-list-box.c" +#line 2767 "gitg-repository-list-box.c" } else { #line 28 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" data1 = param_values->data[0].v_pointer; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" data2 = closure->data; -#line 2753 "gitg-repository-list-box.c" +#line 2773 "gitg-repository-list-box.c" } #line 28 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" callback = (GMarshalFunc_VOID__STRING_STRING) (marshal_data ? marshal_data : cc->callback); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), data2); -#line 2759 "gitg-repository-list-box.c" +#line 2779 "gitg-repository-list-box.c" } static void _gitg_repository_list_box_update_header_gtk_list_box_update_header_func (GtkListBoxRow* row, GtkListBoxRow* before, gpointer self) { #line 372 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" gitg_repository_list_box_update_header ((GitgRepositoryListBox*) self, row, before); -#line 2766 "gitg-repository-list-box.c" +#line 2786 "gitg-repository-list-box.c" } @@ -2771,7 +2791,7 @@ result = gitg_repository_list_box_filter ((GitgRepositoryListBox*) self, row); #line 373 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 2775 "gitg-repository-list-box.c" +#line 2795 "gitg-repository-list-box.c" } @@ -2780,7 +2800,7 @@ result = gitg_repository_list_box_compare_widgets ((GitgRepositoryListBox*) self, row1, row2); #line 374 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 2784 "gitg-repository-list-box.c" +#line 2804 "gitg-repository-list-box.c" } @@ -2813,7 +2833,7 @@ self->priv->d_bookmark_file = _tmp0_; #line 370 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return obj; -#line 2817 "gitg-repository-list-box.c" +#line 2837 "gitg-repository-list-box.c" } @@ -2828,92 +2848,86 @@ if (_tmp1_ == NULL) { #line 151 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp0_ = TRUE; -#line 2832 "gitg-repository-list-box.c" +#line 2852 "gitg-repository-list-box.c" } else { const gchar* _tmp2_ = NULL; #line 151 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp2_ = self->priv->d_branch_name; #line 151 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp0_ = g_strcmp0 (_tmp2_, "") == 0; -#line 2839 "gitg-repository-list-box.c" +#line 2859 "gitg-repository-list-box.c" } #line 151 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp0_) { -#line 2843 "gitg-repository-list-box.c" +#line 2863 "gitg-repository-list-box.c" GtkLabel* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; + gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; #line 154 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp3_ = self->priv->d_branch_label; #line 154 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp4_ = _ ("at %s"); -#line 154 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp5_ = self->priv->d_dirname; + _tmp4_ = self->priv->d_dirname; #line 154 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp6_ = g_strdup_printf (_tmp4_, _tmp5_); + _tmp5_ = g_strdup_printf (_ ("at %s"), _tmp4_); #line 154 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 154 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - gtk_label_set_label (_tmp3_, _tmp7_); + gtk_label_set_label (_tmp3_, _tmp6_); #line 154 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _g_free0 (_tmp7_); -#line 2863 "gitg-repository-list-box.c" + _g_free0 (_tmp6_); +#line 2880 "gitg-repository-list-box.c" } else { - gboolean _tmp8_ = FALSE; - const gchar* _tmp9_ = NULL; + gboolean _tmp7_ = FALSE; + const gchar* _tmp8_ = NULL; #line 156 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp9_ = self->priv->d_dirname; + _tmp8_ = self->priv->d_dirname; #line 156 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - if (_tmp9_ == NULL) { + if (_tmp8_ == NULL) { #line 156 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp8_ = TRUE; -#line 2873 "gitg-repository-list-box.c" + _tmp7_ = TRUE; +#line 2890 "gitg-repository-list-box.c" } else { - const gchar* _tmp10_ = NULL; + const gchar* _tmp9_ = NULL; #line 156 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp10_ = self->priv->d_dirname; + _tmp9_ = self->priv->d_dirname; #line 156 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp8_ = g_strcmp0 (_tmp10_, "") == 0; -#line 2880 "gitg-repository-list-box.c" + _tmp7_ = g_strcmp0 (_tmp9_, "") == 0; +#line 2897 "gitg-repository-list-box.c" } #line 156 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - if (_tmp8_) { -#line 2884 "gitg-repository-list-box.c" - GtkLabel* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; + if (_tmp7_) { +#line 2901 "gitg-repository-list-box.c" + GtkLabel* _tmp10_ = NULL; + const gchar* _tmp11_ = NULL; #line 158 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp11_ = self->priv->d_branch_label; + _tmp10_ = self->priv->d_branch_label; #line 158 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp12_ = self->priv->d_branch_name; + _tmp11_ = self->priv->d_branch_name; #line 158 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - gtk_label_set_label (_tmp11_, _tmp12_); -#line 2893 "gitg-repository-list-box.c" + gtk_label_set_label (_tmp10_, _tmp11_); +#line 2910 "gitg-repository-list-box.c" } else { - GtkLabel* _tmp13_ = NULL; + GtkLabel* _tmp12_ = NULL; + const gchar* _tmp13_ = NULL; const gchar* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; -#line 163 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp13_ = self->priv->d_branch_label; + gchar* _tmp15_ = NULL; + gchar* _tmp16_ = NULL; #line 163 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp14_ = _ ("%s at %s"); + _tmp12_ = self->priv->d_branch_label; #line 163 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp15_ = self->priv->d_branch_name; + _tmp13_ = self->priv->d_branch_name; #line 163 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp16_ = self->priv->d_dirname; + _tmp14_ = self->priv->d_dirname; #line 163 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp17_ = g_strdup_printf (_tmp14_, _tmp15_, _tmp16_); + _tmp15_ = g_strdup_printf (_ ("%s at %s"), _tmp13_, _tmp14_); #line 163 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp18_ = _tmp17_; + _tmp16_ = _tmp15_; #line 163 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - gtk_label_set_label (_tmp13_, _tmp18_); + gtk_label_set_label (_tmp12_, _tmp16_); #line 163 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _g_free0 (_tmp18_); -#line 2917 "gitg-repository-list-box.c" + _g_free0 (_tmp16_); +#line 2931 "gitg-repository-list-box.c" } } } @@ -2922,7 +2936,7 @@ static void _vala_GgitOId_free (GgitOId* self) { #line 191 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_boxed_free (ggit_oid_get_type (), self); -#line 2926 "gitg-repository-list-box.c" +#line 2940 "gitg-repository-list-box.c" } @@ -2954,7 +2968,7 @@ _tmp2_ = self->priv->d_repository; #line 172 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp2_ != NULL) { -#line 2958 "gitg-repository-list-box.c" +#line 2972 "gitg-repository-list-box.c" { GitgRef* head = NULL; GitgRepository* _tmp3_ = NULL; @@ -2983,8 +2997,8 @@ head = _tmp4_; #line 176 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2987 "gitg-repository-list-box.c" - goto __catch70_g_error; +#line 3001 "gitg-repository-list-box.c" + goto __catch72_g_error; } #line 177 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp5_ = head; @@ -3014,8 +3028,8 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 179 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_object_unref0 (head); -#line 3018 "gitg-repository-list-box.c" - goto __catch70_g_error; +#line 3032 "gitg-repository-list-box.c" + goto __catch72_g_error; } #line 179 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp14_ = _tmp11_; @@ -3031,19 +3045,19 @@ tree = _tmp16_; #line 182 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" entry_id = NULL; -#line 3035 "gitg-repository-list-box.c" +#line 3049 "gitg-repository-list-box.c" { gint i = 0; #line 184 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" i = 0; -#line 3040 "gitg-repository-list-box.c" +#line 3054 "gitg-repository-list-box.c" { gboolean _tmp17_ = FALSE; #line 184 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp17_ = TRUE; #line 184 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" while (TRUE) { -#line 3047 "gitg-repository-list-box.c" +#line 3061 "gitg-repository-list-box.c" gint _tmp19_ = 0; GgitTree* _tmp20_ = NULL; guint _tmp21_ = 0U; @@ -3059,13 +3073,13 @@ const gchar* _tmp29_ = NULL; #line 184 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (!_tmp17_) { -#line 3063 "gitg-repository-list-box.c" +#line 3077 "gitg-repository-list-box.c" gint _tmp18_ = 0; #line 184 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp18_ = i; #line 184 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" i = _tmp18_ + 1; -#line 3069 "gitg-repository-list-box.c" +#line 3083 "gitg-repository-list-box.c" } #line 184 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp17_ = FALSE; @@ -3079,7 +3093,7 @@ if (!(((guint) _tmp19_) < _tmp21_)) { #line 184 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" break; -#line 3083 "gitg-repository-list-box.c" +#line 3097 "gitg-repository-list-box.c" } #line 186 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp22_ = tree; @@ -3101,7 +3115,7 @@ _tmp29_ = name; #line 189 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp29_ != NULL) { -#line 3105 "gitg-repository-list-box.c" +#line 3119 "gitg-repository-list-box.c" const gchar* _tmp30_ = NULL; gboolean _tmp31_ = FALSE; #line 189 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" @@ -3110,15 +3124,15 @@ _tmp31_ = g_str_has_suffix (_tmp30_, ".doap"); #line 189 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp28_ = _tmp31_; -#line 3114 "gitg-repository-list-box.c" +#line 3128 "gitg-repository-list-box.c" } else { #line 189 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp28_ = FALSE; -#line 3118 "gitg-repository-list-box.c" +#line 3132 "gitg-repository-list-box.c" } #line 189 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp28_) { -#line 3122 "gitg-repository-list-box.c" +#line 3136 "gitg-repository-list-box.c" GgitTreeEntry* _tmp32_ = NULL; GgitOId* _tmp33_ = NULL; #line 191 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" @@ -3135,13 +3149,13 @@ _ggit_tree_entry_unref0 (entry); #line 192 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" break; -#line 3139 "gitg-repository-list-box.c" +#line 3153 "gitg-repository-list-box.c" } #line 184 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_free0 (name); #line 184 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _ggit_tree_entry_unref0 (entry); -#line 3145 "gitg-repository-list-box.c" +#line 3159 "gitg-repository-list-box.c" } } } @@ -3149,7 +3163,7 @@ _tmp34_ = entry_id; #line 196 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp34_ != NULL) { -#line 3153 "gitg-repository-list-box.c" +#line 3167 "gitg-repository-list-box.c" GgitBlob* blob = NULL; GitgRepository* _tmp35_ = NULL; GgitOId* _tmp36_ = NULL; @@ -3191,8 +3205,8 @@ _g_object_unref0 (_tmp11_); #line 198 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_object_unref0 (head); -#line 3195 "gitg-repository-list-box.c" - goto __catch70_g_error; +#line 3209 "gitg-repository-list-box.c" + goto __catch72_g_error; } #line 200 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp38_ = blob; @@ -3232,8 +3246,8 @@ _g_object_unref0 (_tmp11_); #line 202 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_object_unref0 (head); -#line 3236 "gitg-repository-list-box.c" - goto __catch70_g_error; +#line 3250 "gitg-repository-list-box.c" + goto __catch72_g_error; } #line 204 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp44_ = doap; @@ -3249,7 +3263,7 @@ _tmp47_ = doap; #line 206 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp49_ = _tmp48_ = ide_doap_get_languages (_tmp47_); -#line 3253 "gitg-repository-list-box.c" +#line 3267 "gitg-repository-list-box.c" { gchar** lang_collection = NULL; gint lang_collection_length1 = 0; @@ -3261,14 +3275,14 @@ lang_collection_length1 = _vala_array_length (_tmp48_); #line 206 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" for (lang_it = 0; lang_it < _vala_array_length (_tmp48_); lang_it = lang_it + 1) { -#line 3265 "gitg-repository-list-box.c" +#line 3279 "gitg-repository-list-box.c" gchar* _tmp50_ = NULL; gchar* lang = NULL; #line 206 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp50_ = g_strdup (lang_collection[lang_it]); #line 206 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" lang = _tmp50_; -#line 3272 "gitg-repository-list-box.c" +#line 3286 "gitg-repository-list-box.c" { GtkFrame* frame = NULL; GtkFrame* _tmp51_ = NULL; @@ -3358,7 +3372,7 @@ _g_object_unref0 (frame); #line 206 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_free0 (lang); -#line 3362 "gitg-repository-list-box.c" +#line 3376 "gitg-repository-list-box.c" } } } @@ -3366,7 +3380,7 @@ _g_object_unref0 (doap); #line 196 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_object_unref0 (blob); -#line 3370 "gitg-repository-list-box.c" +#line 3384 "gitg-repository-list-box.c" } #line 174 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" __vala_GgitOId_free0 (entry_id); @@ -3378,18 +3392,18 @@ _g_object_unref0 (_tmp11_); #line 174 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_object_unref0 (head); -#line 3382 "gitg-repository-list-box.c" +#line 3396 "gitg-repository-list-box.c" } - goto __finally70; - __catch70_g_error: + goto __finally72; + __catch72_g_error: { #line 174 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_clear_error (&_inner_error_); #line 174 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _inner_error_ = NULL; -#line 3391 "gitg-repository-list-box.c" +#line 3405 "gitg-repository-list-box.c" } - __finally70: + __finally72: #line 174 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 174 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" @@ -3402,14 +3416,14 @@ g_clear_error (&_inner_error_); #line 174 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return; -#line 3406 "gitg-repository-list-box.c" +#line 3420 "gitg-repository-list-box.c" } } #line 226 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp69_ = self->priv->d_repository; #line 226 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp69_ != NULL) { -#line 3413 "gitg-repository-list-box.c" +#line 3427 "gitg-repository-list-box.c" GitgRepository* _tmp70_ = NULL; gchar* _tmp71_ = NULL; gchar* _tmp72_ = NULL; @@ -3423,7 +3437,7 @@ _g_free0 (_tmp68_); #line 226 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp68_ = _tmp72_; -#line 3427 "gitg-repository-list-box.c" +#line 3441 "gitg-repository-list-box.c" } else { gchar* _tmp73_ = NULL; #line 226 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" @@ -3432,7 +3446,7 @@ _g_free0 (_tmp68_); #line 226 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp68_ = _tmp73_; -#line 3436 "gitg-repository-list-box.c" +#line 3450 "gitg-repository-list-box.c" } #line 226 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" gitg_repository_list_box_row_set_repository_name (self, _tmp68_); @@ -3458,7 +3472,7 @@ _g_free0 (head_description); #line 167 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_free0 (head_name); -#line 3462 "gitg-repository-list-box.c" +#line 3476 "gitg-repository-list-box.c" } @@ -3476,14 +3490,14 @@ self = (GitgRepositoryListBoxRow*) g_object_new (object_type, "repository", _tmp0_, "dirname", _tmp1_, NULL); #line 255 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return self; -#line 3480 "gitg-repository-list-box.c" +#line 3494 "gitg-repository-list-box.c" } GitgRepositoryListBoxRow* gitg_repository_list_box_row_new (GitgRepository* repository, const gchar* dirname) { #line 255 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return gitg_repository_list_box_row_construct (GITG_REPOSITORY_LIST_BOX_TYPE_ROW, repository, dirname); -#line 3487 "gitg-repository-list-box.c" +#line 3501 "gitg-repository-list-box.c" } @@ -3498,45 +3512,49 @@ result = _tmp0_; #line 66 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 3502 "gitg-repository-list-box.c" +#line 3516 "gitg-repository-list-box.c" } void gitg_repository_list_box_row_set_mode (GitgRepositoryListBoxRow* self, GitgSelectionMode value) { - GitgSelectionMode _tmp0_ = 0; - GitgSelectionMode _tmp1_ = 0; #line 68 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_return_if_fail (self != NULL); +#line 68 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" + if (gitg_repository_list_box_row_get_mode (self) != value) { +#line 3525 "gitg-repository-list-box.c" + GitgSelectionMode _tmp0_ = 0; + GitgSelectionMode _tmp1_ = 0; #line 70 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp0_ = self->priv->d_mode; + _tmp0_ = self->priv->d_mode; #line 70 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp1_ = value; + _tmp1_ = value; #line 70 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - if (_tmp0_ != _tmp1_) { -#line 3517 "gitg-repository-list-box.c" - GitgSelectionMode _tmp2_ = 0; - GtkRevealer* _tmp3_ = NULL; - GitgSelectionMode _tmp4_ = 0; - GtkCheckButton* _tmp5_ = NULL; + if (_tmp0_ != _tmp1_) { +#line 3534 "gitg-repository-list-box.c" + GitgSelectionMode _tmp2_ = 0; + GtkRevealer* _tmp3_ = NULL; + GitgSelectionMode _tmp4_ = 0; + GtkCheckButton* _tmp5_ = NULL; #line 72 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp2_ = value; + _tmp2_ = value; #line 72 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - self->priv->d_mode = _tmp2_; + self->priv->d_mode = _tmp2_; #line 74 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp3_ = self->priv->d_remove_revealer; + _tmp3_ = self->priv->d_remove_revealer; #line 74 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp4_ = self->priv->d_mode; + _tmp4_ = self->priv->d_mode; #line 74 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - gtk_revealer_set_reveal_child (_tmp3_, _tmp4_ == GITG_SELECTION_MODE_SELECTION); + gtk_revealer_set_reveal_child (_tmp3_, _tmp4_ == GITG_SELECTION_MODE_SELECTION); #line 76 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp5_ = self->priv->d_remove_check_button; + _tmp5_ = self->priv->d_remove_check_button; #line 76 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - gtk_toggle_button_set_active ((GtkToggleButton*) _tmp5_, FALSE); -#line 3536 "gitg-repository-list-box.c" - } + gtk_toggle_button_set_active ((GtkToggleButton*) _tmp5_, FALSE); +#line 3553 "gitg-repository-list-box.c" + } #line 68 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - g_object_notify ((GObject *) self, "mode"); -#line 3540 "gitg-repository-list-box.c" + g_object_notify ((GObject *) self, "mode"); +#line 3557 "gitg-repository-list-box.c" + } } @@ -3551,21 +3569,25 @@ result = _tmp0_; #line 83 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 3555 "gitg-repository-list-box.c" +#line 3573 "gitg-repository-list-box.c" } void gitg_repository_list_box_row_set_selected (GitgRepositoryListBoxRow* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 83 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_return_if_fail (self != NULL); #line 83 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp0_ = value; + if (gitg_repository_list_box_row_get_selected (self) != value) { +#line 3582 "gitg-repository-list-box.c" + gboolean _tmp0_ = FALSE; +#line 83 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" + _tmp0_ = value; #line 83 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - self->priv->_selected = _tmp0_; + self->priv->_selected = _tmp0_; #line 83 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - g_object_notify ((GObject *) self, "selected"); -#line 3569 "gitg-repository-list-box.c" + g_object_notify ((GObject *) self, "selected"); +#line 3590 "gitg-repository-list-box.c" + } } @@ -3580,28 +3602,32 @@ result = _tmp0_; #line 97 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 3584 "gitg-repository-list-box.c" +#line 3606 "gitg-repository-list-box.c" } void gitg_repository_list_box_row_set_repository (GitgRepositoryListBoxRow* self, GitgRepository* value) { - GitgRepository* _tmp0_ = NULL; - GitgRepository* _tmp1_ = NULL; #line 98 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_return_if_fail (self != NULL); +#line 98 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" + if (gitg_repository_list_box_row_get_repository (self) != value) { +#line 3615 "gitg-repository-list-box.c" + GitgRepository* _tmp0_ = NULL; + GitgRepository* _tmp1_ = NULL; #line 100 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp0_ = value; + _tmp0_ = value; #line 100 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 100 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _g_object_unref0 (self->priv->d_repository); + _g_object_unref0 (self->priv->d_repository); #line 100 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - self->priv->d_repository = _tmp1_; + self->priv->d_repository = _tmp1_; #line 101 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - gitg_repository_list_box_row_update_repository_data (self); + gitg_repository_list_box_row_update_repository_data (self); #line 98 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - g_object_notify ((GObject *) self, "repository"); -#line 3605 "gitg-repository-list-box.c" + g_object_notify ((GObject *) self, "repository"); +#line 3630 "gitg-repository-list-box.c" + } } @@ -3622,24 +3648,28 @@ result = _tmp2_; #line 107 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 3626 "gitg-repository-list-box.c" +#line 3652 "gitg-repository-list-box.c" } void gitg_repository_list_box_row_set_can_remove (GitgRepositoryListBoxRow* self, gboolean value) { - GtkCheckButton* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; #line 108 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_return_if_fail (self != NULL); #line 108 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp0_ = self->priv->d_remove_check_button; + if (gitg_repository_list_box_row_get_can_remove (self) != value) { +#line 3661 "gitg-repository-list-box.c" + GtkCheckButton* _tmp0_ = NULL; + gboolean _tmp1_ = FALSE; #line 108 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp1_ = value; + _tmp0_ = self->priv->d_remove_check_button; +#line 108 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" + _tmp1_ = value; #line 108 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp1_); + gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp1_); #line 108 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - g_object_notify ((GObject *) self, "can-remove"); -#line 3643 "gitg-repository-list-box.c" + g_object_notify ((GObject *) self, "can-remove"); +#line 3672 "gitg-repository-list-box.c" + } } @@ -3654,26 +3684,30 @@ result = _tmp0_; #line 113 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 3658 "gitg-repository-list-box.c" +#line 3688 "gitg-repository-list-box.c" } void gitg_repository_list_box_row_set_time (GitgRepositoryListBoxRow* self, GDateTime* value) { - GDateTime* _tmp0_ = NULL; - GDateTime* _tmp1_ = NULL; #line 114 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_return_if_fail (self != NULL); #line 114 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp0_ = value; + if (gitg_repository_list_box_row_get_time (self) != value) { +#line 3697 "gitg-repository-list-box.c" + GDateTime* _tmp0_ = NULL; + GDateTime* _tmp1_ = NULL; #line 114 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp1_ = _g_date_time_ref0 (_tmp0_); + _tmp0_ = value; #line 114 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _g_date_time_unref0 (self->priv->d_time); + _tmp1_ = _g_date_time_ref0 (_tmp0_); #line 114 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - self->priv->d_time = _tmp1_; + _g_date_time_unref0 (self->priv->d_time); #line 114 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - g_object_notify ((GObject *) self, "time"); -#line 3677 "gitg-repository-list-box.c" + self->priv->d_time = _tmp1_; +#line 114 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" + g_object_notify ((GObject *) self, "time"); +#line 3710 "gitg-repository-list-box.c" + } } @@ -3690,7 +3724,7 @@ gitg_progress_bin_set_fraction (_tmp0_, _tmp1_); #line 120 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_object_notify ((GObject *) self, "fraction"); -#line 3694 "gitg-repository-list-box.c" +#line 3728 "gitg-repository-list-box.c" } @@ -3708,24 +3742,28 @@ result = _tmp1_; #line 125 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 3712 "gitg-repository-list-box.c" +#line 3746 "gitg-repository-list-box.c" } void gitg_repository_list_box_row_set_repository_name (GitgRepositoryListBoxRow* self, const gchar* value) { - GtkLabel* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; #line 126 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_return_if_fail (self != NULL); #line 126 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp0_ = self->priv->d_repository_label; + if (g_strcmp0 (value, gitg_repository_list_box_row_get_repository_name (self)) != 0) { +#line 3755 "gitg-repository-list-box.c" + GtkLabel* _tmp0_ = NULL; + const gchar* _tmp1_ = NULL; #line 126 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp1_ = value; + _tmp0_ = self->priv->d_repository_label; +#line 126 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" + _tmp1_ = value; #line 126 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - gtk_label_set_label (_tmp0_, _tmp1_); + gtk_label_set_label (_tmp0_, _tmp1_); #line 126 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - g_object_notify ((GObject *) self, "repository-name"); -#line 3729 "gitg-repository-list-box.c" + g_object_notify ((GObject *) self, "repository-name"); +#line 3766 "gitg-repository-list-box.c" + } } @@ -3740,28 +3778,32 @@ result = _tmp0_; #line 131 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 3744 "gitg-repository-list-box.c" +#line 3782 "gitg-repository-list-box.c" } void gitg_repository_list_box_row_set_dirname (GitgRepositoryListBoxRow* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; #line 132 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_return_if_fail (self != NULL); +#line 132 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" + if (g_strcmp0 (value, gitg_repository_list_box_row_get_dirname (self)) != 0) { +#line 3791 "gitg-repository-list-box.c" + const gchar* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; #line 134 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp0_ = value; + _tmp0_ = value; #line 134 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp1_ = g_strdup (_tmp0_); #line 134 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _g_free0 (self->priv->d_dirname); + _g_free0 (self->priv->d_dirname); #line 134 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - self->priv->d_dirname = _tmp1_; + self->priv->d_dirname = _tmp1_; #line 135 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - gitg_repository_list_box_row_update_branch_label (self); + gitg_repository_list_box_row_update_branch_label (self); #line 132 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - g_object_notify ((GObject *) self, "dirname"); -#line 3765 "gitg-repository-list-box.c" + g_object_notify ((GObject *) self, "dirname"); +#line 3806 "gitg-repository-list-box.c" + } } @@ -3776,28 +3818,32 @@ result = _tmp0_; #line 141 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 3780 "gitg-repository-list-box.c" +#line 3822 "gitg-repository-list-box.c" } void gitg_repository_list_box_row_set_branch_name (GitgRepositoryListBoxRow* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; #line 142 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_return_if_fail (self != NULL); +#line 142 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" + if (g_strcmp0 (value, gitg_repository_list_box_row_get_branch_name (self)) != 0) { +#line 3831 "gitg-repository-list-box.c" + const gchar* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; #line 144 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp0_ = value; + _tmp0_ = value; #line 144 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp1_ = g_strdup (_tmp0_); #line 144 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _g_free0 (self->priv->d_branch_name); + _g_free0 (self->priv->d_branch_name); #line 144 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - self->priv->d_branch_name = _tmp1_; + self->priv->d_branch_name = _tmp1_; #line 145 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - gitg_repository_list_box_row_update_branch_label (self); + gitg_repository_list_box_row_update_branch_label (self); #line 142 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - g_object_notify ((GObject *) self, "branch-name"); -#line 3801 "gitg-repository-list-box.c" + g_object_notify ((GObject *) self, "branch-name"); +#line 3846 "gitg-repository-list-box.c" + } } @@ -3812,56 +3858,60 @@ result = _tmp0_; #line 236 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return result; -#line 3816 "gitg-repository-list-box.c" +#line 3862 "gitg-repository-list-box.c" } void gitg_repository_list_box_row_set_loading (GitgRepositoryListBoxRow* self, gboolean value) { - gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; #line 237 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_return_if_fail (self != NULL); +#line 237 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" + if (gitg_repository_list_box_row_get_loading (self) != value) { +#line 3871 "gitg-repository-list-box.c" + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; #line 239 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp0_ = value; + _tmp0_ = value; #line 239 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - self->priv->d_loading = _tmp0_; + self->priv->d_loading = _tmp0_; #line 241 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp1_ = self->priv->d_loading; + _tmp1_ = self->priv->d_loading; #line 241 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - if (!_tmp1_) { -#line 3833 "gitg-repository-list-box.c" - GtkSpinner* _tmp2_ = NULL; - GtkSpinner* _tmp3_ = NULL; - GitgProgressBin* _tmp4_ = NULL; + if (!_tmp1_) { +#line 3882 "gitg-repository-list-box.c" + GtkSpinner* _tmp2_ = NULL; + GtkSpinner* _tmp3_ = NULL; + GitgProgressBin* _tmp4_ = NULL; #line 243 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp2_ = self->priv->d_spinner; + _tmp2_ = self->priv->d_spinner; #line 243 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - gtk_spinner_stop (_tmp2_); + gtk_spinner_stop (_tmp2_); #line 244 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp3_ = self->priv->d_spinner; + _tmp3_ = self->priv->d_spinner; #line 244 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - gtk_widget_hide ((GtkWidget*) _tmp3_); + gtk_widget_hide ((GtkWidget*) _tmp3_); #line 245 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp4_ = self->priv->d_progress_bin; + _tmp4_ = self->priv->d_progress_bin; #line 245 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - gitg_progress_bin_set_fraction (_tmp4_, (gdouble) 0); -#line 3849 "gitg-repository-list-box.c" - } else { - GtkSpinner* _tmp5_ = NULL; - GtkSpinner* _tmp6_ = NULL; + gitg_progress_bin_set_fraction (_tmp4_, (gdouble) 0); +#line 3898 "gitg-repository-list-box.c" + } else { + GtkSpinner* _tmp5_ = NULL; + GtkSpinner* _tmp6_ = NULL; #line 249 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp5_ = self->priv->d_spinner; + _tmp5_ = self->priv->d_spinner; #line 249 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - gtk_widget_show ((GtkWidget*) _tmp5_); + gtk_widget_show ((GtkWidget*) _tmp5_); #line 250 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - _tmp6_ = self->priv->d_spinner; + _tmp6_ = self->priv->d_spinner; #line 250 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - gtk_spinner_start (_tmp6_); -#line 3861 "gitg-repository-list-box.c" - } + gtk_spinner_start (_tmp6_); +#line 3910 "gitg-repository-list-box.c" + } #line 237 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - g_object_notify ((GObject *) self, "loading"); -#line 3865 "gitg-repository-list-box.c" + g_object_notify ((GObject *) self, "loading"); +#line 3914 "gitg-repository-list-box.c" + } } @@ -3882,7 +3932,7 @@ g_object_bind_property_with_closures ((GObject*) _tmp0_, "active", (GObject*) self, "selected", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); #line 86 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" return obj; -#line 3886 "gitg-repository-list-box.c" +#line 3936 "gitg-repository-list-box.c" } @@ -3925,7 +3975,7 @@ #line 36 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/gitg/ui/gitg-repository-list-box-row.ui"); #line 36 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - g_signal_new ("request_remove", GITG_REPOSITORY_LIST_BOX_TYPE_ROW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_repository_list_box_row_signals[GITG_REPOSITORY_LIST_BOX_ROW_REQUEST_REMOVE_SIGNAL] = g_signal_new ("request_remove", GITG_REPOSITORY_LIST_BOX_TYPE_ROW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 36 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "d_progress_bin", FALSE, GitgRepositoryListBoxRow_private_offset + G_STRUCT_OFFSET (GitgRepositoryListBoxRowPrivate, d_progress_bin)); #line 36 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" @@ -3942,7 +3992,7 @@ gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "d_remove_revealer", FALSE, GitgRepositoryListBoxRow_private_offset + G_STRUCT_OFFSET (GitgRepositoryListBoxRowPrivate, d_remove_revealer)); #line 36 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "d_languages_box", FALSE, GitgRepositoryListBoxRow_private_offset + G_STRUCT_OFFSET (GitgRepositoryListBoxRowPrivate, d_languages_box)); -#line 3946 "gitg-repository-list-box.c" +#line 3996 "gitg-repository-list-box.c" } @@ -3961,11 +4011,11 @@ g_type_ensure (GITG_TYPE_PROGRESS_BIN); #line 36 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 3965 "gitg-repository-list-box.c" +#line 4015 "gitg-repository-list-box.c" } -static void gitg_repository_list_box_row_finalize (GObject* obj) { +static void gitg_repository_list_box_row_finalize (GObject * obj) { GitgRepositoryListBoxRow * self; #line 36 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_REPOSITORY_LIST_BOX_TYPE_ROW, GitgRepositoryListBoxRow); @@ -3995,7 +4045,7 @@ _g_free0 (self->priv->d_branch_name); #line 36 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" G_OBJECT_CLASS (gitg_repository_list_box_row_parent_class)->finalize (obj); -#line 3999 "gitg-repository-list-box.c" +#line 4049 "gitg-repository-list-box.c" } @@ -4070,13 +4120,13 @@ g_value_set_boolean (value, gitg_repository_list_box_row_get_loading (self)); #line 36 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" break; -#line 4074 "gitg-repository-list-box.c" +#line 4124 "gitg-repository-list-box.c" default: #line 36 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 36 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" break; -#line 4080 "gitg-repository-list-box.c" +#line 4130 "gitg-repository-list-box.c" } } @@ -4146,13 +4196,13 @@ gitg_repository_list_box_row_set_loading (self, g_value_get_boolean (value)); #line 36 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" break; -#line 4150 "gitg-repository-list-box.c" +#line 4200 "gitg-repository-list-box.c" default: #line 36 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 36 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" break; -#line 4156 "gitg-repository-list-box.c" +#line 4206 "gitg-repository-list-box.c" } } @@ -4179,14 +4229,14 @@ #line 28 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REPOSITORY_LIST_BOX_BOOKMARKS_FROM_RECENT_FILES, g_param_spec_boolean ("bookmarks-from-recent-files", "bookmarks-from-recent-files", "bookmarks-from-recent-files", TRUE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REPOSITORY_LIST_BOX_LOCATION, g_param_spec_object ("location", "location", "location", G_TYPE_FILE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REPOSITORY_LIST_BOX_LOCATION, g_param_spec_object ("location", "location", "location", g_file_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REPOSITORY_LIST_BOX_HAS_SELECTION, g_param_spec_boolean ("has-selection", "has-selection", "has-selection", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - g_signal_new ("repository_activated", GITG_TYPE_REPOSITORY_LIST_BOX, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GITG_TYPE_REPOSITORY); + gitg_repository_list_box_signals[GITG_REPOSITORY_LIST_BOX_REPOSITORY_ACTIVATED_SIGNAL] = g_signal_new ("repository_activated", GITG_TYPE_REPOSITORY_LIST_BOX, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GITG_TYPE_REPOSITORY); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" - g_signal_new ("show_error", GITG_TYPE_REPOSITORY_LIST_BOX, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); -#line 4190 "gitg-repository-list-box.c" + gitg_repository_list_box_signals[GITG_REPOSITORY_LIST_BOX_SHOW_ERROR_SIGNAL] = g_signal_new ("show_error", GITG_TYPE_REPOSITORY_LIST_BOX, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); +#line 4240 "gitg-repository-list-box.c" } @@ -4195,11 +4245,11 @@ self->priv = GITG_REPOSITORY_LIST_BOX_GET_PRIVATE (self); #line 263 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" self->priv->_bookmarks_from_recent_files = TRUE; -#line 4199 "gitg-repository-list-box.c" +#line 4249 "gitg-repository-list-box.c" } -static void gitg_repository_list_box_finalize (GObject* obj) { +static void gitg_repository_list_box_finalize (GObject * obj) { GitgRepositoryListBox * self; guint _tmp0_ = 0U; #line 28 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" @@ -4208,7 +4258,7 @@ _tmp0_ = self->priv->d_save_repository_bookmarks_id; #line 384 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" if (_tmp0_ != ((guint) 0)) { -#line 4212 "gitg-repository-list-box.c" +#line 4262 "gitg-repository-list-box.c" guint _tmp1_ = 0U; #line 386 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _tmp1_ = self->priv->d_save_repository_bookmarks_id; @@ -4216,7 +4266,7 @@ g_source_remove (_tmp1_); #line 387 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" gitg_repository_list_box_save_repository_bookmarks (self); -#line 4220 "gitg-repository-list-box.c" +#line 4270 "gitg-repository-list-box.c" } #line 30 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" _g_free0 (self->priv->d_filter_text); @@ -4226,7 +4276,7 @@ _g_bookmark_file_free0 (self->priv->d_bookmark_file); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" G_OBJECT_CLASS (gitg_repository_list_box_parent_class)->finalize (obj); -#line 4230 "gitg-repository-list-box.c" +#line 4280 "gitg-repository-list-box.c" } @@ -4271,13 +4321,13 @@ g_value_set_boolean (value, gitg_repository_list_box_get_has_selection (self)); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" break; -#line 4275 "gitg-repository-list-box.c" +#line 4325 "gitg-repository-list-box.c" default: #line 28 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" break; -#line 4281 "gitg-repository-list-box.c" +#line 4331 "gitg-repository-list-box.c" } } @@ -4305,13 +4355,13 @@ gitg_repository_list_box_set_location (self, g_value_get_object (value)); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" break; -#line 4309 "gitg-repository-list-box.c" +#line 4359 "gitg-repository-list-box.c" default: #line 28 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 28 "/home/jesse/dev/gitg/libgitg/gitg-repository-list-box.vala" break; -#line 4315 "gitg-repository-list-box.c" +#line 4365 "gitg-repository-list-box.c" } } diff -Nru gitg-3.22.0/libgitg/gitg-resource.c gitg-3.23.0/libgitg/gitg-resource.c --- gitg-3.22.0/libgitg/gitg-resource.c 2016-09-18 12:01:42.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-resource.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-resource.c generated by valac 0.32.1, the Vala compiler +/* gitg-resource.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-resource.vala, do not modify */ /* @@ -75,7 +75,7 @@ GtkCssProvider* gitg_resource_load_css (const gchar* id); GitgResource* gitg_resource_new (void); GitgResource* gitg_resource_construct (GType object_type); -static void gitg_resource_finalize (GitgResource* obj); +static void gitg_resource_finalize (GitgResource * obj); GtkCssProvider* gitg_resource_load_css (const gchar* id) { @@ -122,11 +122,11 @@ #line 29 "/home/jesse/dev/gitg/libgitg/gitg-resource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 125 "gitg-resource.c" - goto __catch77_g_error; + goto __catch79_g_error; } } - goto __finally77; - __catch77_g_error: + goto __finally79; + __catch79_g_error: { GError* e = NULL; GError* _tmp8_ = NULL; @@ -153,7 +153,7 @@ return result; #line 155 "gitg-resource.c" } - __finally77: + __finally79: #line 27 "/home/jesse/dev/gitg/libgitg/gitg-resource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 27 "/home/jesse/dev/gitg/libgitg/gitg-resource.vala" @@ -237,7 +237,7 @@ #line 20 "/home/jesse/dev/gitg/libgitg/gitg-resource.vala" if (collect_values[0].v_pointer) { #line 240 "gitg-resource.c" - GitgResource* object; + GitgResource * object; object = collect_values[0].v_pointer; #line 20 "/home/jesse/dev/gitg/libgitg/gitg-resource.vala" if (object->parent_instance.g_class == NULL) { @@ -264,7 +264,7 @@ static gchar* gitg_value_resource_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GitgResource** object_p; + GitgResource ** object_p; object_p = collect_values[0].v_pointer; #line 20 "/home/jesse/dev/gitg/libgitg/gitg-resource.vala" if (!object_p) { @@ -316,7 +316,7 @@ void gitg_value_set_resource (GValue* value, gpointer v_object) { - GitgResource* old; + GitgResource * old; #line 20 "/home/jesse/dev/gitg/libgitg/gitg-resource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_RESOURCE)); #line 20 "/home/jesse/dev/gitg/libgitg/gitg-resource.vala" @@ -347,7 +347,7 @@ void gitg_value_take_resource (GValue* value, gpointer v_object) { - GitgResource* old; + GitgResource * old; #line 20 "/home/jesse/dev/gitg/libgitg/gitg-resource.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_RESOURCE)); #line 20 "/home/jesse/dev/gitg/libgitg/gitg-resource.vala" @@ -391,7 +391,7 @@ } -static void gitg_resource_finalize (GitgResource* obj) { +static void gitg_resource_finalize (GitgResource * obj) { GitgResource * self; #line 20 "/home/jesse/dev/gitg/libgitg/gitg-resource.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_RESOURCE, GitgResource); @@ -416,7 +416,7 @@ gpointer gitg_resource_ref (gpointer instance) { - GitgResource* self; + GitgResource * self; self = instance; #line 20 "/home/jesse/dev/gitg/libgitg/gitg-resource.vala" g_atomic_int_inc (&self->ref_count); @@ -427,7 +427,7 @@ void gitg_resource_unref (gpointer instance) { - GitgResource* self; + GitgResource * self; self = instance; #line 20 "/home/jesse/dev/gitg/libgitg/gitg-resource.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { diff -Nru gitg-3.22.0/libgitg/gitg-resources.c gitg-3.23.0/libgitg/gitg-resources.c --- gitg-3.22.0/libgitg/gitg-resources.c 2016-09-18 12:01:41.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-resources.c 2016-11-26 13:24:48.000000000 +0000 @@ -6,353 +6,154 @@ # define SECTION #endif -static const SECTION union { const guint8 data[11295]; const double alignment; void * const ptr;} resources_resource_data = { { +static const SECTION union { const guint8 data[12391]; const double alignment; void * const ptr;} resources_resource_data = { { 0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x18, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x10, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x28, 0x11, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, - 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, - 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, - 0x09, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, + 0x06, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x07, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, - 0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, - 0xb0, 0xb7, 0x24, 0x30, 0x0a, 0x00, 0x00, 0x00, - 0xe0, 0x01, 0x00, 0x00, 0x06, 0x00, 0x4c, 0x00, - 0xe8, 0x01, 0x00, 0x00, 0xec, 0x01, 0x00, 0x00, - 0xd4, 0xb5, 0x02, 0x00, 0xff, 0xff, 0xff, 0xff, - 0xec, 0x01, 0x00, 0x00, 0x01, 0x00, 0x4c, 0x00, - 0xf0, 0x01, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00, - 0x55, 0x9f, 0xa3, 0x86, 0x06, 0x00, 0x00, 0x00, - 0xf4, 0x01, 0x00, 0x00, 0x0f, 0x00, 0x76, 0x00, - 0x08, 0x02, 0x00, 0x00, 0x17, 0x04, 0x00, 0x00, - 0xe5, 0x98, 0x5f, 0x1e, 0x06, 0x00, 0x00, 0x00, - 0x17, 0x04, 0x00, 0x00, 0x20, 0x00, 0x76, 0x00, - 0x38, 0x04, 0x00, 0x00, 0x47, 0x08, 0x00, 0x00, - 0xd5, 0x2f, 0x1a, 0x1c, 0x06, 0x00, 0x00, 0x00, - 0x47, 0x08, 0x00, 0x00, 0x19, 0x00, 0x76, 0x00, - 0x60, 0x08, 0x00, 0x00, 0x6f, 0x0c, 0x00, 0x00, - 0xe7, 0x1b, 0xfd, 0x42, 0x06, 0x00, 0x00, 0x00, - 0x6f, 0x0c, 0x00, 0x00, 0x21, 0x00, 0x76, 0x00, - 0x90, 0x0c, 0x00, 0x00, 0x9f, 0x10, 0x00, 0x00, - 0x77, 0x03, 0x93, 0xd5, 0x09, 0x00, 0x00, 0x00, - 0x9f, 0x10, 0x00, 0x00, 0x03, 0x00, 0x4c, 0x00, - 0xa4, 0x10, 0x00, 0x00, 0xd0, 0x10, 0x00, 0x00, - 0x78, 0x6e, 0x7a, 0xc8, 0x06, 0x00, 0x00, 0x00, - 0xd0, 0x10, 0x00, 0x00, 0x1d, 0x00, 0x76, 0x00, - 0xf0, 0x10, 0x00, 0x00, 0xff, 0x18, 0x00, 0x00, - 0xe9, 0x2c, 0xb5, 0x82, 0x06, 0x00, 0x00, 0x00, - 0xff, 0x18, 0x00, 0x00, 0x16, 0x00, 0x76, 0x00, - 0x18, 0x19, 0x00, 0x00, 0x27, 0x1b, 0x00, 0x00, - 0x4a, 0x70, 0xbe, 0x68, 0x00, 0x00, 0x00, 0x00, - 0x27, 0x1b, 0x00, 0x00, 0x05, 0x00, 0x4c, 0x00, - 0x2c, 0x1b, 0x00, 0x00, 0x30, 0x1b, 0x00, 0x00, - 0x4b, 0x50, 0x90, 0x0b, 0x01, 0x00, 0x00, 0x00, - 0x30, 0x1b, 0x00, 0x00, 0x04, 0x00, 0x4c, 0x00, - 0x34, 0x1b, 0x00, 0x00, 0x38, 0x1b, 0x00, 0x00, - 0xbc, 0xcf, 0x22, 0xb2, 0x06, 0x00, 0x00, 0x00, - 0x38, 0x1b, 0x00, 0x00, 0x11, 0x00, 0x76, 0x00, - 0x50, 0x1b, 0x00, 0x00, 0x5f, 0x1f, 0x00, 0x00, - 0xce, 0xa8, 0x21, 0x2c, 0x06, 0x00, 0x00, 0x00, - 0x5f, 0x1f, 0x00, 0x00, 0x11, 0x00, 0x76, 0x00, - 0x70, 0x1f, 0x00, 0x00, 0x7f, 0x23, 0x00, 0x00, - 0x5f, 0x88, 0xa3, 0x38, 0x06, 0x00, 0x00, 0x00, - 0x7f, 0x23, 0x00, 0x00, 0x24, 0x00, 0x76, 0x00, - 0xa8, 0x23, 0x00, 0x00, 0xb7, 0x25, 0x00, 0x00, - 0x5f, 0xe2, 0xa5, 0x46, 0x06, 0x00, 0x00, 0x00, - 0xb7, 0x25, 0x00, 0x00, 0x26, 0x00, 0x76, 0x00, - 0xe0, 0x25, 0x00, 0x00, 0xef, 0x27, 0x00, 0x00, - 0x9f, 0x21, 0xcb, 0x33, 0x06, 0x00, 0x00, 0x00, - 0xef, 0x27, 0x00, 0x00, 0x1f, 0x00, 0x76, 0x00, - 0x10, 0x28, 0x00, 0x00, 0x1f, 0x2c, 0x00, 0x00, - 0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2f, 0x00, 0x00, - 0x09, 0x00, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, - 0x0a, 0x00, 0x00, 0x00, 0x67, 0x69, 0x74, 0x67, - 0x2d, 0x73, 0x69, 0x64, 0x65, 0x62, 0x61, 0x72, - 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xff, 0x05, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x78, 0xda, 0xcd, 0x54, 0x4d, 0x4f, 0xe3, 0x30, - 0x10, 0xbd, 0xf7, 0x57, 0x18, 0x5f, 0x57, 0x6e, - 0x52, 0x90, 0x00, 0xa1, 0xc4, 0x1c, 0x90, 0x58, - 0x71, 0x43, 0x50, 0xb8, 0x22, 0x37, 0x9e, 0xa6, - 0xb3, 0x75, 0x3e, 0xd6, 0x9e, 0xb4, 0xe9, 0xfe, - 0xfa, 0x75, 0x48, 0x9b, 0x16, 0x02, 0x6d, 0xa5, - 0x5d, 0x09, 0x72, 0x72, 0xc6, 0x6f, 0x66, 0xde, - 0x9b, 0x97, 0x4c, 0x74, 0x5d, 0x67, 0x86, 0x2d, - 0xc0, 0x3a, 0x2c, 0xf2, 0x98, 0x8f, 0x86, 0x21, - 0x67, 0x90, 0x27, 0x85, 0xc6, 0x3c, 0x8d, 0xf9, - 0xd3, 0xf8, 0x56, 0x5c, 0xf2, 0x6b, 0x39, 0x88, - 0x30, 0x27, 0xb0, 0x53, 0x95, 0x80, 0x8c, 0x4e, - 0x84, 0x60, 0xdd, 0xab, 0xb0, 0xf0, 0xbb, 0x42, - 0x0b, 0x8e, 0xa5, 0x34, 0xff, 0xc1, 0xce, 0x86, - 0x67, 0x4c, 0x88, 0xcf, 0x31, 0x48, 0x29, 0x0b, - 0x87, 0xe1, 0x5e, 0x8c, 0x66, 0xa3, 0x35, 0x82, - 0x20, 0x2b, 0x8d, 0x22, 0x60, 0x89, 0x51, 0xce, - 0xc5, 0xfc, 0xa7, 0x4f, 0x7f, 0x44, 0x0d, 0x13, - 0x65, 0xb9, 0x8c, 0x4a, 0x5b, 0x94, 0x60, 0x69, - 0xc5, 0x72, 0x95, 0x41, 0xcc, 0xb3, 0x42, 0x83, - 0xe1, 0xd2, 0xb5, 0xf7, 0x2f, 0x8e, 0x0a, 0x0b, - 0x51, 0xb0, 0x01, 0xf5, 0xe0, 0x6e, 0x56, 0x2c, - 0x05, 0xd4, 0xa5, 0xca, 0xb5, 0x17, 0xcf, 0xe5, - 0xad, 0x32, 0x6e, 0x1f, 0x7e, 0x06, 0xaa, 0x01, - 0x8a, 0x05, 0x3a, 0x9c, 0x18, 0x38, 0x9c, 0x60, - 0x60, 0x01, 0x46, 0xa0, 0x2f, 0x9f, 0x93, 0x22, - 0x3f, 0x5d, 0x2e, 0x47, 0xa7, 0xbb, 0xf8, 0x64, - 0x86, 0x46, 0xcb, 0xa8, 0x98, 0xfc, 0x82, 0x84, - 0x3a, 0x89, 0x34, 0x1f, 0x5b, 0x80, 0x67, 0x84, - 0xe5, 0x4d, 0x61, 0xaa, 0x2c, 0xe7, 0x0c, 0x75, - 0xcc, 0x93, 0xf6, 0xdc, 0x6b, 0xd2, 0xb1, 0x19, - 0xdb, 0x0a, 0x8e, 0x29, 0x7e, 0x03, 0xc6, 0x3c, - 0x40, 0xa3, 0x19, 0xec, 0x18, 0x6a, 0x6a, 0xcb, - 0xdb, 0x75, 0xe4, 0xa5, 0x54, 0xba, 0x71, 0xbe, - 0xdf, 0xc8, 0x0f, 0x4a, 0x73, 0x79, 0xbe, 0x47, - 0xef, 0xa7, 0x54, 0x82, 0x96, 0x84, 0xe7, 0xe4, - 0x7b, 0x8b, 0x52, 0x25, 0x73, 0xdf, 0xa1, 0x97, - 0xde, 0x5a, 0xf1, 0xc1, 0x58, 0x83, 0xb7, 0x69, - 0xc1, 0x5a, 0xd9, 0x31, 0x02, 0xef, 0xb1, 0x9e, - 0x54, 0xd3, 0x77, 0x12, 0x31, 0x69, 0xac, 0x18, - 0xb0, 0xee, 0xf9, 0x42, 0x82, 0x1f, 0x38, 0xd0, - 0x7e, 0x67, 0x7d, 0x03, 0x56, 0x07, 0x0d, 0x58, - 0x02, 0xa6, 0x33, 0xe2, 0xf2, 0x22, 0x0c, 0xf7, - 0xa0, 0x7c, 0x77, 0x2c, 0x1d, 0xfe, 0xf1, 0x46, - 0x65, 0xa8, 0xb5, 0xf9, 0x07, 0xab, 0x7a, 0x46, - 0xff, 0xd7, 0x41, 0x50, 0x13, 0xfa, 0x06, 0xf4, - 0xbb, 0xa2, 0x5d, 0x60, 0xb3, 0x96, 0x7a, 0x9a, - 0xb6, 0xeb, 0xe9, 0xb1, 0xd9, 0x3e, 0xad, 0xa0, - 0x37, 0x0b, 0xc9, 0x0b, 0x6a, 0x7f, 0x65, 0xb7, - 0x39, 0x30, 0x5a, 0x95, 0x9e, 0x54, 0x5a, 0xf9, - 0x55, 0xc8, 0x83, 0xa3, 0xa2, 0x3b, 0x7d, 0xee, - 0x3c, 0x97, 0xe6, 0x3e, 0xe8, 0xaa, 0x6e, 0xe9, - 0x6e, 0x57, 0xf6, 0xe0, 0x75, 0xd7, 0x42, 0x7d, - 0xe5, 0x80, 0x18, 0xb9, 0xf8, 0x94, 0x01, 0x5d, - 0x35, 0x1b, 0x76, 0xf0, 0x17, 0xda, 0x00, 0x22, - 0xea, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x67, - 0x69, 0x74, 0x67, 0x2d, 0x64, 0x69, 0x66, 0x66, - 0x2d, 0x76, 0x69, 0x65, 0x77, 0x2d, 0x63, 0x6f, - 0x6d, 0x6d, 0x69, 0x74, 0x2d, 0x64, 0x65, 0x74, - 0x61, 0x69, 0x6c, 0x73, 0x2e, 0x75, 0x69, 0x00, - 0xcd, 0x1c, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x78, 0xda, 0xed, 0x59, 0xdb, 0x6e, 0xe3, 0x36, - 0x10, 0x7d, 0xdf, 0xaf, 0x60, 0xf9, 0x90, 0x97, - 0x42, 0xbe, 0xc4, 0x68, 0xb0, 0x45, 0x6c, 0x6d, - 0xdb, 0xbd, 0x04, 0x05, 0x5a, 0xa0, 0x0f, 0xdb, - 0xbe, 0x0a, 0x23, 0x69, 0x2c, 0x4d, 0x4d, 0x5d, - 0x4a, 0x52, 0xbe, 0xec, 0xd7, 0xef, 0xe8, 0xe2, - 0xc4, 0x6b, 0x27, 0xb2, 0x12, 0x28, 0x6a, 0x02, - 0xac, 0x81, 0x20, 0x94, 0x75, 0x48, 0xce, 0x0c, - 0x0f, 0xcf, 0x0c, 0xe9, 0xf9, 0xbb, 0x6d, 0xa2, - 0xc4, 0x1a, 0xb5, 0xa1, 0x2c, 0x5d, 0xc8, 0xe9, - 0x68, 0x22, 0x05, 0xa6, 0x41, 0x16, 0x52, 0x1a, - 0x2d, 0xe4, 0xdf, 0x9f, 0x3f, 0x39, 0x6f, 0xe5, - 0x3b, 0xf7, 0xcd, 0xfc, 0x07, 0xc7, 0x11, 0x37, - 0x98, 0xa2, 0x06, 0x8b, 0xa1, 0xd8, 0x90, 0x8d, - 0x45, 0xa4, 0x20, 0x44, 0x31, 0x1b, 0x4d, 0x7f, - 0x1e, 0x4d, 0x84, 0xe3, 0x30, 0x88, 0x52, 0x8b, - 0x7a, 0x09, 0x01, 0xba, 0x73, 0x8d, 0xff, 0x15, - 0xa4, 0xd1, 0x08, 0x45, 0xfe, 0x42, 0x46, 0x76, - 0xf5, 0xa3, 0xbc, 0x9b, 0x85, 0xfb, 0x5c, 0xca, - 0xb1, 0x3b, 0xb7, 0x98, 0xe4, 0x8a, 0x07, 0x14, - 0x81, 0x02, 0x63, 0x16, 0xf2, 0x86, 0x6c, 0xf4, - 0x81, 0x96, 0xcb, 0x7f, 0x08, 0x37, 0xef, 0xb3, - 0x24, 0x21, 0xfb, 0x01, 0x2d, 0x90, 0x32, 0x52, - 0xe4, 0xa0, 0x31, 0xb5, 0x0c, 0xb1, 0xab, 0x1b, - 0x4d, 0xa1, 0x74, 0xe7, 0xb9, 0xce, 0x72, 0xd4, - 0x76, 0x27, 0x52, 0x48, 0x70, 0x21, 0xd7, 0x64, - 0xc8, 0x57, 0x28, 0xdd, 0xcf, 0xba, 0xc0, 0xf9, - 0x78, 0xff, 0xf6, 0x04, 0x17, 0x40, 0xea, 0x2d, - 0xb3, 0xa0, 0x30, 0xd2, 0xfd, 0x04, 0xca, 0xb4, - 0x41, 0x33, 0x4d, 0x3c, 0x27, 0x58, 0xb6, 0x59, - 0xba, 0x6c, 0xbc, 0xa5, 0x00, 0x54, 0x0b, 0x5e, - 0x67, 0x1b, 0xcf, 0xe4, 0x10, 0x70, 0xe8, 0xa4, - 0x3b, 0xbd, 0x3c, 0x44, 0x06, 0x31, 0xa9, 0xd0, - 0x9d, 0x67, 0xfe, 0xbf, 0x18, 0xd8, 0x5b, 0x77, - 0x1b, 0x5f, 0x04, 0x85, 0x1c, 0x22, 0x6e, 0x79, - 0x94, 0x72, 0x84, 0x07, 0xf1, 0x2d, 0x01, 0x1d, - 0x51, 0xea, 0xd9, 0x2c, 0x3f, 0x36, 0xf5, 0x7e, - 0xa0, 0xb1, 0xa0, 0x6d, 0x37, 0x28, 0xa6, 0xe1, - 0x19, 0x60, 0x4b, 0xa0, 0x8e, 0x3d, 0xca, 0x54, - 0x91, 0xa4, 0x77, 0xe0, 0xab, 0x2e, 0x41, 0xfd, - 0x3d, 0x81, 0x08, 0xeb, 0xa8, 0x52, 0xd9, 0xf4, - 0x60, 0x0d, 0x6c, 0xfe, 0x20, 0x71, 0x8d, 0x41, - 0x51, 0xc4, 0x74, 0x09, 0xb0, 0xdc, 0x0b, 0x2d, - 0xc0, 0x75, 0x57, 0x60, 0x4e, 0x5b, 0x54, 0x9e, - 0xa1, 0x2f, 0x6c, 0xe7, 0x4f, 0x93, 0x16, 0x20, - 0x05, 0x59, 0xea, 0x95, 0x4d, 0xe9, 0xd6, 0x0e, - 0x3b, 0x21, 0x2e, 0xa1, 0x50, 0xd6, 0x31, 0xbb, - 0xc4, 0xcf, 0x14, 0x05, 0x87, 0x9d, 0xc7, 0x75, - 0xd8, 0x78, 0x14, 0x08, 0x56, 0x1c, 0xdb, 0x93, - 0xe1, 0x14, 0x2e, 0xad, 0x07, 0xd6, 0x42, 0x10, - 0x4b, 0xb7, 0x6d, 0x5e, 0xe6, 0xd0, 0xfd, 0xb8, - 0xf1, 0xed, 0xd0, 0xe3, 0x66, 0xa9, 0x3a, 0x6e, - 0x03, 0x28, 0x6c, 0x9c, 0x69, 0x2f, 0xa8, 0x24, - 0xc0, 0x0e, 0xb4, 0x23, 0x62, 0xdc, 0xe6, 0x50, - 0x52, 0xf7, 0x78, 0xc8, 0x87, 0x8c, 0xfe, 0x03, - 0x7c, 0x54, 0xb5, 0xd5, 0xaa, 0x6c, 0x36, 0x66, - 0xf7, 0x62, 0xec, 0x19, 0xe4, 0x9e, 0x65, 0xd5, - 0xae, 0xec, 0x40, 0xb2, 0x73, 0xb8, 0xca, 0x7e, - 0xe9, 0xfe, 0x5a, 0x39, 0x50, 0x7d, 0x27, 0x2e, - 0x20, 0xc9, 0xaf, 0x95, 0xbd, 0xbe, 0xe0, 0x3f, - 0x10, 0xb1, 0xc6, 0xe5, 0x42, 0x62, 0xc2, 0x62, - 0xfc, 0x0b, 0x6e, 0xf9, 0x95, 0xc2, 0x11, 0x2f, - 0x8f, 0xbc, 0x88, 0xec, 0xf5, 0xc9, 0xb7, 0x65, - 0x97, 0x31, 0x94, 0xaf, 0xaa, 0x41, 0xf8, 0x7f, - 0xcb, 0xd4, 0x06, 0x15, 0x87, 0x15, 0xba, 0xc4, - 0x07, 0x95, 0xa2, 0xbc, 0xde, 0x08, 0xac, 0x31, - 0x2d, 0xc0, 0xc2, 0xa0, 0xc7, 0x62, 0xb4, 0x2a, - 0xf2, 0xb3, 0x63, 0x5a, 0xcd, 0x1c, 0xf5, 0xca, - 0x15, 0xe2, 0xbc, 0xe6, 0x29, 0x4a, 0x57, 0xf7, - 0x51, 0xe5, 0x45, 0x6d, 0x96, 0x07, 0x78, 0xe7, - 0x85, 0x9c, 0x49, 0x5f, 0x3f, 0xf9, 0x4a, 0x2f, - 0x06, 0xa6, 0xcb, 0x61, 0x2e, 0x9c, 0x1d, 0xe2, - 0x78, 0xa1, 0x34, 0xf9, 0x85, 0x45, 0x73, 0xd0, - 0xde, 0x1b, 0xc2, 0xb5, 0x00, 0x27, 0x19, 0x76, - 0xb2, 0xe0, 0xa7, 0xc9, 0xe8, 0xed, 0xec, 0x9b, - 0x4f, 0x59, 0xde, 0x8c, 0x0f, 0xfb, 0x1b, 0xbb, - 0x53, 0x5c, 0x17, 0x55, 0xcb, 0xd8, 0x0c, 0x11, - 0x52, 0xe2, 0xd4, 0xce, 0x97, 0xe0, 0x06, 0xf0, - 0x3c, 0x54, 0x9b, 0xf6, 0x44, 0xb5, 0x7e, 0x25, - 0x79, 0x60, 0xa2, 0x1d, 0xae, 0xf3, 0xd5, 0x79, - 0x42, 0xbe, 0x6f, 0x7c, 0x0d, 0x85, 0xbf, 0x13, - 0xfb, 0x87, 0xef, 0xea, 0x38, 0x94, 0x3a, 0x5e, - 0xf6, 0x4d, 0xd9, 0xd7, 0x2e, 0x90, 0x77, 0x14, - 0xfc, 0xae, 0x91, 0xcf, 0x41, 0xb8, 0x59, 0x3b, - 0xe1, 0x1e, 0x37, 0xe9, 0x74, 0xe0, 0x1a, 0xc0, - 0x14, 0x15, 0xe4, 0x15, 0xd3, 0xfb, 0x4f, 0x34, - 0x86, 0x0f, 0x6b, 0x2d, 0xc0, 0x8d, 0x86, 0xf3, - 0x92, 0xd5, 0x0b, 0xf9, 0x07, 0x48, 0xc2, 0xc7, - 0xbe, 0x51, 0x68, 0x9f, 0x2e, 0x7a, 0x47, 0xe7, - 0xa7, 0xfa, 0xb2, 0xc4, 0xb0, 0xf4, 0xa5, 0x16, - 0xe8, 0xc5, 0x5d, 0x29, 0x7c, 0x73, 0xfc, 0xbf, - 0xea, 0xfb, 0xf4, 0x7f, 0xb2, 0x35, 0x9a, 0x68, - 0x0c, 0xb1, 0x35, 0x6a, 0x2a, 0x0b, 0x4e, 0x9b, - 0xa9, 0x51, 0x50, 0xb1, 0x70, 0x21, 0x77, 0xc8, - 0x1d, 0xff, 0xaa, 0x8d, 0x68, 0xe9, 0xbb, 0x6d, - 0xb6, 0xcb, 0xa4, 0xab, 0xba, 0x6e, 0x90, 0xa2, - 0xd8, 0xde, 0xca, 0x2b, 0x9f, 0xf0, 0xc3, 0x13, - 0x45, 0x7d, 0xc9, 0xa7, 0xfc, 0x3e, 0xd7, 0xa5, - 0x23, 0x37, 0xbb, 0xdc, 0x62, 0x3d, 0x78, 0x0f, - 0xf0, 0xd8, 0xdb, 0xc1, 0xff, 0xa5, 0x92, 0x1f, - 0xa0, 0x16, 0x7b, 0x92, 0x72, 0xdd, 0xda, 0xf5, - 0x48, 0x92, 0xf8, 0x99, 0xb5, 0x5c, 0x49, 0x0f, - 0x7e, 0xdd, 0xcb, 0x47, 0x51, 0xfa, 0x52, 0xca, - 0xa7, 0xea, 0xcc, 0xaa, 0x59, 0x1f, 0x57, 0xa3, - 0x0d, 0x70, 0xef, 0x76, 0x27, 0xc5, 0xfb, 0x58, - 0x11, 0x96, 0x55, 0xbe, 0x0a, 0x1b, 0x36, 0x4f, - 0xde, 0x92, 0x14, 0x0e, 0xa2, 0x7a, 0xfb, 0x44, - 0xef, 0x03, 0x27, 0x5f, 0x4e, 0x37, 0x87, 0xd0, - 0x47, 0x97, 0x74, 0xe7, 0xf8, 0xf1, 0x71, 0xcd, - 0x8b, 0xf4, 0x5b, 0xb6, 0x6d, 0x9c, 0x2d, 0x9f, - 0x38, 0x5a, 0x5b, 0xaf, 0x76, 0x9b, 0x53, 0x9e, - 0x52, 0x90, 0xf3, 0x09, 0xa7, 0x3f, 0xef, 0x4f, - 0x78, 0x63, 0xd8, 0x5b, 0x50, 0x0d, 0x90, 0x85, - 0xd6, 0x66, 0xa9, 0x93, 0x6b, 0x2e, 0x5f, 0x9c, - 0xca, 0x1c, 0x29, 0x62, 0xb6, 0x44, 0xa1, 0xde, - 0xbf, 0xf4, 0xaa, 0x97, 0x1e, 0x37, 0x1e, 0x34, - 0xb7, 0x0c, 0x45, 0xe7, 0x84, 0x36, 0xa0, 0xab, - 0x9d, 0xf3, 0x5b, 0xcd, 0x41, 0x01, 0x4a, 0x0d, - 0x4d, 0x94, 0xce, 0xcc, 0x39, 0xad, 0x99, 0x63, - 0x98, 0x0e, 0x59, 0x30, 0xb7, 0x9f, 0xb0, 0xda, - 0x82, 0xf3, 0xc4, 0x14, 0xd5, 0x54, 0xd6, 0x93, - 0x8e, 0x9f, 0xe7, 0xae, 0xaa, 0xfb, 0x5b, 0xe2, - 0xf1, 0xfe, 0x97, 0x43, 0x6e, 0xde, 0xfd, 0xe8, - 0xf8, 0xe6, 0x2b, 0x30, 0x9b, 0x85, 0xe8, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x67, - 0x69, 0x74, 0x67, 0x2d, 0x64, 0x69, 0x66, 0x66, - 0x2d, 0x76, 0x69, 0x65, 0x77, 0x2d, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x75, 0x69, - 0xd5, 0x08, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x78, 0xda, 0xc5, 0x56, 0xdf, 0x6f, 0xda, 0x30, - 0x10, 0x7e, 0xef, 0x5f, 0xe1, 0xf9, 0x75, 0x82, - 0x14, 0x90, 0xa6, 0x6a, 0x4a, 0x52, 0xed, 0x87, - 0x8a, 0x26, 0x4d, 0xda, 0x03, 0x6c, 0xaf, 0x91, - 0xe3, 0x1c, 0xc1, 0xc5, 0xd8, 0x9e, 0x7d, 0x01, - 0xfa, 0xdf, 0xef, 0x20, 0x10, 0xda, 0x92, 0x32, - 0xda, 0x95, 0xee, 0xcd, 0x39, 0x7f, 0x97, 0xfb, - 0xee, 0xf3, 0x77, 0x4e, 0xe2, 0xeb, 0xd5, 0x5c, - 0xb3, 0x05, 0xf8, 0xa0, 0xac, 0x49, 0x78, 0xaf, - 0x7b, 0xc9, 0x19, 0x18, 0x69, 0x0b, 0x65, 0xca, - 0x84, 0xff, 0x1c, 0xdf, 0x74, 0xae, 0xf8, 0x75, - 0x7a, 0x11, 0xbf, 0xeb, 0x74, 0xd8, 0x10, 0x0c, - 0x78, 0x81, 0x50, 0xb0, 0xa5, 0xc2, 0x29, 0x2b, - 0xb5, 0x28, 0x80, 0x0d, 0xba, 0xbd, 0xab, 0x6e, - 0x8f, 0x75, 0x3a, 0x04, 0x52, 0x06, 0xc1, 0x4f, - 0x84, 0x84, 0x34, 0xf6, 0xf0, 0xbb, 0x52, 0x1e, - 0x02, 0xd3, 0x2a, 0x4f, 0x78, 0x89, 0xb3, 0xf7, - 0x7c, 0x5f, 0x85, 0x72, 0xfa, 0x3c, 0x4a, 0x63, - 0x84, 0xb9, 0xd3, 0xf4, 0x42, 0x26, 0xb5, 0x08, - 0x21, 0xe1, 0x43, 0x85, 0xe5, 0x57, 0x35, 0x99, - 0xfc, 0x52, 0xb0, 0xfc, 0xe1, 0x90, 0xb0, 0x81, - 0x33, 0x27, 0x3c, 0x18, 0xa4, 0x4d, 0x9c, 0x8d, - 0xad, 0xd5, 0xb9, 0xf0, 0x3c, 0x8d, 0x9d, 0xb7, - 0x0e, 0x3c, 0xde, 0x31, 0x23, 0xe6, 0x90, 0xf0, - 0x85, 0x0a, 0x2a, 0xd7, 0xc0, 0xd3, 0xb1, 0xaf, - 0x20, 0x8e, 0x76, 0xbb, 0x07, 0x38, 0x29, 0x4c, - 0x36, 0xb1, 0xb2, 0x0a, 0x3c, 0xbd, 0x11, 0x3a, - 0x3c, 0x80, 0xca, 0xa9, 0xd2, 0x45, 0x1a, 0xdb, - 0xfc, 0x16, 0x24, 0x36, 0x8c, 0x70, 0x36, 0x02, - 0x62, 0x20, 0xd0, 0xfa, 0x75, 0xf5, 0x6f, 0x44, - 0x99, 0x33, 0x55, 0x24, 0x3c, 0xec, 0xc2, 0x19, - 0x52, 0x3c, 0x53, 0xb4, 0xd1, 0x3b, 0x0f, 0xb1, - 0x47, 0xd0, 0xc2, 0x8b, 0x65, 0x0b, 0x2a, 0xaa, - 0x89, 0x13, 0x5c, 0xc8, 0x19, 0x1d, 0xde, 0x41, - 0x1e, 0xac, 0x9c, 0x30, 0xc5, 0x21, 0x93, 0xa8, - 0x49, 0x88, 0xb6, 0x12, 0x3c, 0xa5, 0xc4, 0x43, - 0x01, 0x9a, 0xb6, 0x33, 0x69, 0xe9, 0xdc, 0x57, - 0xf8, 0xb6, 0xc7, 0x32, 0xf4, 0xaa, 0xa8, 0x89, - 0x94, 0xb4, 0x3a, 0x2f, 0x87, 0xc7, 0x50, 0xab, - 0xab, 0xb9, 0xc9, 0x02, 0x09, 0x47, 0xba, 0xf1, - 0xf4, 0xc3, 0x29, 0x7c, 0xbf, 0x8b, 0x1c, 0x74, - 0x4d, 0x58, 0xaf, 0x97, 0x6f, 0xca, 0x58, 0xd7, - 0xc5, 0xd1, 0x0b, 0x13, 0x68, 0xe0, 0x04, 0xbd, - 0x3e, 0xe1, 0x77, 0x40, 0x99, 0x5f, 0x6a, 0x16, - 0x1f, 0x9f, 0x65, 0x25, 0x0d, 0x13, 0xcc, 0x04, - 0xa2, 0x90, 0x53, 0x9e, 0x5e, 0x1e, 0xa9, 0x8b, - 0xd6, 0xb5, 0xe3, 0x4e, 0x37, 0xdd, 0xc8, 0x29, - 0xf3, 0xb9, 0x42, 0xb4, 0x66, 0x3b, 0x77, 0xf4, - 0x9c, 0xe5, 0x9b, 0xc0, 0xab, 0x4a, 0xf8, 0x17, - 0xa4, 0x28, 0x6e, 0xab, 0x80, 0x73, 0xba, 0x89, - 0x78, 0xba, 0x5f, 0xef, 0x18, 0xbc, 0x5c, 0xbd, - 0xde, 0xeb, 0xa8, 0xd7, 0x14, 0x7d, 0x32, 0xf0, - 0xef, 0xd7, 0x5b, 0xff, 0x3c, 0x56, 0x3d, 0x99, - 0xe9, 0x9a, 0xe0, 0x7d, 0x27, 0x6c, 0x88, 0x6d, - 0x9d, 0xd0, 0xcc, 0xe2, 0x7f, 0x1d, 0xa6, 0x51, - 0xcd, 0xe2, 0x48, 0x6e, 0x15, 0x20, 0xab, 0x4c, - 0x01, 0x5e, 0x2b, 0xd3, 0x42, 0x2a, 0xa8, 0xd2, - 0x08, 0xbd, 0xa3, 0xa4, 0x95, 0x9c, 0x01, 0x5d, - 0x72, 0x53, 0xba, 0xb7, 0x35, 0xf8, 0x26, 0x92, - 0x51, 0xc3, 0x6d, 0xcd, 0x47, 0x6d, 0x3e, 0xd8, - 0x7d, 0x63, 0x5b, 0x04, 0xfd, 0xb4, 0xf7, 0xf4, - 0x46, 0xd0, 0x43, 0x5f, 0x1f, 0xea, 0x59, 0x39, - 0x7a, 0x22, 0xdb, 0xf6, 0x8f, 0x34, 0xb9, 0x10, - 0xba, 0xa2, 0xe6, 0x06, 0x47, 0x20, 0x01, 0xc1, - 0x65, 0xca, 0x48, 0x0f, 0xf5, 0x48, 0x1d, 0x1b, - 0x03, 0x27, 0x4a, 0xb8, 0x8f, 0x1d, 0xb4, 0xbb, - 0x67, 0xff, 0xf3, 0x71, 0xf1, 0x07, 0x58, 0x22, - 0x39, 0xea, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x0f, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0xb0, 0xb7, 0x24, 0x30, + 0x05, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, + 0x06, 0x00, 0x4c, 0x00, 0x04, 0x02, 0x00, 0x00, + 0x08, 0x02, 0x00, 0x00, 0x5d, 0x6c, 0x9d, 0x57, + 0x06, 0x00, 0x00, 0x00, 0x08, 0x02, 0x00, 0x00, + 0x25, 0x00, 0x76, 0x00, 0x30, 0x02, 0x00, 0x00, + 0x3f, 0x06, 0x00, 0x00, 0xd4, 0xb5, 0x02, 0x00, + 0xff, 0xff, 0xff, 0xff, 0x3f, 0x06, 0x00, 0x00, + 0x01, 0x00, 0x4c, 0x00, 0x40, 0x06, 0x00, 0x00, + 0x44, 0x06, 0x00, 0x00, 0x4a, 0x70, 0xbe, 0x68, + 0x00, 0x00, 0x00, 0x00, 0x44, 0x06, 0x00, 0x00, + 0x05, 0x00, 0x4c, 0x00, 0x4c, 0x06, 0x00, 0x00, + 0x50, 0x06, 0x00, 0x00, 0x9f, 0x21, 0xcb, 0x33, + 0x06, 0x00, 0x00, 0x00, 0x50, 0x06, 0x00, 0x00, + 0x1f, 0x00, 0x76, 0x00, 0x70, 0x06, 0x00, 0x00, + 0x7f, 0x0a, 0x00, 0x00, 0x4b, 0x50, 0x90, 0x0b, + 0x02, 0x00, 0x00, 0x00, 0x7f, 0x0a, 0x00, 0x00, + 0x04, 0x00, 0x4c, 0x00, 0x84, 0x0a, 0x00, 0x00, + 0x88, 0x0a, 0x00, 0x00, 0x77, 0x03, 0x93, 0xd5, + 0x03, 0x00, 0x00, 0x00, 0x88, 0x0a, 0x00, 0x00, + 0x03, 0x00, 0x4c, 0x00, 0x8c, 0x0a, 0x00, 0x00, + 0xbc, 0x0a, 0x00, 0x00, 0x5f, 0x88, 0xa3, 0x38, + 0x06, 0x00, 0x00, 0x00, 0xbc, 0x0a, 0x00, 0x00, + 0x24, 0x00, 0x76, 0x00, 0xe0, 0x0a, 0x00, 0x00, + 0xef, 0x0c, 0x00, 0x00, 0x78, 0x6e, 0x7a, 0xc8, + 0x06, 0x00, 0x00, 0x00, 0xef, 0x0c, 0x00, 0x00, + 0x1d, 0x00, 0x76, 0x00, 0x10, 0x0d, 0x00, 0x00, + 0x1f, 0x15, 0x00, 0x00, 0xd5, 0x2f, 0x1a, 0x1c, + 0x06, 0x00, 0x00, 0x00, 0x1f, 0x15, 0x00, 0x00, + 0x19, 0x00, 0x76, 0x00, 0x38, 0x15, 0x00, 0x00, + 0x47, 0x19, 0x00, 0x00, 0xce, 0xa8, 0x21, 0x2c, + 0x06, 0x00, 0x00, 0x00, 0x47, 0x19, 0x00, 0x00, + 0x11, 0x00, 0x76, 0x00, 0x58, 0x19, 0x00, 0x00, + 0x67, 0x1d, 0x00, 0x00, 0xe9, 0x2c, 0xb5, 0x82, + 0x06, 0x00, 0x00, 0x00, 0x67, 0x1d, 0x00, 0x00, + 0x16, 0x00, 0x76, 0x00, 0x80, 0x1d, 0x00, 0x00, + 0x8f, 0x1f, 0x00, 0x00, 0xbc, 0xcf, 0x22, 0xb2, + 0x06, 0x00, 0x00, 0x00, 0x8f, 0x1f, 0x00, 0x00, + 0x11, 0x00, 0x76, 0x00, 0xa0, 0x1f, 0x00, 0x00, + 0xaf, 0x23, 0x00, 0x00, 0x5f, 0xe2, 0xa5, 0x46, + 0x06, 0x00, 0x00, 0x00, 0xaf, 0x23, 0x00, 0x00, + 0x26, 0x00, 0x76, 0x00, 0xd8, 0x23, 0x00, 0x00, + 0xe7, 0x25, 0x00, 0x00, 0xe5, 0x98, 0x5f, 0x1e, + 0x06, 0x00, 0x00, 0x00, 0xe7, 0x25, 0x00, 0x00, + 0x20, 0x00, 0x76, 0x00, 0x08, 0x26, 0x00, 0x00, + 0x17, 0x2a, 0x00, 0x00, 0x55, 0x9f, 0xa3, 0x86, + 0x06, 0x00, 0x00, 0x00, 0x17, 0x2a, 0x00, 0x00, + 0x0f, 0x00, 0x76, 0x00, 0x28, 0x2a, 0x00, 0x00, + 0x37, 0x2c, 0x00, 0x00, 0xe7, 0x1b, 0xfd, 0x42, + 0x06, 0x00, 0x00, 0x00, 0x37, 0x2c, 0x00, 0x00, + 0x21, 0x00, 0x76, 0x00, 0x58, 0x2c, 0x00, 0x00, + 0x67, 0x30, 0x00, 0x00, 0x67, 0x6e, 0x6f, 0x6d, + 0x65, 0x2f, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x67, 0x69, 0x74, 0x67, 0x2d, 0x64, 0x69, 0x66, + 0x66, 0x2d, 0x76, 0x69, 0x65, 0x77, 0x2d, 0x66, + 0x69, 0x6c, 0x65, 0x2d, 0x72, 0x65, 0x6e, 0x64, + 0x65, 0x72, 0x65, 0x72, 0x2d, 0x69, 0x6d, 0x61, + 0x67, 0x65, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, + 0x91, 0x0e, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x78, 0xda, 0xed, 0x57, 0x4d, 0x8f, 0x9b, 0x30, + 0x10, 0xbd, 0xef, 0xaf, 0x40, 0xbe, 0x56, 0xf9, + 0x6a, 0xd5, 0xaa, 0x07, 0x60, 0xd5, 0x2a, 0xca, + 0xaa, 0xa7, 0x95, 0x9a, 0x6d, 0xaf, 0xc8, 0xc0, + 0x84, 0x78, 0x63, 0x3e, 0x6a, 0x9b, 0x64, 0xe9, + 0xaf, 0xef, 0x98, 0x90, 0xc0, 0x42, 0x42, 0xb2, + 0x56, 0xb2, 0xbb, 0x87, 0x5e, 0x30, 0xe0, 0x61, + 0xe6, 0xbd, 0xf1, 0x7b, 0x06, 0xec, 0xdb, 0xa7, + 0x98, 0x5b, 0x6b, 0x10, 0x92, 0xa5, 0x89, 0x43, + 0x26, 0xc3, 0x31, 0xb1, 0x20, 0x09, 0xd2, 0x90, + 0x25, 0x91, 0x43, 0x7e, 0x3d, 0xcc, 0x06, 0x5f, + 0xc9, 0xad, 0x7b, 0x63, 0xb3, 0x44, 0x81, 0x58, + 0xd0, 0x00, 0x5c, 0x5b, 0xc0, 0x9f, 0x9c, 0x09, + 0x90, 0x16, 0x67, 0xbe, 0x43, 0x22, 0xb5, 0xfa, + 0x40, 0xea, 0x04, 0x9f, 0x86, 0x93, 0x2f, 0x64, + 0xe4, 0xda, 0x0a, 0xe2, 0x8c, 0x53, 0x05, 0x56, + 0xc0, 0xa9, 0x94, 0x0e, 0xb9, 0x63, 0x2a, 0x9a, + 0xb2, 0xc5, 0xe2, 0x37, 0x83, 0xcd, 0x8c, 0x71, + 0xf8, 0x09, 0x49, 0x08, 0x02, 0xc4, 0x8f, 0x98, + 0x46, 0x40, 0xac, 0x8c, 0x0a, 0x48, 0x14, 0x86, + 0xa9, 0xd5, 0x9d, 0x60, 0x21, 0x71, 0xed, 0x4c, + 0xa4, 0x19, 0x08, 0x55, 0x58, 0x09, 0x8d, 0xc1, + 0x21, 0x6b, 0x26, 0x99, 0xcf, 0x81, 0xb8, 0x0f, + 0x22, 0x07, 0x7b, 0xb4, 0x9b, 0xed, 0xc4, 0xa5, + 0x82, 0x61, 0x22, 0xaa, 0x10, 0x0c, 0x71, 0x11, + 0x95, 0x62, 0x01, 0xe5, 0xcd, 0xf8, 0x60, 0xc9, + 0x78, 0xe8, 0xda, 0xa9, 0xff, 0x08, 0x81, 0xda, + 0xa3, 0x53, 0xab, 0xb9, 0xa2, 0xc1, 0x6a, 0xbe, + 0x61, 0x2a, 0x58, 0x82, 0x20, 0x16, 0x0b, 0x1d, + 0x22, 0xf5, 0x2d, 0x4f, 0xee, 0xee, 0x19, 0x63, + 0x2a, 0xf3, 0x10, 0xb7, 0x1c, 0x7a, 0xc2, 0x96, + 0xf0, 0x94, 0xd1, 0x24, 0x3c, 0x99, 0x6e, 0x49, + 0x39, 0x8b, 0x90, 0x5d, 0x00, 0x7a, 0x4d, 0x9a, + 0x81, 0xa3, 0x2d, 0x2b, 0x3c, 0xa9, 0x58, 0xf6, + 0x92, 0x6d, 0x90, 0x34, 0xe7, 0xb6, 0x3e, 0x17, + 0xf4, 0xb1, 0xb8, 0x63, 0x10, 0x4b, 0x19, 0x94, + 0x08, 0x23, 0x3c, 0xf3, 0x24, 0x0b, 0xc1, 0xf3, + 0x8b, 0x72, 0x7c, 0x43, 0xb4, 0xad, 0xb8, 0x98, + 0x8a, 0x88, 0xe1, 0x52, 0x4c, 0x3e, 0x9e, 0xa6, + 0x54, 0x19, 0xa0, 0x14, 0xfc, 0x1c, 0x59, 0x7c, + 0x2f, 0xf4, 0x71, 0x4b, 0x31, 0xc4, 0x09, 0x8f, + 0xe9, 0x99, 0x0b, 0x11, 0x3d, 0x4a, 0xa0, 0x23, + 0x91, 0xfd, 0x8d, 0x0c, 0x75, 0x80, 0xa6, 0xef, + 0xa4, 0xd2, 0x47, 0x14, 0x2f, 0xc2, 0x19, 0xf8, + 0xc5, 0x40, 0x8f, 0x3d, 0x75, 0x15, 0x53, 0x88, + 0xce, 0x52, 0x82, 0x26, 0x12, 0xed, 0x4f, 0x11, + 0xab, 0x43, 0x0a, 0x90, 0xc4, 0xd5, 0x64, 0x2d, + 0xbf, 0xb0, 0xda, 0x09, 0x46, 0xfb, 0xba, 0xa7, + 0x44, 0xdb, 0x56, 0x04, 0xc7, 0x4c, 0xe2, 0x8a, + 0x3b, 0xc5, 0x95, 0xb5, 0x73, 0xdc, 0xc6, 0xed, + 0xc2, 0x55, 0x20, 0x3a, 0x55, 0xa8, 0xb3, 0xb6, + 0x32, 0x24, 0x52, 0x09, 0x4b, 0xea, 0xd3, 0xcb, + 0xb6, 0x6a, 0x89, 0x57, 0x7f, 0x53, 0xbc, 0xec, + 0x6b, 0x56, 0x28, 0xe8, 0xc6, 0x43, 0xe0, 0x39, + 0x26, 0x9f, 0x51, 0x2e, 0xfb, 0xb2, 0xd3, 0xf0, + 0x31, 0x97, 0x2a, 0xc6, 0x0a, 0xc8, 0xb1, 0x81, + 0xd7, 0xab, 0x27, 0x0c, 0x36, 0xb9, 0x67, 0x76, + 0xdb, 0xf2, 0xef, 0x58, 0xed, 0xa5, 0x6d, 0x31, + 0x36, 0x4f, 0x59, 0xc8, 0xcc, 0x36, 0x9d, 0x47, + 0x8d, 0x0d, 0x93, 0xa2, 0xc8, 0x39, 0x2d, 0xfe, + 0x3b, 0xe6, 0x0c, 0xc7, 0x5c, 0xb6, 0x57, 0xaf, + 0x60, 0x99, 0x0a, 0xf0, 0xe5, 0x3c, 0x73, 0x5f, + 0x75, 0xa0, 0x6d, 0x9a, 0x97, 0x77, 0xc6, 0xd4, + 0x35, 0x55, 0x25, 0x23, 0xdb, 0xdc, 0x77, 0x9f, + 0x35, 0xf6, 0x8d, 0x26, 0x8f, 0x9f, 0xaa, 0x49, + 0xf0, 0x8e, 0x3e, 0x3c, 0xae, 0x65, 0x85, 0xa6, + 0x02, 0xa6, 0x35, 0xef, 0xb6, 0x08, 0x8c, 0x5a, + 0x62, 0xaa, 0x83, 0xba, 0x98, 0x91, 0x14, 0xa6, + 0x07, 0x1f, 0xef, 0xaa, 0xa1, 0x0b, 0x6f, 0xf7, + 0x0f, 0x73, 0x40, 0x22, 0xdf, 0x6a, 0x03, 0x76, + 0xde, 0xb3, 0x5e, 0xd3, 0x9d, 0x6d, 0x9c, 0x3c, + 0xdd, 0xe8, 0x57, 0xce, 0xb8, 0x87, 0x4a, 0x9e, + 0x65, 0x3a, 0x64, 0xd2, 0xbf, 0xaa, 0x7a, 0x9b, + 0x18, 0x0f, 0x3f, 0x1f, 0x6c, 0xf0, 0x99, 0x70, + 0xbb, 0x7b, 0xc6, 0x1b, 0xe1, 0x1d, 0xd5, 0x7f, + 0x97, 0x37, 0xff, 0x00, 0x62, 0x62, 0x5a, 0xe9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -404,86 +205,106 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x67, - 0x69, 0x74, 0x67, 0x2d, 0x64, 0x69, 0x66, 0x66, - 0x2d, 0x76, 0x69, 0x65, 0x77, 0x2d, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2d, 0x73, 0x70, - 0x61, 0x63, 0x69, 0x6e, 0x67, 0x2e, 0x75, 0x69, - 0x37, 0x0b, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x78, 0xda, 0xd5, 0x56, 0x51, 0x6f, 0x9b, 0x30, - 0x10, 0x7e, 0xef, 0xaf, 0x40, 0x7e, 0x9d, 0x56, - 0x4a, 0x56, 0x4d, 0xd3, 0x04, 0x54, 0x9b, 0xa6, - 0x56, 0x93, 0x26, 0x6d, 0x52, 0xb3, 0xed, 0x11, - 0x1d, 0xe6, 0x42, 0xdc, 0x18, 0xdb, 0xb3, 0x8f, - 0xb0, 0xfe, 0xfb, 0x19, 0x68, 0x43, 0xb4, 0x24, - 0x64, 0x8a, 0x92, 0x68, 0x7d, 0x3b, 0xe0, 0xf3, - 0xdd, 0x77, 0x9f, 0x3f, 0xec, 0x8b, 0x6f, 0x7e, - 0x57, 0x32, 0x58, 0xa2, 0x75, 0x42, 0xab, 0x84, - 0x45, 0x97, 0x57, 0x2c, 0x40, 0xc5, 0x75, 0x21, - 0x54, 0x99, 0xb0, 0xef, 0xd3, 0xdb, 0xd7, 0xef, - 0xd8, 0x4d, 0x7a, 0x11, 0x0b, 0x45, 0x68, 0x67, - 0xc0, 0x31, 0x8d, 0x2d, 0xfe, 0xaa, 0x85, 0x45, - 0x17, 0x48, 0x91, 0x27, 0xac, 0xa4, 0xc5, 0x2b, - 0x36, 0x24, 0x78, 0x73, 0x19, 0x4d, 0x58, 0x98, - 0xc6, 0x84, 0x95, 0x91, 0x40, 0x18, 0x70, 0x09, - 0xce, 0x25, 0xec, 0x4e, 0x50, 0xf9, 0x49, 0xcc, - 0x66, 0x3f, 0x04, 0x36, 0x5f, 0x0d, 0x79, 0xac, - 0xbb, 0x37, 0xc0, 0x7d, 0x15, 0x16, 0x18, 0xb0, - 0xa8, 0xc8, 0x63, 0x68, 0xf1, 0x4d, 0x1b, 0xed, - 0x73, 0xb1, 0x34, 0x36, 0x56, 0x1b, 0xb4, 0xf4, - 0x18, 0x28, 0xa8, 0x30, 0x61, 0x4b, 0xe1, 0x44, - 0x2e, 0x91, 0xa5, 0xb7, 0x20, 0x1d, 0xc6, 0xe1, - 0xf3, 0xe7, 0x0d, 0x20, 0x07, 0x95, 0xcd, 0x34, - 0xaf, 0xdd, 0x7e, 0xa8, 0xd1, 0x4e, 0xb4, 0x4c, - 0x58, 0x9a, 0x6b, 0x22, 0x5d, 0xad, 0x43, 0xf9, - 0x5c, 0xc8, 0x22, 0x8d, 0x75, 0xfe, 0x80, 0x9c, - 0x56, 0x4d, 0xd0, 0xe2, 0xce, 0x8a, 0x82, 0x05, - 0xa2, 0xf0, 0x8d, 0xb7, 0xd1, 0x6e, 0x9e, 0x53, - 0x5b, 0x1f, 0x89, 0xa6, 0xd5, 0x4d, 0xe6, 0x9e, - 0xb4, 0x4a, 0xdf, 0x8e, 0xe5, 0xd4, 0xb2, 0xae, - 0xd4, 0x80, 0x8d, 0x26, 0x23, 0xe0, 0x0a, 0x6c, - 0x29, 0xd4, 0xdf, 0xa0, 0x5d, 0x6d, 0x7f, 0x81, - 0x1c, 0x65, 0xdf, 0xb7, 0x6c, 0xc3, 0x8c, 0x20, - 0xcf, 0x1a, 0x51, 0xd0, 0xfc, 0x2c, 0x12, 0xcc, - 0x41, 0x8a, 0xd2, 0x93, 0x75, 0x04, 0x96, 0x46, - 0x70, 0xb2, 0xa7, 0x49, 0x16, 0x94, 0xf3, 0xee, - 0x03, 0x4f, 0x23, 0x61, 0x8f, 0xe8, 0x2b, 0x4c, - 0x21, 0x0f, 0x3a, 0xbe, 0xef, 0xd7, 0x97, 0x87, - 0x7d, 0xa3, 0x3e, 0x0f, 0xf0, 0x85, 0xd7, 0x6c, - 0x33, 0x21, 0xce, 0x28, 0x03, 0x22, 0xe0, 0xbe, - 0xd1, 0xab, 0x91, 0xca, 0xa4, 0xcd, 0x76, 0x5c, - 0xb8, 0x4a, 0x1d, 0x3e, 0x89, 0xbb, 0x4b, 0xe3, - 0x7b, 0x23, 0xd4, 0xc7, 0xda, 0x1b, 0x51, 0xf5, - 0x42, 0x3b, 0xff, 0x9c, 0xe5, 0xdd, 0x8b, 0x23, - 0xcb, 0xbd, 0x07, 0xf9, 0xaf, 0x6a, 0x43, 0xf1, - 0x50, 0x3b, 0xaa, 0xfc, 0xbf, 0xcb, 0xd2, 0x21, - 0x1e, 0xb8, 0x1e, 0xae, 0x74, 0x74, 0x5a, 0xa5, - 0x37, 0xdc, 0xdc, 0x58, 0x30, 0x99, 0x14, 0xaa, - 0x75, 0xca, 0x8b, 0xb0, 0xf3, 0x4f, 0x4f, 0x38, - 0xe8, 0x08, 0x9f, 0xc1, 0xcf, 0xd1, 0x81, 0x7e, - 0x6e, 0x04, 0xf9, 0xe5, 0xbd, 0x97, 0xbb, 0xf8, - 0xd8, 0x3a, 0x1f, 0xea, 0xe3, 0xd3, 0x98, 0x31, - 0x3a, 0x92, 0x19, 0x3d, 0x67, 0x6d, 0x31, 0x6b, - 0xe6, 0x82, 0xb0, 0x3d, 0xcb, 0xf1, 0x85, 0x78, - 0xf2, 0x73, 0xc7, 0x3b, 0x18, 0x78, 0x9f, 0xc1, - 0x9a, 0x93, 0xa3, 0x59, 0xf3, 0x34, 0xaa, 0xff, - 0x5f, 0x0e, 0xdd, 0xa3, 0xd6, 0xaa, 0xe8, 0xea, - 0xc5, 0xf3, 0x14, 0xb7, 0x45, 0xc2, 0x0f, 0xc3, - 0xe1, 0xdf, 0xc9, 0xb8, 0xed, 0x02, 0xd8, 0x94, - 0x50, 0xea, 0xa6, 0x9d, 0xee, 0xc6, 0x08, 0xd7, - 0xc6, 0x74, 0x90, 0xb1, 0x49, 0x67, 0x09, 0xb2, - 0xf6, 0xfb, 0x70, 0x3d, 0x02, 0x71, 0x84, 0x26, - 0x13, 0x8a, 0x5b, 0xec, 0x2f, 0xa8, 0xb1, 0x92, - 0x06, 0x4a, 0x5c, 0xc7, 0x5e, 0x6f, 0xdd, 0x8a, - 0x70, 0x98, 0x81, 0x2f, 0xfe, 0x00, 0x47, 0x68, - 0x1d, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x2f, + 0x05, 0x00, 0x00, 0x00, 0x67, 0x69, 0x74, 0x67, + 0x2f, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, + 0x67, 0x69, 0x74, 0x67, 0x2d, 0x72, 0x65, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x2d, + 0x6c, 0x69, 0x73, 0x74, 0x2d, 0x62, 0x6f, 0x78, + 0x2d, 0x72, 0x6f, 0x77, 0x2e, 0x75, 0x69, 0x00, + 0x03, 0x12, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x78, 0xda, 0xed, 0x58, 0x4b, 0x6f, 0xdb, 0x30, + 0x0c, 0xbe, 0xef, 0x57, 0x68, 0x3a, 0x6d, 0x18, + 0xdc, 0xbc, 0x2e, 0x3d, 0x38, 0x2e, 0xd0, 0x01, + 0xed, 0xa5, 0x87, 0x21, 0xeb, 0xce, 0x86, 0x2c, + 0x33, 0xb6, 0x16, 0x59, 0xf2, 0x24, 0xe6, 0xd5, + 0x5f, 0x3f, 0x3a, 0xb1, 0x93, 0xa0, 0x69, 0x13, + 0x67, 0xe8, 0x13, 0xdd, 0x29, 0x12, 0xfd, 0x99, + 0xa2, 0xc8, 0x8f, 0x5f, 0x24, 0x87, 0x17, 0x8b, + 0x42, 0xb3, 0x19, 0x38, 0xaf, 0xac, 0x19, 0xf2, + 0xde, 0x59, 0x97, 0x33, 0x30, 0xd2, 0xa6, 0xca, + 0x64, 0x43, 0xfe, 0xeb, 0xf6, 0x2a, 0x38, 0xe7, + 0x17, 0xd1, 0xa7, 0x50, 0x19, 0x04, 0x37, 0x16, + 0x12, 0xa2, 0xf0, 0x73, 0x10, 0xb0, 0xcd, 0x34, + 0x70, 0xf0, 0x67, 0xaa, 0x1c, 0x78, 0x96, 0xe1, + 0xe4, 0x1b, 0x1b, 0x9c, 0x9d, 0xb3, 0x20, 0x88, + 0x42, 0x84, 0xa2, 0xd4, 0x02, 0x81, 0x49, 0x2d, + 0xbc, 0x1f, 0xf2, 0x6b, 0x85, 0xd9, 0x08, 0x4a, + 0xeb, 0x15, 0x5a, 0xb7, 0xbc, 0x51, 0x1e, 0x2f, + 0xed, 0x62, 0x64, 0xe7, 0x9c, 0x95, 0xc2, 0x81, + 0x41, 0x42, 0xe0, 0x64, 0xc7, 0x1c, 0x85, 0xa5, + 0xb3, 0x25, 0x38, 0x5c, 0x32, 0x23, 0x0a, 0x18, + 0x72, 0x29, 0x4c, 0x3c, 0xb6, 0x72, 0xea, 0x79, + 0x74, 0xeb, 0xa6, 0x10, 0x76, 0x9a, 0xe7, 0x51, + 0x28, 0x73, 0xa5, 0xd3, 0x28, 0xb4, 0xc9, 0x6f, + 0x90, 0xb8, 0xbb, 0xe0, 0x0f, 0x67, 0x33, 0x8a, + 0xcc, 0x5f, 0x2a, 0xc3, 0x99, 0x4a, 0x87, 0x3c, + 0x8d, 0xcb, 0xda, 0x14, 0x27, 0x64, 0xdb, 0x5b, + 0x64, 0xa6, 0xbc, 0x4a, 0x34, 0xb4, 0x5d, 0x02, + 0x27, 0xd7, 0x4e, 0xa5, 0x6b, 0xd7, 0x59, 0x35, + 0x6a, 0xef, 0xf0, 0xf1, 0xdd, 0x5d, 0x09, 0xed, + 0x0f, 0x41, 0x73, 0xe1, 0xdb, 0x42, 0x55, 0x6b, + 0x64, 0x21, 0x5c, 0xa6, 0x4c, 0xec, 0x51, 0x38, + 0xe4, 0x51, 0xaf, 0x7f, 0x1c, 0x0a, 0x26, 0x6d, + 0x07, 0x44, 0x5b, 0xb6, 0x03, 0x26, 0x16, 0xd1, + 0x16, 0x47, 0xb0, 0xd2, 0xea, 0x69, 0x41, 0x81, + 0x96, 0x42, 0x12, 0x41, 0x09, 0xdc, 0x3d, 0x00, + 0x76, 0x76, 0xbe, 0x45, 0x0e, 0x0e, 0xe5, 0x14, + 0x16, 0xa5, 0xa8, 0x36, 0xd4, 0xb6, 0xee, 0x23, + 0x98, 0x81, 0xd0, 0xe0, 0x1a, 0x5a, 0x39, 0x28, + 0xec, 0x0c, 0xe8, 0xa7, 0x36, 0xbf, 0x30, 0x11, + 0x8e, 0x38, 0x9d, 0x35, 0xdb, 0x3b, 0xe6, 0x72, + 0x26, 0xb4, 0xca, 0xa8, 0x2f, 0x24, 0x54, 0xed, + 0x7d, 0x00, 0x88, 0x4e, 0x18, 0x6a, 0x65, 0x92, + 0x8c, 0x18, 0x97, 0x25, 0x6d, 0xcb, 0x6b, 0x95, + 0x42, 0xa0, 0x61, 0x8c, 0x6d, 0xd2, 0xf7, 0x3d, + 0x07, 0x39, 0xb9, 0x9c, 0x52, 0xbd, 0xcd, 0xbd, + 0x0c, 0xca, 0xea, 0x49, 0x9c, 0xac, 0x1f, 0x3d, + 0x45, 0x16, 0x8f, 0x20, 0x4f, 0xe8, 0xa6, 0x67, + 0xc8, 0xa2, 0xb5, 0x1a, 0x55, 0x19, 0x23, 0x2c, + 0x90, 0xb3, 0x55, 0x4e, 0x49, 0x33, 0x05, 0xed, + 0x70, 0xc8, 0x97, 0x40, 0x21, 0x8d, 0x56, 0x49, + 0x61, 0x98, 0x03, 0x73, 0x1b, 0xf1, 0x64, 0x63, + 0x67, 0x8b, 0x95, 0x4d, 0x93, 0x5e, 0xb2, 0x2f, + 0xa9, 0x25, 0xf1, 0x35, 0x16, 0x59, 0x0a, 0x1a, + 0xf0, 0x61, 0x74, 0xaa, 0xfc, 0xe4, 0xeb, 0x6e, + 0x24, 0x9d, 0x75, 0x4d, 0x68, 0x50, 0xd7, 0x68, + 0x63, 0xa0, 0x7e, 0x99, 0x50, 0xc3, 0xec, 0x05, + 0x5b, 0xd5, 0x36, 0x16, 0x88, 0x42, 0xe6, 0x3c, + 0xea, 0x1e, 0xdc, 0x55, 0xd9, 0x0a, 0x37, 0x57, + 0x29, 0x12, 0xa4, 0x77, 0xb0, 0x2f, 0x55, 0x96, + 0xe3, 0xbd, 0xde, 0xed, 0x6c, 0x22, 0x6c, 0x62, + 0x7f, 0x8c, 0x66, 0x37, 0x22, 0x01, 0xbd, 0x25, + 0x58, 0x93, 0x92, 0x58, 0xaf, 0xec, 0xef, 0x56, + 0xac, 0xf3, 0x9a, 0x5f, 0x2b, 0xb5, 0x6e, 0xc1, + 0x43, 0x92, 0xea, 0x7f, 0xd1, 0xbe, 0x7b, 0x38, + 0xd0, 0x5a, 0x95, 0x5e, 0xdd, 0xc1, 0x9e, 0x43, + 0x2a, 0xb6, 0x53, 0xd4, 0xb2, 0xe0, 0x77, 0xc6, + 0xf5, 0x5b, 0x5e, 0x92, 0x1e, 0x72, 0x46, 0xa1, + 0x4c, 0xa1, 0x3a, 0x5d, 0xf4, 0x79, 0x67, 0x1f, + 0x34, 0x5f, 0x97, 0xb9, 0x41, 0x25, 0x56, 0xa7, + 0x15, 0xac, 0xb3, 0xeb, 0xf8, 0x34, 0x7e, 0xf6, + 0x5e, 0x96, 0x9f, 0xbd, 0x27, 0xe0, 0x67, 0x0a, + 0x5e, 0x3a, 0x55, 0xae, 0x34, 0xf5, 0x3f, 0x41, + 0x9f, 0x94, 0xa0, 0xcf, 0xc3, 0x9d, 0xde, 0xdb, + 0xe1, 0x4e, 0x42, 0x7f, 0x1d, 0x32, 0xff, 0x68, + 0xb4, 0x49, 0x84, 0x07, 0xad, 0xcc, 0x73, 0x8b, + 0x56, 0xf7, 0xec, 0x7c, 0x30, 0xd8, 0xd3, 0x23, + 0x8f, 0x4b, 0x4d, 0x77, 0xa1, 0x55, 0x41, 0xea, + 0xd7, 0x52, 0x55, 0x04, 0xeb, 0x12, 0x54, 0xe0, + 0x1a, 0xf0, 0x3c, 0xdc, 0xeb, 0xbf, 0x2a, 0xf7, + 0xe8, 0x8e, 0xd6, 0x30, 0x4f, 0x0b, 0x93, 0x4d, + 0x45, 0x06, 0x74, 0xa1, 0x22, 0xe3, 0xde, 0x42, + 0xd6, 0x29, 0x3a, 0x04, 0x89, 0x4a, 0xd4, 0x78, + 0x94, 0xd3, 0xec, 0xce, 0xd2, 0x54, 0x1f, 0x2a, + 0xee, 0xc7, 0x25, 0xeb, 0xc3, 0x57, 0x95, 0xd3, + 0x08, 0xd4, 0x7f, 0x17, 0x04, 0xfa, 0x59, 0x2a, + 0x63, 0xb6, 0xb7, 0x27, 0x5f, 0x4f, 0x5f, 0xbf, + 0xc8, 0xa7, 0x25, 0x7b, 0xf0, 0xa6, 0x4e, 0xc1, + 0x8f, 0x1f, 0xe9, 0x37, 0x86, 0xe6, 0xab, 0x0c, + 0x0d, 0xb7, 0xdf, 0x73, 0x3e, 0xfd, 0x05, 0xc9, + 0x62, 0x9d, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -521,6 +342,67 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x6f, + 0x72, 0x67, 0x2f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x75, 0x69, 0x2f, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x0b, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x09, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x67, 0x69, 0x74, 0x67, + 0x2d, 0x64, 0x69, 0x66, 0x66, 0x2d, 0x76, 0x69, + 0x65, 0x77, 0x2d, 0x66, 0x69, 0x6c, 0x65, 0x2d, + 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, + 0x2d, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x75, 0x69, + 0x94, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x78, 0xda, 0x8d, 0x93, 0x41, 0x4f, 0xe3, 0x30, + 0x10, 0x85, 0xef, 0xfc, 0x0a, 0xe3, 0xeb, 0x2a, + 0x2d, 0x15, 0x12, 0x02, 0x29, 0x31, 0x12, 0x5a, + 0x95, 0x3b, 0x5b, 0xb8, 0x46, 0x8e, 0xf3, 0x92, + 0x0c, 0x75, 0xec, 0xec, 0xd8, 0x69, 0xcb, 0xbf, + 0xc7, 0xa5, 0x94, 0x22, 0x81, 0x08, 0x27, 0x5b, + 0xf2, 0xf7, 0xc6, 0x6f, 0x9e, 0xc7, 0xf9, 0xed, + 0xae, 0xb7, 0x62, 0x03, 0x0e, 0xe4, 0x5d, 0x21, + 0x17, 0xb3, 0x0b, 0x29, 0xe0, 0x8c, 0xaf, 0xc9, + 0xb5, 0x85, 0x7c, 0x5c, 0x2d, 0xb3, 0x6b, 0x79, + 0xab, 0xce, 0xf2, 0xf3, 0x2c, 0x13, 0xf7, 0x70, + 0x60, 0x1d, 0x51, 0x8b, 0x2d, 0xc5, 0x4e, 0xb4, + 0x56, 0xd7, 0x10, 0x97, 0xb3, 0xc5, 0xcd, 0xec, + 0x42, 0x64, 0x59, 0x82, 0xc8, 0x45, 0x70, 0xa3, + 0x0d, 0x54, 0xce, 0xf8, 0x3f, 0x12, 0x23, 0x08, + 0x4b, 0x55, 0x21, 0xdb, 0xb8, 0xfe, 0x23, 0x4f, + 0xb7, 0x24, 0xcd, 0x95, 0x9c, 0xab, 0x3c, 0xa2, + 0x1f, 0x6c, 0x2a, 0x28, 0x8c, 0xd5, 0x21, 0x14, + 0xf2, 0x9e, 0x62, 0xfb, 0x97, 0x9a, 0xe6, 0x89, + 0xb0, 0x5d, 0x92, 0xc5, 0x03, 0x5c, 0x0d, 0x06, + 0xaf, 0xb0, 0x8b, 0x52, 0x0c, 0x9a, 0xe1, 0x62, + 0xa2, 0xe2, 0xfa, 0x9f, 0x1f, 0xd9, 0x60, 0x8f, + 0x49, 0x95, 0x0f, 0xec, 0x07, 0x70, 0x7c, 0x11, + 0x4e, 0xf7, 0x28, 0xe4, 0x86, 0x02, 0x55, 0x16, + 0x52, 0xad, 0x78, 0x44, 0x3e, 0x3f, 0x9e, 0x7e, + 0xe1, 0x8c, 0x76, 0x65, 0xe3, 0xcd, 0x18, 0x26, + 0xc9, 0xd0, 0xf9, 0x6d, 0x69, 0xc9, 0xa1, 0x74, + 0x63, 0x5f, 0xa5, 0x26, 0xa4, 0x5a, 0x6a, 0x1b, + 0x7e, 0x92, 0xa0, 0xa6, 0xa8, 0xdf, 0x5c, 0x4c, + 0x91, 0x66, 0xe4, 0xe0, 0xb9, 0xfc, 0x70, 0x3d, + 0xc5, 0xf7, 0xde, 0xf9, 0x30, 0xa4, 0x8c, 0x27, + 0x6d, 0x77, 0xd8, 0x0d, 0xda, 0xd5, 0x93, 0xdc, + 0x40, 0x3b, 0xd8, 0x50, 0xea, 0xca, 0x6f, 0xf0, + 0xd6, 0x66, 0xea, 0x6f, 0x31, 0xcd, 0x57, 0xb0, + 0xef, 0xb1, 0x4c, 0xf0, 0x16, 0x4d, 0x2c, 0x7b, + 0xcd, 0x2d, 0x39, 0xa9, 0xae, 0x7e, 0x00, 0x99, + 0xda, 0xee, 0x77, 0x64, 0x35, 0x36, 0x0d, 0x58, + 0xaa, 0xc3, 0xfa, 0x19, 0x9c, 0x1f, 0x67, 0x4a, + 0xe5, 0xbe, 0x7a, 0x86, 0x89, 0x1f, 0xb3, 0x75, + 0x9c, 0x9a, 0xbb, 0x83, 0x56, 0x50, 0x7d, 0xaa, + 0xf3, 0x25, 0xba, 0xe4, 0xc4, 0xbe, 0xbb, 0x89, + 0xa6, 0x4b, 0x7f, 0xa1, 0xac, 0x58, 0x9b, 0x35, + 0xe2, 0x2f, 0xde, 0x9e, 0x92, 0x01, 0x32, 0x14, + 0xcb, 0xc8, 0x9a, 0xec, 0x5e, 0xeb, 0xb0, 0xdd, + 0xe7, 0xf4, 0x8d, 0x74, 0x7e, 0x30, 0x99, 0x36, + 0xa7, 0xbf, 0x73, 0xf6, 0x0a, 0x69, 0x87, 0x4e, + 0xa3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -538,17 +420,11 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x75, - 0x69, 0x2f, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x0d, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, - 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x0b, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, - 0x67, 0x69, 0x74, 0x67, 0x2d, 0x61, 0x75, 0x74, - 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2d, 0x64, 0x69, 0x61, 0x6c, - 0x6f, 0x67, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x67, + 0x69, 0x74, 0x67, 0x2d, 0x61, 0x75, 0x74, 0x68, + 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x2d, 0x64, 0x69, 0x61, 0x6c, 0x6f, + 0x67, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, 0x8e, 0x1c, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x78, 0xda, 0xed, 0x59, 0xcd, 0x92, 0xdb, 0x36, 0x0c, 0xbe, 0xe7, 0x29, 0x58, 0x5e, 0x53, 0xaf, @@ -808,6 +684,271 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x67, 0x69, 0x74, 0x67, 0x2d, 0x64, 0x69, 0x66, 0x66, + 0x2d, 0x76, 0x69, 0x65, 0x77, 0x2d, 0x6f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x75, 0x69, + 0xd5, 0x08, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x78, 0xda, 0xc5, 0x56, 0xdf, 0x6f, 0xda, 0x30, + 0x10, 0x7e, 0xef, 0x5f, 0xe1, 0xf9, 0x75, 0x82, + 0x14, 0x90, 0xa6, 0x6a, 0x4a, 0x52, 0xed, 0x87, + 0x8a, 0x26, 0x4d, 0xda, 0x03, 0x6c, 0xaf, 0x91, + 0xe3, 0x1c, 0xc1, 0xc5, 0xd8, 0x9e, 0x7d, 0x01, + 0xfa, 0xdf, 0xef, 0x20, 0x10, 0xda, 0x92, 0x32, + 0xda, 0x95, 0xee, 0xcd, 0x39, 0x7f, 0x97, 0xfb, + 0xee, 0xf3, 0x77, 0x4e, 0xe2, 0xeb, 0xd5, 0x5c, + 0xb3, 0x05, 0xf8, 0xa0, 0xac, 0x49, 0x78, 0xaf, + 0x7b, 0xc9, 0x19, 0x18, 0x69, 0x0b, 0x65, 0xca, + 0x84, 0xff, 0x1c, 0xdf, 0x74, 0xae, 0xf8, 0x75, + 0x7a, 0x11, 0xbf, 0xeb, 0x74, 0xd8, 0x10, 0x0c, + 0x78, 0x81, 0x50, 0xb0, 0xa5, 0xc2, 0x29, 0x2b, + 0xb5, 0x28, 0x80, 0x0d, 0xba, 0xbd, 0xab, 0x6e, + 0x8f, 0x75, 0x3a, 0x04, 0x52, 0x06, 0xc1, 0x4f, + 0x84, 0x84, 0x34, 0xf6, 0xf0, 0xbb, 0x52, 0x1e, + 0x02, 0xd3, 0x2a, 0x4f, 0x78, 0x89, 0xb3, 0xf7, + 0x7c, 0x5f, 0x85, 0x72, 0xfa, 0x3c, 0x4a, 0x63, + 0x84, 0xb9, 0xd3, 0xf4, 0x42, 0x26, 0xb5, 0x08, + 0x21, 0xe1, 0x43, 0x85, 0xe5, 0x57, 0x35, 0x99, + 0xfc, 0x52, 0xb0, 0xfc, 0xe1, 0x90, 0xb0, 0x81, + 0x33, 0x27, 0x3c, 0x18, 0xa4, 0x4d, 0x9c, 0x8d, + 0xad, 0xd5, 0xb9, 0xf0, 0x3c, 0x8d, 0x9d, 0xb7, + 0x0e, 0x3c, 0xde, 0x31, 0x23, 0xe6, 0x90, 0xf0, + 0x85, 0x0a, 0x2a, 0xd7, 0xc0, 0xd3, 0xb1, 0xaf, + 0x20, 0x8e, 0x76, 0xbb, 0x07, 0x38, 0x29, 0x4c, + 0x36, 0xb1, 0xb2, 0x0a, 0x3c, 0xbd, 0x11, 0x3a, + 0x3c, 0x80, 0xca, 0xa9, 0xd2, 0x45, 0x1a, 0xdb, + 0xfc, 0x16, 0x24, 0x36, 0x8c, 0x70, 0x36, 0x02, + 0x62, 0x20, 0xd0, 0xfa, 0x75, 0xf5, 0x6f, 0x44, + 0x99, 0x33, 0x55, 0x24, 0x3c, 0xec, 0xc2, 0x19, + 0x52, 0x3c, 0x53, 0xb4, 0xd1, 0x3b, 0x0f, 0xb1, + 0x47, 0xd0, 0xc2, 0x8b, 0x65, 0x0b, 0x2a, 0xaa, + 0x89, 0x13, 0x5c, 0xc8, 0x19, 0x1d, 0xde, 0x41, + 0x1e, 0xac, 0x9c, 0x30, 0xc5, 0x21, 0x93, 0xa8, + 0x49, 0x88, 0xb6, 0x12, 0x3c, 0xa5, 0xc4, 0x43, + 0x01, 0x9a, 0xb6, 0x33, 0x69, 0xe9, 0xdc, 0x57, + 0xf8, 0xb6, 0xc7, 0x32, 0xf4, 0xaa, 0xa8, 0x89, + 0x94, 0xb4, 0x3a, 0x2f, 0x87, 0xc7, 0x50, 0xab, + 0xab, 0xb9, 0xc9, 0x02, 0x09, 0x47, 0xba, 0xf1, + 0xf4, 0xc3, 0x29, 0x7c, 0xbf, 0x8b, 0x1c, 0x74, + 0x4d, 0x58, 0xaf, 0x97, 0x6f, 0xca, 0x58, 0xd7, + 0xc5, 0xd1, 0x0b, 0x13, 0x68, 0xe0, 0x04, 0xbd, + 0x3e, 0xe1, 0x77, 0x40, 0x99, 0x5f, 0x6a, 0x16, + 0x1f, 0x9f, 0x65, 0x25, 0x0d, 0x13, 0xcc, 0x04, + 0xa2, 0x90, 0x53, 0x9e, 0x5e, 0x1e, 0xa9, 0x8b, + 0xd6, 0xb5, 0xe3, 0x4e, 0x37, 0xdd, 0xc8, 0x29, + 0xf3, 0xb9, 0x42, 0xb4, 0x66, 0x3b, 0x77, 0xf4, + 0x9c, 0xe5, 0x9b, 0xc0, 0xab, 0x4a, 0xf8, 0x17, + 0xa4, 0x28, 0x6e, 0xab, 0x80, 0x73, 0xba, 0x89, + 0x78, 0xba, 0x5f, 0xef, 0x18, 0xbc, 0x5c, 0xbd, + 0xde, 0xeb, 0xa8, 0xd7, 0x14, 0x7d, 0x32, 0xf0, + 0xef, 0xd7, 0x5b, 0xff, 0x3c, 0x56, 0x3d, 0x99, + 0xe9, 0x9a, 0xe0, 0x7d, 0x27, 0x6c, 0x88, 0x6d, + 0x9d, 0xd0, 0xcc, 0xe2, 0x7f, 0x1d, 0xa6, 0x51, + 0xcd, 0xe2, 0x48, 0x6e, 0x15, 0x20, 0xab, 0x4c, + 0x01, 0x5e, 0x2b, 0xd3, 0x42, 0x2a, 0xa8, 0xd2, + 0x08, 0xbd, 0xa3, 0xa4, 0x95, 0x9c, 0x01, 0x5d, + 0x72, 0x53, 0xba, 0xb7, 0x35, 0xf8, 0x26, 0x92, + 0x51, 0xc3, 0x6d, 0xcd, 0x47, 0x6d, 0x3e, 0xd8, + 0x7d, 0x63, 0x5b, 0x04, 0xfd, 0xb4, 0xf7, 0xf4, + 0x46, 0xd0, 0x43, 0x5f, 0x1f, 0xea, 0x59, 0x39, + 0x7a, 0x22, 0xdb, 0xf6, 0x8f, 0x34, 0xb9, 0x10, + 0xba, 0xa2, 0xe6, 0x06, 0x47, 0x20, 0x01, 0xc1, + 0x65, 0xca, 0x48, 0x0f, 0xf5, 0x48, 0x1d, 0x1b, + 0x03, 0x27, 0x4a, 0xb8, 0x8f, 0x1d, 0xb4, 0xbb, + 0x67, 0xff, 0xf3, 0x71, 0xf1, 0x07, 0x58, 0x22, + 0x39, 0xea, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x6c, + 0x69, 0x62, 0x67, 0x69, 0x74, 0x67, 0x2d, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x2e, 0x63, 0x73, 0x73, + 0x90, 0x09, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x78, 0xda, 0x9d, 0x55, 0x4d, 0x8f, 0xda, 0x30, + 0x10, 0x3d, 0x93, 0x5f, 0x61, 0x69, 0x2f, 0x20, + 0xe1, 0x88, 0x2c, 0x85, 0x6d, 0xe1, 0xb2, 0xda, + 0xae, 0xba, 0xea, 0xa9, 0x52, 0xb7, 0xea, 0x15, + 0x39, 0x78, 0x12, 0x2c, 0x12, 0x3b, 0xb2, 0x0d, + 0x65, 0x55, 0xed, 0x7f, 0xaf, 0x1d, 0x07, 0x30, + 0x21, 0x09, 0xe9, 0x8a, 0x2f, 0x61, 0x7b, 0xde, + 0x9b, 0x37, 0x6f, 0x32, 0x0e, 0x53, 0xa6, 0x53, + 0x9c, 0xb0, 0x0c, 0xf0, 0x06, 0x08, 0x05, 0x89, + 0xfe, 0x06, 0x03, 0x2d, 0x09, 0x57, 0x4c, 0x33, + 0xc1, 0x17, 0x68, 0x12, 0x46, 0x0a, 0x01, 0x51, + 0x80, 0xc5, 0x4e, 0x2f, 0x83, 0x41, 0x4c, 0xd6, + 0xdb, 0x54, 0x8a, 0x1d, 0xa7, 0x78, 0x2d, 0x32, + 0x21, 0x17, 0xe8, 0x51, 0x6f, 0x20, 0x87, 0x55, + 0x9c, 0xae, 0xca, 0x85, 0x65, 0xf0, 0x1e, 0x04, + 0x61, 0x1d, 0x36, 0x84, 0x43, 0x41, 0x38, 0x05, + 0xfa, 0xff, 0xf8, 0x6a, 0x63, 0x00, 0x86, 0x35, + 0x96, 0xb1, 0x09, 0xfc, 0x32, 0x1b, 0x79, 0x64, + 0x94, 0x25, 0x09, 0xde, 0x33, 0xf8, 0x83, 0x53, + 0xc9, 0x68, 0xc9, 0xad, 0x2c, 0x59, 0x2c, 0xa4, + 0xe1, 0xc7, 0x5a, 0x14, 0x0b, 0x14, 0x15, 0x07, + 0xa4, 0x44, 0xc6, 0x28, 0x7a, 0x74, 0xcb, 0xca, + 0x01, 0x94, 0xb1, 0x19, 0xe3, 0xa0, 0xb0, 0x82, + 0x82, 0x48, 0xa2, 0x85, 0xf4, 0x62, 0x25, 0x4b, + 0x37, 0xda, 0x8f, 0xbe, 0x9d, 0x92, 0x87, 0x98, + 0xee, 0xb4, 0x36, 0x20, 0x0e, 0xeb, 0x1a, 0xf5, + 0xbe, 0x3f, 0xea, 0x8b, 0xd1, 0xf9, 0x6c, 0x80, + 0x7f, 0x1b, 0x95, 0xdf, 0x8c, 0xbe, 0x9f, 0x60, + 0x2a, 0x2a, 0x41, 0xfe, 0x82, 0x83, 0xb6, 0xc0, + 0x47, 0x43, 0x18, 0x57, 0x50, 0x16, 0x78, 0x0f, + 0xab, 0xc4, 0xb7, 0xa5, 0x0b, 0x20, 0xb4, 0xb5, + 0xf3, 0x51, 0x5c, 0x1e, 0xda, 0x6c, 0xb5, 0x20, + 0x20, 0xff, 0xcf, 0x57, 0x91, 0xe7, 0x4c, 0x3f, + 0x83, 0x26, 0x2c, 0xf3, 0xeb, 0x1e, 0x0b, 0xad, + 0x45, 0xee, 0x8a, 0x67, 0x1c, 0x56, 0xa0, 0x51, + 0x66, 0x85, 0x83, 0x1c, 0x1e, 0x3d, 0x70, 0xe2, + 0x2c, 0x91, 0x4d, 0x21, 0x5c, 0x97, 0x48, 0x38, + 0x07, 0xa5, 0x48, 0x0a, 0x48, 0x57, 0xe2, 0x7a, + 0x34, 0x5e, 0x77, 0xea, 0xa7, 0x2e, 0x51, 0x9a, + 0xe8, 0x73, 0x86, 0x2e, 0x35, 0x5b, 0x32, 0x7d, + 0x74, 0xa0, 0xca, 0x6b, 0x8c, 0xa2, 0xf0, 0x7e, + 0xb4, 0x3c, 0x1b, 0x46, 0x28, 0xdb, 0xa9, 0x05, + 0x9a, 0x15, 0x87, 0x1e, 0x8d, 0x6a, 0x5a, 0xda, + 0x73, 0xf0, 0xc1, 0x5a, 0x38, 0x28, 0x08, 0xa5, + 0x8c, 0xa7, 0x8e, 0xd2, 0xc0, 0x94, 0xbf, 0xd3, + 0x12, 0x0e, 0x5f, 0xa4, 0x87, 0x63, 0x22, 0xcd, + 0x93, 0xe3, 0x3a, 0xa4, 0xe4, 0xab, 0x0b, 0x08, + 0xb9, 0xc0, 0x89, 0x24, 0x39, 0xf8, 0x4a, 0x26, + 0x0d, 0xe7, 0x0c, 0x25, 0xd0, 0x71, 0x6d, 0x51, + 0x42, 0x2e, 0xf6, 0xd7, 0xcb, 0x47, 0xcc, 0xe6, + 0xa0, 0xd3, 0x6e, 0x15, 0xfd, 0x21, 0xe6, 0x72, + 0x11, 0x0b, 0x9e, 0xbd, 0x7d, 0x90, 0xfc, 0x0c, + 0xd0, 0xdc, 0x15, 0x77, 0x94, 0x26, 0x09, 0xa5, + 0xd7, 0xb6, 0x99, 0x3a, 0xa3, 0x49, 0xf5, 0x99, + 0x36, 0x96, 0xb4, 0x84, 0x0e, 0x29, 0x91, 0xdb, + 0xf6, 0xac, 0xcb, 0xed, 0x66, 0x66, 0x99, 0xc6, + 0xc3, 0x87, 0xcf, 0xa6, 0x6b, 0x66, 0x9f, 0xc6, + 0x68, 0x3e, 0x6a, 0x23, 0x58, 0x50, 0x26, 0x87, + 0x52, 0x67, 0xa3, 0x6e, 0x89, 0xa7, 0x63, 0xfe, + 0xc8, 0xa8, 0xa4, 0x54, 0x12, 0x8e, 0x92, 0x1a, + 0x98, 0x5a, 0x0c, 0xae, 0x96, 0xbb, 0xeb, 0x7f, + 0xab, 0x39, 0x7c, 0x90, 0x16, 0x0f, 0xac, 0x03, + 0x4d, 0x1e, 0x34, 0x25, 0xee, 0x2a, 0xda, 0x92, + 0x7e, 0xc7, 0x66, 0x07, 0xbf, 0x75, 0x22, 0x9a, + 0x1b, 0x17, 0x26, 0xe6, 0x3d, 0x6a, 0x2f, 0xcf, + 0x6d, 0x2b, 0xea, 0x07, 0x1b, 0xcc, 0xb8, 0xdd, + 0x57, 0x5d, 0x55, 0xef, 0xf1, 0x3c, 0xf4, 0x32, + 0xad, 0xf6, 0x58, 0x5c, 0xa5, 0x78, 0x35, 0xbd, + 0x7f, 0x14, 0xf6, 0x02, 0x56, 0xe8, 0x45, 0x6f, + 0x5f, 0x0b, 0xc6, 0x9f, 0xcc, 0x2d, 0x25, 0xf8, + 0xb8, 0xed, 0x88, 0xdb, 0xb6, 0xd0, 0xa7, 0x19, + 0x66, 0x75, 0xcf, 0x2b, 0x2f, 0xe7, 0x1d, 0x04, + 0x3d, 0xef, 0xe0, 0x8c, 0xf0, 0x74, 0x67, 0x06, + 0xbe, 0x37, 0xd5, 0xae, 0xfb, 0x0a, 0x22, 0xfb, + 0x5a, 0x36, 0x0b, 0xbc, 0x48, 0xcd, 0x6b, 0xad, + 0x7e, 0xd0, 0xb3, 0xa9, 0x7d, 0x5d, 0xa8, 0xf8, + 0x9e, 0x9b, 0xa0, 0x57, 0x46, 0xe1, 0xe9, 0xcd, + 0x7e, 0x87, 0x22, 0xbb, 0x98, 0x79, 0xd1, 0xe4, + 0x24, 0xe5, 0xce, 0xb6, 0x7b, 0x92, 0x74, 0x46, + 0x73, 0x77, 0xbd, 0x36, 0x47, 0xbb, 0x91, 0xf5, + 0x1e, 0xfc, 0x03, 0x39, 0xf4, 0x48, 0xd2, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x67, + 0x69, 0x74, 0x67, 0x2d, 0x64, 0x69, 0x66, 0x66, 0x2d, 0x76, 0x69, 0x65, 0x77, 0x2d, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x8a, 0x07, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, @@ -876,11 +1017,8 @@ 0x79, 0xf5, 0x1b, 0xd9, 0xc8, 0xbf, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x67, - 0x69, 0x74, 0x67, 0x2f, 0x06, 0x00, 0x00, 0x00, - 0x6f, 0x72, 0x67, 0x2f, 0x00, 0x00, 0x00, 0x00, - 0x67, 0x69, 0x74, 0x67, 0x2d, 0x64, 0x69, 0x66, - 0x66, 0x2d, 0x76, 0x69, 0x65, 0x77, 0x2e, 0x75, - 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x69, 0x74, 0x67, 0x2d, 0x64, 0x69, 0x66, 0x66, + 0x2d, 0x76, 0x69, 0x65, 0x77, 0x2e, 0x75, 0x69, 0x5a, 0x0c, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x78, 0xda, 0xd5, 0x57, 0x4d, 0x6f, 0xdb, 0x30, 0x0c, 0xbd, 0xf7, 0x57, 0x68, 0xba, 0x0e, 0x4e, @@ -1010,123 +1148,62 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x6c, - 0x69, 0x62, 0x67, 0x69, 0x74, 0x67, 0x2d, 0x73, - 0x74, 0x79, 0x6c, 0x65, 0x2e, 0x63, 0x73, 0x73, - 0x14, 0x09, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x78, 0xda, 0x9d, 0x55, 0x4d, 0x8f, 0xda, 0x30, - 0x10, 0x3d, 0xc3, 0xaf, 0xb0, 0xd4, 0x0b, 0x48, - 0x38, 0x82, 0xa5, 0xb0, 0x6d, 0xb8, 0xac, 0xda, - 0x55, 0xf7, 0x58, 0xa9, 0xad, 0x7a, 0x45, 0x0e, - 0x9e, 0x04, 0x8b, 0xc4, 0x8e, 0xec, 0x81, 0x52, - 0x55, 0xfd, 0xef, 0xb5, 0x93, 0x00, 0xde, 0x7c, - 0x91, 0xae, 0x02, 0x42, 0x8c, 0x3d, 0xef, 0xcd, - 0x9b, 0x37, 0x76, 0x82, 0x44, 0x60, 0x42, 0x63, - 0x91, 0x02, 0xdd, 0x03, 0xe3, 0xa0, 0xc9, 0x9f, - 0xf1, 0x08, 0x35, 0x93, 0x46, 0xa0, 0x50, 0x32, - 0x24, 0xf3, 0x60, 0x61, 0x08, 0x30, 0x03, 0x54, - 0x1d, 0x71, 0x33, 0x1e, 0x45, 0x6c, 0x77, 0x48, - 0xb4, 0x3a, 0x4a, 0x4e, 0x77, 0x2a, 0x55, 0x3a, - 0x24, 0x4f, 0xb8, 0x87, 0x0c, 0xb6, 0x51, 0xb2, - 0x2d, 0x02, 0x9b, 0xf1, 0xdf, 0xf1, 0x38, 0xa8, - 0xc3, 0x06, 0x70, 0xce, 0x99, 0xe4, 0xc0, 0xff, - 0x1f, 0xdf, 0xec, 0x2d, 0xc0, 0xa4, 0xc6, 0x32, - 0xb3, 0x89, 0x1f, 0x57, 0x53, 0x8f, 0x8c, 0x8b, - 0x38, 0xa6, 0x27, 0x01, 0xbf, 0x68, 0xa2, 0x05, - 0x2f, 0xb8, 0x8d, 0x23, 0x8b, 0x94, 0xb6, 0xfc, - 0x14, 0x55, 0x1e, 0x92, 0x45, 0x7e, 0x26, 0x46, - 0xa5, 0x82, 0x93, 0xa7, 0x32, 0x6c, 0x4a, 0x80, - 0x22, 0x37, 0x15, 0x12, 0x0c, 0x35, 0x90, 0x33, - 0xcd, 0x50, 0x69, 0x2f, 0x57, 0x8b, 0x64, 0x8f, - 0x7e, 0xf6, 0xfd, 0x92, 0x3c, 0xc4, 0xe4, 0x88, - 0x68, 0x41, 0x4a, 0xac, 0x26, 0xea, 0xc3, 0x70, - 0xd4, 0x17, 0xab, 0xf3, 0xd9, 0x02, 0xff, 0xb4, - 0x2a, 0xbf, 0x58, 0x7d, 0xdf, 0xc0, 0x76, 0x54, - 0x83, 0xfe, 0x01, 0x67, 0x74, 0xc0, 0x17, 0x43, - 0x84, 0x34, 0x50, 0x34, 0xf8, 0x04, 0xdb, 0xd8, - 0xb7, 0xa5, 0x0f, 0x20, 0x70, 0xbd, 0xf3, 0x51, - 0xca, 0x3a, 0xd0, 0x2e, 0x75, 0x20, 0x10, 0xff, - 0xcf, 0x67, 0x95, 0x65, 0x02, 0x9f, 0x01, 0x99, - 0x48, 0xfd, 0xbe, 0x47, 0x0a, 0x51, 0x65, 0x65, - 0xf3, 0xac, 0xc3, 0x06, 0x90, 0xa4, 0x4e, 0x38, - 0xe8, 0xc9, 0xc5, 0x83, 0x52, 0x9c, 0x23, 0x72, - 0x25, 0x04, 0xbb, 0x02, 0x89, 0x66, 0x60, 0x0c, - 0x4b, 0x80, 0x60, 0x25, 0x6e, 0xc0, 0xe0, 0xf5, - 0x97, 0x7e, 0x9d, 0x12, 0x83, 0x0c, 0x6f, 0x15, - 0x96, 0xa5, 0xb9, 0x96, 0xe1, 0xc5, 0x81, 0xaa, - 0xae, 0x19, 0x59, 0x04, 0x0f, 0xd3, 0xcd, 0xcd, - 0x30, 0xc6, 0xc5, 0xd1, 0x84, 0x64, 0x95, 0x9f, - 0x07, 0x0c, 0xaa, 0x1d, 0x69, 0xcf, 0xc1, 0x47, - 0x67, 0xe1, 0x28, 0x67, 0x9c, 0x0b, 0x99, 0x94, - 0x94, 0x16, 0xa6, 0xf8, 0x5d, 0x16, 0x70, 0xf4, - 0x55, 0x79, 0x34, 0x62, 0xda, 0x9e, 0x9c, 0x72, - 0x42, 0x0a, 0xbe, 0xba, 0x80, 0x40, 0x2a, 0x1a, - 0x6b, 0x96, 0x81, 0xaf, 0x64, 0xde, 0xb2, 0xcf, - 0x52, 0x02, 0x9f, 0xd5, 0x82, 0x1a, 0x32, 0x75, - 0x6a, 0x86, 0x2f, 0x98, 0xed, 0x49, 0xd7, 0xd5, - 0x2a, 0xfb, 0x4d, 0xcc, 0x45, 0x90, 0x2a, 0x99, - 0xfe, 0x7e, 0x23, 0xf9, 0x0d, 0xa0, 0x7d, 0x2a, - 0xde, 0x71, 0x1e, 0xc7, 0x9c, 0x37, 0x6d, 0xb3, - 0x7d, 0x26, 0xf3, 0xea, 0xbb, 0x6c, 0x6d, 0x69, - 0x01, 0x1d, 0x70, 0xa6, 0x0f, 0xdd, 0x55, 0x17, - 0xcb, 0xed, 0xcc, 0x3a, 0x89, 0x26, 0x8f, 0x1f, - 0xec, 0xd4, 0xac, 0xde, 0xcf, 0xc8, 0x7a, 0xda, - 0x45, 0x10, 0x72, 0xa1, 0x27, 0x1a, 0xd3, 0x69, - 0xbf, 0xc4, 0xeb, 0x36, 0xff, 0xca, 0xa8, 0xa4, - 0x54, 0x12, 0x2e, 0x92, 0x5a, 0x98, 0x3a, 0x0c, - 0xae, 0xc2, 0xfd, 0xfd, 0xbf, 0x37, 0x1c, 0x3e, - 0x48, 0x87, 0x07, 0xce, 0x81, 0x36, 0x0f, 0xda, - 0x0a, 0x2f, 0x3b, 0xda, 0x51, 0x7e, 0xcf, 0x62, - 0x0f, 0xbf, 0x73, 0x62, 0xb1, 0xb6, 0x2e, 0xcc, - 0xed, 0x67, 0xda, 0xdd, 0x9e, 0xfb, 0x56, 0xd4, - 0x37, 0xb6, 0x98, 0x71, 0x7f, 0xae, 0xfa, 0xba, - 0x3e, 0xe0, 0x3c, 0x0c, 0x32, 0xad, 0x76, 0x2c, - 0x1a, 0x25, 0x36, 0x6e, 0xef, 0xaf, 0xb9, 0x7b, - 0x01, 0x1b, 0xf2, 0x82, 0x87, 0xef, 0xb9, 0x90, - 0x9f, 0xec, 0x5b, 0x4a, 0xc9, 0x59, 0xd7, 0x96, - 0x72, 0xd9, 0x41, 0x5f, 0xef, 0x30, 0xa7, 0x7b, - 0x5d, 0x79, 0xb9, 0xee, 0x21, 0x18, 0xf8, 0x0e, - 0x4e, 0x99, 0x4c, 0x8e, 0xf6, 0xc2, 0xf7, 0x6e, - 0xb5, 0xe6, 0x5c, 0xc1, 0xc2, 0x3d, 0x9b, 0x76, - 0x81, 0xaf, 0x4a, 0xf3, 0x46, 0x6b, 0x18, 0xf4, - 0x6a, 0xe9, 0x1e, 0x97, 0xf6, 0x0f, 0xb3, 0x8c, - 0x1f, 0x97, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x67, + 0x69, 0x74, 0x67, 0x2d, 0x64, 0x69, 0x66, 0x66, + 0x2d, 0x76, 0x69, 0x65, 0x77, 0x2d, 0x66, 0x69, + 0x6c, 0x65, 0x2d, 0x72, 0x65, 0x6e, 0x64, 0x65, + 0x72, 0x65, 0x72, 0x2d, 0x62, 0x69, 0x6e, 0x61, + 0x72, 0x79, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, + 0xd4, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x78, 0xda, 0x95, 0x52, 0x5d, 0x4f, 0xdc, 0x40, + 0x0c, 0x7c, 0xe7, 0x57, 0x18, 0xbf, 0x56, 0xb9, + 0x70, 0x45, 0xaa, 0x8a, 0x94, 0x2c, 0x2a, 0xa2, + 0x97, 0x56, 0x42, 0x05, 0xa1, 0xa3, 0x3c, 0xa2, + 0x4d, 0xe2, 0xe4, 0xdc, 0xdb, 0xec, 0xa6, 0x5e, + 0xdf, 0x1d, 0xf7, 0xef, 0x59, 0x3e, 0xae, 0x50, + 0x1e, 0xa0, 0x7d, 0xb3, 0xe5, 0x99, 0xb1, 0xc6, + 0x9e, 0xe2, 0xf8, 0x76, 0x70, 0xb0, 0x26, 0x89, + 0x1c, 0x7c, 0x89, 0xd3, 0xc9, 0x01, 0x02, 0xf9, + 0x26, 0xb4, 0xec, 0xfb, 0x12, 0xaf, 0xe6, 0xb3, + 0xec, 0x33, 0x1e, 0x9b, 0xbd, 0x62, 0x3f, 0xcb, + 0xa0, 0x22, 0x4f, 0x62, 0x95, 0x5a, 0xd8, 0xb0, + 0x2e, 0xa0, 0x77, 0xb6, 0x25, 0x38, 0x9c, 0x4c, + 0x8f, 0x26, 0x07, 0x90, 0x65, 0x09, 0xc4, 0x5e, + 0x49, 0x3a, 0xdb, 0x90, 0x29, 0x84, 0x7e, 0xaf, + 0x58, 0x28, 0x82, 0xe3, 0xba, 0xc4, 0x5e, 0x97, + 0x1f, 0xf0, 0x79, 0x4b, 0xe2, 0x7c, 0xc2, 0xdc, + 0x14, 0x4a, 0xc3, 0xe8, 0x92, 0x20, 0x34, 0xce, + 0xc6, 0x58, 0x62, 0xc5, 0xda, 0x9f, 0x72, 0xd7, + 0xfd, 0x64, 0xda, 0xcc, 0xd8, 0xd1, 0x25, 0xf9, + 0x96, 0x84, 0xe4, 0x84, 0xbd, 0x95, 0x2d, 0xc2, + 0x68, 0x85, 0xbc, 0x26, 0x9c, 0x2e, 0x2b, 0xe1, + 0x16, 0x4d, 0x31, 0x4a, 0x18, 0x49, 0x74, 0x0b, + 0xde, 0x0e, 0x54, 0xe2, 0x9a, 0x23, 0xd7, 0x8e, + 0xd0, 0xcc, 0x65, 0x45, 0x45, 0xbe, 0x9b, 0x9a, + 0xa2, 0x59, 0xb0, 0x6b, 0x4d, 0x11, 0xea, 0x5f, + 0xd4, 0xe8, 0x9f, 0x75, 0xba, 0x3c, 0xb3, 0x35, + 0xb9, 0xff, 0xd0, 0x79, 0x85, 0x73, 0x0f, 0x74, + 0x50, 0xb1, 0x3e, 0x26, 0x23, 0x36, 0x71, 0x4a, + 0xdc, 0x52, 0x44, 0x73, 0xe5, 0xef, 0x1b, 0xd0, + 0x00, 0x2d, 0xc7, 0x64, 0x72, 0x0b, 0xcd, 0xc2, + 0xfa, 0x3e, 0x1d, 0xa4, 0x0b, 0x02, 0xf5, 0x83, + 0x21, 0xe8, 0x92, 0xc7, 0x37, 0xd4, 0x07, 0x2b, + 0x3d, 0xfb, 0x4c, 0xc3, 0x88, 0xe6, 0xf0, 0x7d, + 0x5c, 0x54, 0x2b, 0x8a, 0x66, 0xfa, 0xf1, 0x7d, + 0x68, 0xba, 0xeb, 0xbf, 0x01, 0xeb, 0xa0, 0x1a, + 0x06, 0x34, 0x47, 0x6f, 0x40, 0x23, 0xf9, 0xc8, + 0xca, 0xeb, 0x74, 0xae, 0x99, 0x75, 0xf1, 0x2f, + 0x47, 0x56, 0x55, 0xb8, 0x5e, 0x29, 0xc5, 0x17, + 0xf5, 0x13, 0x6f, 0x43, 0xdc, 0x2f, 0x34, 0xc5, + 0xc2, 0xba, 0x55, 0x6a, 0x2f, 0xbe, 0xfc, 0xa8, + 0xce, 0x6f, 0xae, 0xbf, 0x7e, 0xaf, 0xbe, 0xcd, + 0x6f, 0x4e, 0xce, 0xcf, 0x4e, 0xef, 0x13, 0x92, + 0xbf, 0x14, 0xc8, 0x1f, 0xdf, 0x97, 0x8a, 0xa7, + 0x77, 0xe6, 0xbb, 0x00, 0xa5, 0xf2, 0x39, 0x7b, + 0x7b, 0x77, 0xec, 0xfd, 0x00, 0x36, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1144,62 +1221,199 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x67, 0x69, 0x74, 0x67, 0x2d, 0x64, 0x69, 0x66, 0x66, - 0x2d, 0x76, 0x69, 0x65, 0x77, 0x2d, 0x66, 0x69, - 0x6c, 0x65, 0x2d, 0x72, 0x65, 0x6e, 0x64, 0x65, - 0x72, 0x65, 0x72, 0x2d, 0x74, 0x65, 0x78, 0x74, - 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x94, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x78, 0xda, 0x8d, 0x93, 0x41, 0x4f, 0xe3, 0x30, - 0x10, 0x85, 0xef, 0xfc, 0x0a, 0xe3, 0xeb, 0x2a, - 0x2d, 0x15, 0x12, 0x02, 0x29, 0x31, 0x12, 0x5a, - 0x95, 0x3b, 0x5b, 0xb8, 0x46, 0x8e, 0xf3, 0x92, - 0x0c, 0x75, 0xec, 0xec, 0xd8, 0x69, 0xcb, 0xbf, - 0xc7, 0xa5, 0x94, 0x22, 0x81, 0x08, 0x27, 0x5b, - 0xf2, 0xf7, 0xc6, 0x6f, 0x9e, 0xc7, 0xf9, 0xed, - 0xae, 0xb7, 0x62, 0x03, 0x0e, 0xe4, 0x5d, 0x21, - 0x17, 0xb3, 0x0b, 0x29, 0xe0, 0x8c, 0xaf, 0xc9, - 0xb5, 0x85, 0x7c, 0x5c, 0x2d, 0xb3, 0x6b, 0x79, - 0xab, 0xce, 0xf2, 0xf3, 0x2c, 0x13, 0xf7, 0x70, - 0x60, 0x1d, 0x51, 0x8b, 0x2d, 0xc5, 0x4e, 0xb4, - 0x56, 0xd7, 0x10, 0x97, 0xb3, 0xc5, 0xcd, 0xec, - 0x42, 0x64, 0x59, 0x82, 0xc8, 0x45, 0x70, 0xa3, - 0x0d, 0x54, 0xce, 0xf8, 0x3f, 0x12, 0x23, 0x08, - 0x4b, 0x55, 0x21, 0xdb, 0xb8, 0xfe, 0x23, 0x4f, - 0xb7, 0x24, 0xcd, 0x95, 0x9c, 0xab, 0x3c, 0xa2, - 0x1f, 0x6c, 0x2a, 0x28, 0x8c, 0xd5, 0x21, 0x14, - 0xf2, 0x9e, 0x62, 0xfb, 0x97, 0x9a, 0xe6, 0x89, - 0xb0, 0x5d, 0x92, 0xc5, 0x03, 0x5c, 0x0d, 0x06, - 0xaf, 0xb0, 0x8b, 0x52, 0x0c, 0x9a, 0xe1, 0x62, - 0xa2, 0xe2, 0xfa, 0x9f, 0x1f, 0xd9, 0x60, 0x8f, - 0x49, 0x95, 0x0f, 0xec, 0x07, 0x70, 0x7c, 0x11, - 0x4e, 0xf7, 0x28, 0xe4, 0x86, 0x02, 0x55, 0x16, - 0x52, 0xad, 0x78, 0x44, 0x3e, 0x3f, 0x9e, 0x7e, - 0xe1, 0x8c, 0x76, 0x65, 0xe3, 0xcd, 0x18, 0x26, - 0xc9, 0xd0, 0xf9, 0x6d, 0x69, 0xc9, 0xa1, 0x74, - 0x63, 0x5f, 0xa5, 0x26, 0xa4, 0x5a, 0x6a, 0x1b, - 0x7e, 0x92, 0xa0, 0xa6, 0xa8, 0xdf, 0x5c, 0x4c, - 0x91, 0x66, 0xe4, 0xe0, 0xb9, 0xfc, 0x70, 0x3d, - 0xc5, 0xf7, 0xde, 0xf9, 0x30, 0xa4, 0x8c, 0x27, - 0x6d, 0x77, 0xd8, 0x0d, 0xda, 0xd5, 0x93, 0xdc, - 0x40, 0x3b, 0xd8, 0x50, 0xea, 0xca, 0x6f, 0xf0, - 0xd6, 0x66, 0xea, 0x6f, 0x31, 0xcd, 0x57, 0xb0, - 0xef, 0xb1, 0x4c, 0xf0, 0x16, 0x4d, 0x2c, 0x7b, - 0xcd, 0x2d, 0x39, 0xa9, 0xae, 0x7e, 0x00, 0x99, - 0xda, 0xee, 0x77, 0x64, 0x35, 0x36, 0x0d, 0x58, - 0xaa, 0xc3, 0xfa, 0x19, 0x9c, 0x1f, 0x67, 0x4a, - 0xe5, 0xbe, 0x7a, 0x86, 0x89, 0x1f, 0xb3, 0x75, - 0x9c, 0x9a, 0xbb, 0x83, 0x56, 0x50, 0x7d, 0xaa, - 0xf3, 0x25, 0xba, 0xe4, 0xc4, 0xbe, 0xbb, 0x89, - 0xa6, 0x4b, 0x7f, 0xa1, 0xac, 0x58, 0x9b, 0x35, - 0xe2, 0x2f, 0xde, 0x9e, 0x92, 0x01, 0x32, 0x14, - 0xcb, 0xc8, 0x9a, 0xec, 0x5e, 0xeb, 0xb0, 0xdd, - 0xe7, 0xf4, 0x8d, 0x74, 0x7e, 0x30, 0x99, 0x36, - 0xa7, 0xbf, 0x73, 0xf6, 0x0a, 0x69, 0x87, 0x4e, - 0xa3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x2d, 0x76, 0x69, 0x65, 0x77, 0x2d, 0x63, 0x6f, + 0x6d, 0x6d, 0x69, 0x74, 0x2d, 0x64, 0x65, 0x74, + 0x61, 0x69, 0x6c, 0x73, 0x2e, 0x75, 0x69, 0x00, + 0xcd, 0x1c, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x78, 0xda, 0xed, 0x59, 0xdb, 0x6e, 0xe3, 0x36, + 0x10, 0x7d, 0xdf, 0xaf, 0x60, 0xf9, 0x90, 0x97, + 0x42, 0xbe, 0xc4, 0x68, 0xb0, 0x45, 0x6c, 0x6d, + 0xdb, 0xbd, 0x04, 0x05, 0x5a, 0xa0, 0x0f, 0xdb, + 0xbe, 0x0a, 0x23, 0x69, 0x2c, 0x4d, 0x4d, 0x5d, + 0x4a, 0x52, 0xbe, 0xec, 0xd7, 0xef, 0xe8, 0xe2, + 0xc4, 0x6b, 0x27, 0xb2, 0x12, 0x28, 0x6a, 0x02, + 0xac, 0x81, 0x20, 0x94, 0x75, 0x48, 0xce, 0x0c, + 0x0f, 0xcf, 0x0c, 0xe9, 0xf9, 0xbb, 0x6d, 0xa2, + 0xc4, 0x1a, 0xb5, 0xa1, 0x2c, 0x5d, 0xc8, 0xe9, + 0x68, 0x22, 0x05, 0xa6, 0x41, 0x16, 0x52, 0x1a, + 0x2d, 0xe4, 0xdf, 0x9f, 0x3f, 0x39, 0x6f, 0xe5, + 0x3b, 0xf7, 0xcd, 0xfc, 0x07, 0xc7, 0x11, 0x37, + 0x98, 0xa2, 0x06, 0x8b, 0xa1, 0xd8, 0x90, 0x8d, + 0x45, 0xa4, 0x20, 0x44, 0x31, 0x1b, 0x4d, 0x7f, + 0x1e, 0x4d, 0x84, 0xe3, 0x30, 0x88, 0x52, 0x8b, + 0x7a, 0x09, 0x01, 0xba, 0x73, 0x8d, 0xff, 0x15, + 0xa4, 0xd1, 0x08, 0x45, 0xfe, 0x42, 0x46, 0x76, + 0xf5, 0xa3, 0xbc, 0x9b, 0x85, 0xfb, 0x5c, 0xca, + 0xb1, 0x3b, 0xb7, 0x98, 0xe4, 0x8a, 0x07, 0x14, + 0x81, 0x02, 0x63, 0x16, 0xf2, 0x86, 0x6c, 0xf4, + 0x81, 0x96, 0xcb, 0x7f, 0x08, 0x37, 0xef, 0xb3, + 0x24, 0x21, 0xfb, 0x01, 0x2d, 0x90, 0x32, 0x52, + 0xe4, 0xa0, 0x31, 0xb5, 0x0c, 0xb1, 0xab, 0x1b, + 0x4d, 0xa1, 0x74, 0xe7, 0xb9, 0xce, 0x72, 0xd4, + 0x76, 0x27, 0x52, 0x48, 0x70, 0x21, 0xd7, 0x64, + 0xc8, 0x57, 0x28, 0xdd, 0xcf, 0xba, 0xc0, 0xf9, + 0x78, 0xff, 0xf6, 0x04, 0x17, 0x40, 0xea, 0x2d, + 0xb3, 0xa0, 0x30, 0xd2, 0xfd, 0x04, 0xca, 0xb4, + 0x41, 0x33, 0x4d, 0x3c, 0x27, 0x58, 0xb6, 0x59, + 0xba, 0x6c, 0xbc, 0xa5, 0x00, 0x54, 0x0b, 0x5e, + 0x67, 0x1b, 0xcf, 0xe4, 0x10, 0x70, 0xe8, 0xa4, + 0x3b, 0xbd, 0x3c, 0x44, 0x06, 0x31, 0xa9, 0xd0, + 0x9d, 0x67, 0xfe, 0xbf, 0x18, 0xd8, 0x5b, 0x77, + 0x1b, 0x5f, 0x04, 0x85, 0x1c, 0x22, 0x6e, 0x79, + 0x94, 0x72, 0x84, 0x07, 0xf1, 0x2d, 0x01, 0x1d, + 0x51, 0xea, 0xd9, 0x2c, 0x3f, 0x36, 0xf5, 0x7e, + 0xa0, 0xb1, 0xa0, 0x6d, 0x37, 0x28, 0xa6, 0xe1, + 0x19, 0x60, 0x4b, 0xa0, 0x8e, 0x3d, 0xca, 0x54, + 0x91, 0xa4, 0x77, 0xe0, 0xab, 0x2e, 0x41, 0xfd, + 0x3d, 0x81, 0x08, 0xeb, 0xa8, 0x52, 0xd9, 0xf4, + 0x60, 0x0d, 0x6c, 0xfe, 0x20, 0x71, 0x8d, 0x41, + 0x51, 0xc4, 0x74, 0x09, 0xb0, 0xdc, 0x0b, 0x2d, + 0xc0, 0x75, 0x57, 0x60, 0x4e, 0x5b, 0x54, 0x9e, + 0xa1, 0x2f, 0x6c, 0xe7, 0x4f, 0x93, 0x16, 0x20, + 0x05, 0x59, 0xea, 0x95, 0x4d, 0xe9, 0xd6, 0x0e, + 0x3b, 0x21, 0x2e, 0xa1, 0x50, 0xd6, 0x31, 0xbb, + 0xc4, 0xcf, 0x14, 0x05, 0x87, 0x9d, 0xc7, 0x75, + 0xd8, 0x78, 0x14, 0x08, 0x56, 0x1c, 0xdb, 0x93, + 0xe1, 0x14, 0x2e, 0xad, 0x07, 0xd6, 0x42, 0x10, + 0x4b, 0xb7, 0x6d, 0x5e, 0xe6, 0xd0, 0xfd, 0xb8, + 0xf1, 0xed, 0xd0, 0xe3, 0x66, 0xa9, 0x3a, 0x6e, + 0x03, 0x28, 0x6c, 0x9c, 0x69, 0x2f, 0xa8, 0x24, + 0xc0, 0x0e, 0xb4, 0x23, 0x62, 0xdc, 0xe6, 0x50, + 0x52, 0xf7, 0x78, 0xc8, 0x87, 0x8c, 0xfe, 0x03, + 0x7c, 0x54, 0xb5, 0xd5, 0xaa, 0x6c, 0x36, 0x66, + 0xf7, 0x62, 0xec, 0x19, 0xe4, 0x9e, 0x65, 0xd5, + 0xae, 0xec, 0x40, 0xb2, 0x73, 0xb8, 0xca, 0x7e, + 0xe9, 0xfe, 0x5a, 0x39, 0x50, 0x7d, 0x27, 0x2e, + 0x20, 0xc9, 0xaf, 0x95, 0xbd, 0xbe, 0xe0, 0x3f, + 0x10, 0xb1, 0xc6, 0xe5, 0x42, 0x62, 0xc2, 0x62, + 0xfc, 0x0b, 0x6e, 0xf9, 0x95, 0xc2, 0x11, 0x2f, + 0x8f, 0xbc, 0x88, 0xec, 0xf5, 0xc9, 0xb7, 0x65, + 0x97, 0x31, 0x94, 0xaf, 0xaa, 0x41, 0xf8, 0x7f, + 0xcb, 0xd4, 0x06, 0x15, 0x87, 0x15, 0xba, 0xc4, + 0x07, 0x95, 0xa2, 0xbc, 0xde, 0x08, 0xac, 0x31, + 0x2d, 0xc0, 0xc2, 0xa0, 0xc7, 0x62, 0xb4, 0x2a, + 0xf2, 0xb3, 0x63, 0x5a, 0xcd, 0x1c, 0xf5, 0xca, + 0x15, 0xe2, 0xbc, 0xe6, 0x29, 0x4a, 0x57, 0xf7, + 0x51, 0xe5, 0x45, 0x6d, 0x96, 0x07, 0x78, 0xe7, + 0x85, 0x9c, 0x49, 0x5f, 0x3f, 0xf9, 0x4a, 0x2f, + 0x06, 0xa6, 0xcb, 0x61, 0x2e, 0x9c, 0x1d, 0xe2, + 0x78, 0xa1, 0x34, 0xf9, 0x85, 0x45, 0x73, 0xd0, + 0xde, 0x1b, 0xc2, 0xb5, 0x00, 0x27, 0x19, 0x76, + 0xb2, 0xe0, 0xa7, 0xc9, 0xe8, 0xed, 0xec, 0x9b, + 0x4f, 0x59, 0xde, 0x8c, 0x0f, 0xfb, 0x1b, 0xbb, + 0x53, 0x5c, 0x17, 0x55, 0xcb, 0xd8, 0x0c, 0x11, + 0x52, 0xe2, 0xd4, 0xce, 0x97, 0xe0, 0x06, 0xf0, + 0x3c, 0x54, 0x9b, 0xf6, 0x44, 0xb5, 0x7e, 0x25, + 0x79, 0x60, 0xa2, 0x1d, 0xae, 0xf3, 0xd5, 0x79, + 0x42, 0xbe, 0x6f, 0x7c, 0x0d, 0x85, 0xbf, 0x13, + 0xfb, 0x87, 0xef, 0xea, 0x38, 0x94, 0x3a, 0x5e, + 0xf6, 0x4d, 0xd9, 0xd7, 0x2e, 0x90, 0x77, 0x14, + 0xfc, 0xae, 0x91, 0xcf, 0x41, 0xb8, 0x59, 0x3b, + 0xe1, 0x1e, 0x37, 0xe9, 0x74, 0xe0, 0x1a, 0xc0, + 0x14, 0x15, 0xe4, 0x15, 0xd3, 0xfb, 0x4f, 0x34, + 0x86, 0x0f, 0x6b, 0x2d, 0xc0, 0x8d, 0x86, 0xf3, + 0x92, 0xd5, 0x0b, 0xf9, 0x07, 0x48, 0xc2, 0xc7, + 0xbe, 0x51, 0x68, 0x9f, 0x2e, 0x7a, 0x47, 0xe7, + 0xa7, 0xfa, 0xb2, 0xc4, 0xb0, 0xf4, 0xa5, 0x16, + 0xe8, 0xc5, 0x5d, 0x29, 0x7c, 0x73, 0xfc, 0xbf, + 0xea, 0xfb, 0xf4, 0x7f, 0xb2, 0x35, 0x9a, 0x68, + 0x0c, 0xb1, 0x35, 0x6a, 0x2a, 0x0b, 0x4e, 0x9b, + 0xa9, 0x51, 0x50, 0xb1, 0x70, 0x21, 0x77, 0xc8, + 0x1d, 0xff, 0xaa, 0x8d, 0x68, 0xe9, 0xbb, 0x6d, + 0xb6, 0xcb, 0xa4, 0xab, 0xba, 0x6e, 0x90, 0xa2, + 0xd8, 0xde, 0xca, 0x2b, 0x9f, 0xf0, 0xc3, 0x13, + 0x45, 0x7d, 0xc9, 0xa7, 0xfc, 0x3e, 0xd7, 0xa5, + 0x23, 0x37, 0xbb, 0xdc, 0x62, 0x3d, 0x78, 0x0f, + 0xf0, 0xd8, 0xdb, 0xc1, 0xff, 0xa5, 0x92, 0x1f, + 0xa0, 0x16, 0x7b, 0x92, 0x72, 0xdd, 0xda, 0xf5, + 0x48, 0x92, 0xf8, 0x99, 0xb5, 0x5c, 0x49, 0x0f, + 0x7e, 0xdd, 0xcb, 0x47, 0x51, 0xfa, 0x52, 0xca, + 0xa7, 0xea, 0xcc, 0xaa, 0x59, 0x1f, 0x57, 0xa3, + 0x0d, 0x70, 0xef, 0x76, 0x27, 0xc5, 0xfb, 0x58, + 0x11, 0x96, 0x55, 0xbe, 0x0a, 0x1b, 0x36, 0x4f, + 0xde, 0x92, 0x14, 0x0e, 0xa2, 0x7a, 0xfb, 0x44, + 0xef, 0x03, 0x27, 0x5f, 0x4e, 0x37, 0x87, 0xd0, + 0x47, 0x97, 0x74, 0xe7, 0xf8, 0xf1, 0x71, 0xcd, + 0x8b, 0xf4, 0x5b, 0xb6, 0x6d, 0x9c, 0x2d, 0x9f, + 0x38, 0x5a, 0x5b, 0xaf, 0x76, 0x9b, 0x53, 0x9e, + 0x52, 0x90, 0xf3, 0x09, 0xa7, 0x3f, 0xef, 0x4f, + 0x78, 0x63, 0xd8, 0x5b, 0x50, 0x0d, 0x90, 0x85, + 0xd6, 0x66, 0xa9, 0x93, 0x6b, 0x2e, 0x5f, 0x9c, + 0xca, 0x1c, 0x29, 0x62, 0xb6, 0x44, 0xa1, 0xde, + 0xbf, 0xf4, 0xaa, 0x97, 0x1e, 0x37, 0x1e, 0x34, + 0xb7, 0x0c, 0x45, 0xe7, 0x84, 0x36, 0xa0, 0xab, + 0x9d, 0xf3, 0x5b, 0xcd, 0x41, 0x01, 0x4a, 0x0d, + 0x4d, 0x94, 0xce, 0xcc, 0x39, 0xad, 0x99, 0x63, + 0x98, 0x0e, 0x59, 0x30, 0xb7, 0x9f, 0xb0, 0xda, + 0x82, 0xf3, 0xc4, 0x14, 0xd5, 0x54, 0xd6, 0x93, + 0x8e, 0x9f, 0xe7, 0xae, 0xaa, 0xfb, 0x5b, 0xe2, + 0xf1, 0xfe, 0x97, 0x43, 0x6e, 0xde, 0xfd, 0xe8, + 0xf8, 0xe6, 0x2b, 0x30, 0x9b, 0x85, 0xe8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x67, + 0x69, 0x74, 0x67, 0x2d, 0x73, 0x69, 0x64, 0x65, + 0x62, 0x61, 0x72, 0x2e, 0x75, 0x69, 0x00, 0x00, + 0xff, 0x05, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x78, 0xda, 0xcd, 0x54, 0x4d, 0x4f, 0xe3, 0x30, + 0x10, 0xbd, 0xf7, 0x57, 0x18, 0x5f, 0x57, 0x6e, + 0x52, 0x90, 0x00, 0xa1, 0xc4, 0x1c, 0x90, 0x58, + 0x71, 0x43, 0x50, 0xb8, 0x22, 0x37, 0x9e, 0xa6, + 0xb3, 0x75, 0x3e, 0xd6, 0x9e, 0xb4, 0xe9, 0xfe, + 0xfa, 0x75, 0x48, 0x9b, 0x16, 0x02, 0x6d, 0xa5, + 0x5d, 0x09, 0x72, 0x72, 0xc6, 0x6f, 0x66, 0xde, + 0x9b, 0x97, 0x4c, 0x74, 0x5d, 0x67, 0x86, 0x2d, + 0xc0, 0x3a, 0x2c, 0xf2, 0x98, 0x8f, 0x86, 0x21, + 0x67, 0x90, 0x27, 0x85, 0xc6, 0x3c, 0x8d, 0xf9, + 0xd3, 0xf8, 0x56, 0x5c, 0xf2, 0x6b, 0x39, 0x88, + 0x30, 0x27, 0xb0, 0x53, 0x95, 0x80, 0x8c, 0x4e, + 0x84, 0x60, 0xdd, 0xab, 0xb0, 0xf0, 0xbb, 0x42, + 0x0b, 0x8e, 0xa5, 0x34, 0xff, 0xc1, 0xce, 0x86, + 0x67, 0x4c, 0x88, 0xcf, 0x31, 0x48, 0x29, 0x0b, + 0x87, 0xe1, 0x5e, 0x8c, 0x66, 0xa3, 0x35, 0x82, + 0x20, 0x2b, 0x8d, 0x22, 0x60, 0x89, 0x51, 0xce, + 0xc5, 0xfc, 0xa7, 0x4f, 0x7f, 0x44, 0x0d, 0x13, + 0x65, 0xb9, 0x8c, 0x4a, 0x5b, 0x94, 0x60, 0x69, + 0xc5, 0x72, 0x95, 0x41, 0xcc, 0xb3, 0x42, 0x83, + 0xe1, 0xd2, 0xb5, 0xf7, 0x2f, 0x8e, 0x0a, 0x0b, + 0x51, 0xb0, 0x01, 0xf5, 0xe0, 0x6e, 0x56, 0x2c, + 0x05, 0xd4, 0xa5, 0xca, 0xb5, 0x17, 0xcf, 0xe5, + 0xad, 0x32, 0x6e, 0x1f, 0x7e, 0x06, 0xaa, 0x01, + 0x8a, 0x05, 0x3a, 0x9c, 0x18, 0x38, 0x9c, 0x60, + 0x60, 0x01, 0x46, 0xa0, 0x2f, 0x9f, 0x93, 0x22, + 0x3f, 0x5d, 0x2e, 0x47, 0xa7, 0xbb, 0xf8, 0x64, + 0x86, 0x46, 0xcb, 0xa8, 0x98, 0xfc, 0x82, 0x84, + 0x3a, 0x89, 0x34, 0x1f, 0x5b, 0x80, 0x67, 0x84, + 0xe5, 0x4d, 0x61, 0xaa, 0x2c, 0xe7, 0x0c, 0x75, + 0xcc, 0x93, 0xf6, 0xdc, 0x6b, 0xd2, 0xb1, 0x19, + 0xdb, 0x0a, 0x8e, 0x29, 0x7e, 0x03, 0xc6, 0x3c, + 0x40, 0xa3, 0x19, 0xec, 0x18, 0x6a, 0x6a, 0xcb, + 0xdb, 0x75, 0xe4, 0xa5, 0x54, 0xba, 0x71, 0xbe, + 0xdf, 0xc8, 0x0f, 0x4a, 0x73, 0x79, 0xbe, 0x47, + 0xef, 0xa7, 0x54, 0x82, 0x96, 0x84, 0xe7, 0xe4, + 0x7b, 0x8b, 0x52, 0x25, 0x73, 0xdf, 0xa1, 0x97, + 0xde, 0x5a, 0xf1, 0xc1, 0x58, 0x83, 0xb7, 0x69, + 0xc1, 0x5a, 0xd9, 0x31, 0x02, 0xef, 0xb1, 0x9e, + 0x54, 0xd3, 0x77, 0x12, 0x31, 0x69, 0xac, 0x18, + 0xb0, 0xee, 0xf9, 0x42, 0x82, 0x1f, 0x38, 0xd0, + 0x7e, 0x67, 0x7d, 0x03, 0x56, 0x07, 0x0d, 0x58, + 0x02, 0xa6, 0x33, 0xe2, 0xf2, 0x22, 0x0c, 0xf7, + 0xa0, 0x7c, 0x77, 0x2c, 0x1d, 0xfe, 0xf1, 0x46, + 0x65, 0xa8, 0xb5, 0xf9, 0x07, 0xab, 0x7a, 0x46, + 0xff, 0xd7, 0x41, 0x50, 0x13, 0xfa, 0x06, 0xf4, + 0xbb, 0xa2, 0x5d, 0x60, 0xb3, 0x96, 0x7a, 0x9a, + 0xb6, 0xeb, 0xe9, 0xb1, 0xd9, 0x3e, 0xad, 0xa0, + 0x37, 0x0b, 0xc9, 0x0b, 0x6a, 0x7f, 0x65, 0xb7, + 0x39, 0x30, 0x5a, 0x95, 0x9e, 0x54, 0x5a, 0xf9, + 0x55, 0xc8, 0x83, 0xa3, 0xa2, 0x3b, 0x7d, 0xee, + 0x3c, 0x97, 0xe6, 0x3e, 0xe8, 0xaa, 0x6e, 0xe9, + 0x6e, 0x57, 0xf6, 0xe0, 0x75, 0xd7, 0x42, 0x7d, + 0xe5, 0x80, 0x18, 0xb9, 0xf8, 0x94, 0x01, 0x5d, + 0x35, 0x1b, 0x76, 0xf0, 0x17, 0xda, 0x00, 0x22, + 0xea, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1207,65 +1421,85 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x67, + 0x69, 0x74, 0x67, 0x2d, 0x64, 0x69, 0x66, 0x66, + 0x2d, 0x76, 0x69, 0x65, 0x77, 0x2d, 0x6f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2d, 0x73, 0x70, + 0x61, 0x63, 0x69, 0x6e, 0x67, 0x2e, 0x75, 0x69, + 0x37, 0x0b, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x78, 0xda, 0xd5, 0x56, 0x51, 0x6f, 0x9b, 0x30, + 0x10, 0x7e, 0xef, 0xaf, 0x40, 0x7e, 0x9d, 0x56, + 0x4a, 0x56, 0x4d, 0xd3, 0x04, 0x54, 0x9b, 0xa6, + 0x56, 0x93, 0x26, 0x6d, 0x52, 0xb3, 0xed, 0x11, + 0x1d, 0xe6, 0x42, 0xdc, 0x18, 0xdb, 0xb3, 0x8f, + 0xb0, 0xfe, 0xfb, 0x19, 0x68, 0x43, 0xb4, 0x24, + 0x64, 0x8a, 0x92, 0x68, 0x7d, 0x3b, 0xe0, 0xf3, + 0xdd, 0x77, 0x9f, 0x3f, 0xec, 0x8b, 0x6f, 0x7e, + 0x57, 0x32, 0x58, 0xa2, 0x75, 0x42, 0xab, 0x84, + 0x45, 0x97, 0x57, 0x2c, 0x40, 0xc5, 0x75, 0x21, + 0x54, 0x99, 0xb0, 0xef, 0xd3, 0xdb, 0xd7, 0xef, + 0xd8, 0x4d, 0x7a, 0x11, 0x0b, 0x45, 0x68, 0x67, + 0xc0, 0x31, 0x8d, 0x2d, 0xfe, 0xaa, 0x85, 0x45, + 0x17, 0x48, 0x91, 0x27, 0xac, 0xa4, 0xc5, 0x2b, + 0x36, 0x24, 0x78, 0x73, 0x19, 0x4d, 0x58, 0x98, + 0xc6, 0x84, 0x95, 0x91, 0x40, 0x18, 0x70, 0x09, + 0xce, 0x25, 0xec, 0x4e, 0x50, 0xf9, 0x49, 0xcc, + 0x66, 0x3f, 0x04, 0x36, 0x5f, 0x0d, 0x79, 0xac, + 0xbb, 0x37, 0xc0, 0x7d, 0x15, 0x16, 0x18, 0xb0, + 0xa8, 0xc8, 0x63, 0x68, 0xf1, 0x4d, 0x1b, 0xed, + 0x73, 0xb1, 0x34, 0x36, 0x56, 0x1b, 0xb4, 0xf4, + 0x18, 0x28, 0xa8, 0x30, 0x61, 0x4b, 0xe1, 0x44, + 0x2e, 0x91, 0xa5, 0xb7, 0x20, 0x1d, 0xc6, 0xe1, + 0xf3, 0xe7, 0x0d, 0x20, 0x07, 0x95, 0xcd, 0x34, + 0xaf, 0xdd, 0x7e, 0xa8, 0xd1, 0x4e, 0xb4, 0x4c, + 0x58, 0x9a, 0x6b, 0x22, 0x5d, 0xad, 0x43, 0xf9, + 0x5c, 0xc8, 0x22, 0x8d, 0x75, 0xfe, 0x80, 0x9c, + 0x56, 0x4d, 0xd0, 0xe2, 0xce, 0x8a, 0x82, 0x05, + 0xa2, 0xf0, 0x8d, 0xb7, 0xd1, 0x6e, 0x9e, 0x53, + 0x5b, 0x1f, 0x89, 0xa6, 0xd5, 0x4d, 0xe6, 0x9e, + 0xb4, 0x4a, 0xdf, 0x8e, 0xe5, 0xd4, 0xb2, 0xae, + 0xd4, 0x80, 0x8d, 0x26, 0x23, 0xe0, 0x0a, 0x6c, + 0x29, 0xd4, 0xdf, 0xa0, 0x5d, 0x6d, 0x7f, 0x81, + 0x1c, 0x65, 0xdf, 0xb7, 0x6c, 0xc3, 0x8c, 0x20, + 0xcf, 0x1a, 0x51, 0xd0, 0xfc, 0x2c, 0x12, 0xcc, + 0x41, 0x8a, 0xd2, 0x93, 0x75, 0x04, 0x96, 0x46, + 0x70, 0xb2, 0xa7, 0x49, 0x16, 0x94, 0xf3, 0xee, + 0x03, 0x4f, 0x23, 0x61, 0x8f, 0xe8, 0x2b, 0x4c, + 0x21, 0x0f, 0x3a, 0xbe, 0xef, 0xd7, 0x97, 0x87, + 0x7d, 0xa3, 0x3e, 0x0f, 0xf0, 0x85, 0xd7, 0x6c, + 0x33, 0x21, 0xce, 0x28, 0x03, 0x22, 0xe0, 0xbe, + 0xd1, 0xab, 0x91, 0xca, 0xa4, 0xcd, 0x76, 0x5c, + 0xb8, 0x4a, 0x1d, 0x3e, 0x89, 0xbb, 0x4b, 0xe3, + 0x7b, 0x23, 0xd4, 0xc7, 0xda, 0x1b, 0x51, 0xf5, + 0x42, 0x3b, 0xff, 0x9c, 0xe5, 0xdd, 0x8b, 0x23, + 0xcb, 0xbd, 0x07, 0xf9, 0xaf, 0x6a, 0x43, 0xf1, + 0x50, 0x3b, 0xaa, 0xfc, 0xbf, 0xcb, 0xd2, 0x21, + 0x1e, 0xb8, 0x1e, 0xae, 0x74, 0x74, 0x5a, 0xa5, + 0x37, 0xdc, 0xdc, 0x58, 0x30, 0x99, 0x14, 0xaa, + 0x75, 0xca, 0x8b, 0xb0, 0xf3, 0x4f, 0x4f, 0x38, + 0xe8, 0x08, 0x9f, 0xc1, 0xcf, 0xd1, 0x81, 0x7e, + 0x6e, 0x04, 0xf9, 0xe5, 0xbd, 0x97, 0xbb, 0xf8, + 0xd8, 0x3a, 0x1f, 0xea, 0xe3, 0xd3, 0x98, 0x31, + 0x3a, 0x92, 0x19, 0x3d, 0x67, 0x6d, 0x31, 0x6b, + 0xe6, 0x82, 0xb0, 0x3d, 0xcb, 0xf1, 0x85, 0x78, + 0xf2, 0x73, 0xc7, 0x3b, 0x18, 0x78, 0x9f, 0xc1, + 0x9a, 0x93, 0xa3, 0x59, 0xf3, 0x34, 0xaa, 0xff, + 0x5f, 0x0e, 0xdd, 0xa3, 0xd6, 0xaa, 0xe8, 0xea, + 0xc5, 0xf3, 0x14, 0xb7, 0x45, 0xc2, 0x0f, 0xc3, + 0xe1, 0xdf, 0xc9, 0xb8, 0xed, 0x02, 0xd8, 0x94, + 0x50, 0xea, 0xa6, 0x9d, 0xee, 0xc6, 0x08, 0xd7, + 0xc6, 0x74, 0x90, 0xb1, 0x49, 0x67, 0x09, 0xb2, + 0xf6, 0xfb, 0x70, 0x3d, 0x02, 0x71, 0x84, 0x26, + 0x13, 0x8a, 0x5b, 0xec, 0x2f, 0xa8, 0xb1, 0x92, + 0x06, 0x4a, 0x5c, 0xc7, 0x5e, 0x6f, 0xdd, 0x8a, + 0x70, 0x98, 0x81, 0x2f, 0xfe, 0x00, 0x47, 0x68, + 0x1d, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x67, - 0x69, 0x74, 0x67, 0x2d, 0x64, 0x69, 0x66, 0x66, - 0x2d, 0x76, 0x69, 0x65, 0x77, 0x2d, 0x66, 0x69, - 0x6c, 0x65, 0x2d, 0x72, 0x65, 0x6e, 0x64, 0x65, - 0x72, 0x65, 0x72, 0x2d, 0x62, 0x69, 0x6e, 0x61, - 0x72, 0x79, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, - 0xd4, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x78, 0xda, 0x95, 0x52, 0x5d, 0x4f, 0xdc, 0x40, - 0x0c, 0x7c, 0xe7, 0x57, 0x18, 0xbf, 0x56, 0xb9, - 0x70, 0x45, 0xaa, 0x8a, 0x94, 0x2c, 0x2a, 0xa2, - 0x97, 0x56, 0x42, 0x05, 0xa1, 0xa3, 0x3c, 0xa2, - 0x4d, 0xe2, 0xe4, 0xdc, 0xdb, 0xec, 0xa6, 0x5e, - 0xdf, 0x1d, 0xf7, 0xef, 0x59, 0x3e, 0xae, 0x50, - 0x1e, 0xa0, 0x7d, 0xb3, 0xe5, 0x99, 0xb1, 0xc6, - 0x9e, 0xe2, 0xf8, 0x76, 0x70, 0xb0, 0x26, 0x89, - 0x1c, 0x7c, 0x89, 0xd3, 0xc9, 0x01, 0x02, 0xf9, - 0x26, 0xb4, 0xec, 0xfb, 0x12, 0xaf, 0xe6, 0xb3, - 0xec, 0x33, 0x1e, 0x9b, 0xbd, 0x62, 0x3f, 0xcb, - 0xa0, 0x22, 0x4f, 0x62, 0x95, 0x5a, 0xd8, 0xb0, - 0x2e, 0xa0, 0x77, 0xb6, 0x25, 0x38, 0x9c, 0x4c, - 0x8f, 0x26, 0x07, 0x90, 0x65, 0x09, 0xc4, 0x5e, - 0x49, 0x3a, 0xdb, 0x90, 0x29, 0x84, 0x7e, 0xaf, - 0x58, 0x28, 0x82, 0xe3, 0xba, 0xc4, 0x5e, 0x97, - 0x1f, 0xf0, 0x79, 0x4b, 0xe2, 0x7c, 0xc2, 0xdc, - 0x14, 0x4a, 0xc3, 0xe8, 0x92, 0x20, 0x34, 0xce, - 0xc6, 0x58, 0x62, 0xc5, 0xda, 0x9f, 0x72, 0xd7, - 0xfd, 0x64, 0xda, 0xcc, 0xd8, 0xd1, 0x25, 0xf9, - 0x96, 0x84, 0xe4, 0x84, 0xbd, 0x95, 0x2d, 0xc2, - 0x68, 0x85, 0xbc, 0x26, 0x9c, 0x2e, 0x2b, 0xe1, - 0x16, 0x4d, 0x31, 0x4a, 0x18, 0x49, 0x74, 0x0b, - 0xde, 0x0e, 0x54, 0xe2, 0x9a, 0x23, 0xd7, 0x8e, - 0xd0, 0xcc, 0x65, 0x45, 0x45, 0xbe, 0x9b, 0x9a, - 0xa2, 0x59, 0xb0, 0x6b, 0x4d, 0x11, 0xea, 0x5f, - 0xd4, 0xe8, 0x9f, 0x75, 0xba, 0x3c, 0xb3, 0x35, - 0xb9, 0xff, 0xd0, 0x79, 0x85, 0x73, 0x0f, 0x74, - 0x50, 0xb1, 0x3e, 0x26, 0x23, 0x36, 0x71, 0x4a, - 0xdc, 0x52, 0x44, 0x73, 0xe5, 0xef, 0x1b, 0xd0, - 0x00, 0x2d, 0xc7, 0x64, 0x72, 0x0b, 0xcd, 0xc2, - 0xfa, 0x3e, 0x1d, 0xa4, 0x0b, 0x02, 0xf5, 0x83, - 0x21, 0xe8, 0x92, 0xc7, 0x37, 0xd4, 0x07, 0x2b, - 0x3d, 0xfb, 0x4c, 0xc3, 0x88, 0xe6, 0xf0, 0x7d, - 0x5c, 0x54, 0x2b, 0x8a, 0x66, 0xfa, 0xf1, 0x7d, - 0x68, 0xba, 0xeb, 0xbf, 0x01, 0xeb, 0xa0, 0x1a, - 0x06, 0x34, 0x47, 0x6f, 0x40, 0x23, 0xf9, 0xc8, - 0xca, 0xeb, 0x74, 0xae, 0x99, 0x75, 0xf1, 0x2f, - 0x47, 0x56, 0x55, 0xb8, 0x5e, 0x29, 0xc5, 0x17, - 0xf5, 0x13, 0x6f, 0x43, 0xdc, 0x2f, 0x34, 0xc5, - 0xc2, 0xba, 0x55, 0x6a, 0x2f, 0xbe, 0xfc, 0xa8, - 0xce, 0x6f, 0xae, 0xbf, 0x7e, 0xaf, 0xbe, 0xcd, - 0x6f, 0x4e, 0xce, 0xcf, 0x4e, 0xef, 0x13, 0x92, - 0xbf, 0x14, 0xc8, 0x1f, 0xdf, 0x97, 0x8a, 0xa7, - 0x77, 0xe6, 0xbb, 0x00, 0xa5, 0xf2, 0x39, 0x7b, - 0x7b, 0x77, 0xec, 0xfd, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1284,103 +1518,6 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x67, - 0x69, 0x74, 0x67, 0x2d, 0x72, 0x65, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x2d, 0x6c, - 0x69, 0x73, 0x74, 0x2d, 0x62, 0x6f, 0x78, 0x2d, - 0x72, 0x6f, 0x77, 0x2e, 0x75, 0x69, 0x00, 0x00, - 0x03, 0x12, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x78, 0xda, 0xed, 0x58, 0x4b, 0x6f, 0xdb, 0x30, - 0x0c, 0xbe, 0xef, 0x57, 0x68, 0x3a, 0x6d, 0x18, - 0xdc, 0xbc, 0x2e, 0x3d, 0x38, 0x2e, 0xd0, 0x01, - 0xed, 0xa5, 0x87, 0x21, 0xeb, 0xce, 0x86, 0x2c, - 0x33, 0xb6, 0x16, 0x59, 0xf2, 0x24, 0xe6, 0xd5, - 0x5f, 0x3f, 0x3a, 0xb1, 0x93, 0xa0, 0x69, 0x13, - 0x67, 0xe8, 0x13, 0xdd, 0x29, 0x12, 0xfd, 0x99, - 0xa2, 0xc8, 0x8f, 0x5f, 0x24, 0x87, 0x17, 0x8b, - 0x42, 0xb3, 0x19, 0x38, 0xaf, 0xac, 0x19, 0xf2, - 0xde, 0x59, 0x97, 0x33, 0x30, 0xd2, 0xa6, 0xca, - 0x64, 0x43, 0xfe, 0xeb, 0xf6, 0x2a, 0x38, 0xe7, - 0x17, 0xd1, 0xa7, 0x50, 0x19, 0x04, 0x37, 0x16, - 0x12, 0xa2, 0xf0, 0x73, 0x10, 0xb0, 0xcd, 0x34, - 0x70, 0xf0, 0x67, 0xaa, 0x1c, 0x78, 0x96, 0xe1, - 0xe4, 0x1b, 0x1b, 0x9c, 0x9d, 0xb3, 0x20, 0x88, - 0x42, 0x84, 0xa2, 0xd4, 0x02, 0x81, 0x49, 0x2d, - 0xbc, 0x1f, 0xf2, 0x6b, 0x85, 0xd9, 0x08, 0x4a, - 0xeb, 0x15, 0x5a, 0xb7, 0xbc, 0x51, 0x1e, 0x2f, - 0xed, 0x62, 0x64, 0xe7, 0x9c, 0x95, 0xc2, 0x81, - 0x41, 0x42, 0xe0, 0x64, 0xc7, 0x1c, 0x85, 0xa5, - 0xb3, 0x25, 0x38, 0x5c, 0x32, 0x23, 0x0a, 0x18, - 0x72, 0x29, 0x4c, 0x3c, 0xb6, 0x72, 0xea, 0x79, - 0x74, 0xeb, 0xa6, 0x10, 0x76, 0x9a, 0xe7, 0x51, - 0x28, 0x73, 0xa5, 0xd3, 0x28, 0xb4, 0xc9, 0x6f, - 0x90, 0xb8, 0xbb, 0xe0, 0x0f, 0x67, 0x33, 0x8a, - 0xcc, 0x5f, 0x2a, 0xc3, 0x99, 0x4a, 0x87, 0x3c, - 0x8d, 0xcb, 0xda, 0x14, 0x27, 0x64, 0xdb, 0x5b, - 0x64, 0xa6, 0xbc, 0x4a, 0x34, 0xb4, 0x5d, 0x02, - 0x27, 0xd7, 0x4e, 0xa5, 0x6b, 0xd7, 0x59, 0x35, - 0x6a, 0xef, 0xf0, 0xf1, 0xdd, 0x5d, 0x09, 0xed, - 0x0f, 0x41, 0x73, 0xe1, 0xdb, 0x42, 0x55, 0x6b, - 0x64, 0x21, 0x5c, 0xa6, 0x4c, 0xec, 0x51, 0x38, - 0xe4, 0x51, 0xaf, 0x7f, 0x1c, 0x0a, 0x26, 0x6d, - 0x07, 0x44, 0x5b, 0xb6, 0x03, 0x26, 0x16, 0xd1, - 0x16, 0x47, 0xb0, 0xd2, 0xea, 0x69, 0x41, 0x81, - 0x96, 0x42, 0x12, 0x41, 0x09, 0xdc, 0x3d, 0x00, - 0x76, 0x76, 0xbe, 0x45, 0x0e, 0x0e, 0xe5, 0x14, - 0x16, 0xa5, 0xa8, 0x36, 0xd4, 0xb6, 0xee, 0x23, - 0x98, 0x81, 0xd0, 0xe0, 0x1a, 0x5a, 0x39, 0x28, - 0xec, 0x0c, 0xe8, 0xa7, 0x36, 0xbf, 0x30, 0x11, - 0x8e, 0x38, 0x9d, 0x35, 0xdb, 0x3b, 0xe6, 0x72, - 0x26, 0xb4, 0xca, 0xa8, 0x2f, 0x24, 0x54, 0xed, - 0x7d, 0x00, 0x88, 0x4e, 0x18, 0x6a, 0x65, 0x92, - 0x8c, 0x18, 0x97, 0x25, 0x6d, 0xcb, 0x6b, 0x95, - 0x42, 0xa0, 0x61, 0x8c, 0x6d, 0xd2, 0xf7, 0x3d, - 0x07, 0x39, 0xb9, 0x9c, 0x52, 0xbd, 0xcd, 0xbd, - 0x0c, 0xca, 0xea, 0x49, 0x9c, 0xac, 0x1f, 0x3d, - 0x45, 0x16, 0x8f, 0x20, 0x4f, 0xe8, 0xa6, 0x67, - 0xc8, 0xa2, 0xb5, 0x1a, 0x55, 0x19, 0x23, 0x2c, - 0x90, 0xb3, 0x55, 0x4e, 0x49, 0x33, 0x05, 0xed, - 0x70, 0xc8, 0x97, 0x40, 0x21, 0x8d, 0x56, 0x49, - 0x61, 0x98, 0x03, 0x73, 0x1b, 0xf1, 0x64, 0x63, - 0x67, 0x8b, 0x95, 0x4d, 0x93, 0x5e, 0xb2, 0x2f, - 0xa9, 0x25, 0xf1, 0x35, 0x16, 0x59, 0x0a, 0x1a, - 0xf0, 0x61, 0x74, 0xaa, 0xfc, 0xe4, 0xeb, 0x6e, - 0x24, 0x9d, 0x75, 0x4d, 0x68, 0x50, 0xd7, 0x68, - 0x63, 0xa0, 0x7e, 0x99, 0x50, 0xc3, 0xec, 0x05, - 0x5b, 0xd5, 0x36, 0x16, 0x88, 0x42, 0xe6, 0x3c, - 0xea, 0x1e, 0xdc, 0x55, 0xd9, 0x0a, 0x37, 0x57, - 0x29, 0x12, 0xa4, 0x77, 0xb0, 0x2f, 0x55, 0x96, - 0xe3, 0xbd, 0xde, 0xed, 0x6c, 0x22, 0x6c, 0x62, - 0x7f, 0x8c, 0x66, 0x37, 0x22, 0x01, 0xbd, 0x25, - 0x58, 0x93, 0x92, 0x58, 0xaf, 0xec, 0xef, 0x56, - 0xac, 0xf3, 0x9a, 0x5f, 0x2b, 0xb5, 0x6e, 0xc1, - 0x43, 0x92, 0xea, 0x7f, 0xd1, 0xbe, 0x7b, 0x38, - 0xd0, 0x5a, 0x95, 0x5e, 0xdd, 0xc1, 0x9e, 0x43, - 0x2a, 0xb6, 0x53, 0xd4, 0xb2, 0xe0, 0x77, 0xc6, - 0xf5, 0x5b, 0x5e, 0x92, 0x1e, 0x72, 0x46, 0xa1, - 0x4c, 0xa1, 0x3a, 0x5d, 0xf4, 0x79, 0x67, 0x1f, - 0x34, 0x5f, 0x97, 0xb9, 0x41, 0x25, 0x56, 0xa7, - 0x15, 0xac, 0xb3, 0xeb, 0xf8, 0x34, 0x7e, 0xf6, - 0x5e, 0x96, 0x9f, 0xbd, 0x27, 0xe0, 0x67, 0x0a, - 0x5e, 0x3a, 0x55, 0xae, 0x34, 0xf5, 0x3f, 0x41, - 0x9f, 0x94, 0xa0, 0xcf, 0xc3, 0x9d, 0xde, 0xdb, - 0xe1, 0x4e, 0x42, 0x7f, 0x1d, 0x32, 0xff, 0x68, - 0xb4, 0x49, 0x84, 0x07, 0xad, 0xcc, 0x73, 0x8b, - 0x56, 0xf7, 0xec, 0x7c, 0x30, 0xd8, 0xd3, 0x23, - 0x8f, 0x4b, 0x4d, 0x77, 0xa1, 0x55, 0x41, 0xea, - 0xd7, 0x52, 0x55, 0x04, 0xeb, 0x12, 0x54, 0xe0, - 0x1a, 0xf0, 0x3c, 0xdc, 0xeb, 0xbf, 0x2a, 0xf7, - 0xe8, 0x8e, 0xd6, 0x30, 0x4f, 0x0b, 0x93, 0x4d, - 0x45, 0x06, 0x74, 0xa1, 0x22, 0xe3, 0xde, 0x42, - 0xd6, 0x29, 0x3a, 0x04, 0x89, 0x4a, 0xd4, 0x78, - 0x94, 0xd3, 0xec, 0xce, 0xd2, 0x54, 0x1f, 0x2a, - 0xee, 0xc7, 0x25, 0xeb, 0xc3, 0x57, 0x95, 0xd3, - 0x08, 0xd4, 0x7f, 0x17, 0x04, 0xfa, 0x59, 0x2a, - 0x63, 0xb6, 0xb7, 0x27, 0x5f, 0x4f, 0x5f, 0xbf, - 0xc8, 0xa7, 0x25, 0x7b, 0xf0, 0xa6, 0x4e, 0xc1, - 0x8f, 0x1f, 0xe9, 0x37, 0x86, 0xe6, 0xab, 0x0c, - 0x0d, 0xb7, 0xdf, 0x73, 0x3e, 0xfd, 0x05, 0xc9, - 0x62, 0x9d, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff -Nru gitg-3.22.0/libgitg/gitg-sidebar.c gitg-3.23.0/libgitg/gitg-sidebar.c --- gitg-3.22.0/libgitg/gitg-sidebar.c 2016-09-18 12:01:42.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-sidebar.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-sidebar.c generated by valac 0.32.1, the Vala compiler +/* gitg-sidebar.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-sidebar.vala, do not modify */ /* @@ -39,6 +39,11 @@ typedef struct _GitgSidebarItem GitgSidebarItem; typedef struct _GitgSidebarItemIface GitgSidebarItemIface; +enum { + GITG_SIDEBAR_ITEM_ACTIVATED_SIGNAL, + GITG_SIDEBAR_ITEM_LAST_SIGNAL +}; +static guint gitg_sidebar_item_signals[GITG_SIDEBAR_ITEM_LAST_SIGNAL] = {0}; #define GITG_TYPE_SIDEBAR_STORE (gitg_sidebar_store_get_type ()) #define GITG_SIDEBAR_STORE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GITG_TYPE_SIDEBAR_STORE, GitgSidebarStore)) @@ -91,6 +96,12 @@ typedef struct _Block19Data Block19Data; typedef struct _Block20Data Block20Data; #define _g_list_free0(var) ((var == NULL) ? NULL : (var = (g_list_free (var), NULL))) +enum { + GITG_SIDEBAR_DESELECTED_SIGNAL, + GITG_SIDEBAR_POPULATE_POPUP_SIGNAL, + GITG_SIDEBAR_LAST_SIGNAL +}; +static guint gitg_sidebar_signals[GITG_SIDEBAR_LAST_SIGNAL] = {0}; typedef enum { GITG_SIDEBAR_HINT_NONE, @@ -187,7 +198,7 @@ static gpointer gitg_sidebar_store_parent_class = NULL; static gpointer gitg_sidebar_store_sidebar_text_parent_class = NULL; -static GitgSidebarItemIface* gitg_sidebar_store_sidebar_text_gitg_sidebar_item_parent_iface = NULL; +static GitgSidebarItemIface * gitg_sidebar_store_sidebar_text_gitg_sidebar_item_parent_iface = NULL; static gpointer gitg_sidebar_store_sidebar_header_parent_class = NULL; static gpointer gitg_sidebar_parent_class = NULL; @@ -232,7 +243,7 @@ GITG_SIDEBAR_STORE_SIDEBAR_TEXT_TEXT, GITG_SIDEBAR_STORE_SIDEBAR_TEXT_ICON_NAME }; -static void gitg_sidebar_store_sidebar_text_finalize (GObject* obj); +static void gitg_sidebar_store_sidebar_text_finalize (GObject * obj); static void _vala_gitg_sidebar_store_sidebar_text_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); #define GITG_SIDEBAR_STORE_SIDEBAR_HEADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_SIDEBAR_STORE_TYPE_SIDEBAR_HEADER, GitgSidebarStoreSidebarHeaderPrivate)) enum { @@ -240,9 +251,9 @@ GITG_SIDEBAR_STORE_SIDEBAR_HEADER_ID }; guint gitg_sidebar_store_sidebar_header_get_id (GitgSidebarStoreSidebarHeader* self); -static void gitg_sidebar_store_sidebar_header_finalize (GObject* obj); +static void gitg_sidebar_store_sidebar_header_finalize (GObject * obj); static void _vala_gitg_sidebar_store_sidebar_header_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); -static void gitg_sidebar_store_finalize (GObject* obj); +static void gitg_sidebar_store_finalize (GObject * obj); static void _vala_gitg_sidebar_store_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); GType gitg_sidebar_get_type (void) G_GNUC_CONST; #define GITG_SIDEBAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_SIDEBAR, GitgSidebarPrivate)) @@ -260,7 +271,7 @@ static void _g_list_free__gtk_tree_path_free0_ (GList* self); gpointer gitg_sidebar_get_selected_item (GitgSidebar* self, GType t_type, GBoxedCopyFunc t_dup_func, GDestroyNotify t_destroy_func); gpointer* gitg_sidebar_get_selected_items (GitgSidebar* self, GType t_type, GBoxedCopyFunc t_dup_func, GDestroyNotify t_destroy_func, int* result_length1); -static void _vala_array_add15 (gpointer** array, int* length, int* size, gpointer value); +static void _vala_array_add15 (gpointer* * array, int* length, int* size, gpointer value); void gitg_sidebar_select (GitgSidebar* self, GitgSidebarItem* item); static Block19Data* block19_data_ref (Block19Data* _data19_); static void block19_data_unref (void * _userdata_); @@ -290,7 +301,7 @@ static gboolean __gitg_sidebar___lambda78__gtk_tree_view_row_separator_func (GtkTreeModel* model, GtkTreeIter* iter, gpointer self); static gboolean _gitg_sidebar_select_function_gtk_tree_selection_func (GtkTreeSelection* selection, GtkTreeModel* model, GtkTreePath* path, gboolean path_currently_selected, gpointer self); static void _gitg_sidebar_selection_changed_gtk_tree_selection_changed (GtkTreeSelection* _sender, gpointer self); -static void gitg_sidebar_finalize (GObject* obj); +static void gitg_sidebar_finalize (GObject * obj); static void _vala_gitg_sidebar_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_sidebar_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -326,8 +337,8 @@ #line 47 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp0_ = numclick; #line 47 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" - g_signal_emit_by_name (self, "activated", _tmp0_); -#line 331 "gitg-sidebar.c" + g_signal_emit (self, gitg_sidebar_item_signals[GITG_SIDEBAR_ITEM_ACTIVATED_SIGNAL], 0, _tmp0_); +#line 342 "gitg-sidebar.c" } @@ -336,7 +347,7 @@ g_return_if_fail (self != NULL); #line 45 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" GITG_SIDEBAR_ITEM_GET_INTERFACE (self)->activate (self, numclick); -#line 340 "gitg-sidebar.c" +#line 351 "gitg-sidebar.c" } @@ -345,7 +356,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 40 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return GITG_SIDEBAR_ITEM_GET_INTERFACE (self)->get_text (self); -#line 349 "gitg-sidebar.c" +#line 360 "gitg-sidebar.c" } @@ -354,7 +365,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 41 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return GITG_SIDEBAR_ITEM_GET_INTERFACE (self)->get_icon_name (self); -#line 358 "gitg-sidebar.c" +#line 369 "gitg-sidebar.c" } @@ -370,10 +381,10 @@ #line 38 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" g_object_interface_install_property (iface, g_param_spec_string ("icon-name", "icon-name", "icon-name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 38 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" - g_signal_new ("activated", GITG_TYPE_SIDEBAR_ITEM, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); + gitg_sidebar_item_signals[GITG_SIDEBAR_ITEM_ACTIVATED_SIGNAL] = g_signal_new ("activated", GITG_TYPE_SIDEBAR_ITEM, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); #line 38 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" iface->activate = gitg_sidebar_item_real_activate; -#line 377 "gitg-sidebar.c" +#line 388 "gitg-sidebar.c" } } @@ -394,7 +405,7 @@ static void _g_free0_ (gpointer var) { #line 54 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" (var == NULL) ? NULL : (var = (g_free (var), NULL)); -#line 398 "gitg-sidebar.c" +#line 409 "gitg-sidebar.c" } @@ -403,7 +414,7 @@ g_slist_foreach (self, (GFunc) _g_free0_, NULL); #line 54 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" g_slist_free (self); -#line 407 "gitg-sidebar.c" +#line 418 "gitg-sidebar.c" } @@ -422,7 +433,7 @@ _tmp0_ = self->priv->d_parents; #line 98 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if (_tmp0_ != NULL) { -#line 426 "gitg-sidebar.c" +#line 437 "gitg-sidebar.c" GSList* _tmp1_ = NULL; gconstpointer _tmp2_ = NULL; GtkTreeIter _tmp3_ = {0}; @@ -434,14 +445,14 @@ gtk_tree_store_append (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_store_get_type (), GtkTreeStore), &_tmp3_, (GtkTreeIter*) _tmp2_); #line 100 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _vala_iter = _tmp3_; -#line 438 "gitg-sidebar.c" +#line 449 "gitg-sidebar.c" } else { GtkTreeIter _tmp4_ = {0}; #line 104 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" gtk_tree_store_append (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_store_get_type (), GtkTreeStore), &_tmp4_, NULL); #line 104 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _vala_iter = _tmp4_; -#line 445 "gitg-sidebar.c" +#line 456 "gitg-sidebar.c" } #line 107 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp5_ = _vala_iter; @@ -457,7 +468,7 @@ if (iter) { #line 94 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" *iter = _vala_iter; -#line 461 "gitg-sidebar.c" +#line 472 "gitg-sidebar.c" } } @@ -465,7 +476,7 @@ static gpointer _g_object_ref0 (gpointer self) { #line 118 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return self ? g_object_ref (self) : NULL; -#line 469 "gitg-sidebar.c" +#line 480 "gitg-sidebar.c" } @@ -499,7 +510,7 @@ result = _tmp4_; #line 118 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 503 "gitg-sidebar.c" +#line 514 "gitg-sidebar.c" } @@ -525,7 +536,7 @@ result = _tmp2_; #line 126 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 529 "gitg-sidebar.c" +#line 540 "gitg-sidebar.c" } @@ -537,14 +548,14 @@ memcpy (dup, self, sizeof (GtkTreeIter)); #line 136 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return dup; -#line 541 "gitg-sidebar.c" +#line 552 "gitg-sidebar.c" } static gpointer __gtk_tree_iter_dup0 (gpointer self) { #line 136 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return self ? _gtk_tree_iter_dup (self) : NULL; -#line 548 "gitg-sidebar.c" +#line 559 "gitg-sidebar.c" } @@ -584,7 +595,7 @@ result = item; #line 138 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 588 "gitg-sidebar.c" +#line 599 "gitg-sidebar.c" } @@ -598,13 +609,13 @@ _tmp0_ = self->priv->d_parents; #line 143 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if (_tmp0_ != NULL) { -#line 602 "gitg-sidebar.c" +#line 613 "gitg-sidebar.c" GSList* _tmp1_ = NULL; #line 145 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp1_ = self->priv->d_parents; #line 145 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" self->priv->d_parents = g_slist_delete_link (self->priv->d_parents, _tmp1_); -#line 608 "gitg-sidebar.c" +#line 619 "gitg-sidebar.c" } #line 148 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp2_ = _g_object_ref0 (self); @@ -612,7 +623,7 @@ result = _tmp2_; #line 148 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 616 "gitg-sidebar.c" +#line 627 "gitg-sidebar.c" } @@ -631,7 +642,7 @@ result = _tmp0_; #line 154 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 635 "gitg-sidebar.c" +#line 646 "gitg-sidebar.c" } @@ -643,7 +654,7 @@ _tmp0_ = self->priv->d_sections; #line 159 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" self->priv->d_sections = _tmp0_ + 1; -#line 647 "gitg-sidebar.c" +#line 658 "gitg-sidebar.c" } @@ -658,7 +669,7 @@ self->priv->d_clearing = FALSE; #line 173 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" self->priv->d_sections = (guint) 0; -#line 662 "gitg-sidebar.c" +#line 673 "gitg-sidebar.c" } @@ -678,7 +689,7 @@ result = item; #line 182 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 682 "gitg-sidebar.c" +#line 693 "gitg-sidebar.c" } @@ -698,7 +709,7 @@ _tmp1_ = item; #line 191 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if (_tmp1_ != NULL) { -#line 702 "gitg-sidebar.c" +#line 713 "gitg-sidebar.c" GitgSidebarItem* _tmp2_ = NULL; gint _tmp3_ = 0; #line 193 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" @@ -707,11 +718,11 @@ _tmp3_ = numclick; #line 193 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" gitg_sidebar_item_activate (_tmp2_, _tmp3_); -#line 711 "gitg-sidebar.c" +#line 722 "gitg-sidebar.c" } #line 185 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _g_object_unref0 (item); -#line 715 "gitg-sidebar.c" +#line 726 "gitg-sidebar.c" } @@ -721,14 +732,14 @@ self = (GitgSidebarStore*) g_object_new (object_type, NULL); #line 51 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return self; -#line 725 "gitg-sidebar.c" +#line 736 "gitg-sidebar.c" } GitgSidebarStore* gitg_sidebar_store_new (void) { #line 51 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return gitg_sidebar_store_construct (GITG_TYPE_SIDEBAR_STORE); -#line 732 "gitg-sidebar.c" +#line 743 "gitg-sidebar.c" } @@ -743,7 +754,7 @@ result = _tmp0_; #line 164 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 747 "gitg-sidebar.c" +#line 758 "gitg-sidebar.c" } @@ -765,14 +776,14 @@ self->priv->d_text = _tmp1_; #line 61 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return self; -#line 769 "gitg-sidebar.c" +#line 780 "gitg-sidebar.c" } GitgSidebarStoreSidebarText* gitg_sidebar_store_sidebar_text_new (const gchar* text) { #line 61 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return gitg_sidebar_store_sidebar_text_construct (GITG_SIDEBAR_STORE_TYPE_SIDEBAR_TEXT, text); -#line 776 "gitg-sidebar.c" +#line 787 "gitg-sidebar.c" } @@ -791,7 +802,7 @@ result = _tmp1_; #line 68 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 795 "gitg-sidebar.c" +#line 806 "gitg-sidebar.c" } @@ -804,7 +815,7 @@ result = NULL; #line 73 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 808 "gitg-sidebar.c" +#line 819 "gitg-sidebar.c" } @@ -821,7 +832,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_SIDEBAR_STORE_SIDEBAR_TEXT_TEXT, g_param_spec_string ("text", "text", "text", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 57 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_SIDEBAR_STORE_SIDEBAR_TEXT_ICON_NAME, g_param_spec_string ("icon-name", "icon-name", "icon-name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 825 "gitg-sidebar.c" +#line 836 "gitg-sidebar.c" } @@ -832,18 +843,18 @@ iface->get_text = gitg_sidebar_store_sidebar_text_real_get_text; #line 57 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" iface->get_icon_name = gitg_sidebar_store_sidebar_text_real_get_icon_name; -#line 836 "gitg-sidebar.c" +#line 847 "gitg-sidebar.c" } static void gitg_sidebar_store_sidebar_text_instance_init (GitgSidebarStoreSidebarText * self) { #line 57 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" self->priv = GITG_SIDEBAR_STORE_SIDEBAR_TEXT_GET_PRIVATE (self); -#line 843 "gitg-sidebar.c" +#line 854 "gitg-sidebar.c" } -static void gitg_sidebar_store_sidebar_text_finalize (GObject* obj) { +static void gitg_sidebar_store_sidebar_text_finalize (GObject * obj) { GitgSidebarStoreSidebarText * self; #line 57 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_SIDEBAR_STORE_TYPE_SIDEBAR_TEXT, GitgSidebarStoreSidebarText); @@ -851,7 +862,7 @@ _g_free0 (self->priv->d_text); #line 57 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" G_OBJECT_CLASS (gitg_sidebar_store_sidebar_text_parent_class)->finalize (obj); -#line 855 "gitg-sidebar.c" +#line 866 "gitg-sidebar.c" } @@ -886,13 +897,13 @@ g_value_take_string (value, gitg_sidebar_item_get_icon_name ((GitgSidebarItem*) self)); #line 57 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" break; -#line 890 "gitg-sidebar.c" +#line 901 "gitg-sidebar.c" default: #line 57 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 57 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" break; -#line 896 "gitg-sidebar.c" +#line 907 "gitg-sidebar.c" } } @@ -913,14 +924,14 @@ self->priv->d_id = _tmp1_; #line 86 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return self; -#line 917 "gitg-sidebar.c" +#line 928 "gitg-sidebar.c" } GitgSidebarStoreSidebarHeader* gitg_sidebar_store_sidebar_header_new (const gchar* text, guint id) { #line 86 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return gitg_sidebar_store_sidebar_header_construct (GITG_SIDEBAR_STORE_TYPE_SIDEBAR_HEADER, text, id); -#line 924 "gitg-sidebar.c" +#line 935 "gitg-sidebar.c" } @@ -935,7 +946,7 @@ result = _tmp0_; #line 83 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 939 "gitg-sidebar.c" +#line 950 "gitg-sidebar.c" } @@ -950,24 +961,24 @@ G_OBJECT_CLASS (klass)->finalize = gitg_sidebar_store_sidebar_header_finalize; #line 77 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_SIDEBAR_STORE_SIDEBAR_HEADER_ID, g_param_spec_uint ("id", "id", "id", 0, G_MAXUINT, 0U, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 954 "gitg-sidebar.c" +#line 965 "gitg-sidebar.c" } static void gitg_sidebar_store_sidebar_header_instance_init (GitgSidebarStoreSidebarHeader * self) { #line 77 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" self->priv = GITG_SIDEBAR_STORE_SIDEBAR_HEADER_GET_PRIVATE (self); -#line 961 "gitg-sidebar.c" +#line 972 "gitg-sidebar.c" } -static void gitg_sidebar_store_sidebar_header_finalize (GObject* obj) { +static void gitg_sidebar_store_sidebar_header_finalize (GObject * obj) { GitgSidebarStoreSidebarHeader * self; #line 77 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_SIDEBAR_STORE_TYPE_SIDEBAR_HEADER, GitgSidebarStoreSidebarHeader); #line 77 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" G_OBJECT_CLASS (gitg_sidebar_store_sidebar_header_parent_class)->finalize (obj); -#line 971 "gitg-sidebar.c" +#line 982 "gitg-sidebar.c" } @@ -994,13 +1005,13 @@ g_value_set_uint (value, gitg_sidebar_store_sidebar_header_get_id (self)); #line 77 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" break; -#line 998 "gitg-sidebar.c" +#line 1009 "gitg-sidebar.c" default: #line 77 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 77 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" break; -#line 1004 "gitg-sidebar.c" +#line 1015 "gitg-sidebar.c" } } @@ -1016,18 +1027,18 @@ G_OBJECT_CLASS (klass)->finalize = gitg_sidebar_store_finalize; #line 51 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_SIDEBAR_STORE_CLEARING, g_param_spec_boolean ("clearing", "clearing", "clearing", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1020 "gitg-sidebar.c" +#line 1031 "gitg-sidebar.c" } static void gitg_sidebar_store_instance_init (GitgSidebarStore * self) { #line 51 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" self->priv = GITG_SIDEBAR_STORE_GET_PRIVATE (self); -#line 1027 "gitg-sidebar.c" +#line 1038 "gitg-sidebar.c" } -static void gitg_sidebar_store_finalize (GObject* obj) { +static void gitg_sidebar_store_finalize (GObject * obj) { GitgSidebarStore * self; #line 51 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_SIDEBAR_STORE, GitgSidebarStore); @@ -1035,7 +1046,7 @@ __g_slist_free__g_free0_0 (self->priv->d_parents); #line 51 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" G_OBJECT_CLASS (gitg_sidebar_store_parent_class)->finalize (obj); -#line 1039 "gitg-sidebar.c" +#line 1050 "gitg-sidebar.c" } @@ -1062,13 +1073,13 @@ g_value_set_boolean (value, gitg_sidebar_store_get_clearing (self)); #line 51 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" break; -#line 1066 "gitg-sidebar.c" +#line 1077 "gitg-sidebar.c" default: #line 51 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 51 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" break; -#line 1072 "gitg-sidebar.c" +#line 1083 "gitg-sidebar.c" } } @@ -1108,23 +1119,23 @@ _tmp6_ = hint; #line 295 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if (_tmp6_ != ((guint) GITG_SIDEBAR_HINT_HEADER)) { -#line 1112 "gitg-sidebar.c" +#line 1123 "gitg-sidebar.c" guint _tmp7_ = 0U; #line 295 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp7_ = hint; #line 295 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp5_ = _tmp7_ != ((guint) GITG_SIDEBAR_HINT_DUMMY); -#line 1118 "gitg-sidebar.c" +#line 1129 "gitg-sidebar.c" } else { #line 295 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp5_ = FALSE; -#line 1122 "gitg-sidebar.c" +#line 1133 "gitg-sidebar.c" } #line 295 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" result = _tmp5_; #line 295 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 1128 "gitg-sidebar.c" +#line 1139 "gitg-sidebar.c" } @@ -1133,7 +1144,7 @@ g_return_val_if_fail (self != NULL, FALSE); #line 283 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return GITG_SIDEBAR_GET_CLASS (self)->select_function (self, sel, model, path, cursel); -#line 1137 "gitg-sidebar.c" +#line 1148 "gitg-sidebar.c" } @@ -1159,7 +1170,7 @@ if (_tmp3_) { #line 304 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return; -#line 1163 "gitg-sidebar.c" +#line 1174 "gitg-sidebar.c" } #line 307 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp5_ = gitg_sidebar_get_selected_iter (self, &_tmp4_); @@ -1167,7 +1178,7 @@ iter = _tmp4_; #line 307 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if (_tmp5_) { -#line 1171 "gitg-sidebar.c" +#line 1182 "gitg-sidebar.c" GitgSidebarHint hint = 0; GitgSidebarStore* _tmp6_ = NULL; GitgSidebarStore* _tmp7_ = NULL; @@ -1186,21 +1197,21 @@ _tmp10_ = hint; #line 312 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if (_tmp10_ != GITG_SIDEBAR_HINT_HEADER) { -#line 1190 "gitg-sidebar.c" +#line 1201 "gitg-sidebar.c" GitgSidebarHint _tmp11_ = 0; #line 312 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp11_ = hint; #line 312 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp9_ = _tmp11_ != GITG_SIDEBAR_HINT_DUMMY; -#line 1196 "gitg-sidebar.c" +#line 1207 "gitg-sidebar.c" } else { #line 312 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp9_ = FALSE; -#line 1200 "gitg-sidebar.c" +#line 1211 "gitg-sidebar.c" } #line 312 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if (_tmp9_) { -#line 1204 "gitg-sidebar.c" +#line 1215 "gitg-sidebar.c" GitgSidebarStore* _tmp12_ = NULL; GitgSidebarStore* _tmp13_ = NULL; GtkTreeIter _tmp14_ = {0}; @@ -1212,16 +1223,16 @@ _tmp14_ = iter; #line 314 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" gitg_sidebar_store_activate (_tmp13_, &_tmp14_, 1); -#line 1216 "gitg-sidebar.c" +#line 1227 "gitg-sidebar.c" } else { #line 318 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" - g_signal_emit_by_name (self, "deselected"); -#line 1220 "gitg-sidebar.c" + g_signal_emit (self, gitg_sidebar_signals[GITG_SIDEBAR_DESELECTED_SIGNAL], 0); +#line 1231 "gitg-sidebar.c" } } else { #line 323 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" - g_signal_emit_by_name (self, "deselected"); -#line 1225 "gitg-sidebar.c" + g_signal_emit (self, gitg_sidebar_signals[GITG_SIDEBAR_DESELECTED_SIGNAL], 0); +#line 1236 "gitg-sidebar.c" } } @@ -1231,14 +1242,14 @@ g_return_if_fail (self != NULL); #line 298 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" GITG_SIDEBAR_GET_CLASS (self)->selection_changed (self, sel); -#line 1235 "gitg-sidebar.c" +#line 1246 "gitg-sidebar.c" } static void _gtk_tree_path_free0_ (gpointer var) { #line 338 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" (var == NULL) ? NULL : (var = (gtk_tree_path_free (var), NULL)); -#line 1242 "gitg-sidebar.c" +#line 1253 "gitg-sidebar.c" } @@ -1247,7 +1258,7 @@ g_list_foreach (self, (GFunc) _gtk_tree_path_free0_, NULL); #line 338 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" g_list_free (self); -#line 1251 "gitg-sidebar.c" +#line 1262 "gitg-sidebar.c" } @@ -1273,7 +1284,7 @@ _tmp3_ = gtk_tree_selection_count_selected_rows (_tmp2_); #line 331 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if (_tmp3_ == 1) { -#line 1277 "gitg-sidebar.c" +#line 1288 "gitg-sidebar.c" GtkTreeModel* m = NULL; GList* rows = NULL; GtkTreeSelection* _tmp4_ = NULL; @@ -1318,15 +1329,15 @@ if (iter) { #line 338 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" *iter = _vala_iter; -#line 1322 "gitg-sidebar.c" +#line 1333 "gitg-sidebar.c" } #line 338 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 1326 "gitg-sidebar.c" +#line 1337 "gitg-sidebar.c" } else { #line 342 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" memset (&_vala_iter, 0, sizeof (GtkTreeIter)); -#line 1330 "gitg-sidebar.c" +#line 1341 "gitg-sidebar.c" } #line 345 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" result = FALSE; @@ -1336,11 +1347,11 @@ if (iter) { #line 345 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" *iter = _vala_iter; -#line 1340 "gitg-sidebar.c" +#line 1351 "gitg-sidebar.c" } #line 345 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 1344 "gitg-sidebar.c" +#line 1355 "gitg-sidebar.c" } @@ -1357,7 +1368,7 @@ iter = _tmp0_; #line 352 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if (_tmp1_) { -#line 1361 "gitg-sidebar.c" +#line 1372 "gitg-sidebar.c" GitgSidebarStore* _tmp2_ = NULL; GitgSidebarStore* _tmp3_ = NULL; GtkTreeIter _tmp4_ = {0}; @@ -1374,37 +1385,37 @@ result = (gpointer) _tmp5_; #line 354 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 1378 "gitg-sidebar.c" +#line 1389 "gitg-sidebar.c" } #line 357 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" result = NULL; #line 357 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 1384 "gitg-sidebar.c" +#line 1395 "gitg-sidebar.c" } static gpointer _gtk_tree_path_copy0 (gpointer self) { #line 370 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return self ? gtk_tree_path_copy (self) : NULL; -#line 1391 "gitg-sidebar.c" +#line 1402 "gitg-sidebar.c" } -static void _vala_array_add15 (gpointer** array, int* length, int* size, gpointer value) { +static void _vala_array_add15 (gpointer* * array, int* length, int* size, gpointer value) { #line 373 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if ((*length) == (*size)) { #line 373 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" *size = (*size) ? (2 * (*size)) : 4; #line 373 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" *array = g_renew (gpointer, *array, (*size) + 1); -#line 1402 "gitg-sidebar.c" +#line 1413 "gitg-sidebar.c" } #line 373 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" (*array)[(*length)++] = value; #line 373 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" (*array)[*length] = NULL; -#line 1408 "gitg-sidebar.c" +#line 1419 "gitg-sidebar.c" } @@ -1457,7 +1468,7 @@ _ret_size_ = ret_length1; #line 370 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp7_ = rows; -#line 1461 "gitg-sidebar.c" +#line 1472 "gitg-sidebar.c" { GList* row_collection = NULL; GList* row_it = NULL; @@ -1465,14 +1476,14 @@ row_collection = _tmp7_; #line 370 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" for (row_it = row_collection; row_it != NULL; row_it = row_it->next) { -#line 1469 "gitg-sidebar.c" +#line 1480 "gitg-sidebar.c" GtkTreePath* _tmp8_ = NULL; GtkTreePath* row = NULL; #line 370 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp8_ = _gtk_tree_path_copy0 ((GtkTreePath*) row_it->data); #line 370 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" row = _tmp8_; -#line 1476 "gitg-sidebar.c" +#line 1487 "gitg-sidebar.c" { GtkTreeModel* _tmp9_ = NULL; GtkTreePath* _tmp10_ = NULL; @@ -1507,7 +1518,7 @@ _vala_array_add15 (&ret, &ret_length1, &_ret_size_, (gpointer) _tmp16_); #line 370 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _gtk_tree_path_free0 (row); -#line 1511 "gitg-sidebar.c" +#line 1522 "gitg-sidebar.c" } } } @@ -1519,7 +1530,7 @@ if (result_length1) { #line 376 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" *result_length1 = _tmp17__length1; -#line 1523 "gitg-sidebar.c" +#line 1534 "gitg-sidebar.c" } #line 376 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" result = _tmp17_; @@ -1531,7 +1542,7 @@ _g_object_unref0 (sel); #line 376 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 1535 "gitg-sidebar.c" +#line 1546 "gitg-sidebar.c" } @@ -1540,7 +1551,7 @@ g_atomic_int_inc (&_data19_->_ref_count_); #line 379 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return _data19_; -#line 1544 "gitg-sidebar.c" +#line 1555 "gitg-sidebar.c" } @@ -1549,7 +1560,7 @@ _data19_ = (Block19Data*) _userdata_; #line 379 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if (g_atomic_int_dec_and_test (&_data19_->_ref_count_)) { -#line 1553 "gitg-sidebar.c" +#line 1564 "gitg-sidebar.c" GitgSidebar* self; #line 379 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" self = _data19_->self; @@ -1559,7 +1570,7 @@ _g_object_unref0 (self); #line 379 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" g_slice_free (Block19Data, _data19_); -#line 1563 "gitg-sidebar.c" +#line 1574 "gitg-sidebar.c" } } @@ -1600,7 +1611,7 @@ _g_object_unref0 (_tmp4_); #line 382 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if (_tmp6_) { -#line 1604 "gitg-sidebar.c" +#line 1615 "gitg-sidebar.c" GtkTreeSelection* _tmp7_ = NULL; GtkTreeIter _tmp8_ = {0}; #line 384 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" @@ -1613,13 +1624,13 @@ result = TRUE; #line 385 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 1617 "gitg-sidebar.c" +#line 1628 "gitg-sidebar.c" } #line 388 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" result = FALSE; #line 388 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 1623 "gitg-sidebar.c" +#line 1634 "gitg-sidebar.c" } @@ -1628,7 +1639,7 @@ result = __lambda73_ (self, model, path, iter); #line 381 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 1632 "gitg-sidebar.c" +#line 1643 "gitg-sidebar.c" } @@ -1666,7 +1677,7 @@ block19_data_unref (_data19_); #line 379 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _data19_ = NULL; -#line 1670 "gitg-sidebar.c" +#line 1681 "gitg-sidebar.c" } @@ -1675,7 +1686,7 @@ g_atomic_int_inc (&_data20_->_ref_count_); #line 392 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return _data20_; -#line 1679 "gitg-sidebar.c" +#line 1690 "gitg-sidebar.c" } @@ -1684,7 +1695,7 @@ _data20_ = (Block20Data*) _userdata_; #line 392 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if (g_atomic_int_dec_and_test (&_data20_->_ref_count_)) { -#line 1688 "gitg-sidebar.c" +#line 1699 "gitg-sidebar.c" GitgSidebar* self; #line 392 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" self = _data20_->self; @@ -1694,7 +1705,7 @@ _g_object_unref0 (self); #line 392 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" g_slice_free (Block20Data, _data20_); -#line 1698 "gitg-sidebar.c" +#line 1709 "gitg-sidebar.c" } } @@ -1735,7 +1746,7 @@ _g_object_unref0 (_tmp4_); #line 397 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if (_tmp6_) { -#line 1739 "gitg-sidebar.c" +#line 1750 "gitg-sidebar.c" GtkTreeSelection* _tmp7_ = NULL; GtkTreeIter _tmp8_ = {0}; gboolean _tmp9_ = FALSE; @@ -1751,13 +1762,13 @@ result = TRUE; #line 400 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 1755 "gitg-sidebar.c" +#line 1766 "gitg-sidebar.c" } #line 403 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" result = FALSE; #line 403 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 1761 "gitg-sidebar.c" +#line 1772 "gitg-sidebar.c" } @@ -1766,7 +1777,7 @@ result = __lambda74_ (self, model, path, iter); #line 396 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 1770 "gitg-sidebar.c" +#line 1781 "gitg-sidebar.c" } @@ -1811,7 +1822,7 @@ _data20_ = NULL; #line 406 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 1815 "gitg-sidebar.c" +#line 1826 "gitg-sidebar.c" } @@ -1845,7 +1856,7 @@ if (_tmp3_) { #line 413 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return; -#line 1849 "gitg-sidebar.c" +#line 1860 "gitg-sidebar.c" } #line 418 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp4_ = gitg_sidebar_get_model (self); @@ -1859,7 +1870,7 @@ iter = _tmp7_; #line 418 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if (_tmp8_) { -#line 1863 "gitg-sidebar.c" +#line 1874 "gitg-sidebar.c" GitgSidebarStore* _tmp9_ = NULL; GitgSidebarStore* _tmp10_ = NULL; GtkTreeIter _tmp11_ = {0}; @@ -1871,7 +1882,7 @@ _tmp11_ = iter; #line 420 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" gitg_sidebar_store_activate (_tmp10_, &_tmp11_, 2); -#line 1875 "gitg-sidebar.c" +#line 1886 "gitg-sidebar.c" } } @@ -1898,7 +1909,7 @@ _tmp2_ = gtk_accelerator_get_default_mod_mask (); #line 426 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if ((_tmp1_ & _tmp2_) != 0) { -#line 1902 "gitg-sidebar.c" +#line 1913 "gitg-sidebar.c" GdkEventKey* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; #line 428 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" @@ -1909,7 +1920,7 @@ result = _tmp4_; #line 428 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 1913 "gitg-sidebar.c" +#line 1924 "gitg-sidebar.c" } #line 431 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp5_ = event; @@ -1927,7 +1938,7 @@ case GDK_KEY_space: #line 431 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" case GDK_KEY_KP_Space: -#line 1931 "gitg-sidebar.c" +#line 1942 "gitg-sidebar.c" { GtkTreePath* path = NULL; GtkTreeIter iter = {0}; @@ -1954,7 +1965,7 @@ _tmp10_ = path; #line 444 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if (_tmp10_ != NULL) { -#line 1958 "gitg-sidebar.c" +#line 1969 "gitg-sidebar.c" GitgSidebarStore* _tmp11_ = NULL; GitgSidebarStore* _tmp12_ = NULL; GtkTreePath* _tmp13_ = NULL; @@ -1972,7 +1983,7 @@ iter = _tmp14_; #line 446 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if (_tmp15_) { -#line 1976 "gitg-sidebar.c" +#line 1987 "gitg-sidebar.c" GtkTreeSelection* _tmp16_ = NULL; GtkTreeIter _tmp17_ = {0}; gboolean _tmp18_ = FALSE; @@ -1984,7 +1995,7 @@ _tmp18_ = gtk_tree_selection_iter_is_selected (_tmp16_, &_tmp17_); #line 448 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if (_tmp18_) { -#line 1988 "gitg-sidebar.c" +#line 1999 "gitg-sidebar.c" GitgSidebarStore* _tmp19_ = NULL; GitgSidebarStore* _tmp20_ = NULL; GtkTreeIter _tmp21_ = {0}; @@ -1996,7 +2007,7 @@ _tmp21_ = iter; #line 450 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" gitg_sidebar_store_activate (_tmp20_, &_tmp21_, 2); -#line 2000 "gitg-sidebar.c" +#line 2011 "gitg-sidebar.c" } else { GtkTreeSelection* _tmp22_ = NULL; GtkTreeSelection* _tmp23_ = NULL; @@ -2011,7 +2022,7 @@ _tmp24_ = iter; #line 455 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" gtk_tree_selection_select_iter (_tmp23_, &_tmp24_); -#line 2015 "gitg-sidebar.c" +#line 2026 "gitg-sidebar.c" } } } @@ -2023,12 +2034,12 @@ _gtk_tree_path_free0 (path); #line 460 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 2027 "gitg-sidebar.c" +#line 2038 "gitg-sidebar.c" } default: #line 431 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" break; -#line 2032 "gitg-sidebar.c" +#line 2043 "gitg-sidebar.c" } #line 463 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp25_ = event; @@ -2038,7 +2049,7 @@ result = _tmp26_; #line 463 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 2042 "gitg-sidebar.c" +#line 2053 "gitg-sidebar.c" } @@ -2070,7 +2081,7 @@ #line 476 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp1_ = menu; #line 476 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" - g_signal_emit_by_name (self, "populate-popup", _tmp1_); + g_signal_emit (self, gitg_sidebar_signals[GITG_SIDEBAR_POPULATE_POPUP_SIGNAL], 0, _tmp1_); #line 478 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp2_ = menu; #line 478 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" @@ -2089,7 +2100,7 @@ _g_object_unref0 (menu); #line 480 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 2093 "gitg-sidebar.c" +#line 2104 "gitg-sidebar.c" } #line 483 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp6_ = menu; @@ -2107,7 +2118,7 @@ _tmp8_ = event; #line 489 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if (_tmp8_ != NULL) { -#line 2111 "gitg-sidebar.c" +#line 2122 "gitg-sidebar.c" GdkEventButton* _tmp9_ = NULL; guint _tmp10_ = 0U; GdkEventButton* _tmp11_ = NULL; @@ -2124,7 +2135,7 @@ _tmp12_ = _tmp11_->time; #line 492 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" t = _tmp12_; -#line 2128 "gitg-sidebar.c" +#line 2139 "gitg-sidebar.c" } #line 495 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp13_ = menu; @@ -2140,7 +2151,7 @@ _g_object_unref0 (menu); #line 496 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 2144 "gitg-sidebar.c" +#line 2155 "gitg-sidebar.c" } @@ -2165,7 +2176,7 @@ _tmp2_ = gdk_event_triggers_context_menu (_tmp1_); #line 503 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if (_tmp2_) { -#line 2169 "gitg-sidebar.c" +#line 2180 "gitg-sidebar.c" GtkTreeSelection* _tmp3_ = NULL; gint _tmp4_ = 0; GdkEventButton* _tmp6_ = NULL; @@ -2176,13 +2187,13 @@ _tmp4_ = gtk_tree_selection_count_selected_rows (_tmp3_); #line 505 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if (_tmp4_ <= 1) { -#line 2180 "gitg-sidebar.c" +#line 2191 "gitg-sidebar.c" GdkEventButton* _tmp5_ = NULL; #line 507 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp5_ = event; #line 507 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" GTK_WIDGET_CLASS (gitg_sidebar_parent_class)->button_press_event ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp5_); -#line 2186 "gitg-sidebar.c" +#line 2197 "gitg-sidebar.c" } #line 510 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp6_ = event; @@ -2192,7 +2203,7 @@ result = _tmp7_; #line 510 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 2196 "gitg-sidebar.c" +#line 2207 "gitg-sidebar.c" } else { GdkEventButton* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; @@ -2204,7 +2215,7 @@ result = _tmp9_; #line 514 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 2208 "gitg-sidebar.c" +#line 2219 "gitg-sidebar.c" } } @@ -2221,7 +2232,7 @@ result = _tmp0_; #line 520 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 2225 "gitg-sidebar.c" +#line 2236 "gitg-sidebar.c" } @@ -2231,14 +2242,14 @@ self = (GitgSidebar*) g_object_new (object_type, NULL); #line 199 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return self; -#line 2235 "gitg-sidebar.c" +#line 2246 "gitg-sidebar.c" } GitgSidebar* gitg_sidebar_new (void) { #line 199 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return gitg_sidebar_construct (GITG_TYPE_SIDEBAR); -#line 2242 "gitg-sidebar.c" +#line 2253 "gitg-sidebar.c" } @@ -2253,21 +2264,25 @@ result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, GITG_TYPE_SIDEBAR_STORE) ? ((GitgSidebarStore*) _tmp0_) : NULL; #line 468 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 2257 "gitg-sidebar.c" +#line 2268 "gitg-sidebar.c" } void gitg_sidebar_set_model (GitgSidebar* self, GitgSidebarStore* value) { - GitgSidebarStore* _tmp0_ = NULL; #line 469 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" g_return_if_fail (self != NULL); #line 469 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" - _tmp0_ = value; + if (gitg_sidebar_get_model (self) != value) { +#line 2277 "gitg-sidebar.c" + GitgSidebarStore* _tmp0_ = NULL; +#line 469 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" + _tmp0_ = value; #line 469 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" - gtk_tree_view_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), (GtkTreeModel*) _tmp0_); + gtk_tree_view_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), (GtkTreeModel*) _tmp0_); #line 469 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" - g_object_notify ((GObject *) self, "model"); -#line 2271 "gitg-sidebar.c" + g_object_notify ((GObject *) self, "model"); +#line 2285 "gitg-sidebar.c" + } } @@ -2340,14 +2355,14 @@ _g_object_unref0 (r); #line 219 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _g_object_unref0 (item); -#line 2344 "gitg-sidebar.c" +#line 2359 "gitg-sidebar.c" } static void __gitg_sidebar___lambda75__gtk_cell_layout_data_func (GtkCellLayout* cell_layout, GtkCellRenderer* cell, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer self) { #line 219 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _gitg_sidebar___lambda75_ ((GitgSidebar*) self, cell_layout, cell, tree_model, iter); -#line 2351 "gitg-sidebar.c" +#line 2366 "gitg-sidebar.c" } @@ -2410,14 +2425,14 @@ _g_object_unref0 (r); #line 229 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _g_object_unref0 (item); -#line 2414 "gitg-sidebar.c" +#line 2429 "gitg-sidebar.c" } static void __gitg_sidebar___lambda76__gtk_cell_layout_data_func (GtkCellLayout* cell_layout, GtkCellRenderer* cell, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer self) { #line 229 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _gitg_sidebar___lambda76_ ((GitgSidebar*) self, cell_layout, cell, tree_model, iter); -#line 2421 "gitg-sidebar.c" +#line 2436 "gitg-sidebar.c" } @@ -2481,7 +2496,7 @@ _tmp11_ = hint; #line 252 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" if (_tmp11_ == GITG_SIDEBAR_HINT_DUMMY) { -#line 2485 "gitg-sidebar.c" +#line 2500 "gitg-sidebar.c" GtkStyleContext* context = NULL; GtkStyleContext* _tmp12_ = NULL; GtkStyleContext* _tmp13_ = NULL; @@ -2531,27 +2546,27 @@ g_object_set (_tmp21_, "foreground-rgba", &_tmp22_, NULL); #line 252 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _g_object_unref0 (context); -#line 2535 "gitg-sidebar.c" +#line 2550 "gitg-sidebar.c" } else { GtkCellRendererText* _tmp23_ = NULL; #line 265 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _tmp23_ = r; #line 265 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" g_object_set (_tmp23_, "foreground-set", FALSE, NULL); -#line 2542 "gitg-sidebar.c" +#line 2557 "gitg-sidebar.c" } #line 241 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _g_object_unref0 (r); #line 241 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _g_object_unref0 (item); -#line 2548 "gitg-sidebar.c" +#line 2563 "gitg-sidebar.c" } static void __gitg_sidebar___lambda77__gtk_cell_layout_data_func (GtkCellLayout* cell_layout, GtkCellRenderer* cell, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer self) { #line 241 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" _gitg_sidebar___lambda77_ ((GitgSidebar*) self, cell_layout, cell, tree_model, iter); -#line 2555 "gitg-sidebar.c" +#line 2570 "gitg-sidebar.c" } @@ -2577,7 +2592,7 @@ result = _tmp2_ == GITG_SIDEBAR_HINT_SEPARATOR; #line 273 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 2581 "gitg-sidebar.c" +#line 2596 "gitg-sidebar.c" } @@ -2586,7 +2601,7 @@ result = _gitg_sidebar___lambda78_ ((GitgSidebar*) self, model, iter); #line 269 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 2590 "gitg-sidebar.c" +#line 2605 "gitg-sidebar.c" } @@ -2595,14 +2610,14 @@ result = gitg_sidebar_select_function ((GitgSidebar*) self, selection, model, path, path_currently_selected); #line 278 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return result; -#line 2599 "gitg-sidebar.c" +#line 2614 "gitg-sidebar.c" } static void _gitg_sidebar_selection_changed_gtk_tree_selection_changed (GtkTreeSelection* _sender, gpointer self) { #line 280 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" gitg_sidebar_selection_changed ((GitgSidebar*) self, _sender); -#line 2606 "gitg-sidebar.c" +#line 2621 "gitg-sidebar.c" } @@ -2665,7 +2680,7 @@ _g_object_unref0 (sel); #line 217 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" return obj; -#line 2669 "gitg-sidebar.c" +#line 2684 "gitg-sidebar.c" } @@ -2702,9 +2717,9 @@ #line 199 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/gitg/ui/gitg-sidebar.ui"); #line 199 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" - g_signal_new ("deselected", GITG_TYPE_SIDEBAR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_sidebar_signals[GITG_SIDEBAR_DESELECTED_SIGNAL] = g_signal_new ("deselected", GITG_TYPE_SIDEBAR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 199 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" - g_signal_new ("populate_popup", GITG_TYPE_SIDEBAR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, gtk_menu_get_type ()); + gitg_sidebar_signals[GITG_SIDEBAR_POPULATE_POPUP_SIGNAL] = g_signal_new ("populate_popup", GITG_TYPE_SIDEBAR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, gtk_menu_get_type ()); #line 199 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "column", FALSE, GitgSidebar_private_offset + G_STRUCT_OFFSET (GitgSidebarPrivate, d_column)); #line 199 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" @@ -2713,7 +2728,7 @@ gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "renderer_header", FALSE, GitgSidebar_private_offset + G_STRUCT_OFFSET (GitgSidebarPrivate, d_renderer_header)); #line 199 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "renderer_text", FALSE, GitgSidebar_private_offset + G_STRUCT_OFFSET (GitgSidebarPrivate, d_renderer_text)); -#line 2717 "gitg-sidebar.c" +#line 2732 "gitg-sidebar.c" } @@ -2722,11 +2737,11 @@ self->priv = GITG_SIDEBAR_GET_PRIVATE (self); #line 199 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 2726 "gitg-sidebar.c" +#line 2741 "gitg-sidebar.c" } -static void gitg_sidebar_finalize (GObject* obj) { +static void gitg_sidebar_finalize (GObject * obj) { GitgSidebar * self; #line 199 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_SIDEBAR, GitgSidebar); @@ -2740,7 +2755,7 @@ _g_object_unref0 (self->priv->d_renderer_text); #line 199 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" G_OBJECT_CLASS (gitg_sidebar_parent_class)->finalize (obj); -#line 2744 "gitg-sidebar.c" +#line 2759 "gitg-sidebar.c" } @@ -2767,13 +2782,13 @@ g_value_set_object (value, gitg_sidebar_get_model (self)); #line 199 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" break; -#line 2771 "gitg-sidebar.c" +#line 2786 "gitg-sidebar.c" default: #line 199 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 199 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" break; -#line 2777 "gitg-sidebar.c" +#line 2792 "gitg-sidebar.c" } } @@ -2789,13 +2804,13 @@ gitg_sidebar_set_model (self, g_value_get_object (value)); #line 199 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" break; -#line 2793 "gitg-sidebar.c" +#line 2808 "gitg-sidebar.c" default: #line 199 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 199 "/home/jesse/dev/gitg/libgitg/gitg-sidebar.vala" break; -#line 2799 "gitg-sidebar.c" +#line 2814 "gitg-sidebar.c" } } diff -Nru gitg-3.22.0/libgitg/gitg-stage.c gitg-3.23.0/libgitg/gitg-stage.c --- gitg-3.22.0/libgitg/gitg-stage.c 2016-09-18 12:01:42.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-stage.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-stage.c generated by valac 0.32.1, the Vala compiler +/* gitg-stage.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-stage.vala, do not modify */ /* @@ -955,7 +955,7 @@ GitgPatchSet* gitg_patch_set_reversed (GitgPatchSet* self); GitgPatchSet* gitg_patch_set_new (void); GitgPatchSet* gitg_patch_set_construct (GType object_type); -static void gitg_patch_set_finalize (GitgPatchSet* obj); +static void gitg_patch_set_finalize (GitgPatchSet * obj); GType gitg_stage_get_type (void) G_GNUC_CONST; GType gitg_repository_get_type (void) G_GNUC_CONST; #define GITG_STAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_STAGE, GitgStagePrivate)) @@ -1001,7 +1001,7 @@ static void ___lambda5__gitg_async_thread_func (gpointer self, GError** error); static void gitg_stage_thread_index_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); static gchar* gitg_stage_message_with_sign_off (GitgStage* self, const gchar* message, GgitSignature* committer); -static gchar* gitg_stage_convert_message_to_encoding (GitgStage* self, GgitConfig* conf, const gchar* message, gchar** encoding); +static gchar* gitg_stage_convert_message_to_encoding (GitgStage* self, GgitConfig* conf, const gchar* message, gchar* * encoding); GType gitg_hook_get_type (void) G_GNUC_CONST; static void gitg_stage_setup_commit_hook_environment (GitgStage* self, GitgHook* hook, GgitSignature* author); void gitg_hook_set_working_directory (GitgHook* self, GFile* value); @@ -1054,7 +1054,7 @@ static Block28Data* block28_data_ref (Block28Data* _data28_); static void block28_data_unref (void * _userdata_); static void __lambda19_ (Block28Data* _data28_, GError** error); -static GgitOId** _vala_array_dup20 (GgitOId** self, int length); +static GgitOId** _vala_array_dup21 (GgitOId** self, int length); gpointer gitg_repository_lookup (GitgRepository* self, GType t_type, GBoxedCopyFunc t_dup_func, GDestroyNotify t_destroy_func, GgitOId* id, GError** error); static void ___lambda19__gitg_async_thread_func (gpointer self, GError** error); static void gitg_stage_commit_tree_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); @@ -1184,7 +1184,7 @@ GgitDiff* gitg_stage_diff_workdir_finish (GitgStage* self, GAsyncResult* _res_, GError** error); static gboolean gitg_stage_diff_workdir_co (GitgStageDiffWorkdirData* _data_); static void gitg_stage_diff_workdir_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); -static void gitg_stage_finalize (GObject* obj); +static void gitg_stage_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_clear_GMutex (GMutex * mutex); @@ -1511,7 +1511,7 @@ #line 40 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (collect_values[0].v_pointer) { #line 1514 "gitg-stage.c" - GitgPatchSet* object; + GitgPatchSet * object; object = collect_values[0].v_pointer; #line 40 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (object->parent_instance.g_class == NULL) { @@ -1538,7 +1538,7 @@ static gchar* gitg_value_patch_set_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GitgPatchSet** object_p; + GitgPatchSet ** object_p; object_p = collect_values[0].v_pointer; #line 40 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (!object_p) { @@ -1590,7 +1590,7 @@ void gitg_value_set_patch_set (GValue* value, gpointer v_object) { - GitgPatchSet* old; + GitgPatchSet * old; #line 40 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_PATCH_SET)); #line 40 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -1621,7 +1621,7 @@ void gitg_value_take_patch_set (GValue* value, gpointer v_object) { - GitgPatchSet* old; + GitgPatchSet * old; #line 40 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_PATCH_SET)); #line 40 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -1665,7 +1665,7 @@ } -static void gitg_patch_set_finalize (GitgPatchSet* obj) { +static void gitg_patch_set_finalize (GitgPatchSet * obj) { GitgPatchSet * self; #line 40 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_PATCH_SET, GitgPatchSet); @@ -1694,7 +1694,7 @@ gpointer gitg_patch_set_ref (gpointer instance) { - GitgPatchSet* self; + GitgPatchSet * self; self = instance; #line 40 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_atomic_int_inc (&self->ref_count); @@ -1705,7 +1705,7 @@ void gitg_patch_set_unref (gpointer instance) { - GitgPatchSet* self; + GitgPatchSet * self; self = instance; #line 40 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2020,7 +2020,7 @@ #line 125 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2023 "gitg-stage.c" - goto __catch90_g_error; + goto __catch92_g_error; } #line 126 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp3_ = head; @@ -2033,7 +2033,7 @@ #line 126 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (head); #line 2036 "gitg-stage.c" - goto __catch90_g_error; + goto __catch92_g_error; } #line 126 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp5_ = _tmp2_; @@ -2057,8 +2057,8 @@ _g_object_unref0 (head); #line 2059 "gitg-stage.c" } - goto __finally90; - __catch90_g_error: + goto __finally92; + __catch92_g_error: { GError* err = NULL; GError* _tmp8_ = NULL; @@ -2079,7 +2079,7 @@ _g_error_free0 (err); #line 2081 "gitg-stage.c" } - __finally90: + __finally92: #line 123 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 123 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -2346,7 +2346,7 @@ #line 155 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2349 "gitg-stage.c" - goto __finally91; + goto __finally93; } #line 155 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp3_ = func; @@ -2359,13 +2359,13 @@ #line 155 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (_tmp0_); #line 2362 "gitg-stage.c" - goto __finally91; + goto __finally93; } #line 153 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (_tmp0_); #line 2367 "gitg-stage.c" } - __finally91: + __finally93: { #line 153 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_rec_mutex_unlock (&self->priv->__lock_d_index_mutex); @@ -2638,7 +2638,7 @@ } -static gchar* gitg_stage_convert_message_to_encoding (GitgStage* self, GgitConfig* conf, const gchar* message, gchar** encoding) { +static gchar* gitg_stage_convert_message_to_encoding (GitgStage* self, GgitConfig* conf, const gchar* message, gchar* * encoding) { gchar* _vala_encoding = NULL; gchar* result = NULL; gboolean _tmp6_ = FALSE; @@ -2672,7 +2672,7 @@ #line 182 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2675 "gitg-stage.c" - goto __catch92_g_error; + goto __catch94_g_error; } #line 182 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp3_ = g_strdup (_tmp0_); @@ -2682,8 +2682,8 @@ _vala_encoding = _tmp3_; #line 2684 "gitg-stage.c" } - goto __finally92; - __catch92_g_error: + goto __finally94; + __catch94_g_error: { const gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; @@ -2715,7 +2715,7 @@ return result; #line 2717 "gitg-stage.c" } - __finally92: + __finally94: #line 180 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 180 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -2779,7 +2779,7 @@ #line 196 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2782 "gitg-stage.c" - goto __catch93_g_error; + goto __catch95_g_error; } #line 196 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp16_ = _tmp12_; @@ -2803,8 +2803,8 @@ return result; #line 2805 "gitg-stage.c" } - goto __finally93; - __catch93_g_error: + goto __finally95; + __catch95_g_error: { #line 194 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_clear_error (&_inner_error_); @@ -2816,7 +2816,7 @@ _vala_encoding = NULL; #line 2818 "gitg-stage.c" } - __finally93: + __finally95: #line 194 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 194 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -2858,11 +2858,11 @@ static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 2868 "gitg-stage.c" } @@ -3191,72 +3191,72 @@ gboolean _tmp2_ = FALSE; gchar** _tmp3_ = NULL; gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" separator = ""; #line 3201 "gitg-stage.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = TRUE; #line 3211 "gitg-stage.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; #line 3221 "gitg-stage.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = TRUE; #line 3227 "gitg-stage.c" } else { gboolean _tmp5_ = FALSE; gchar** _tmp6_ = NULL; gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { #line 3238 "gitg-stage.c" gchar** _tmp7_ = NULL; gint _tmp7__length1 = 0; const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; #line 3250 "gitg-stage.c" } else { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = FALSE; #line 3254 "gitg-stage.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; #line 3258 "gitg-stage.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_) { #line 3262 "gitg-stage.c" gint i = 0; @@ -3279,16 +3279,16 @@ const gchar* _tmp44_ = NULL; void* _tmp45_ = NULL; const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1075 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" len = (gsize) 1; #line 3285 "gitg-stage.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { #line 3294 "gitg-stage.c" gboolean _tmp11_ = FALSE; @@ -3301,97 +3301,97 @@ gint _tmp23_ = 0; const gchar* _tmp24_ = NULL; gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp9_) { #line 3307 "gitg-stage.c" gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp10_ + 1; #line 3313 "gitg-stage.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { #line 3323 "gitg-stage.c" gint _tmp14_ = 0; gchar** _tmp15_ = NULL; gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; #line 3335 "gitg-stage.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 3339 "gitg-stage.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = TRUE; #line 3345 "gitg-stage.c" } else { gboolean _tmp16_ = FALSE; gchar** _tmp17_ = NULL; gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { #line 3356 "gitg-stage.c" gchar** _tmp18_ = NULL; gint _tmp18__length1 = 0; gint _tmp19_ = 0; const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; #line 3371 "gitg-stage.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = FALSE; #line 3375 "gitg-stage.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; #line 3379 "gitg-stage.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" break; #line 3385 "gitg-stage.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { #line 3397 "gitg-stage.c" gchar** _tmp25_ = NULL; @@ -3400,91 +3400,91 @@ const gchar* _tmp27_ = NULL; gint _tmp28_ = 0; gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; #line 3418 "gitg-stage.c" } else { -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = 0; #line 3422 "gitg-stage.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1077 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; #line 3428 "gitg-stage.c" } } -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1079 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1079 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { #line 3435 "gitg-stage.c" gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1080 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1080 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1080 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 3443 "gitg-stage.c" } -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1082 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1082 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1082 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1083 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1085 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1085 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1085 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp45_; #line 3481 "gitg-stage.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { #line 3490 "gitg-stage.c" gint _tmp48_ = 0; @@ -3500,94 +3500,94 @@ const gchar* _tmp56_ = NULL; void* _tmp60_ = NULL; void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp46_) { #line 3506 "gitg-stage.c" gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp47_ + 1; #line 3512 "gitg-stage.c" } -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" break; #line 3526 "gitg-stage.c" } -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1088 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1088 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1088 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1088 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { #line 3546 "gitg-stage.c" gchar** _tmp57_ = NULL; gint _tmp57__length1 = 0; gint _tmp58_ = 0; const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; #line 3561 "gitg-stage.c" } else { -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = ""; #line 3565 "gitg-stage.c" } -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1089 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp61_; #line 3573 "gitg-stage.c" } } -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1092 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1092 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1092 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1092 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 3584 "gitg-stage.c" } else { gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1094 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1094 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1094 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 3593 "gitg-stage.c" } @@ -3626,7 +3626,7 @@ #line 253 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (_inner_error_->domain == G_SPAWN_ERROR) { #line 3629 "gitg-stage.c" - goto __catch95_g_spawn_error; + goto __catch97_g_spawn_error; } #line 253 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (hook); @@ -3669,8 +3669,8 @@ #line 3670 "gitg-stage.c" } } - goto __finally95; - __catch95_g_spawn_error: + goto __finally97; + __catch97_g_spawn_error: { GError* e = NULL; #line 251 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -3681,7 +3681,7 @@ _g_error_free0 (e); #line 3683 "gitg-stage.c" } - __finally95: + __finally97: #line 251 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 251 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -3769,11 +3769,11 @@ #line 245 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 3772 "gitg-stage.c" - goto __catch94_g_error; + goto __catch96_g_error; } } - goto __finally94; - __catch94_g_error: + goto __finally96; + __catch96_g_error: { #line 243 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_clear_error (&_data_->_inner_error_); @@ -3781,7 +3781,7 @@ _data_->_inner_error_ = NULL; #line 3783 "gitg-stage.c" } - __finally94: + __finally96: #line 243 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 243 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -3993,11 +3993,11 @@ #line 279 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3996 "gitg-stage.c" - goto __catch96_g_error; + goto __catch98_g_error; } } - goto __finally96; - __catch96_g_error: + goto __finally98; + __catch98_g_error: { #line 277 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_clear_error (&_inner_error_); @@ -4005,7 +4005,7 @@ _inner_error_ = NULL; #line 4007 "gitg-stage.c" } - __finally96: + __finally98: #line 277 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 277 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -4134,11 +4134,11 @@ #line 305 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 4137 "gitg-stage.c" - goto __catch97_g_error; + goto __catch99_g_error; } } - goto __finally97; - __catch97_g_error: + goto __finally99; + __catch99_g_error: { const gchar* _tmp17_ = NULL; gchar* _tmp18_ = NULL; @@ -4160,7 +4160,7 @@ return result; #line 4162 "gitg-stage.c" } - __finally97: + __finally99: #line 303 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 303 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -4202,14 +4202,14 @@ #line 315 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 4205 "gitg-stage.c" - goto __catch98_g_error; + goto __catch100_g_error; } #line 315 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" status = _tmp23_; #line 4210 "gitg-stage.c" } - goto __finally98; - __catch98_g_error: + goto __finally100; + __catch100_g_error: { const gchar* _tmp27_ = NULL; gchar* _tmp28_ = NULL; @@ -4231,7 +4231,7 @@ return result; #line 4233 "gitg-stage.c" } - __finally98: + __finally100: #line 313 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 313 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -4321,7 +4321,7 @@ #line 329 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_free0 (newmessage); #line 4324 "gitg-stage.c" - goto __catch99_g_error; + goto __catch101_g_error; } #line 330 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" result = newmessage; @@ -4350,60 +4350,57 @@ return result; #line 4352 "gitg-stage.c" } - goto __finally99; - __catch99_g_error: + goto __finally101; + __catch101_g_error: { GError* e = NULL; - const gchar* _tmp45_ = NULL; - GError* _tmp46_ = NULL; - const gchar* _tmp47_ = NULL; + GError* _tmp45_ = NULL; + const gchar* _tmp46_ = NULL; + gchar* _tmp47_ = NULL; gchar* _tmp48_ = NULL; - gchar* _tmp49_ = NULL; + GError* _tmp49_ = NULL; GError* _tmp50_ = NULL; - GError* _tmp51_ = NULL; #line 325 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" e = _inner_error_; #line 325 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _inner_error_ = NULL; #line 334 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" - _tmp45_ = _ ("Could not read commit message after running commit-msg hook: %s"); -#line 334 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" - _tmp46_ = e; + _tmp45_ = e; #line 334 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" - _tmp47_ = _tmp46_->message; + _tmp46_ = _tmp45_->message; #line 334 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" - _tmp48_ = g_strdup_printf (_tmp45_, _tmp47_); + _tmp47_ = g_strdup_printf (_ ("Could not read commit message after running commit-msg hook: %s"), _tmp46_); #line 334 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" - _tmp49_ = _tmp48_; + _tmp48_ = _tmp47_; #line 334 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" - _tmp50_ = g_error_new_literal (GITG_STAGE_ERROR, GITG_STAGE_ERROR_COMMIT_MSG_HOOK_FAILED, _tmp49_); + _tmp49_ = g_error_new_literal (GITG_STAGE_ERROR, GITG_STAGE_ERROR_COMMIT_MSG_HOOK_FAILED, _tmp48_); #line 334 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" - _tmp51_ = _tmp50_; + _tmp50_ = _tmp49_; #line 334 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" - _g_free0 (_tmp49_); + _g_free0 (_tmp48_); #line 334 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" - _inner_error_ = _tmp51_; + _inner_error_ = _tmp50_; #line 334 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_error_free0 (e); -#line 4389 "gitg-stage.c" - goto __finally99; +#line 4386 "gitg-stage.c" + goto __finally101; } - __finally99: + __finally101: { - GFile* _tmp52_ = NULL; + GFile* _tmp51_ = NULL; + gchar* _tmp52_ = NULL; gchar* _tmp53_ = NULL; - gchar* _tmp54_ = NULL; #line 338 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" - _tmp52_ = msgfile; + _tmp51_ = msgfile; #line 338 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" - _tmp53_ = g_file_get_path (_tmp52_); + _tmp52_ = g_file_get_path (_tmp51_); #line 338 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" - _tmp54_ = _tmp53_; + _tmp53_ = _tmp52_; #line 338 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" - g_remove (_tmp54_); + g_remove (_tmp53_); #line 338 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" - _g_free0 (_tmp54_); -#line 4407 "gitg-stage.c" + _g_free0 (_tmp53_); +#line 4404 "gitg-stage.c" } #line 325 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_propagate_error (error, _inner_error_); @@ -4413,7 +4410,7 @@ _g_object_unref0 (hook); #line 325 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return NULL; -#line 4417 "gitg-stage.c" +#line 4414 "gitg-stage.c" } @@ -4422,7 +4419,7 @@ g_atomic_int_inc (&_data26_->_ref_count_); #line 342 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return _data26_; -#line 4426 "gitg-stage.c" +#line 4423 "gitg-stage.c" } @@ -4431,7 +4428,7 @@ _data26_ = (Block26Data*) _userdata_; #line 342 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (g_atomic_int_dec_and_test (&_data26_->_ref_count_)) { -#line 4435 "gitg-stage.c" +#line 4432 "gitg-stage.c" GitgStage* self; #line 342 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" self = _data26_->self; @@ -4441,7 +4438,7 @@ _g_object_unref0 (self); #line 342 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (Block26Data, _data26_); -#line 4445 "gitg-stage.c" +#line 4442 "gitg-stage.c" } } @@ -4453,7 +4450,7 @@ self = _data26_->self; #line 348 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_return_if_fail (res != NULL); -#line 4457 "gitg-stage.c" +#line 4454 "gitg-stage.c" { GAsyncResult* _tmp0_ = NULL; #line 351 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -4462,20 +4459,20 @@ gitg_hook_run_finish (_data26_->hook, _tmp0_, &_inner_error_); #line 351 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4466 "gitg-stage.c" - goto __catch100_g_error; +#line 4463 "gitg-stage.c" + goto __catch102_g_error; } } - goto __finally100; - __catch100_g_error: + goto __finally102; + __catch102_g_error: { #line 349 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_clear_error (&_inner_error_); #line 349 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _inner_error_ = NULL; -#line 4477 "gitg-stage.c" +#line 4474 "gitg-stage.c" } - __finally100: + __finally102: #line 349 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 349 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -4484,7 +4481,7 @@ g_clear_error (&_inner_error_); #line 349 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 4488 "gitg-stage.c" +#line 4485 "gitg-stage.c" } } @@ -4494,7 +4491,7 @@ __lambda17_ (self, source_object, res); #line 348 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" block26_data_unref (self); -#line 4498 "gitg-stage.c" +#line 4495 "gitg-stage.c" } @@ -4529,7 +4526,7 @@ block26_data_unref (_data26_); #line 342 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data26_ = NULL; -#line 4533 "gitg-stage.c" +#line 4530 "gitg-stage.c" } @@ -4540,37 +4537,37 @@ const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1003 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1003 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, 0); -#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1004 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1004 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = needle; -#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1004 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_); -#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1004 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1006 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1006 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 4560 "gitg-stage.c" +#line 4557 "gitg-stage.c" gchar* _tmp4_ = NULL; -#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1007 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1007 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1007 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 4568 "gitg-stage.c" +#line 4565 "gitg-stage.c" } else { -#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1009 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = -1; -#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1009 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 4574 "gitg-stage.c" +#line 4571 "gitg-stage.c" } } @@ -4592,105 +4589,105 @@ glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1347 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { -#line 4608 "gitg-stage.c" +#line 4605 "gitg-stage.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; -#line 4617 "gitg-stage.c" +#line 4614 "gitg-stage.c" } -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { -#line 4623 "gitg-stage.c" +#line 4620 "gitg-stage.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; -#line 4632 "gitg-stage.c" +#line 4629 "gitg-stage.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { -#line 4638 "gitg-stage.c" +#line 4635 "gitg-stage.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; -#line 4647 "gitg-stage.c" +#line 4644 "gitg-stage.c" } else { -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = FALSE; -#line 4651 "gitg-stage.c" +#line 4648 "gitg-stage.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { -#line 4659 "gitg-stage.c" +#line 4656 "gitg-stage.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; -#line 4668 "gitg-stage.c" +#line 4665 "gitg-stage.c" } else { -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 4672 "gitg-stage.c" +#line 4669 "gitg-stage.c" } -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 4694 "gitg-stage.c" +#line 4691 "gitg-stage.c" } @@ -4714,7 +4711,7 @@ _tmp2_ = nlpos; #line 360 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (_tmp2_ == -1) { -#line 4718 "gitg-stage.c" +#line 4715 "gitg-stage.c" const gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; #line 362 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -4725,7 +4722,7 @@ result = _tmp4_; #line 362 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return result; -#line 4729 "gitg-stage.c" +#line 4726 "gitg-stage.c" } else { const gchar* _tmp5_ = NULL; gint _tmp6_ = 0; @@ -4740,7 +4737,7 @@ result = _tmp7_; #line 366 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return result; -#line 4744 "gitg-stage.c" +#line 4741 "gitg-stage.c" } } @@ -4748,7 +4745,7 @@ static void _vala_GgitOId_free (GgitOId* self) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_boxed_free (ggit_oid_get_type (), self); -#line 4752 "gitg-stage.c" +#line 4749 "gitg-stage.c" } @@ -4769,7 +4766,7 @@ _g_object_unref0 (_data_->self); #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (GitgStageCommitIndexData, _data_); -#line 4773 "gitg-stage.c" +#line 4770 "gitg-stage.c" } @@ -4853,7 +4850,7 @@ _data_->options = _tmp12_; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_commit_index_co (_data_); -#line 4857 "gitg-stage.c" +#line 4854 "gitg-stage.c" } @@ -4864,7 +4861,7 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return NULL; -#line 4868 "gitg-stage.c" +#line 4865 "gitg-stage.c" } #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); @@ -4874,7 +4871,7 @@ _data_->result = NULL; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return result; -#line 4878 "gitg-stage.c" +#line 4875 "gitg-stage.c" } @@ -4883,7 +4880,7 @@ g_atomic_int_inc (&_data27_->_ref_count_); #line 370 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return _data27_; -#line 4887 "gitg-stage.c" +#line 4884 "gitg-stage.c" } @@ -4892,7 +4889,7 @@ _data27_ = (Block27Data*) _userdata_; #line 370 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (g_atomic_int_dec_and_test (&_data27_->_ref_count_)) { -#line 4896 "gitg-stage.c" +#line 4893 "gitg-stage.c" GitgStage* self; #line 370 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" self = _data27_->self; @@ -4904,7 +4901,7 @@ _g_object_unref0 (self); #line 370 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (Block27Data, _data27_); -#line 4908 "gitg-stage.c" +#line 4905 "gitg-stage.c" } } @@ -4933,7 +4930,7 @@ g_propagate_error (error, _inner_error_); #line 381 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 4937 "gitg-stage.c" +#line 4934 "gitg-stage.c" } #line 381 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp4_ = _tmp0_; @@ -4945,14 +4942,14 @@ _data27_->treeoid = _tmp4_; #line 380 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" __vala_GgitOId_free0 (_tmp0_); -#line 4949 "gitg-stage.c" +#line 4946 "gitg-stage.c" } static void ___lambda18__gitg_async_thread_func (gpointer self, GError** error) { #line 380 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" __lambda18_ (self, error); -#line 4956 "gitg-stage.c" +#line 4953 "gitg-stage.c" } @@ -4966,7 +4963,7 @@ _data_->_res_ = _res_; #line 380 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_commit_index_co (_data_); -#line 4970 "gitg-stage.c" +#line 4967 "gitg-stage.c" } @@ -4975,20 +4972,20 @@ switch (_data_->_state_) { #line 370 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 0: -#line 4979 "gitg-stage.c" +#line 4976 "gitg-stage.c" goto _state_0; #line 370 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 1: -#line 4983 "gitg-stage.c" +#line 4980 "gitg-stage.c" goto _state_1; #line 370 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 2: -#line 4987 "gitg-stage.c" +#line 4984 "gitg-stage.c" goto _state_2; default: #line 370 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_assert_not_reached (); -#line 4992 "gitg-stage.c" +#line 4989 "gitg-stage.c" } _state_0: #line 370 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -5015,7 +5012,7 @@ gitg_async_thread (___lambda18__gitg_async_thread_func, _data_->_data27_, gitg_stage_commit_index_ready, _data_); #line 380 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 5019 "gitg-stage.c" +#line 5016 "gitg-stage.c" _state_1: #line 380 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_async_thread_finish (_data_->_res_, &_data_->_inner_error_); @@ -5033,17 +5030,17 @@ if (_data_->_state_ == 0) { #line 380 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 5037 "gitg-stage.c" +#line 5034 "gitg-stage.c" } else { #line 380 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 5041 "gitg-stage.c" +#line 5038 "gitg-stage.c" } #line 380 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 380 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 5047 "gitg-stage.c" +#line 5044 "gitg-stage.c" } #line 384 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp2_ = NULL; @@ -5083,7 +5080,7 @@ gitg_stage_commit_tree (_data_->self, _data_->_tmp2_, _data_->_tmp3_, _data_->_tmp4_, _data_->_tmp5_, _data_->_tmp6_, _data_->_tmp7_, _data_->_tmp7__length1, _data_->_tmp8_, gitg_stage_commit_index_ready, _data_); #line 384 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 5087 "gitg-stage.c" +#line 5084 "gitg-stage.c" _state_2: #line 384 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp9_ = NULL; @@ -5105,17 +5102,17 @@ if (_data_->_state_ == 0) { #line 384 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 5109 "gitg-stage.c" +#line 5106 "gitg-stage.c" } else { #line 384 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 5113 "gitg-stage.c" +#line 5110 "gitg-stage.c" } #line 384 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 384 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 5119 "gitg-stage.c" +#line 5116 "gitg-stage.c" } #line 384 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp10_ = NULL; @@ -5135,11 +5132,11 @@ if (_data_->_state_ == 0) { #line 384 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 5139 "gitg-stage.c" +#line 5136 "gitg-stage.c" } else { #line 384 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 5143 "gitg-stage.c" +#line 5140 "gitg-stage.c" } #line 384 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); @@ -5155,17 +5152,17 @@ if (_data_->_state_ == 0) { #line 370 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 5159 "gitg-stage.c" +#line 5156 "gitg-stage.c" } else { #line 370 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 5163 "gitg-stage.c" +#line 5160 "gitg-stage.c" } #line 370 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 370 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 5169 "gitg-stage.c" +#line 5166 "gitg-stage.c" } @@ -5178,21 +5175,21 @@ _g_object_unref0 (_data_->self); #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (GitgStageCommitTreeData, _data_); -#line 5182 "gitg-stage.c" +#line 5179 "gitg-stage.c" } static GgitOId* _vala_GgitOId_copy (GgitOId* self) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return g_boxed_copy (ggit_oid_get_type (), self); -#line 5189 "gitg-stage.c" +#line 5186 "gitg-stage.c" } static gpointer __vala_GgitOId_copy0 (gpointer self) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return self ? _vala_GgitOId_copy (self) : NULL; -#line 5196 "gitg-stage.c" +#line 5193 "gitg-stage.c" } @@ -5276,7 +5273,7 @@ _data_->options = _tmp12_; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_commit_tree_co (_data_); -#line 5280 "gitg-stage.c" +#line 5277 "gitg-stage.c" } @@ -5287,7 +5284,7 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return NULL; -#line 5291 "gitg-stage.c" +#line 5288 "gitg-stage.c" } #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); @@ -5297,7 +5294,7 @@ _data_->result = NULL; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return result; -#line 5301 "gitg-stage.c" +#line 5298 "gitg-stage.c" } @@ -5306,7 +5303,7 @@ g_atomic_int_inc (&_data28_->_ref_count_); #line 387 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return _data28_; -#line 5310 "gitg-stage.c" +#line 5307 "gitg-stage.c" } @@ -5315,7 +5312,7 @@ _data28_ = (Block28Data*) _userdata_; #line 387 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (g_atomic_int_dec_and_test (&_data28_->_ref_count_)) { -#line 5319 "gitg-stage.c" +#line 5316 "gitg-stage.c" GitgStage* self; #line 387 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" self = _data28_->self; @@ -5335,29 +5332,29 @@ _g_object_unref0 (self); #line 387 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (Block28Data, _data28_); -#line 5339 "gitg-stage.c" +#line 5336 "gitg-stage.c" } } -static GgitOId** _vala_array_dup20 (GgitOId** self, int length) { +static GgitOId** _vala_array_dup21 (GgitOId** self, int length) { GgitOId** result; int i; #line 445 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" result = g_new0 (GgitOId*, length + 1); #line 445 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" for (i = 0; i < length; i++) { -#line 5351 "gitg-stage.c" +#line 5348 "gitg-stage.c" GgitOId* _tmp0_ = NULL; #line 445 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp0_ = __vala_GgitOId_copy0 (self[i]); #line 445 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" result[i] = _tmp0_; -#line 5357 "gitg-stage.c" +#line 5354 "gitg-stage.c" } #line 445 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return result; -#line 5361 "gitg-stage.c" +#line 5358 "gitg-stage.c" } @@ -5426,7 +5423,7 @@ g_propagate_error (error, _inner_error_); #line 402 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 5430 "gitg-stage.c" +#line 5427 "gitg-stage.c" } #line 402 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp5_ = _tmp2_; @@ -5450,7 +5447,7 @@ _g_object_unref0 (_tmp2_); #line 402 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 5454 "gitg-stage.c" +#line 5451 "gitg-stage.c" } #line 404 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp9_ = _data28_->message; @@ -5462,7 +5459,7 @@ _tmp11_ = _data28_->options; #line 406 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if ((_tmp11_ & GITG_STAGE_COMMIT_OPTIONS_SIGN_OFF) != 0) { -#line 5466 "gitg-stage.c" +#line 5463 "gitg-stage.c" const gchar* _tmp12_ = NULL; GgitSignature* _tmp13_ = NULL; gchar* _tmp14_ = NULL; @@ -5476,7 +5473,7 @@ _g_free0 (emsg); #line 408 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" emsg = _tmp14_; -#line 5480 "gitg-stage.c" +#line 5477 "gitg-stage.c" } #line 413 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp15_ = conf; @@ -5496,7 +5493,7 @@ _tmp19_ = skip_hooks; #line 415 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (!_tmp19_) { -#line 5500 "gitg-stage.c" +#line 5497 "gitg-stage.c" gchar* _tmp20_ = NULL; const gchar* _tmp21_ = NULL; GgitSignature* _tmp22_ = NULL; @@ -5527,7 +5524,7 @@ _g_object_unref0 (_tmp2_); #line 417 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 5531 "gitg-stage.c" +#line 5528 "gitg-stage.c" } #line 417 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp25_ = _tmp20_; @@ -5539,11 +5536,11 @@ emsg = _tmp25_; #line 415 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_free0 (_tmp20_); -#line 5543 "gitg-stage.c" +#line 5540 "gitg-stage.c" } #line 420 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" refoid = NULL; -#line 5547 "gitg-stage.c" +#line 5544 "gitg-stage.c" { GgitRef* _tmp26_ = NULL; GgitRef* _tmp27_ = NULL; @@ -5559,8 +5556,8 @@ _tmp26_ = _tmp28_; #line 425 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5563 "gitg-stage.c" - goto __catch101_g_error; +#line 5560 "gitg-stage.c" + goto __catch103_g_error; } #line 425 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp29_ = _tmp26_; @@ -5578,18 +5575,18 @@ _g_object_unref0 (_tmp30_); #line 422 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (_tmp26_); -#line 5582 "gitg-stage.c" +#line 5579 "gitg-stage.c" } - goto __finally101; - __catch101_g_error: + goto __finally103; + __catch103_g_error: { #line 422 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_clear_error (&_inner_error_); #line 422 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _inner_error_ = NULL; -#line 5591 "gitg-stage.c" +#line 5588 "gitg-stage.c" } - __finally101: + __finally103: #line 422 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 422 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -5606,13 +5603,13 @@ _g_object_unref0 (_tmp2_); #line 422 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 5610 "gitg-stage.c" +#line 5607 "gitg-stage.c" } #line 428 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp32_ = amend; #line 428 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (!_tmp32_) { -#line 5616 "gitg-stage.c" +#line 5613 "gitg-stage.c" GgitOId** pars = NULL; gint pars_length1 = 0; gint _pars_size_ = 0; @@ -5637,13 +5634,13 @@ _tmp33__length1 = _data28_->parents_length1; #line 432 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (_tmp33_ == NULL) { -#line 5641 "gitg-stage.c" +#line 5638 "gitg-stage.c" GgitOId* _tmp34_ = NULL; #line 434 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp34_ = refoid; #line 434 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (_tmp34_ == NULL) { -#line 5647 "gitg-stage.c" +#line 5644 "gitg-stage.c" GgitOId** _tmp35_ = NULL; #line 436 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp35_ = g_new0 (GgitOId*, 0 + 1); @@ -5655,7 +5652,7 @@ pars_length1 = 0; #line 436 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _pars_size_ = pars_length1; -#line 5659 "gitg-stage.c" +#line 5656 "gitg-stage.c" } else { GgitOId* _tmp36_ = NULL; GgitOId* _tmp37_ = NULL; @@ -5676,7 +5673,7 @@ pars_length1 = 1; #line 440 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _pars_size_ = pars_length1; -#line 5680 "gitg-stage.c" +#line 5677 "gitg-stage.c" } } else { GgitOId** _tmp39_ = NULL; @@ -5688,7 +5685,7 @@ #line 445 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp39__length1 = _data28_->parents_length1; #line 445 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" - _tmp40_ = (_tmp39_ != NULL) ? _vala_array_dup20 (_tmp39_, _tmp39__length1) : ((gpointer) _tmp39_); + _tmp40_ = (_tmp39_ != NULL) ? _vala_array_dup21 (_tmp39_, _tmp39__length1) : ((gpointer) _tmp39_); #line 445 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp40__length1 = _tmp39__length1; #line 445 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -5699,7 +5696,7 @@ pars_length1 = _tmp40__length1; #line 445 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _pars_size_ = pars_length1; -#line 5703 "gitg-stage.c" +#line 5700 "gitg-stage.c" } #line 448 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp42_ = self->priv->d_repository; @@ -5743,7 +5740,7 @@ _g_object_unref0 (_tmp2_); #line 448 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 5747 "gitg-stage.c" +#line 5744 "gitg-stage.c" } #line 448 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp52_ = _tmp41_; @@ -5757,7 +5754,7 @@ __vala_GgitOId_free0 (_tmp41_); #line 428 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" pars = (_vala_array_free (pars, pars_length1, (GDestroyNotify) _vala_GgitOId_free), NULL); -#line 5761 "gitg-stage.c" +#line 5758 "gitg-stage.c" } else { GgitCommit* refcommit = NULL; GitgRepository* _tmp53_ = NULL; @@ -5802,7 +5799,7 @@ _g_object_unref0 (_tmp2_); #line 458 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 5806 "gitg-stage.c" +#line 5803 "gitg-stage.c" } #line 459 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp56_ = self->priv->d_repository; @@ -5830,7 +5827,7 @@ _g_object_unref0 (_tmp2_); #line 459 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 5834 "gitg-stage.c" +#line 5831 "gitg-stage.c" } #line 461 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp60_ = refcommit; @@ -5872,7 +5869,7 @@ _g_object_unref0 (_tmp2_); #line 461 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 5876 "gitg-stage.c" +#line 5873 "gitg-stage.c" } #line 461 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp69_ = _tmp59_; @@ -5888,11 +5885,11 @@ _g_object_unref0 (tree); #line 428 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (refcommit); -#line 5892 "gitg-stage.c" +#line 5889 "gitg-stage.c" } #line 469 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" always_update = FALSE; -#line 5896 "gitg-stage.c" +#line 5893 "gitg-stage.c" { gboolean _tmp70_ = FALSE; GgitConfig* _tmp71_ = NULL; @@ -5905,23 +5902,23 @@ _tmp70_ = _tmp72_; #line 473 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5909 "gitg-stage.c" - goto __catch102_g_error; +#line 5906 "gitg-stage.c" + goto __catch104_g_error; } #line 473 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" always_update = _tmp70_; -#line 5914 "gitg-stage.c" +#line 5911 "gitg-stage.c" } - goto __finally102; - __catch102_g_error: + goto __finally104; + __catch104_g_error: { #line 471 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_clear_error (&_inner_error_); #line 471 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _inner_error_ = NULL; -#line 5923 "gitg-stage.c" +#line 5920 "gitg-stage.c" } - __finally102: + __finally104: #line 471 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 471 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -5938,7 +5935,7 @@ _g_object_unref0 (_tmp2_); #line 471 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 5942 "gitg-stage.c" +#line 5939 "gitg-stage.c" } #line 476 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp73_ = g_strdup ("commit"); @@ -5948,7 +5945,7 @@ _tmp74_ = amend; #line 478 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (_tmp74_) { -#line 5952 "gitg-stage.c" +#line 5949 "gitg-stage.c" const gchar* _tmp75_ = NULL; gchar* _tmp76_ = NULL; #line 480 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -5959,7 +5956,7 @@ _g_free0 (reflogmsg); #line 480 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" reflogmsg = _tmp76_; -#line 5963 "gitg-stage.c" +#line 5960 "gitg-stage.c" } #line 483 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp77_ = reflogmsg; @@ -5983,7 +5980,7 @@ _g_free0 (_tmp82_); #line 483 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_free0 (_tmp80_); -#line 5987 "gitg-stage.c" +#line 5984 "gitg-stage.c" { gboolean _tmp84_ = FALSE; gboolean _tmp85_ = FALSE; @@ -5993,7 +5990,7 @@ if (_tmp85_) { #line 488 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp84_ = TRUE; -#line 5997 "gitg-stage.c" +#line 5994 "gitg-stage.c" } else { GgitRef* _tmp86_ = NULL; gboolean _tmp87_ = FALSE; @@ -6003,11 +6000,11 @@ _tmp87_ = ggit_ref_has_log (_tmp86_); #line 488 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp84_ = _tmp87_; -#line 6007 "gitg-stage.c" +#line 6004 "gitg-stage.c" } #line 488 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (_tmp84_) { -#line 6011 "gitg-stage.c" +#line 6008 "gitg-stage.c" GgitReflog* reflog = NULL; GgitRef* _tmp88_ = NULL; GgitReflog* _tmp89_ = NULL; @@ -6023,8 +6020,8 @@ reflog = _tmp89_; #line 490 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6027 "gitg-stage.c" - goto __catch103_g_error; +#line 6024 "gitg-stage.c" + goto __catch105_g_error; } #line 491 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp90_ = reflog; @@ -6038,8 +6035,8 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 491 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _ggit_reflog_unref0 (reflog); -#line 6042 "gitg-stage.c" - goto __catch103_g_error; +#line 6039 "gitg-stage.c" + goto __catch105_g_error; } #line 492 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp93_ = reflog; @@ -6049,24 +6046,24 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 492 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _ggit_reflog_unref0 (reflog); -#line 6053 "gitg-stage.c" - goto __catch103_g_error; +#line 6050 "gitg-stage.c" + goto __catch105_g_error; } #line 488 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _ggit_reflog_unref0 (reflog); -#line 6058 "gitg-stage.c" +#line 6055 "gitg-stage.c" } } - goto __finally103; - __catch103_g_error: + goto __finally105; + __catch105_g_error: { #line 486 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_clear_error (&_inner_error_); #line 486 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _inner_error_ = NULL; -#line 6068 "gitg-stage.c" +#line 6065 "gitg-stage.c" } - __finally103: + __finally105: #line 486 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 486 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -6085,7 +6082,7 @@ _g_object_unref0 (_tmp2_); #line 486 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 6089 "gitg-stage.c" +#line 6086 "gitg-stage.c" } #line 496 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp94_ = _data28_->reference; @@ -6093,7 +6090,7 @@ _tmp95_ = ggit_ref_get_reference_type (_tmp94_); #line 496 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (_tmp95_ == GGIT_REF_SYMBOLIC) { -#line 6097 "gitg-stage.c" +#line 6094 "gitg-stage.c" { GgitRef* resolved = NULL; GgitRef* _tmp96_ = NULL; @@ -6108,8 +6105,8 @@ resolved = _tmp97_; #line 501 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6112 "gitg-stage.c" - goto __catch104_g_error; +#line 6109 "gitg-stage.c" + goto __catch106_g_error; } #line 503 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp99_ = always_update; @@ -6117,7 +6114,7 @@ if (_tmp99_) { #line 503 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp98_ = TRUE; -#line 6121 "gitg-stage.c" +#line 6118 "gitg-stage.c" } else { GgitRef* _tmp100_ = NULL; gboolean _tmp101_ = FALSE; @@ -6127,11 +6124,11 @@ _tmp101_ = ggit_ref_has_log (_tmp100_); #line 503 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp98_ = _tmp101_; -#line 6131 "gitg-stage.c" +#line 6128 "gitg-stage.c" } #line 503 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (_tmp98_) { -#line 6135 "gitg-stage.c" +#line 6132 "gitg-stage.c" GgitReflog* reflog = NULL; GgitRef* _tmp102_ = NULL; GgitReflog* _tmp103_ = NULL; @@ -6149,8 +6146,8 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 505 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (resolved); -#line 6153 "gitg-stage.c" - goto __catch104_g_error; +#line 6150 "gitg-stage.c" + goto __catch106_g_error; } #line 507 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp104_ = reflog; @@ -6166,8 +6163,8 @@ _ggit_reflog_unref0 (reflog); #line 507 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (resolved); -#line 6170 "gitg-stage.c" - goto __catch104_g_error; +#line 6167 "gitg-stage.c" + goto __catch106_g_error; } #line 508 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp107_ = reflog; @@ -6179,27 +6176,27 @@ _ggit_reflog_unref0 (reflog); #line 508 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (resolved); -#line 6183 "gitg-stage.c" - goto __catch104_g_error; +#line 6180 "gitg-stage.c" + goto __catch106_g_error; } #line 503 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _ggit_reflog_unref0 (reflog); -#line 6188 "gitg-stage.c" +#line 6185 "gitg-stage.c" } #line 499 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (resolved); -#line 6192 "gitg-stage.c" +#line 6189 "gitg-stage.c" } - goto __finally104; - __catch104_g_error: + goto __finally106; + __catch106_g_error: { #line 499 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_clear_error (&_inner_error_); #line 499 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _inner_error_ = NULL; -#line 6201 "gitg-stage.c" +#line 6198 "gitg-stage.c" } - __finally104: + __finally106: #line 499 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 499 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -6218,7 +6215,7 @@ _g_object_unref0 (_tmp2_); #line 499 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 6222 "gitg-stage.c" +#line 6219 "gitg-stage.c" } } #line 513 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -6231,7 +6228,7 @@ _g_object_unref0 (self->priv->d_head_tree); #line 515 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" self->priv->d_head_tree = NULL; -#line 6235 "gitg-stage.c" +#line 6232 "gitg-stage.c" } #line 519 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp110_ = _data28_->author; @@ -6249,14 +6246,14 @@ _g_object_unref0 (conf); #line 397 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (_tmp2_); -#line 6253 "gitg-stage.c" +#line 6250 "gitg-stage.c" } static void ___lambda19__gitg_async_thread_func (gpointer self, GError** error) { #line 397 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" __lambda19_ (self, error); -#line 6260 "gitg-stage.c" +#line 6257 "gitg-stage.c" } @@ -6270,7 +6267,7 @@ _data_->_res_ = _res_; #line 397 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_commit_tree_co (_data_); -#line 6274 "gitg-stage.c" +#line 6271 "gitg-stage.c" } @@ -6279,16 +6276,16 @@ switch (_data_->_state_) { #line 387 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 0: -#line 6283 "gitg-stage.c" +#line 6280 "gitg-stage.c" goto _state_0; #line 387 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 1: -#line 6287 "gitg-stage.c" +#line 6284 "gitg-stage.c" goto _state_1; default: #line 387 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_assert_not_reached (); -#line 6292 "gitg-stage.c" +#line 6289 "gitg-stage.c" } _state_0: #line 387 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -6365,7 +6362,7 @@ gitg_async_thread (___lambda19__gitg_async_thread_func, _data_->_data28_, gitg_stage_commit_tree_ready, _data_); #line 397 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 6369 "gitg-stage.c" +#line 6366 "gitg-stage.c" _state_1: #line 397 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_async_thread_finish (_data_->_res_, &_data_->_inner_error_); @@ -6383,17 +6380,17 @@ if (_data_->_state_ == 0) { #line 397 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 6387 "gitg-stage.c" +#line 6384 "gitg-stage.c" } else { #line 397 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 6391 "gitg-stage.c" +#line 6388 "gitg-stage.c" } #line 397 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 397 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 6397 "gitg-stage.c" +#line 6394 "gitg-stage.c" } #line 522 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp7_ = NULL; @@ -6409,11 +6406,11 @@ if (_data_->_state_ == 0) { #line 522 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 6413 "gitg-stage.c" +#line 6410 "gitg-stage.c" } else { #line 522 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 6417 "gitg-stage.c" +#line 6414 "gitg-stage.c" } #line 522 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); @@ -6427,17 +6424,17 @@ if (_data_->_state_ == 0) { #line 387 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 6431 "gitg-stage.c" +#line 6428 "gitg-stage.c" } else { #line 387 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 6435 "gitg-stage.c" +#line 6432 "gitg-stage.c" } #line 387 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 387 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 6441 "gitg-stage.c" +#line 6438 "gitg-stage.c" } @@ -6456,7 +6453,7 @@ _g_object_unref0 (_data_->self); #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (GitgStageCommitData, _data_); -#line 6460 "gitg-stage.c" +#line 6457 "gitg-stage.c" } @@ -6510,7 +6507,7 @@ _data_->options = _tmp7_; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_commit_co (_data_); -#line 6514 "gitg-stage.c" +#line 6511 "gitg-stage.c" } @@ -6521,7 +6518,7 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return NULL; -#line 6525 "gitg-stage.c" +#line 6522 "gitg-stage.c" } #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); @@ -6531,7 +6528,7 @@ _data_->result = NULL; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return result; -#line 6535 "gitg-stage.c" +#line 6532 "gitg-stage.c" } @@ -6540,7 +6537,7 @@ g_atomic_int_inc (&_data29_->_ref_count_); #line 533 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return _data29_; -#line 6544 "gitg-stage.c" +#line 6541 "gitg-stage.c" } @@ -6549,7 +6546,7 @@ _data29_ = (Block29Data*) _userdata_; #line 533 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (g_atomic_int_dec_and_test (&_data29_->_ref_count_)) { -#line 6553 "gitg-stage.c" +#line 6550 "gitg-stage.c" GitgStage* self; #line 533 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" self = _data29_->self; @@ -6559,7 +6556,7 @@ _g_object_unref0 (self); #line 533 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (Block29Data, _data29_); -#line 6563 "gitg-stage.c" +#line 6560 "gitg-stage.c" } } @@ -6585,7 +6582,7 @@ g_propagate_error (error, _inner_error_); #line 538 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 6589 "gitg-stage.c" +#line 6586 "gitg-stage.c" } #line 538 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp3_ = _tmp0_; @@ -6597,14 +6594,14 @@ _data29_->index = _tmp3_; #line 537 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (_tmp0_); -#line 6601 "gitg-stage.c" +#line 6598 "gitg-stage.c" } static void _____lambda20__gitg_async_thread_func (gpointer self, GError** error) { #line 537 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" ____lambda20_ (self, error); -#line 6608 "gitg-stage.c" +#line 6605 "gitg-stage.c" } @@ -6618,7 +6615,7 @@ _data_->_res_ = _res_; #line 537 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_commit_co (_data_); -#line 6622 "gitg-stage.c" +#line 6619 "gitg-stage.c" } @@ -6627,20 +6624,20 @@ switch (_data_->_state_) { #line 525 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 0: -#line 6631 "gitg-stage.c" +#line 6628 "gitg-stage.c" goto _state_0; #line 525 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 1: -#line 6635 "gitg-stage.c" +#line 6632 "gitg-stage.c" goto _state_1; #line 525 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 2: -#line 6639 "gitg-stage.c" +#line 6636 "gitg-stage.c" goto _state_2; default: #line 525 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_assert_not_reached (); -#line 6644 "gitg-stage.c" +#line 6641 "gitg-stage.c" } _state_0: #line 530 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -6651,11 +6648,11 @@ _data_->amend = (_data_->_tmp0_ & GITG_STAGE_COMMIT_OPTIONS_AMEND) != 0; #line 531 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->ret = NULL; -#line 6655 "gitg-stage.c" +#line 6652 "gitg-stage.c" { #line 533 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_rec_mutex_lock (&_data_->self->priv->__lock_d_index_mutex); -#line 6659 "gitg-stage.c" +#line 6656 "gitg-stage.c" { #line 533 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_data29_ = g_slice_new0 (Block29Data); @@ -6671,7 +6668,7 @@ gitg_async_thread (_____lambda20__gitg_async_thread_func, _data_->_data29_, gitg_stage_commit_ready, _data_); #line 537 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 6675 "gitg-stage.c" +#line 6672 "gitg-stage.c" _state_1: #line 537 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_async_thread_finish (_data_->_res_, &_data_->_inner_error_); @@ -6681,8 +6678,8 @@ block29_data_unref (_data_->_data29_); #line 537 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_data29_ = NULL; -#line 6685 "gitg-stage.c" - goto __finally105; +#line 6682 "gitg-stage.c" + goto __finally107; } #line 541 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp2_ = FALSE; @@ -6696,11 +6693,11 @@ _data_->_tmp3_ = gitg_stage_has_index_changes (_data_->self); #line 541 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp1_ = !_data_->_tmp3_; -#line 6700 "gitg-stage.c" +#line 6697 "gitg-stage.c" } else { #line 541 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp1_ = FALSE; -#line 6704 "gitg-stage.c" +#line 6701 "gitg-stage.c" } #line 541 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (_data_->_tmp1_) { @@ -6714,8 +6711,8 @@ block29_data_unref (_data_->_data29_); #line 543 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_data29_ = NULL; -#line 6718 "gitg-stage.c" - goto __finally105; +#line 6715 "gitg-stage.c" + goto __finally107; } #line 547 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp6_ = NULL; @@ -6733,8 +6730,8 @@ block29_data_unref (_data_->_data29_); #line 547 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_data29_ = NULL; -#line 6737 "gitg-stage.c" - goto __finally105; +#line 6734 "gitg-stage.c" + goto __finally107; } #line 546 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp9_ = NULL; @@ -6762,7 +6759,7 @@ gitg_stage_commit_index (_data_->self, _data_->_tmp9_, (GgitRef*) _data_->_tmp5_, _data_->_tmp10_, _data_->_tmp11_, _data_->_tmp12_, NULL, 0, _data_->_tmp13_, gitg_stage_commit_ready, _data_); #line 546 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 6766 "gitg-stage.c" +#line 6763 "gitg-stage.c" _state_2: #line 546 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp14_ = NULL; @@ -6778,8 +6775,8 @@ block29_data_unref (_data_->_data29_); #line 546 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_data29_ = NULL; -#line 6782 "gitg-stage.c" - goto __finally105; +#line 6779 "gitg-stage.c" + goto __finally107; } #line 546 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp15_ = NULL; @@ -6799,13 +6796,13 @@ block29_data_unref (_data_->_data29_); #line 533 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_data29_ = NULL; -#line 6803 "gitg-stage.c" +#line 6800 "gitg-stage.c" } - __finally105: + __finally107: { #line 533 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_rec_mutex_unlock (&_data_->self->priv->__lock_d_index_mutex); -#line 6809 "gitg-stage.c" +#line 6806 "gitg-stage.c" } #line 533 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { @@ -6819,17 +6816,17 @@ if (_data_->_state_ == 0) { #line 533 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 6823 "gitg-stage.c" +#line 6820 "gitg-stage.c" } else { #line 533 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 6827 "gitg-stage.c" +#line 6824 "gitg-stage.c" } #line 533 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 533 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 6833 "gitg-stage.c" +#line 6830 "gitg-stage.c" } } #line 555 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -6838,11 +6835,11 @@ if (_data_->_state_ == 0) { #line 555 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 6842 "gitg-stage.c" +#line 6839 "gitg-stage.c" } else { #line 555 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 6846 "gitg-stage.c" +#line 6843 "gitg-stage.c" } #line 555 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); @@ -6854,17 +6851,17 @@ if (_data_->_state_ == 0) { #line 525 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 6858 "gitg-stage.c" +#line 6855 "gitg-stage.c" } else { #line 525 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 6862 "gitg-stage.c" +#line 6859 "gitg-stage.c" } #line 525 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 525 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 6868 "gitg-stage.c" +#line 6865 "gitg-stage.c" } @@ -6875,7 +6872,7 @@ _g_object_unref0 (_data_->self); #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (GitgStageRevertData, _data_); -#line 6879 "gitg-stage.c" +#line 6876 "gitg-stage.c" } @@ -6904,7 +6901,7 @@ _data_->file = _tmp2_; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_revert_co (_data_); -#line 6908 "gitg-stage.c" +#line 6905 "gitg-stage.c" } @@ -6914,11 +6911,11 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 6918 "gitg-stage.c" +#line 6915 "gitg-stage.c" } #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 6922 "gitg-stage.c" +#line 6919 "gitg-stage.c" } @@ -6937,7 +6934,7 @@ g_atomic_int_inc (&_data30_->_ref_count_); #line 568 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return _data30_; -#line 6941 "gitg-stage.c" +#line 6938 "gitg-stage.c" } @@ -6946,7 +6943,7 @@ _data30_ = (Block30Data*) _userdata_; #line 568 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (g_atomic_int_dec_and_test (&_data30_->_ref_count_)) { -#line 6950 "gitg-stage.c" +#line 6947 "gitg-stage.c" GitgStage* self; #line 568 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" self = _data30_->self; @@ -6958,7 +6955,7 @@ _g_object_unref0 (self); #line 568 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (Block30Data, _data30_); -#line 6962 "gitg-stage.c" +#line 6959 "gitg-stage.c" } } @@ -6973,7 +6970,7 @@ _data_->_res_ = _res_; #line 570 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_revert_co (_data_); -#line 6977 "gitg-stage.c" +#line 6974 "gitg-stage.c" } @@ -7042,7 +7039,7 @@ _g_object_unref0 (wd); #line 578 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 7046 "gitg-stage.c" +#line 7043 "gitg-stage.c" } #line 579 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp8_ = entry; @@ -7072,7 +7069,7 @@ _g_object_unref0 (wd); #line 582 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 7076 "gitg-stage.c" +#line 7073 "gitg-stage.c" } #line 584 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp13_ = _data30_->file; @@ -7096,7 +7093,7 @@ _g_object_unref0 (wd); #line 584 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 7100 "gitg-stage.c" +#line 7097 "gitg-stage.c" } #line 586 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp15_ = stream; @@ -7124,7 +7121,7 @@ _g_object_unref0 (wd); #line 586 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 7128 "gitg-stage.c" +#line 7125 "gitg-stage.c" } #line 587 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp19_ = stream; @@ -7148,7 +7145,7 @@ _g_object_unref0 (wd); #line 587 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 7152 "gitg-stage.c" +#line 7149 "gitg-stage.c" } #line 572 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (stream); @@ -7162,14 +7159,14 @@ _g_free0 (path); #line 572 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (wd); -#line 7166 "gitg-stage.c" +#line 7163 "gitg-stage.c" } static void ___lambda21__gitg_stage_with_index_func (GgitIndex* index, gpointer self, GError** error) { #line 572 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" __lambda21_ (self, index, error); -#line 7173 "gitg-stage.c" +#line 7170 "gitg-stage.c" } @@ -7178,20 +7175,20 @@ switch (_data_->_state_) { #line 568 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 0: -#line 7182 "gitg-stage.c" +#line 7179 "gitg-stage.c" goto _state_0; #line 568 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 1: -#line 7186 "gitg-stage.c" +#line 7183 "gitg-stage.c" goto _state_1; #line 568 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 2: -#line 7190 "gitg-stage.c" +#line 7187 "gitg-stage.c" goto _state_2; default: #line 568 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_assert_not_reached (); -#line 7195 "gitg-stage.c" +#line 7192 "gitg-stage.c" } _state_0: #line 568 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -7216,7 +7213,7 @@ gitg_stage_get_head_tree (_data_->self, gitg_stage_revert_ready, _data_); #line 570 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 7220 "gitg-stage.c" +#line 7217 "gitg-stage.c" _state_1: #line 570 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp1_ = NULL; @@ -7238,17 +7235,17 @@ if (_data_->_state_ == 0) { #line 570 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 7242 "gitg-stage.c" +#line 7239 "gitg-stage.c" } else { #line 570 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 7246 "gitg-stage.c" +#line 7243 "gitg-stage.c" } #line 570 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 570 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 7252 "gitg-stage.c" +#line 7249 "gitg-stage.c" } #line 572 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_state_ = 2; @@ -7256,7 +7253,7 @@ gitg_stage_thread_index (_data_->self, ___lambda21__gitg_stage_with_index_func, _data_->_data30_, gitg_stage_revert_ready, _data_); #line 572 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 7260 "gitg-stage.c" +#line 7257 "gitg-stage.c" _state_2: #line 572 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_thread_index_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); @@ -7274,17 +7271,17 @@ if (_data_->_state_ == 0) { #line 572 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 7278 "gitg-stage.c" +#line 7275 "gitg-stage.c" } else { #line 572 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 7282 "gitg-stage.c" +#line 7279 "gitg-stage.c" } #line 572 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 572 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 7288 "gitg-stage.c" +#line 7285 "gitg-stage.c" } #line 568 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" block30_data_unref (_data_->_data30_); @@ -7294,17 +7291,17 @@ if (_data_->_state_ == 0) { #line 568 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 7298 "gitg-stage.c" +#line 7295 "gitg-stage.c" } else { #line 568 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 7302 "gitg-stage.c" +#line 7299 "gitg-stage.c" } #line 568 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 568 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 7308 "gitg-stage.c" +#line 7305 "gitg-stage.c" } @@ -7317,7 +7314,7 @@ _g_object_unref0 (_data_->self); #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (GitgStageRevertPathData, _data_); -#line 7321 "gitg-stage.c" +#line 7318 "gitg-stage.c" } @@ -7346,7 +7343,7 @@ _data_->path = _tmp2_; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_revert_path_co (_data_); -#line 7350 "gitg-stage.c" +#line 7347 "gitg-stage.c" } @@ -7356,11 +7353,11 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 7360 "gitg-stage.c" +#line 7357 "gitg-stage.c" } #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 7364 "gitg-stage.c" +#line 7361 "gitg-stage.c" } @@ -7384,7 +7381,7 @@ _data_->_res_ = _res_; #line 603 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_revert_path_co (_data_); -#line 7388 "gitg-stage.c" +#line 7385 "gitg-stage.c" } @@ -7393,16 +7390,16 @@ switch (_data_->_state_) { #line 601 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 0: -#line 7397 "gitg-stage.c" +#line 7394 "gitg-stage.c" goto _state_0; #line 601 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 1: -#line 7401 "gitg-stage.c" +#line 7398 "gitg-stage.c" goto _state_1; default: #line 601 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_assert_not_reached (); -#line 7406 "gitg-stage.c" +#line 7403 "gitg-stage.c" } _state_0: #line 603 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -7435,7 +7432,7 @@ gitg_stage_revert (_data_->self, _data_->_tmp5_, gitg_stage_revert_path_ready, _data_); #line 603 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 7439 "gitg-stage.c" +#line 7436 "gitg-stage.c" _state_1: #line 603 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_revert_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); @@ -7453,33 +7450,33 @@ if (_data_->_state_ == 0) { #line 603 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 7457 "gitg-stage.c" +#line 7454 "gitg-stage.c" } else { #line 603 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 7461 "gitg-stage.c" +#line 7458 "gitg-stage.c" } #line 603 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 603 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 7467 "gitg-stage.c" +#line 7464 "gitg-stage.c" } #line 601 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (_data_->_state_ == 0) { #line 601 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 7473 "gitg-stage.c" +#line 7470 "gitg-stage.c" } else { #line 601 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 7477 "gitg-stage.c" +#line 7474 "gitg-stage.c" } #line 601 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 601 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 7483 "gitg-stage.c" +#line 7480 "gitg-stage.c" } @@ -7490,14 +7487,14 @@ _g_object_unref0 (_data_->self); #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (GitgStageRevertPatchData, _data_); -#line 7494 "gitg-stage.c" +#line 7491 "gitg-stage.c" } static gpointer _gitg_patch_set_ref0 (gpointer self) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return self ? gitg_patch_set_ref (self) : NULL; -#line 7501 "gitg-stage.c" +#line 7498 "gitg-stage.c" } @@ -7526,7 +7523,7 @@ _data_->patch = _tmp2_; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_revert_patch_co (_data_); -#line 7530 "gitg-stage.c" +#line 7527 "gitg-stage.c" } @@ -7536,11 +7533,11 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 7540 "gitg-stage.c" +#line 7537 "gitg-stage.c" } #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 7544 "gitg-stage.c" +#line 7541 "gitg-stage.c" } @@ -7558,7 +7555,7 @@ g_atomic_int_inc (&_data31_->_ref_count_); #line 615 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return _data31_; -#line 7562 "gitg-stage.c" +#line 7559 "gitg-stage.c" } @@ -7567,7 +7564,7 @@ _data31_ = (Block31Data*) _userdata_; #line 615 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (g_atomic_int_dec_and_test (&_data31_->_ref_count_)) { -#line 7571 "gitg-stage.c" +#line 7568 "gitg-stage.c" GitgStage* self; #line 615 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" self = _data31_->self; @@ -7581,7 +7578,7 @@ _g_object_unref0 (self); #line 615 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (Block31Data, _data31_); -#line 7585 "gitg-stage.c" +#line 7582 "gitg-stage.c" } } @@ -7596,7 +7593,7 @@ _data_->_res_ = _res_; #line 619 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_revert_patch_co (_data_); -#line 7600 "gitg-stage.c" +#line 7597 "gitg-stage.c" } @@ -7661,7 +7658,7 @@ _tmp5_ = entry; #line 625 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (_tmp5_ == NULL) { -#line 7665 "gitg-stage.c" +#line 7662 "gitg-stage.c" GitgPatchSet* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; GError* _tmp8_ = NULL; @@ -7681,7 +7678,7 @@ _ggit_index_entries_unref0 (entries); #line 627 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 7685 "gitg-stage.c" +#line 7682 "gitg-stage.c" } #line 630 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp9_ = self->priv->d_repository; @@ -7709,7 +7706,7 @@ _ggit_index_entries_unref0 (entries); #line 630 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 7713 "gitg-stage.c" +#line 7710 "gitg-stage.c" } #line 631 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp15_ = index_blob; @@ -7747,7 +7744,7 @@ out_stream = NULL; #line 637 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" outf = NULL; -#line 7751 "gitg-stage.c" +#line 7748 "gitg-stage.c" { GFile* _tmp25_ = NULL; GFileIOStream* _tmp26_ = NULL; @@ -7769,8 +7766,8 @@ _tmp25_ = _tmp27_; #line 641 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7773 "gitg-stage.c" - goto __catch106_g_error; +#line 7770 "gitg-stage.c" + goto __catch108_g_error; } #line 641 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp28_ = _tmp25_; @@ -7798,15 +7795,15 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 643 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (_tmp25_); -#line 7802 "gitg-stage.c" - goto __catch106_g_error; +#line 7799 "gitg-stage.c" + goto __catch108_g_error; } #line 639 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (_tmp25_); -#line 7807 "gitg-stage.c" +#line 7804 "gitg-stage.c" } - goto __finally106; - __catch106_g_error: + goto __finally108; + __catch108_g_error: { GError* e = NULL; GFileInputStream* _tmp35_ = NULL; @@ -7826,8 +7823,8 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 650 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_error_free0 (e); -#line 7830 "gitg-stage.c" - goto __finally106; +#line 7827 "gitg-stage.c" + goto __finally108; } #line 651 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp36_ = index_stream; @@ -7837,14 +7834,14 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 651 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_error_free0 (e); -#line 7841 "gitg-stage.c" - goto __finally106; +#line 7838 "gitg-stage.c" + goto __finally108; } #line 653 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp37_ = outf; #line 653 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (_tmp37_ != NULL) { -#line 7848 "gitg-stage.c" +#line 7845 "gitg-stage.c" { GFile* _tmp38_ = NULL; #line 657 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -7853,20 +7850,20 @@ g_file_delete (_tmp38_, NULL, &_inner_error_); #line 657 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7857 "gitg-stage.c" - goto __catch107_g_error; +#line 7854 "gitg-stage.c" + goto __catch109_g_error; } } - goto __finally107; - __catch107_g_error: + goto __finally109; + __catch109_g_error: { #line 655 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_clear_error (&_inner_error_); #line 655 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _inner_error_ = NULL; -#line 7868 "gitg-stage.c" +#line 7865 "gitg-stage.c" } - __finally107: + __finally109: #line 655 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 655 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -7893,7 +7890,7 @@ g_clear_error (&_inner_error_); #line 655 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 7897 "gitg-stage.c" +#line 7894 "gitg-stage.c" } } #line 661 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -7904,10 +7901,10 @@ _inner_error_ = _tmp40_; #line 661 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_error_free0 (e); -#line 7908 "gitg-stage.c" - goto __finally106; +#line 7905 "gitg-stage.c" + goto __finally108; } - __finally106: + __finally108: #line 639 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 639 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -7928,7 +7925,7 @@ _ggit_index_entries_unref0 (entries); #line 639 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 7932 "gitg-stage.c" +#line 7929 "gitg-stage.c" } #line 664 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp41_ = _data31_->workdirf_stream; @@ -7954,7 +7951,7 @@ _ggit_index_entries_unref0 (entries); #line 664 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 7958 "gitg-stage.c" +#line 7955 "gitg-stage.c" } #line 665 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp42_ = index_stream; @@ -7980,13 +7977,13 @@ _ggit_index_entries_unref0 (entries); #line 665 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 7984 "gitg-stage.c" +#line 7981 "gitg-stage.c" } #line 667 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp43_ = out_stream; #line 667 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (_tmp43_ != NULL) { -#line 7990 "gitg-stage.c" +#line 7987 "gitg-stage.c" GFileIOStream* _tmp44_ = NULL; #line 669 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp44_ = out_stream; @@ -8012,7 +8009,7 @@ _ggit_index_entries_unref0 (entries); #line 669 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 8016 "gitg-stage.c" +#line 8013 "gitg-stage.c" } } { @@ -8031,8 +8028,8 @@ repl = _tmp46_; #line 675 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8035 "gitg-stage.c" - goto __catch108_g_error; +#line 8032 "gitg-stage.c" + goto __catch110_g_error; } #line 679 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp48_ = outf; @@ -8044,8 +8041,8 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 679 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (repl); -#line 8048 "gitg-stage.c" - goto __catch108_g_error; +#line 8045 "gitg-stage.c" + goto __catch110_g_error; } #line 679 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp50_ = repl; @@ -8057,17 +8054,17 @@ _g_object_unref0 (_tmp47_); #line 679 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (repl); -#line 8061 "gitg-stage.c" - goto __catch108_g_error; +#line 8058 "gitg-stage.c" + goto __catch110_g_error; } #line 673 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (_tmp47_); #line 673 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (repl); -#line 8068 "gitg-stage.c" +#line 8065 "gitg-stage.c" } - goto __finally108; - __catch108_g_error: + goto __finally110; + __catch110_g_error: { GError* e = NULL; GError* _tmp52_ = NULL; @@ -8076,7 +8073,7 @@ e = _inner_error_; #line 673 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _inner_error_ = NULL; -#line 8080 "gitg-stage.c" +#line 8077 "gitg-stage.c" { GFile* _tmp51_ = NULL; #line 687 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -8085,20 +8082,20 @@ g_file_delete (_tmp51_, NULL, &_inner_error_); #line 687 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8089 "gitg-stage.c" - goto __catch109_g_error; +#line 8086 "gitg-stage.c" + goto __catch111_g_error; } } - goto __finally109; - __catch109_g_error: + goto __finally111; + __catch111_g_error: { #line 685 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_clear_error (&_inner_error_); #line 685 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _inner_error_ = NULL; -#line 8100 "gitg-stage.c" +#line 8097 "gitg-stage.c" } - __finally109: + __finally111: #line 685 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 685 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -8125,7 +8122,7 @@ g_clear_error (&_inner_error_); #line 685 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 8129 "gitg-stage.c" +#line 8126 "gitg-stage.c" } #line 690 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp52_ = e; @@ -8135,10 +8132,10 @@ _inner_error_ = _tmp53_; #line 690 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_error_free0 (e); -#line 8139 "gitg-stage.c" - goto __finally108; +#line 8136 "gitg-stage.c" + goto __finally110; } - __finally108: + __finally110: #line 673 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 673 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -8159,7 +8156,7 @@ _ggit_index_entries_unref0 (entries); #line 673 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 8163 "gitg-stage.c" +#line 8160 "gitg-stage.c" } { GFile* _tmp54_ = NULL; @@ -8169,20 +8166,20 @@ g_file_delete (_tmp54_, NULL, &_inner_error_); #line 695 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8173 "gitg-stage.c" - goto __catch110_g_error; +#line 8170 "gitg-stage.c" + goto __catch112_g_error; } } - goto __finally110; - __catch110_g_error: + goto __finally112; + __catch112_g_error: { #line 693 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_clear_error (&_inner_error_); #line 693 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _inner_error_ = NULL; -#line 8184 "gitg-stage.c" +#line 8181 "gitg-stage.c" } - __finally110: + __finally112: #line 693 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 693 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -8203,7 +8200,7 @@ _ggit_index_entries_unref0 (entries); #line 693 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 8207 "gitg-stage.c" +#line 8204 "gitg-stage.c" } #line 621 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (outf); @@ -8219,14 +8216,14 @@ _ggit_index_entry_unref0 (entry); #line 621 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _ggit_index_entries_unref0 (entries); -#line 8223 "gitg-stage.c" +#line 8220 "gitg-stage.c" } static void ___lambda22__gitg_stage_with_index_func (GgitIndex* index, gpointer self, GError** error) { #line 621 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" __lambda22_ (self, index, error); -#line 8230 "gitg-stage.c" +#line 8227 "gitg-stage.c" } @@ -8235,20 +8232,20 @@ switch (_data_->_state_) { #line 615 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 0: -#line 8239 "gitg-stage.c" +#line 8236 "gitg-stage.c" goto _state_0; #line 615 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 1: -#line 8243 "gitg-stage.c" +#line 8240 "gitg-stage.c" goto _state_1; #line 615 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 2: -#line 8247 "gitg-stage.c" +#line 8244 "gitg-stage.c" goto _state_2; default: #line 615 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_assert_not_reached (); -#line 8252 "gitg-stage.c" +#line 8249 "gitg-stage.c" } _state_0: #line 615 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -8309,7 +8306,7 @@ g_file_read_async (_data_->_tmp8_, G_PRIORITY_DEFAULT, NULL, gitg_stage_revert_patch_ready, _data_); #line 619 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 8313 "gitg-stage.c" +#line 8310 "gitg-stage.c" _state_1: #line 619 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp9_ = NULL; @@ -8331,17 +8328,17 @@ if (_data_->_state_ == 0) { #line 619 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 8335 "gitg-stage.c" +#line 8332 "gitg-stage.c" } else { #line 619 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 8339 "gitg-stage.c" +#line 8336 "gitg-stage.c" } #line 619 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 619 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 8345 "gitg-stage.c" +#line 8342 "gitg-stage.c" } #line 621 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_state_ = 2; @@ -8349,7 +8346,7 @@ gitg_stage_thread_index (_data_->self, ___lambda22__gitg_stage_with_index_func, _data_->_data31_, gitg_stage_revert_patch_ready, _data_); #line 621 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 8353 "gitg-stage.c" +#line 8350 "gitg-stage.c" _state_2: #line 621 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_thread_index_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); @@ -8367,17 +8364,17 @@ if (_data_->_state_ == 0) { #line 621 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 8371 "gitg-stage.c" +#line 8368 "gitg-stage.c" } else { #line 621 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 8375 "gitg-stage.c" +#line 8372 "gitg-stage.c" } #line 621 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 621 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 8381 "gitg-stage.c" +#line 8378 "gitg-stage.c" } #line 615 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" block31_data_unref (_data_->_data31_); @@ -8387,17 +8384,17 @@ if (_data_->_state_ == 0) { #line 615 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 8391 "gitg-stage.c" +#line 8388 "gitg-stage.c" } else { #line 615 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 8395 "gitg-stage.c" +#line 8392 "gitg-stage.c" } #line 615 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 615 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 8401 "gitg-stage.c" +#line 8398 "gitg-stage.c" } @@ -8408,7 +8405,7 @@ _g_object_unref0 (_data_->self); #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (GitgStageDeleteData, _data_); -#line 8412 "gitg-stage.c" +#line 8409 "gitg-stage.c" } @@ -8437,7 +8434,7 @@ _data_->file = _tmp2_; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_delete_co (_data_); -#line 8441 "gitg-stage.c" +#line 8438 "gitg-stage.c" } @@ -8447,11 +8444,11 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 8451 "gitg-stage.c" +#line 8448 "gitg-stage.c" } #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 8455 "gitg-stage.c" +#line 8452 "gitg-stage.c" } @@ -8467,7 +8464,7 @@ g_atomic_int_inc (&_data32_->_ref_count_); #line 707 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return _data32_; -#line 8471 "gitg-stage.c" +#line 8468 "gitg-stage.c" } @@ -8476,7 +8473,7 @@ _data32_ = (Block32Data*) _userdata_; #line 707 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (g_atomic_int_dec_and_test (&_data32_->_ref_count_)) { -#line 8480 "gitg-stage.c" +#line 8477 "gitg-stage.c" GitgStage* self; #line 707 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" self = _data32_->self; @@ -8486,7 +8483,7 @@ _g_object_unref0 (self); #line 707 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (Block32Data, _data32_); -#line 8490 "gitg-stage.c" +#line 8487 "gitg-stage.c" } } @@ -8513,7 +8510,7 @@ g_propagate_error (error, _inner_error_); #line 710 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 8517 "gitg-stage.c" +#line 8514 "gitg-stage.c" } #line 711 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp2_ = index; @@ -8525,7 +8522,7 @@ g_propagate_error (error, _inner_error_); #line 711 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 8529 "gitg-stage.c" +#line 8526 "gitg-stage.c" } } @@ -8533,7 +8530,7 @@ static void ___lambda23__gitg_stage_with_index_func (GgitIndex* index, gpointer self, GError** error) { #line 709 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" __lambda23_ (self, index, error); -#line 8537 "gitg-stage.c" +#line 8534 "gitg-stage.c" } @@ -8547,7 +8544,7 @@ _data_->_res_ = _res_; #line 709 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_delete_co (_data_); -#line 8551 "gitg-stage.c" +#line 8548 "gitg-stage.c" } @@ -8556,16 +8553,16 @@ switch (_data_->_state_) { #line 707 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 0: -#line 8560 "gitg-stage.c" +#line 8557 "gitg-stage.c" goto _state_0; #line 707 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 1: -#line 8564 "gitg-stage.c" +#line 8561 "gitg-stage.c" goto _state_1; default: #line 707 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_assert_not_reached (); -#line 8569 "gitg-stage.c" +#line 8566 "gitg-stage.c" } _state_0: #line 707 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -8590,7 +8587,7 @@ gitg_stage_thread_index (_data_->self, ___lambda23__gitg_stage_with_index_func, _data_->_data32_, gitg_stage_delete_ready, _data_); #line 709 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 8594 "gitg-stage.c" +#line 8591 "gitg-stage.c" _state_1: #line 709 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_thread_index_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); @@ -8608,17 +8605,17 @@ if (_data_->_state_ == 0) { #line 709 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 8612 "gitg-stage.c" +#line 8609 "gitg-stage.c" } else { #line 709 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 8616 "gitg-stage.c" +#line 8613 "gitg-stage.c" } #line 709 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 709 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 8622 "gitg-stage.c" +#line 8619 "gitg-stage.c" } #line 707 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" block32_data_unref (_data_->_data32_); @@ -8628,17 +8625,17 @@ if (_data_->_state_ == 0) { #line 707 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 8632 "gitg-stage.c" +#line 8629 "gitg-stage.c" } else { #line 707 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 8636 "gitg-stage.c" +#line 8633 "gitg-stage.c" } #line 707 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 707 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 8642 "gitg-stage.c" +#line 8639 "gitg-stage.c" } @@ -8651,7 +8648,7 @@ _g_object_unref0 (_data_->self); #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (GitgStageDeletePathData, _data_); -#line 8655 "gitg-stage.c" +#line 8652 "gitg-stage.c" } @@ -8680,7 +8677,7 @@ _data_->path = _tmp2_; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_delete_path_co (_data_); -#line 8684 "gitg-stage.c" +#line 8681 "gitg-stage.c" } @@ -8690,11 +8687,11 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 8694 "gitg-stage.c" +#line 8691 "gitg-stage.c" } #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 8698 "gitg-stage.c" +#line 8695 "gitg-stage.c" } @@ -8715,7 +8712,7 @@ _data_->_res_ = _res_; #line 724 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_delete_path_co (_data_); -#line 8719 "gitg-stage.c" +#line 8716 "gitg-stage.c" } @@ -8724,16 +8721,16 @@ switch (_data_->_state_) { #line 722 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 0: -#line 8728 "gitg-stage.c" +#line 8725 "gitg-stage.c" goto _state_0; #line 722 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 1: -#line 8732 "gitg-stage.c" +#line 8729 "gitg-stage.c" goto _state_1; default: #line 722 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_assert_not_reached (); -#line 8737 "gitg-stage.c" +#line 8734 "gitg-stage.c" } _state_0: #line 724 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -8766,7 +8763,7 @@ gitg_stage_delete (_data_->self, _data_->_tmp5_, gitg_stage_delete_path_ready, _data_); #line 724 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 8770 "gitg-stage.c" +#line 8767 "gitg-stage.c" _state_1: #line 724 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_delete_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); @@ -8784,33 +8781,33 @@ if (_data_->_state_ == 0) { #line 724 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 8788 "gitg-stage.c" +#line 8785 "gitg-stage.c" } else { #line 724 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 8792 "gitg-stage.c" +#line 8789 "gitg-stage.c" } #line 724 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 724 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 8798 "gitg-stage.c" +#line 8795 "gitg-stage.c" } #line 722 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (_data_->_state_ == 0) { #line 722 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 8804 "gitg-stage.c" +#line 8801 "gitg-stage.c" } else { #line 722 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 8808 "gitg-stage.c" +#line 8805 "gitg-stage.c" } #line 722 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 722 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 8814 "gitg-stage.c" +#line 8811 "gitg-stage.c" } @@ -8821,7 +8818,7 @@ _g_object_unref0 (_data_->self); #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (GitgStageStageData, _data_); -#line 8825 "gitg-stage.c" +#line 8822 "gitg-stage.c" } @@ -8850,7 +8847,7 @@ _data_->file = _tmp2_; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_stage_co (_data_); -#line 8854 "gitg-stage.c" +#line 8851 "gitg-stage.c" } @@ -8860,11 +8857,11 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 8864 "gitg-stage.c" +#line 8861 "gitg-stage.c" } #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 8868 "gitg-stage.c" +#line 8865 "gitg-stage.c" } @@ -8881,7 +8878,7 @@ g_atomic_int_inc (&_data33_->_ref_count_); #line 735 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return _data33_; -#line 8885 "gitg-stage.c" +#line 8882 "gitg-stage.c" } @@ -8890,7 +8887,7 @@ _data33_ = (Block33Data*) _userdata_; #line 735 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (g_atomic_int_dec_and_test (&_data33_->_ref_count_)) { -#line 8894 "gitg-stage.c" +#line 8891 "gitg-stage.c" GitgStage* self; #line 735 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" self = _data33_->self; @@ -8900,7 +8897,7 @@ _g_object_unref0 (self); #line 735 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (Block33Data, _data33_); -#line 8904 "gitg-stage.c" +#line 8901 "gitg-stage.c" } } @@ -8927,7 +8924,7 @@ g_propagate_error (error, _inner_error_); #line 738 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 8931 "gitg-stage.c" +#line 8928 "gitg-stage.c" } #line 739 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp2_ = index; @@ -8939,7 +8936,7 @@ g_propagate_error (error, _inner_error_); #line 739 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 8943 "gitg-stage.c" +#line 8940 "gitg-stage.c" } } @@ -8947,7 +8944,7 @@ static void ___lambda24__gitg_stage_with_index_func (GgitIndex* index, gpointer self, GError** error) { #line 737 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" __lambda24_ (self, index, error); -#line 8951 "gitg-stage.c" +#line 8948 "gitg-stage.c" } @@ -8961,7 +8958,7 @@ _data_->_res_ = _res_; #line 737 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_stage_co (_data_); -#line 8965 "gitg-stage.c" +#line 8962 "gitg-stage.c" } @@ -8970,16 +8967,16 @@ switch (_data_->_state_) { #line 735 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 0: -#line 8974 "gitg-stage.c" +#line 8971 "gitg-stage.c" goto _state_0; #line 735 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 1: -#line 8978 "gitg-stage.c" +#line 8975 "gitg-stage.c" goto _state_1; default: #line 735 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_assert_not_reached (); -#line 8983 "gitg-stage.c" +#line 8980 "gitg-stage.c" } _state_0: #line 735 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -9004,7 +9001,7 @@ gitg_stage_thread_index (_data_->self, ___lambda24__gitg_stage_with_index_func, _data_->_data33_, gitg_stage_stage_ready, _data_); #line 737 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 9008 "gitg-stage.c" +#line 9005 "gitg-stage.c" _state_1: #line 737 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_thread_index_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); @@ -9022,17 +9019,17 @@ if (_data_->_state_ == 0) { #line 737 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 9026 "gitg-stage.c" +#line 9023 "gitg-stage.c" } else { #line 737 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 9030 "gitg-stage.c" +#line 9027 "gitg-stage.c" } #line 737 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 737 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 9036 "gitg-stage.c" +#line 9033 "gitg-stage.c" } #line 735 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" block33_data_unref (_data_->_data33_); @@ -9042,17 +9039,17 @@ if (_data_->_state_ == 0) { #line 735 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 9046 "gitg-stage.c" +#line 9043 "gitg-stage.c" } else { #line 735 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 9050 "gitg-stage.c" +#line 9047 "gitg-stage.c" } #line 735 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 735 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 9056 "gitg-stage.c" +#line 9053 "gitg-stage.c" } @@ -9065,7 +9062,7 @@ _g_object_unref0 (_data_->self); #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (GitgStageStagePathData, _data_); -#line 9069 "gitg-stage.c" +#line 9066 "gitg-stage.c" } @@ -9094,7 +9091,7 @@ _data_->path = _tmp2_; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_stage_path_co (_data_); -#line 9098 "gitg-stage.c" +#line 9095 "gitg-stage.c" } @@ -9104,11 +9101,11 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 9108 "gitg-stage.c" +#line 9105 "gitg-stage.c" } #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 9112 "gitg-stage.c" +#line 9109 "gitg-stage.c" } @@ -9130,7 +9127,7 @@ _data_->_res_ = _res_; #line 753 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_stage_path_co (_data_); -#line 9134 "gitg-stage.c" +#line 9131 "gitg-stage.c" } @@ -9139,16 +9136,16 @@ switch (_data_->_state_) { #line 751 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 0: -#line 9143 "gitg-stage.c" +#line 9140 "gitg-stage.c" goto _state_0; #line 751 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 1: -#line 9147 "gitg-stage.c" +#line 9144 "gitg-stage.c" goto _state_1; default: #line 751 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_assert_not_reached (); -#line 9152 "gitg-stage.c" +#line 9149 "gitg-stage.c" } _state_0: #line 753 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -9181,7 +9178,7 @@ gitg_stage_stage (_data_->self, _data_->_tmp5_, gitg_stage_stage_path_ready, _data_); #line 753 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 9185 "gitg-stage.c" +#line 9182 "gitg-stage.c" _state_1: #line 753 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_stage_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); @@ -9199,33 +9196,33 @@ if (_data_->_state_ == 0) { #line 753 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 9203 "gitg-stage.c" +#line 9200 "gitg-stage.c" } else { #line 753 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 9207 "gitg-stage.c" +#line 9204 "gitg-stage.c" } #line 753 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 753 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 9213 "gitg-stage.c" +#line 9210 "gitg-stage.c" } #line 751 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (_data_->_state_ == 0) { #line 751 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 9219 "gitg-stage.c" +#line 9216 "gitg-stage.c" } else { #line 751 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 9223 "gitg-stage.c" +#line 9220 "gitg-stage.c" } #line 751 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 751 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 9229 "gitg-stage.c" +#line 9226 "gitg-stage.c" } @@ -9236,7 +9233,7 @@ _g_object_unref0 (_data_->self); #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (GitgStageStageCommitData, _data_); -#line 9240 "gitg-stage.c" +#line 9237 "gitg-stage.c" } @@ -9275,7 +9272,7 @@ _data_->commit = _tmp4_; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_stage_commit_co (_data_); -#line 9279 "gitg-stage.c" +#line 9276 "gitg-stage.c" } @@ -9285,11 +9282,11 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 9289 "gitg-stage.c" +#line 9286 "gitg-stage.c" } #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 9293 "gitg-stage.c" +#line 9290 "gitg-stage.c" } @@ -9307,7 +9304,7 @@ g_atomic_int_inc (&_data34_->_ref_count_); #line 765 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return _data34_; -#line 9311 "gitg-stage.c" +#line 9308 "gitg-stage.c" } @@ -9316,7 +9313,7 @@ _data34_ = (Block34Data*) _userdata_; #line 765 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (g_atomic_int_dec_and_test (&_data34_->_ref_count_)) { -#line 9320 "gitg-stage.c" +#line 9317 "gitg-stage.c" GitgStage* self; #line 765 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" self = _data34_->self; @@ -9328,7 +9325,7 @@ _g_object_unref0 (self); #line 765 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (Block34Data, _data34_); -#line 9332 "gitg-stage.c" +#line 9329 "gitg-stage.c" } } @@ -9377,7 +9374,7 @@ g_propagate_error (error, _inner_error_); #line 768 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 9381 "gitg-stage.c" +#line 9378 "gitg-stage.c" } #line 769 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp7_ = entry; @@ -9399,7 +9396,7 @@ _ggit_index_entry_unref0 (entry); #line 771 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 9403 "gitg-stage.c" +#line 9400 "gitg-stage.c" } #line 772 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp11_ = index; @@ -9413,18 +9410,18 @@ _ggit_index_entry_unref0 (entry); #line 772 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 9417 "gitg-stage.c" +#line 9414 "gitg-stage.c" } #line 767 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _ggit_index_entry_unref0 (entry); -#line 9421 "gitg-stage.c" +#line 9418 "gitg-stage.c" } static void ___lambda25__gitg_stage_with_index_func (GgitIndex* index, gpointer self, GError** error) { #line 767 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" __lambda25_ (self, index, error); -#line 9428 "gitg-stage.c" +#line 9425 "gitg-stage.c" } @@ -9438,7 +9435,7 @@ _data_->_res_ = _res_; #line 767 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_stage_commit_co (_data_); -#line 9442 "gitg-stage.c" +#line 9439 "gitg-stage.c" } @@ -9447,16 +9444,16 @@ switch (_data_->_state_) { #line 765 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 0: -#line 9451 "gitg-stage.c" +#line 9448 "gitg-stage.c" goto _state_0; #line 765 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 1: -#line 9455 "gitg-stage.c" +#line 9452 "gitg-stage.c" goto _state_1; default: #line 765 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_assert_not_reached (); -#line 9460 "gitg-stage.c" +#line 9457 "gitg-stage.c" } _state_0: #line 765 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -9489,7 +9486,7 @@ gitg_stage_thread_index (_data_->self, ___lambda25__gitg_stage_with_index_func, _data_->_data34_, gitg_stage_stage_commit_ready, _data_); #line 767 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 9493 "gitg-stage.c" +#line 9490 "gitg-stage.c" _state_1: #line 767 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_thread_index_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); @@ -9507,17 +9504,17 @@ if (_data_->_state_ == 0) { #line 767 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 9511 "gitg-stage.c" +#line 9508 "gitg-stage.c" } else { #line 767 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 9515 "gitg-stage.c" +#line 9512 "gitg-stage.c" } #line 767 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 767 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 9521 "gitg-stage.c" +#line 9518 "gitg-stage.c" } #line 765 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" block34_data_unref (_data_->_data34_); @@ -9527,17 +9524,17 @@ if (_data_->_state_ == 0) { #line 765 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 9531 "gitg-stage.c" +#line 9528 "gitg-stage.c" } else { #line 765 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 9535 "gitg-stage.c" +#line 9532 "gitg-stage.c" } #line 765 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 765 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 9541 "gitg-stage.c" +#line 9538 "gitg-stage.c" } @@ -9571,7 +9568,7 @@ if (_tmp0_ == ((gsize) 0)) { #line 780 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 9575 "gitg-stage.c" +#line 9572 "gitg-stage.c" } #line 783 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp1_ = length; @@ -9589,7 +9586,7 @@ _tmp4_ = index; #line 785 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (_tmp3_ != _tmp4_) { -#line 9593 "gitg-stage.c" +#line 9590 "gitg-stage.c" GInputStream* _tmp5_ = NULL; gsize _tmp6_ = 0UL; gsize _tmp7_ = 0UL; @@ -9607,13 +9604,13 @@ buf = (g_free (buf), NULL); #line 787 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 9611 "gitg-stage.c" +#line 9608 "gitg-stage.c" } #line 788 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp7_ = index; #line 788 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" *pos = _tmp7_; -#line 9617 "gitg-stage.c" +#line 9614 "gitg-stage.c" } #line 791 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp8_ = src; @@ -9631,7 +9628,7 @@ buf = (g_free (buf), NULL); #line 791 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 9635 "gitg-stage.c" +#line 9632 "gitg-stage.c" } #line 792 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp10_ = dest; @@ -9649,7 +9646,7 @@ buf = (g_free (buf), NULL); #line 792 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 9653 "gitg-stage.c" +#line 9650 "gitg-stage.c" } #line 794 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp12_ = *pos; @@ -9659,7 +9656,7 @@ *pos = _tmp12_ + _tmp13_; #line 776 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" buf = (g_free (buf), NULL); -#line 9663 "gitg-stage.c" +#line 9660 "gitg-stage.c" } @@ -9719,7 +9716,7 @@ _g_object_unref0 (patched_stream); #line 804 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 9723 "gitg-stage.c" +#line 9720 "gitg-stage.c" } #line 806 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp6_ = patched_stream; @@ -9733,7 +9730,7 @@ _g_object_unref0 (patched_stream); #line 806 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 9737 "gitg-stage.c" +#line 9734 "gitg-stage.c" } #line 807 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp7_ = patched_stream; @@ -9749,7 +9746,7 @@ _g_object_unref0 (patched_stream); #line 807 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 9753 "gitg-stage.c" +#line 9750 "gitg-stage.c" } #line 809 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp9_ = self->priv->d_repository; @@ -9773,7 +9770,7 @@ _g_object_unref0 (patched_stream); #line 809 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 9777 "gitg-stage.c" +#line 9774 "gitg-stage.c" } #line 812 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp14_ = index; @@ -9793,7 +9790,7 @@ _g_object_unref0 (patched_stream); #line 812 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 9797 "gitg-stage.c" +#line 9794 "gitg-stage.c" } #line 813 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp16_ = index; @@ -9811,7 +9808,7 @@ _g_object_unref0 (patched_stream); #line 813 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 9815 "gitg-stage.c" +#line 9812 "gitg-stage.c" } #line 797 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _ggit_index_entry_unref0 (new_entry); @@ -9819,7 +9816,7 @@ __vala_GgitOId_free0 (new_id); #line 797 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (patched_stream); -#line 9823 "gitg-stage.c" +#line 9820 "gitg-stage.c" } @@ -9852,7 +9849,7 @@ _tmp1_ = _tmp0_->patches; #line 826 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp1__length1 = _tmp0_->patches_length1; -#line 9856 "gitg-stage.c" +#line 9853 "gitg-stage.c" { GitgPatchSetPatch* p_collection = NULL; gint p_collection_length1 = 0; @@ -9864,11 +9861,11 @@ p_collection_length1 = _tmp1__length1; #line 826 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" for (p_it = 0; p_it < _tmp1__length1; p_it = p_it + 1) { -#line 9868 "gitg-stage.c" +#line 9865 "gitg-stage.c" GitgPatchSetPatch p = {0}; #line 826 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" p = p_collection[p_it]; -#line 9872 "gitg-stage.c" +#line 9869 "gitg-stage.c" { GOutputStream* _tmp2_ = NULL; GInputStream* _tmp3_ = NULL; @@ -9898,7 +9895,7 @@ g_propagate_error (error, _inner_error_); #line 829 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 9902 "gitg-stage.c" +#line 9899 "gitg-stage.c" } #line 835 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp8_ = p; @@ -9906,7 +9903,7 @@ _tmp9_ = _tmp8_.type; #line 835 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (_tmp9_ == GITG_PATCH_SET_TYPE_REMOVE) { -#line 9910 "gitg-stage.c" +#line 9907 "gitg-stage.c" GInputStream* _tmp10_ = NULL; GitgPatchSetPatch _tmp11_ = {0}; gsize _tmp12_ = 0UL; @@ -9927,7 +9924,7 @@ g_propagate_error (error, _inner_error_); #line 838 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 9931 "gitg-stage.c" +#line 9928 "gitg-stage.c" } #line 839 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp13_ = old_ptr; @@ -9937,7 +9934,7 @@ _tmp15_ = _tmp14_.length; #line 839 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" old_ptr = _tmp13_ + _tmp15_; -#line 9941 "gitg-stage.c" +#line 9938 "gitg-stage.c" } else { GOutputStream* _tmp16_ = NULL; GInputStream* _tmp17_ = NULL; @@ -9965,7 +9962,7 @@ g_propagate_error (error, _inner_error_); #line 844 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 9969 "gitg-stage.c" +#line 9966 "gitg-stage.c" } } } @@ -9983,7 +9980,7 @@ g_propagate_error (error, _inner_error_); #line 853 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 9987 "gitg-stage.c" +#line 9984 "gitg-stage.c" } } @@ -9995,7 +9992,7 @@ _g_object_unref0 (_data_->self); #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (GitgStageStagePatchData, _data_); -#line 9999 "gitg-stage.c" +#line 9996 "gitg-stage.c" } @@ -10024,7 +10021,7 @@ _data_->patch = _tmp2_; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_stage_patch_co (_data_); -#line 10028 "gitg-stage.c" +#line 10025 "gitg-stage.c" } @@ -10034,11 +10031,11 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 10038 "gitg-stage.c" +#line 10035 "gitg-stage.c" } #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 10042 "gitg-stage.c" +#line 10039 "gitg-stage.c" } @@ -10056,7 +10053,7 @@ g_atomic_int_inc (&_data35_->_ref_count_); #line 865 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return _data35_; -#line 10060 "gitg-stage.c" +#line 10057 "gitg-stage.c" } @@ -10065,7 +10062,7 @@ _data35_ = (Block35Data*) _userdata_; #line 865 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (g_atomic_int_dec_and_test (&_data35_->_ref_count_)) { -#line 10069 "gitg-stage.c" +#line 10066 "gitg-stage.c" GitgStage* self; #line 865 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" self = _data35_->self; @@ -10079,7 +10076,7 @@ _g_object_unref0 (self); #line 865 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (Block35Data, _data35_); -#line 10083 "gitg-stage.c" +#line 10080 "gitg-stage.c" } } @@ -10094,7 +10091,7 @@ _data_->_res_ = _res_; #line 869 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_stage_patch_co (_data_); -#line 10098 "gitg-stage.c" +#line 10095 "gitg-stage.c" } @@ -10157,7 +10154,7 @@ _tmp5_ = entry; #line 875 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (_tmp5_ == NULL) { -#line 10161 "gitg-stage.c" +#line 10158 "gitg-stage.c" GitgPatchSet* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; GError* _tmp8_ = NULL; @@ -10177,7 +10174,7 @@ _ggit_index_entries_unref0 (entries); #line 877 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 10181 "gitg-stage.c" +#line 10178 "gitg-stage.c" } #line 880 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp9_ = self->priv->d_repository; @@ -10205,7 +10202,7 @@ _ggit_index_entries_unref0 (entries); #line 880 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 10209 "gitg-stage.c" +#line 10206 "gitg-stage.c" } #line 881 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp15_ = old_blob; @@ -10257,7 +10254,7 @@ _ggit_index_entries_unref0 (entries); #line 885 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 10261 "gitg-stage.c" +#line 10258 "gitg-stage.c" } #line 887 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp27_ = _data35_->new_stream; @@ -10277,7 +10274,7 @@ _ggit_index_entries_unref0 (entries); #line 887 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 10281 "gitg-stage.c" +#line 10278 "gitg-stage.c" } #line 888 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp28_ = old_stream; @@ -10297,7 +10294,7 @@ _ggit_index_entries_unref0 (entries); #line 888 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 10301 "gitg-stage.c" +#line 10298 "gitg-stage.c" } #line 871 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (old_stream); @@ -10307,14 +10304,14 @@ _ggit_index_entry_unref0 (entry); #line 871 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _ggit_index_entries_unref0 (entries); -#line 10311 "gitg-stage.c" +#line 10308 "gitg-stage.c" } static void ___lambda26__gitg_stage_with_index_func (GgitIndex* index, gpointer self, GError** error) { #line 871 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" __lambda26_ (self, index, error); -#line 10318 "gitg-stage.c" +#line 10315 "gitg-stage.c" } @@ -10323,20 +10320,20 @@ switch (_data_->_state_) { #line 865 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 0: -#line 10327 "gitg-stage.c" +#line 10324 "gitg-stage.c" goto _state_0; #line 865 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 1: -#line 10331 "gitg-stage.c" +#line 10328 "gitg-stage.c" goto _state_1; #line 865 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 2: -#line 10335 "gitg-stage.c" +#line 10332 "gitg-stage.c" goto _state_2; default: #line 865 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_assert_not_reached (); -#line 10340 "gitg-stage.c" +#line 10337 "gitg-stage.c" } _state_0: #line 865 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -10397,7 +10394,7 @@ g_file_read_async (_data_->_tmp8_, G_PRIORITY_DEFAULT, NULL, gitg_stage_stage_patch_ready, _data_); #line 869 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 10401 "gitg-stage.c" +#line 10398 "gitg-stage.c" _state_1: #line 869 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp9_ = NULL; @@ -10419,17 +10416,17 @@ if (_data_->_state_ == 0) { #line 869 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 10423 "gitg-stage.c" +#line 10420 "gitg-stage.c" } else { #line 869 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 10427 "gitg-stage.c" +#line 10424 "gitg-stage.c" } #line 869 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 869 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 10433 "gitg-stage.c" +#line 10430 "gitg-stage.c" } #line 871 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_state_ = 2; @@ -10437,7 +10434,7 @@ gitg_stage_thread_index (_data_->self, ___lambda26__gitg_stage_with_index_func, _data_->_data35_, gitg_stage_stage_patch_ready, _data_); #line 871 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 10441 "gitg-stage.c" +#line 10438 "gitg-stage.c" _state_2: #line 871 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_thread_index_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); @@ -10455,17 +10452,17 @@ if (_data_->_state_ == 0) { #line 871 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 10459 "gitg-stage.c" +#line 10456 "gitg-stage.c" } else { #line 871 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 10463 "gitg-stage.c" +#line 10460 "gitg-stage.c" } #line 871 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 871 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 10469 "gitg-stage.c" +#line 10466 "gitg-stage.c" } #line 865 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" block35_data_unref (_data_->_data35_); @@ -10475,17 +10472,17 @@ if (_data_->_state_ == 0) { #line 865 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 10479 "gitg-stage.c" +#line 10476 "gitg-stage.c" } else { #line 865 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 10483 "gitg-stage.c" +#line 10480 "gitg-stage.c" } #line 865 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 865 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 10489 "gitg-stage.c" +#line 10486 "gitg-stage.c" } @@ -10496,7 +10493,7 @@ _g_object_unref0 (_data_->self); #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (GitgStageUnstageData, _data_); -#line 10500 "gitg-stage.c" +#line 10497 "gitg-stage.c" } @@ -10525,7 +10522,7 @@ _data_->file = _tmp2_; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_unstage_co (_data_); -#line 10529 "gitg-stage.c" +#line 10526 "gitg-stage.c" } @@ -10535,11 +10532,11 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 10539 "gitg-stage.c" +#line 10536 "gitg-stage.c" } #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 10543 "gitg-stage.c" +#line 10540 "gitg-stage.c" } @@ -10556,7 +10553,7 @@ g_atomic_int_inc (&_data36_->_ref_count_); #line 900 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return _data36_; -#line 10560 "gitg-stage.c" +#line 10557 "gitg-stage.c" } @@ -10565,7 +10562,7 @@ _data36_ = (Block36Data*) _userdata_; #line 900 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (g_atomic_int_dec_and_test (&_data36_->_ref_count_)) { -#line 10569 "gitg-stage.c" +#line 10566 "gitg-stage.c" GitgStage* self; #line 900 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" self = _data36_->self; @@ -10577,7 +10574,7 @@ _g_object_unref0 (self); #line 900 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (Block36Data, _data36_); -#line 10581 "gitg-stage.c" +#line 10578 "gitg-stage.c" } } @@ -10592,7 +10589,7 @@ _data_->_res_ = _res_; #line 902 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_unstage_co (_data_); -#line 10596 "gitg-stage.c" +#line 10593 "gitg-stage.c" } @@ -10660,7 +10657,7 @@ _g_object_unref0 (wd); #line 910 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 10664 "gitg-stage.c" +#line 10661 "gitg-stage.c" } #line 911 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp8_ = entry; @@ -10692,7 +10689,7 @@ _g_object_unref0 (wd); #line 915 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 10696 "gitg-stage.c" +#line 10693 "gitg-stage.c" } #line 918 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp14_ = ientry; @@ -10724,7 +10721,7 @@ _g_object_unref0 (wd); #line 920 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 10728 "gitg-stage.c" +#line 10725 "gitg-stage.c" } #line 921 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp19_ = index; @@ -10746,7 +10743,7 @@ _g_object_unref0 (wd); #line 921 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 10750 "gitg-stage.c" +#line 10747 "gitg-stage.c" } #line 904 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _ggit_index_entry_unref0 (ientry); @@ -10758,14 +10755,14 @@ _g_free0 (path); #line 904 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (wd); -#line 10762 "gitg-stage.c" +#line 10759 "gitg-stage.c" } static void ___lambda27__gitg_stage_with_index_func (GgitIndex* index, gpointer self, GError** error) { #line 904 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" __lambda27_ (self, index, error); -#line 10769 "gitg-stage.c" +#line 10766 "gitg-stage.c" } @@ -10774,20 +10771,20 @@ switch (_data_->_state_) { #line 900 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 0: -#line 10778 "gitg-stage.c" +#line 10775 "gitg-stage.c" goto _state_0; #line 900 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 1: -#line 10782 "gitg-stage.c" +#line 10779 "gitg-stage.c" goto _state_1; #line 900 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 2: -#line 10786 "gitg-stage.c" +#line 10783 "gitg-stage.c" goto _state_2; default: #line 900 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_assert_not_reached (); -#line 10791 "gitg-stage.c" +#line 10788 "gitg-stage.c" } _state_0: #line 900 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -10812,7 +10809,7 @@ gitg_stage_get_head_tree (_data_->self, gitg_stage_unstage_ready, _data_); #line 902 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 10816 "gitg-stage.c" +#line 10813 "gitg-stage.c" _state_1: #line 902 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp1_ = NULL; @@ -10834,17 +10831,17 @@ if (_data_->_state_ == 0) { #line 902 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 10838 "gitg-stage.c" +#line 10835 "gitg-stage.c" } else { #line 902 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 10842 "gitg-stage.c" +#line 10839 "gitg-stage.c" } #line 902 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 902 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 10848 "gitg-stage.c" +#line 10845 "gitg-stage.c" } #line 904 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_state_ = 2; @@ -10852,7 +10849,7 @@ gitg_stage_thread_index (_data_->self, ___lambda27__gitg_stage_with_index_func, _data_->_data36_, gitg_stage_unstage_ready, _data_); #line 904 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 10856 "gitg-stage.c" +#line 10853 "gitg-stage.c" _state_2: #line 904 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_thread_index_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); @@ -10870,17 +10867,17 @@ if (_data_->_state_ == 0) { #line 904 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 10874 "gitg-stage.c" +#line 10871 "gitg-stage.c" } else { #line 904 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 10878 "gitg-stage.c" +#line 10875 "gitg-stage.c" } #line 904 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 904 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 10884 "gitg-stage.c" +#line 10881 "gitg-stage.c" } #line 900 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" block36_data_unref (_data_->_data36_); @@ -10890,17 +10887,17 @@ if (_data_->_state_ == 0) { #line 900 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 10894 "gitg-stage.c" +#line 10891 "gitg-stage.c" } else { #line 900 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 10898 "gitg-stage.c" +#line 10895 "gitg-stage.c" } #line 900 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 900 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 10904 "gitg-stage.c" +#line 10901 "gitg-stage.c" } @@ -10913,7 +10910,7 @@ _g_object_unref0 (_data_->self); #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (GitgStageUnstagePathData, _data_); -#line 10917 "gitg-stage.c" +#line 10914 "gitg-stage.c" } @@ -10942,7 +10939,7 @@ _data_->path = _tmp2_; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_unstage_path_co (_data_); -#line 10946 "gitg-stage.c" +#line 10943 "gitg-stage.c" } @@ -10952,11 +10949,11 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 10956 "gitg-stage.c" +#line 10953 "gitg-stage.c" } #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 10960 "gitg-stage.c" +#line 10957 "gitg-stage.c" } @@ -10978,7 +10975,7 @@ _data_->_res_ = _res_; #line 935 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_unstage_path_co (_data_); -#line 10982 "gitg-stage.c" +#line 10979 "gitg-stage.c" } @@ -10987,16 +10984,16 @@ switch (_data_->_state_) { #line 933 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 0: -#line 10991 "gitg-stage.c" +#line 10988 "gitg-stage.c" goto _state_0; #line 933 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 1: -#line 10995 "gitg-stage.c" +#line 10992 "gitg-stage.c" goto _state_1; default: #line 933 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_assert_not_reached (); -#line 11000 "gitg-stage.c" +#line 10997 "gitg-stage.c" } _state_0: #line 935 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -11029,7 +11026,7 @@ gitg_stage_unstage (_data_->self, _data_->_tmp5_, gitg_stage_unstage_path_ready, _data_); #line 935 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 11033 "gitg-stage.c" +#line 11030 "gitg-stage.c" _state_1: #line 935 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_unstage_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); @@ -11047,33 +11044,33 @@ if (_data_->_state_ == 0) { #line 935 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 11051 "gitg-stage.c" +#line 11048 "gitg-stage.c" } else { #line 935 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 11055 "gitg-stage.c" +#line 11052 "gitg-stage.c" } #line 935 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 935 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 11061 "gitg-stage.c" +#line 11058 "gitg-stage.c" } #line 933 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (_data_->_state_ == 0) { #line 933 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 11067 "gitg-stage.c" +#line 11064 "gitg-stage.c" } else { #line 933 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 11071 "gitg-stage.c" +#line 11068 "gitg-stage.c" } #line 933 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 933 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 11077 "gitg-stage.c" +#line 11074 "gitg-stage.c" } @@ -11084,7 +11081,7 @@ _g_object_unref0 (_data_->self); #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (GitgStageUnstagePatchData, _data_); -#line 11088 "gitg-stage.c" +#line 11085 "gitg-stage.c" } @@ -11113,7 +11110,7 @@ _data_->patch = _tmp2_; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_unstage_patch_co (_data_); -#line 11117 "gitg-stage.c" +#line 11114 "gitg-stage.c" } @@ -11123,11 +11120,11 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 11127 "gitg-stage.c" +#line 11124 "gitg-stage.c" } #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 11131 "gitg-stage.c" +#line 11128 "gitg-stage.c" } @@ -11144,7 +11141,7 @@ g_atomic_int_inc (&_data37_->_ref_count_); #line 946 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return _data37_; -#line 11148 "gitg-stage.c" +#line 11145 "gitg-stage.c" } @@ -11153,7 +11150,7 @@ _data37_ = (Block37Data*) _userdata_; #line 946 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (g_atomic_int_dec_and_test (&_data37_->_ref_count_)) { -#line 11157 "gitg-stage.c" +#line 11154 "gitg-stage.c" GitgStage* self; #line 946 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" self = _data37_->self; @@ -11167,7 +11164,7 @@ _g_object_unref0 (self); #line 946 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (Block37Data, _data37_); -#line 11171 "gitg-stage.c" +#line 11168 "gitg-stage.c" } } @@ -11182,7 +11179,7 @@ _data_->_res_ = _res_; #line 949 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_unstage_patch_co (_data_); -#line 11186 "gitg-stage.c" +#line 11183 "gitg-stage.c" } @@ -11273,7 +11270,7 @@ _tmp5_ = entry; #line 955 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (_tmp5_ == NULL) { -#line 11277 "gitg-stage.c" +#line 11274 "gitg-stage.c" GitgPatchSet* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; GError* _tmp8_ = NULL; @@ -11293,7 +11290,7 @@ _ggit_index_entries_unref0 (entries); #line 957 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 11297 "gitg-stage.c" +#line 11294 "gitg-stage.c" } #line 960 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp9_ = _data37_->tree; @@ -11315,7 +11312,7 @@ _ggit_index_entries_unref0 (entries); #line 960 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 11319 "gitg-stage.c" +#line 11316 "gitg-stage.c" } #line 961 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp13_ = self->priv->d_repository; @@ -11345,7 +11342,7 @@ _ggit_index_entries_unref0 (entries); #line 961 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 11349 "gitg-stage.c" +#line 11346 "gitg-stage.c" } #line 962 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp19_ = self->priv->d_repository; @@ -11377,7 +11374,7 @@ _ggit_index_entries_unref0 (entries); #line 962 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 11381 "gitg-stage.c" +#line 11378 "gitg-stage.c" } #line 964 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp25_ = head_blob; @@ -11469,7 +11466,7 @@ _ggit_index_entries_unref0 (entries); #line 972 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 11473 "gitg-stage.c" +#line 11470 "gitg-stage.c" } #line 974 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp47_ = head_stream; @@ -11497,7 +11494,7 @@ _ggit_index_entries_unref0 (entries); #line 974 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 11501 "gitg-stage.c" +#line 11498 "gitg-stage.c" } #line 975 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _tmp48_ = index_stream; @@ -11525,7 +11522,7 @@ _ggit_index_entries_unref0 (entries); #line 975 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return; -#line 11529 "gitg-stage.c" +#line 11526 "gitg-stage.c" } #line 951 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _gitg_patch_set_unref0 (reversed); @@ -11543,14 +11540,14 @@ _ggit_index_entry_unref0 (entry); #line 951 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _ggit_index_entries_unref0 (entries); -#line 11547 "gitg-stage.c" +#line 11544 "gitg-stage.c" } static void ___lambda28__gitg_stage_with_index_func (GgitIndex* index, gpointer self, GError** error) { #line 951 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" __lambda28_ (self, index, error); -#line 11554 "gitg-stage.c" +#line 11551 "gitg-stage.c" } @@ -11559,20 +11556,20 @@ switch (_data_->_state_) { #line 946 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 0: -#line 11563 "gitg-stage.c" +#line 11560 "gitg-stage.c" goto _state_0; #line 946 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 1: -#line 11567 "gitg-stage.c" +#line 11564 "gitg-stage.c" goto _state_1; #line 946 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 2: -#line 11571 "gitg-stage.c" +#line 11568 "gitg-stage.c" goto _state_2; default: #line 946 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_assert_not_reached (); -#line 11576 "gitg-stage.c" +#line 11573 "gitg-stage.c" } _state_0: #line 946 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -11629,7 +11626,7 @@ gitg_stage_get_head_tree (_data_->self, gitg_stage_unstage_patch_ready, _data_); #line 949 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 11633 "gitg-stage.c" +#line 11630 "gitg-stage.c" _state_1: #line 949 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp8_ = NULL; @@ -11651,17 +11648,17 @@ if (_data_->_state_ == 0) { #line 949 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 11655 "gitg-stage.c" +#line 11652 "gitg-stage.c" } else { #line 949 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 11659 "gitg-stage.c" +#line 11656 "gitg-stage.c" } #line 949 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 949 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 11665 "gitg-stage.c" +#line 11662 "gitg-stage.c" } #line 951 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_state_ = 2; @@ -11669,7 +11666,7 @@ gitg_stage_thread_index (_data_->self, ___lambda28__gitg_stage_with_index_func, _data_->_data37_, gitg_stage_unstage_patch_ready, _data_); #line 951 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 11673 "gitg-stage.c" +#line 11670 "gitg-stage.c" _state_2: #line 951 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_thread_index_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); @@ -11687,17 +11684,17 @@ if (_data_->_state_ == 0) { #line 951 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 11691 "gitg-stage.c" +#line 11688 "gitg-stage.c" } else { #line 951 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 11695 "gitg-stage.c" +#line 11692 "gitg-stage.c" } #line 951 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 951 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 11701 "gitg-stage.c" +#line 11698 "gitg-stage.c" } #line 946 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" block37_data_unref (_data_->_data37_); @@ -11707,17 +11704,17 @@ if (_data_->_state_ == 0) { #line 946 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 11711 "gitg-stage.c" +#line 11708 "gitg-stage.c" } else { #line 946 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 11715 "gitg-stage.c" +#line 11712 "gitg-stage.c" } #line 946 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 946 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 11721 "gitg-stage.c" +#line 11718 "gitg-stage.c" } @@ -11732,7 +11729,7 @@ _g_object_unref0 (_data_->self); #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (GitgStageDiffIndexAllData, _data_); -#line 11736 "gitg-stage.c" +#line 11733 "gitg-stage.c" } @@ -11771,7 +11768,7 @@ _data_->defopts = _tmp3_; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_diff_index_all_co (_data_); -#line 11775 "gitg-stage.c" +#line 11772 "gitg-stage.c" } @@ -11782,7 +11779,7 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return NULL; -#line 11786 "gitg-stage.c" +#line 11783 "gitg-stage.c" } #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); @@ -11792,7 +11789,7 @@ _data_->result = NULL; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return result; -#line 11796 "gitg-stage.c" +#line 11793 "gitg-stage.c" } @@ -11806,7 +11803,7 @@ _data_->_res_ = _res_; #line 1016 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_diff_index_all_co (_data_); -#line 11810 "gitg-stage.c" +#line 11807 "gitg-stage.c" } @@ -11815,16 +11812,16 @@ switch (_data_->_state_) { #line 979 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 0: -#line 11819 "gitg-stage.c" +#line 11816 "gitg-stage.c" goto _state_0; #line 979 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 1: -#line 11823 "gitg-stage.c" +#line 11820 "gitg-stage.c" goto _state_1; default: #line 979 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_assert_not_reached (); -#line 11828 "gitg-stage.c" +#line 11825 "gitg-stage.c" } _state_0: #line 982 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -11871,11 +11868,11 @@ _data_->pspec_length1 = _data_->_tmp3__length1; #line 991 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_pspec_size_ = _data_->pspec_length1; -#line 11875 "gitg-stage.c" +#line 11872 "gitg-stage.c" { #line 993 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->i = 0; -#line 11879 "gitg-stage.c" +#line 11876 "gitg-stage.c" { #line 993 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp5_ = TRUE; @@ -11889,7 +11886,7 @@ _data_->_tmp6_ = _data_->i; #line 993 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->i = _data_->_tmp6_ + 1; -#line 11893 "gitg-stage.c" +#line 11890 "gitg-stage.c" } #line 993 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp5_ = FALSE; @@ -11909,7 +11906,7 @@ if (!(_data_->_tmp7_ < _data_->_tmp8__length1)) { #line 993 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" break; -#line 11913 "gitg-stage.c" +#line 11910 "gitg-stage.c" } #line 995 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp9_ = NULL; @@ -11955,7 +11952,7 @@ _data_->_tmp16_ = NULL; #line 995 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp16_ = _data_->_tmp9_[_data_->_tmp10_]; -#line 11959 "gitg-stage.c" +#line 11956 "gitg-stage.c" } } } @@ -11975,7 +11972,7 @@ ggit_diff_options_set_pathspec (_data_->_tmp17_, _data_->_tmp18_); #line 989 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->pspec = (_vala_array_free (_data_->pspec, _data_->pspec_length1, (GDestroyNotify) g_free), NULL); -#line 11979 "gitg-stage.c" +#line 11976 "gitg-stage.c" } #line 1001 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp19_ = NULL; @@ -12085,7 +12082,7 @@ _data_->_tmp42_ = _data_->_tmp41_; #line 1009 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" ggit_diff_options_set_new_prefix (_data_->_tmp39_, _data_->_tmp42_); -#line 12089 "gitg-stage.c" +#line 12086 "gitg-stage.c" } #line 1012 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->tree = NULL; @@ -12113,17 +12110,17 @@ if (_data_->_state_ == 0) { #line 1014 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 12117 "gitg-stage.c" +#line 12114 "gitg-stage.c" } else { #line 1014 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 12121 "gitg-stage.c" +#line 12118 "gitg-stage.c" } #line 1014 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 1014 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 12127 "gitg-stage.c" +#line 12124 "gitg-stage.c" } #line 1014 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" if (!_data_->_tmp43_) { @@ -12133,7 +12130,7 @@ gitg_stage_get_head_tree (_data_->self, gitg_stage_diff_index_all_ready, _data_); #line 1016 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 12137 "gitg-stage.c" +#line 12134 "gitg-stage.c" _state_1: #line 1016 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp47_ = NULL; @@ -12155,17 +12152,17 @@ if (_data_->_state_ == 0) { #line 1016 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 12159 "gitg-stage.c" +#line 12156 "gitg-stage.c" } else { #line 1016 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 12163 "gitg-stage.c" +#line 12160 "gitg-stage.c" } #line 1016 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 1016 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 12169 "gitg-stage.c" +#line 12166 "gitg-stage.c" } #line 1016 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp48_ = NULL; @@ -12179,7 +12176,7 @@ _data_->tree = _data_->_tmp48_; #line 1014 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _g_object_unref0 (_data_->_tmp46_); -#line 12183 "gitg-stage.c" +#line 12180 "gitg-stage.c" } #line 1021 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp50_ = NULL; @@ -12205,17 +12202,17 @@ if (_data_->_state_ == 0) { #line 1021 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 12209 "gitg-stage.c" +#line 12206 "gitg-stage.c" } else { #line 1021 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 12213 "gitg-stage.c" +#line 12210 "gitg-stage.c" } #line 1021 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 1021 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 12219 "gitg-stage.c" +#line 12216 "gitg-stage.c" } #line 1019 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp53_ = NULL; @@ -12251,17 +12248,17 @@ if (_data_->_state_ == 0) { #line 1019 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 12255 "gitg-stage.c" +#line 12252 "gitg-stage.c" } else { #line 1019 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 12259 "gitg-stage.c" +#line 12256 "gitg-stage.c" } #line 1019 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 1019 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 12265 "gitg-stage.c" +#line 12262 "gitg-stage.c" } #line 1019 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp57_ = NULL; @@ -12283,11 +12280,11 @@ if (_data_->_state_ == 0) { #line 1019 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 12287 "gitg-stage.c" +#line 12284 "gitg-stage.c" } else { #line 1019 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 12291 "gitg-stage.c" +#line 12288 "gitg-stage.c" } #line 1019 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); @@ -12305,17 +12302,17 @@ if (_data_->_state_ == 0) { #line 979 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 12309 "gitg-stage.c" +#line 12306 "gitg-stage.c" } else { #line 979 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 12313 "gitg-stage.c" +#line 12310 "gitg-stage.c" } #line 979 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 979 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 12319 "gitg-stage.c" +#line 12316 "gitg-stage.c" } @@ -12332,7 +12329,7 @@ _g_object_unref0 (_data_->self); #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (GitgStageDiffIndexData, _data_); -#line 12336 "gitg-stage.c" +#line 12333 "gitg-stage.c" } @@ -12371,7 +12368,7 @@ _data_->defopts = _tmp4_; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_diff_index_co (_data_); -#line 12375 "gitg-stage.c" +#line 12372 "gitg-stage.c" } @@ -12382,7 +12379,7 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return NULL; -#line 12386 "gitg-stage.c" +#line 12383 "gitg-stage.c" } #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); @@ -12392,7 +12389,7 @@ _data_->result = NULL; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return result; -#line 12396 "gitg-stage.c" +#line 12393 "gitg-stage.c" } @@ -12406,7 +12403,7 @@ _data_->_res_ = _res_; #line 1028 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_diff_index_co (_data_); -#line 12410 "gitg-stage.c" +#line 12407 "gitg-stage.c" } @@ -12415,16 +12412,16 @@ switch (_data_->_state_) { #line 1025 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 0: -#line 12419 "gitg-stage.c" +#line 12416 "gitg-stage.c" goto _state_0; #line 1025 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 1: -#line 12423 "gitg-stage.c" +#line 12420 "gitg-stage.c" goto _state_1; default: #line 1025 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_assert_not_reached (); -#line 12428 "gitg-stage.c" +#line 12425 "gitg-stage.c" } _state_0: #line 1028 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -12459,7 +12456,7 @@ gitg_stage_diff_index_all (_data_->self, _data_->_tmp4_, 1, _data_->_tmp5_, gitg_stage_diff_index_ready, _data_); #line 1028 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 12463 "gitg-stage.c" +#line 12460 "gitg-stage.c" _state_1: #line 1028 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp6_ = NULL; @@ -12483,17 +12480,17 @@ if (_data_->_state_ == 0) { #line 1028 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 12487 "gitg-stage.c" +#line 12484 "gitg-stage.c" } else { #line 1028 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 12491 "gitg-stage.c" +#line 12488 "gitg-stage.c" } #line 1028 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 1028 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 12497 "gitg-stage.c" +#line 12494 "gitg-stage.c" } #line 1028 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp8_ = NULL; @@ -12509,11 +12506,11 @@ if (_data_->_state_ == 0) { #line 1028 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 12513 "gitg-stage.c" +#line 12510 "gitg-stage.c" } else { #line 1028 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 12517 "gitg-stage.c" +#line 12514 "gitg-stage.c" } #line 1028 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); @@ -12525,17 +12522,17 @@ if (_data_->_state_ == 0) { #line 1025 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 12529 "gitg-stage.c" +#line 12526 "gitg-stage.c" } else { #line 1025 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 12533 "gitg-stage.c" +#line 12530 "gitg-stage.c" } #line 1025 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 1025 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 12539 "gitg-stage.c" +#line 12536 "gitg-stage.c" } @@ -12550,7 +12547,7 @@ _g_object_unref0 (_data_->self); #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (GitgStageDiffWorkdirAllData, _data_); -#line 12554 "gitg-stage.c" +#line 12551 "gitg-stage.c" } @@ -12589,7 +12586,7 @@ _data_->defopts = _tmp3_; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_diff_workdir_all_co (_data_); -#line 12593 "gitg-stage.c" +#line 12590 "gitg-stage.c" } @@ -12600,7 +12597,7 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return NULL; -#line 12604 "gitg-stage.c" +#line 12601 "gitg-stage.c" } #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); @@ -12610,7 +12607,7 @@ _data_->result = NULL; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return result; -#line 12614 "gitg-stage.c" +#line 12611 "gitg-stage.c" } @@ -12619,12 +12616,12 @@ switch (_data_->_state_) { #line 1031 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 0: -#line 12623 "gitg-stage.c" +#line 12620 "gitg-stage.c" goto _state_0; default: #line 1031 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_assert_not_reached (); -#line 12628 "gitg-stage.c" +#line 12625 "gitg-stage.c" } _state_0: #line 1034 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -12671,11 +12668,11 @@ _data_->pspec_length1 = _data_->_tmp3__length1; #line 1043 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_pspec_size_ = _data_->pspec_length1; -#line 12675 "gitg-stage.c" +#line 12672 "gitg-stage.c" { #line 1045 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->i = 0; -#line 12679 "gitg-stage.c" +#line 12676 "gitg-stage.c" { #line 1045 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp5_ = TRUE; @@ -12689,7 +12686,7 @@ _data_->_tmp6_ = _data_->i; #line 1045 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->i = _data_->_tmp6_ + 1; -#line 12693 "gitg-stage.c" +#line 12690 "gitg-stage.c" } #line 1045 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp5_ = FALSE; @@ -12709,7 +12706,7 @@ if (!(_data_->_tmp7_ < _data_->_tmp8__length1)) { #line 1045 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" break; -#line 12713 "gitg-stage.c" +#line 12710 "gitg-stage.c" } #line 1047 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp9_ = NULL; @@ -12755,7 +12752,7 @@ _data_->_tmp16_ = NULL; #line 1047 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp16_ = _data_->_tmp9_[_data_->_tmp10_]; -#line 12759 "gitg-stage.c" +#line 12756 "gitg-stage.c" } } } @@ -12775,7 +12772,7 @@ ggit_diff_options_set_pathspec (_data_->_tmp17_, _data_->_tmp18_); #line 1041 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->pspec = (_vala_array_free (_data_->pspec, _data_->pspec_length1, (GDestroyNotify) g_free), NULL); -#line 12779 "gitg-stage.c" +#line 12776 "gitg-stage.c" } #line 1053 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp19_ = NULL; @@ -12885,7 +12882,7 @@ _data_->_tmp42_ = _data_->_tmp41_; #line 1061 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" ggit_diff_options_set_new_prefix (_data_->_tmp39_, _data_->_tmp42_); -#line 12889 "gitg-stage.c" +#line 12886 "gitg-stage.c" } #line 1065 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp44_ = NULL; @@ -12909,17 +12906,17 @@ if (_data_->_state_ == 0) { #line 1065 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 12913 "gitg-stage.c" +#line 12910 "gitg-stage.c" } else { #line 1065 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 12917 "gitg-stage.c" +#line 12914 "gitg-stage.c" } #line 1065 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 1065 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 12923 "gitg-stage.c" +#line 12920 "gitg-stage.c" } #line 1064 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp47_ = NULL; @@ -12949,17 +12946,17 @@ if (_data_->_state_ == 0) { #line 1064 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 12953 "gitg-stage.c" +#line 12950 "gitg-stage.c" } else { #line 1064 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 12957 "gitg-stage.c" +#line 12954 "gitg-stage.c" } #line 1064 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 1064 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 12963 "gitg-stage.c" +#line 12960 "gitg-stage.c" } #line 1064 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp50_ = NULL; @@ -12979,11 +12976,11 @@ if (_data_->_state_ == 0) { #line 1064 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 12983 "gitg-stage.c" +#line 12980 "gitg-stage.c" } else { #line 1064 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 12987 "gitg-stage.c" +#line 12984 "gitg-stage.c" } #line 1064 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); @@ -12999,17 +12996,17 @@ if (_data_->_state_ == 0) { #line 1031 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 13003 "gitg-stage.c" +#line 13000 "gitg-stage.c" } else { #line 1031 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 13007 "gitg-stage.c" +#line 13004 "gitg-stage.c" } #line 1031 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 1031 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 13013 "gitg-stage.c" +#line 13010 "gitg-stage.c" } @@ -13026,7 +13023,7 @@ _g_object_unref0 (_data_->self); #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_slice_free (GitgStageDiffWorkdirData, _data_); -#line 13030 "gitg-stage.c" +#line 13027 "gitg-stage.c" } @@ -13065,7 +13062,7 @@ _data_->defopts = _tmp4_; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_diff_workdir_co (_data_); -#line 13069 "gitg-stage.c" +#line 13066 "gitg-stage.c" } @@ -13076,7 +13073,7 @@ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return NULL; -#line 13080 "gitg-stage.c" +#line 13077 "gitg-stage.c" } #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); @@ -13086,7 +13083,7 @@ _data_->result = NULL; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return result; -#line 13090 "gitg-stage.c" +#line 13087 "gitg-stage.c" } @@ -13100,7 +13097,7 @@ _data_->_res_ = _res_; #line 1072 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" gitg_stage_diff_workdir_co (_data_); -#line 13104 "gitg-stage.c" +#line 13101 "gitg-stage.c" } @@ -13109,16 +13106,16 @@ switch (_data_->_state_) { #line 1069 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 0: -#line 13113 "gitg-stage.c" +#line 13110 "gitg-stage.c" goto _state_0; #line 1069 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" case 1: -#line 13117 "gitg-stage.c" +#line 13114 "gitg-stage.c" goto _state_1; default: #line 1069 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_assert_not_reached (); -#line 13122 "gitg-stage.c" +#line 13119 "gitg-stage.c" } _state_0: #line 1072 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" @@ -13153,7 +13150,7 @@ gitg_stage_diff_workdir_all (_data_->self, _data_->_tmp4_, 1, _data_->_tmp5_, gitg_stage_diff_workdir_ready, _data_); #line 1072 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 13157 "gitg-stage.c" +#line 13154 "gitg-stage.c" _state_1: #line 1072 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp6_ = NULL; @@ -13177,17 +13174,17 @@ if (_data_->_state_ == 0) { #line 1072 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 13181 "gitg-stage.c" +#line 13178 "gitg-stage.c" } else { #line 1072 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 13185 "gitg-stage.c" +#line 13182 "gitg-stage.c" } #line 1072 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 1072 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 13191 "gitg-stage.c" +#line 13188 "gitg-stage.c" } #line 1072 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" _data_->_tmp8_ = NULL; @@ -13203,11 +13200,11 @@ if (_data_->_state_ == 0) { #line 1072 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 13207 "gitg-stage.c" +#line 13204 "gitg-stage.c" } else { #line 1072 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 13211 "gitg-stage.c" +#line 13208 "gitg-stage.c" } #line 1072 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); @@ -13219,17 +13216,17 @@ if (_data_->_state_ == 0) { #line 1069 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 13223 "gitg-stage.c" +#line 13220 "gitg-stage.c" } else { #line 1069 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_simple_async_result_complete (_data_->_async_result); -#line 13227 "gitg-stage.c" +#line 13224 "gitg-stage.c" } #line 1069 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_object_unref (_data_->_async_result); #line 1069 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" return FALSE; -#line 13233 "gitg-stage.c" +#line 13230 "gitg-stage.c" } @@ -13240,7 +13237,7 @@ g_type_class_add_private (klass, sizeof (GitgStagePrivate)); #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" G_OBJECT_CLASS (klass)->finalize = gitg_stage_finalize; -#line 13244 "gitg-stage.c" +#line 13241 "gitg-stage.c" } @@ -13249,11 +13246,11 @@ self->priv = GITG_STAGE_GET_PRIVATE (self); #line 96 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" g_rec_mutex_init (&self->priv->__lock_d_index_mutex); -#line 13253 "gitg-stage.c" +#line 13250 "gitg-stage.c" } -static void gitg_stage_finalize (GObject* obj) { +static void gitg_stage_finalize (GObject * obj) { GitgStage * self; #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_STAGE, GitgStage); @@ -13265,7 +13262,7 @@ _g_object_unref0 (self->priv->d_head_tree); #line 93 "/home/jesse/dev/gitg/libgitg/gitg-stage.vala" G_OBJECT_CLASS (gitg_stage_parent_class)->finalize (obj); -#line 13269 "gitg-stage.c" +#line 13266 "gitg-stage.c" } diff -Nru gitg-3.22.0/libgitg/gitg-stage-status-enumerator.c gitg-3.23.0/libgitg/gitg-stage-status-enumerator.c --- gitg-3.22.0/libgitg/gitg-stage-status-enumerator.c 2016-09-18 12:01:42.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-stage-status-enumerator.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-stage-status-enumerator.c generated by valac 0.32.1, the Vala compiler +/* gitg-stage-status-enumerator.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-stage-status-enumerator.vala, do not modify */ /* @@ -218,7 +218,7 @@ static GgitStatusFlags gitg_stage_status_file_s_work_flags = (GGIT_STATUS_WORKING_TREE_MODIFIED | GGIT_STATUS_WORKING_TREE_DELETED) | GGIT_STATUS_WORKING_TREE_TYPECHANGE; static GgitStatusFlags gitg_stage_status_file_s_untracked_flags; static GgitStatusFlags gitg_stage_status_file_s_untracked_flags = GGIT_STATUS_WORKING_TREE_NEW; -static GitgStageStatusItemIface* gitg_stage_status_file_gitg_stage_status_item_parent_iface = NULL; +static GitgStageStatusItemIface * gitg_stage_status_file_gitg_stage_status_item_parent_iface = NULL; static gpointer gitg_stage_status_submodule_parent_class = NULL; static GgitSubmoduleStatus gitg_stage_status_submodule_s_index_flags; static GgitSubmoduleStatus gitg_stage_status_submodule_s_index_flags = (GGIT_SUBMODULE_STATUS_INDEX_ADDED | GGIT_SUBMODULE_STATUS_INDEX_DELETED) | GGIT_SUBMODULE_STATUS_INDEX_MODIFIED; @@ -230,7 +230,7 @@ static GgitSubmoduleStatus gitg_stage_status_submodule_s_tracked_flags = GGIT_SUBMODULE_STATUS_IN_HEAD | GGIT_SUBMODULE_STATUS_IN_INDEX; static GgitSubmoduleStatus gitg_stage_status_submodule_s_dirty_flags; static GgitSubmoduleStatus gitg_stage_status_submodule_s_dirty_flags = GGIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED | GGIT_SUBMODULE_STATUS_WD_WD_MODIFIED; -static GitgStageStatusItemIface* gitg_stage_status_submodule_gitg_stage_status_item_parent_iface = NULL; +static GitgStageStatusItemIface * gitg_stage_status_submodule_gitg_stage_status_item_parent_iface = NULL; static gpointer gitg_stage_status_enumerator_parent_class = NULL; static GRegex* gitg_stage_status_enumerator_s_ignore_regex; static GRegex* gitg_stage_status_enumerator_s_ignore_regex = NULL; @@ -256,7 +256,7 @@ GitgStageStatusFile* gitg_stage_status_file_construct (GType object_type, const gchar* path, GgitStatusFlags flags); static gchar* gitg_stage_status_file_icon_for_status (GitgStageStatusFile* self, GgitStatusFlags status); GgitStatusFlags gitg_stage_status_file_get_flags (GitgStageStatusFile* self); -static void gitg_stage_status_file_finalize (GObject* obj); +static void gitg_stage_status_file_finalize (GObject * obj); static void _vala_gitg_stage_status_file_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); GType gitg_stage_status_submodule_get_type (void) G_GNUC_CONST; #define GITG_STAGE_STATUS_SUBMODULE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_STAGE_STATUS_SUBMODULE, GitgStageStatusSubmodulePrivate)) @@ -276,7 +276,7 @@ GgitSubmodule* gitg_stage_status_submodule_get_submodule (GitgStageStatusSubmodule* self); gboolean gitg_stage_status_submodule_get_is_dirty (GitgStageStatusSubmodule* self); GgitSubmoduleStatus gitg_stage_status_submodule_get_flags (GitgStageStatusSubmodule* self); -static void gitg_stage_status_submodule_finalize (GObject* obj); +static void gitg_stage_status_submodule_finalize (GObject * obj); static void _vala_gitg_stage_status_submodule_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); GType gitg_stage_status_enumerator_get_type (void) G_GNUC_CONST; GType gitg_repository_get_type (void) G_GNUC_CONST; @@ -296,20 +296,20 @@ static Block21Data* block21_data_ref (Block21Data* _data21_); static void block21_data_unref (void * _userdata_); static void __lambda9_ (GitgStageStatusEnumerator* self, GitgStageStatusItem* item); -static void _vala_array_add16 (GitgStageStatusItem*** array, int* length, int* size, GitgStageStatusItem* value); +static void _vala_array_add16 (GitgStageStatusItem** * array, int* length, int* size, GitgStageStatusItem* value); static void ___lambda9__gitg_stage_status_enumerator_add_item (GitgStageStatusItem* item, gpointer self); static gint ____lambda10_ (Block21Data* _data21_, GgitSubmodule* submodule, const gchar* name); static gint _____lambda10__ggit_submodule_callback (GgitSubmodule* submodule, const gchar* name, gpointer self); static gint ___lambda11_ (Block21Data* _data21_, const gchar* path, GgitStatusFlags flags); static gint ____lambda11__ggit_status_callback (const gchar* path, GgitStatusFlags status_flags, gpointer self); static GitgStageStatusItem** gitg_stage_status_enumerator_fill_items (GitgStageStatusEnumerator* self, gint num, int* result_length1); -static void _vala_array_add17 (GitgStageStatusItem*** array, int* length, int* size, GitgStageStatusItem* value); +static void _vala_array_add17 (GitgStageStatusItem** * array, int* length, int* size, GitgStageStatusItem* value); static void gitg_stage_status_enumerator_next_items_data_free (gpointer _data); void gitg_stage_status_enumerator_next_items (GitgStageStatusEnumerator* self, gint num, GAsyncReadyCallback _callback_, gpointer _user_data_); GitgStageStatusItem** gitg_stage_status_enumerator_next_items_finish (GitgStageStatusEnumerator* self, GAsyncResult* _res_, int* result_length1); static gboolean gitg_stage_status_enumerator_next_items_co (GitgStageStatusEnumeratorNextItemsData* _data_); static gboolean _gitg_stage_status_enumerator_next_items_co_gsource_func (gpointer self); -static void gitg_stage_status_enumerator_finalize (GObject* obj); +static void gitg_stage_status_enumerator_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -646,7 +646,7 @@ } -static void gitg_stage_status_file_finalize (GObject* obj) { +static void gitg_stage_status_file_finalize (GObject * obj) { GitgStageStatusFile * self; #line 34 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_STAGE_STATUS_FILE, GitgStageStatusFile); @@ -787,14 +787,14 @@ #line 151 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 790 "gitg-stage-status-enumerator.c" - goto __catch78_g_error; + goto __catch80_g_error; } #line 151 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" self->priv->d_flags = _tmp7_; #line 795 "gitg-stage-status-enumerator.c" } - goto __finally78; - __catch78_g_error: + goto __finally80; + __catch80_g_error: { #line 149 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" g_clear_error (&_inner_error_); @@ -802,7 +802,7 @@ _inner_error_ = NULL; #line 804 "gitg-stage-status-enumerator.c" } - __finally78: + __finally80: #line 149 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 149 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" @@ -1059,7 +1059,7 @@ } -static void gitg_stage_status_submodule_finalize (GObject* obj) { +static void gitg_stage_status_submodule_finalize (GObject * obj) { GitgStageStatusSubmodule * self; #line 115 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_STAGE_STATUS_SUBMODULE, GitgStageStatusSubmodule); @@ -1319,7 +1319,7 @@ #line 240 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1322 "gitg-stage-status-enumerator.c" - goto __catch79_g_error; + goto __catch81_g_error; } #line 240 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" _tmp12_ = _tmp8_; @@ -1340,7 +1340,7 @@ #line 240 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" _g_object_unref0 (_tmp8_); #line 1343 "gitg-stage-status-enumerator.c" - goto __catch79_g_error; + goto __catch81_g_error; } #line 240 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" _tmp16_ = _tmp11_; @@ -1361,7 +1361,7 @@ #line 240 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" _g_object_unref0 (_tmp8_); #line 1364 "gitg-stage-status-enumerator.c" - goto __catch79_g_error; + goto __catch81_g_error; } #line 236 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" _g_object_unref0 (_tmp11_); @@ -1369,8 +1369,8 @@ _g_object_unref0 (_tmp8_); #line 1371 "gitg-stage-status-enumerator.c" } - goto __finally79; - __catch79_g_error: + goto __finally81; + __catch81_g_error: { #line 236 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" g_clear_error (&_inner_error_); @@ -1378,7 +1378,7 @@ _inner_error_ = NULL; #line 1380 "gitg-stage-status-enumerator.c" } - __finally79: + __finally81: #line 236 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 236 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" @@ -1400,7 +1400,7 @@ #line 253 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1403 "gitg-stage-status-enumerator.c" - goto __catch80_g_error; + goto __catch82_g_error; } #line 253 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" _tmp21_ = _tmp19_; @@ -1414,8 +1414,8 @@ _g_thread_unref0 (_tmp19_); #line 1416 "gitg-stage-status-enumerator.c" } - goto __finally80; - __catch80_g_error: + goto __finally82; + __catch82_g_error: { #line 251 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" g_clear_error (&_inner_error_); @@ -1423,7 +1423,7 @@ _inner_error_ = NULL; #line 1425 "gitg-stage-status-enumerator.c" } - __finally80: + __finally82: #line 251 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 251 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" @@ -1485,7 +1485,7 @@ #line 1486 "gitg-stage-status-enumerator.c" } } - __finally81: + __finally83: { GitgStageStatusItem** _tmp3_ = NULL; gint _tmp3__length1 = 0; @@ -1567,7 +1567,7 @@ } -static void _vala_array_add16 (GitgStageStatusItem*** array, int* length, int* size, GitgStageStatusItem* value) { +static void _vala_array_add16 (GitgStageStatusItem** * array, int* length, int* size, GitgStageStatusItem* value) { #line 281 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" if ((*length) == (*size)) { #line 281 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" @@ -1717,7 +1717,7 @@ #line 1718 "gitg-stage-status-enumerator.c" } } - __finally82: + __finally84: { GitgStageStatusItem** _tmp12_ = NULL; gint _tmp12__length1 = 0; @@ -1806,7 +1806,7 @@ #line 308 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1809 "gitg-stage-status-enumerator.c" - goto __catch84_g_error; + goto __catch86_g_error; } #line 308 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" _tmp10_ = _data21_->add; @@ -1824,8 +1824,8 @@ _ggit_submodule_unref0 (_tmp6_); #line 1826 "gitg-stage-status-enumerator.c" } - goto __finally84; - __catch84_g_error: + goto __finally86; + __catch86_g_error: { #line 306 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" g_clear_error (&_inner_error_); @@ -1833,7 +1833,7 @@ _inner_error_ = NULL; #line 1835 "gitg-stage-status-enumerator.c" } - __finally84: + __finally86: #line 306 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 306 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" @@ -1997,11 +1997,11 @@ #line 301 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2000 "gitg-stage-status-enumerator.c" - goto __catch83_g_error; + goto __catch85_g_error; } } - goto __finally83; - __catch83_g_error: + goto __finally85; + __catch85_g_error: { #line 299 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" g_clear_error (&_inner_error_); @@ -2009,7 +2009,7 @@ _inner_error_ = NULL; #line 2011 "gitg-stage-status-enumerator.c" } - __finally83: + __finally85: #line 299 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 299 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" @@ -2037,11 +2037,11 @@ #line 319 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2040 "gitg-stage-status-enumerator.c" - goto __catch85_g_error; + goto __catch87_g_error; } } - goto __finally85; - __catch85_g_error: + goto __finally87; + __catch87_g_error: { #line 317 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" g_clear_error (&_inner_error_); @@ -2049,7 +2049,7 @@ _inner_error_ = NULL; #line 2051 "gitg-stage-status-enumerator.c" } - __finally85: + __finally87: #line 317 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 317 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" @@ -2161,7 +2161,7 @@ #line 2162 "gitg-stage-status-enumerator.c" } } - __finally86: + __finally88: { GitgStageStatusItem** _tmp13_ = NULL; gint _tmp13__length1 = 0; @@ -2200,7 +2200,7 @@ } -static void _vala_array_add17 (GitgStageStatusItem*** array, int* length, int* size, GitgStageStatusItem* value) { +static void _vala_array_add17 (GitgStageStatusItem** * array, int* length, int* size, GitgStageStatusItem* value) { #line 365 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" if ((*length) == (*size)) { #line 365 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" @@ -2573,7 +2573,7 @@ #line 2574 "gitg-stage-status-enumerator.c" } } - __finally87: + __finally89: { #line 379 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" _data_->_tmp9_ = NULL; @@ -2648,7 +2648,7 @@ _data_->_ret_size_ = _data_->ret_length1; #line 2650 "gitg-stage-status-enumerator.c" } - __finally88: + __finally90: { #line 395 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" _data_->_tmp14_ = NULL; @@ -2765,11 +2765,11 @@ static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 2775 "gitg-stage-status-enumerator.c" } @@ -2795,7 +2795,7 @@ #line 218 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2798 "gitg-stage-status-enumerator.c" - goto __catch89_g_error; + goto __catch91_g_error; } #line 218 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" _tmp2_ = _tmp0_; @@ -2809,8 +2809,8 @@ _g_regex_unref0 (_tmp0_); #line 2811 "gitg-stage-status-enumerator.c" } - goto __finally89; - __catch89_g_error: + goto __finally91; + __catch91_g_error: { GError* e = NULL; FILE* _tmp3_ = NULL; @@ -2843,7 +2843,7 @@ _g_error_free0 (e); #line 2845 "gitg-stage-status-enumerator.c" } - __finally89: + __finally91: #line 216 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 216 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" @@ -2864,7 +2864,7 @@ } -static void gitg_stage_status_enumerator_finalize (GObject* obj) { +static void gitg_stage_status_enumerator_finalize (GObject * obj) { GitgStageStatusEnumerator * self; #line 200 "/home/jesse/dev/gitg/libgitg/gitg-stage-status-enumerator.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_STAGE_STATUS_ENUMERATOR, GitgStageStatusEnumerator); diff -Nru gitg-3.22.0/libgitg/gitg-utils.c gitg-3.23.0/libgitg/gitg-utils.c --- gitg-3.22.0/libgitg/gitg-utils.c 2016-09-18 12:01:42.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-utils.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-utils.c generated by valac 0.32.1, the Vala compiler +/* gitg-utils.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-utils.vala, do not modify */ /* @@ -73,7 +73,7 @@ gchar* gitg_utils_expand_home_dir (const gchar* path); GitgUtils* gitg_utils_new (void); GitgUtils* gitg_utils_construct (GType object_type); -static void gitg_utils_finalize (GitgUtils* obj); +static void gitg_utils_finalize (GitgUtils * obj); static gchar* string_slice (const gchar* self, glong start, glong end) { @@ -93,103 +93,103 @@ glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1347 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { #line 109 "gitg-utils.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; #line 118 "gitg-utils.c" } -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { #line 124 "gitg-utils.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; #line 133 "gitg-utils.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { #line 139 "gitg-utils.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; #line 148 "gitg-utils.c" } else { -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = FALSE; #line 152 "gitg-utils.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { #line 160 "gitg-utils.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; #line 169 "gitg-utils.c" } else { -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 173 "gitg-utils.c" } -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 195 "gitg-utils.c" } @@ -239,7 +239,7 @@ #line 33 "/home/jesse/dev/gitg/libgitg/gitg-utils.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 242 "gitg-utils.c" - goto __catch111_g_error; + goto __catch113_g_error; } #line 35 "/home/jesse/dev/gitg/libgitg/gitg-utils.vala" _tmp7_ = hd; @@ -323,8 +323,8 @@ _g_free0 (hd); #line 325 "gitg-utils.c" } - goto __finally111; - __catch111_g_error: + goto __finally113; + __catch113_g_error: { #line 31 "/home/jesse/dev/gitg/libgitg/gitg-utils.vala" g_clear_error (&_inner_error_); @@ -332,7 +332,7 @@ _inner_error_ = NULL; #line 334 "gitg-utils.c" } - __finally111: + __finally113: #line 31 "/home/jesse/dev/gitg/libgitg/gitg-utils.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 31 "/home/jesse/dev/gitg/libgitg/gitg-utils.vala" @@ -365,33 +365,33 @@ gunichar _tmp1_ = 0U; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1007 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1023 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1024 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1024 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = c; -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1024 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_); -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1024 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1026 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1026 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { #line 383 "gitg-utils.c" gchar* _tmp4_ = NULL; -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1027 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1027 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1027 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 391 "gitg-utils.c" } else { -#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1029 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = -1; -#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1029 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 397 "gitg-utils.c" } @@ -405,37 +405,37 @@ glong _tmp1_ = 0L; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1314 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1315 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1315 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { #line 421 "gitg-utils.c" glong _tmp4_ = 0L; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = maxlen; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 429 "gitg-utils.c" } else { gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = (glong) (_tmp5_ - _tmp6_); -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1318 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 441 "gitg-utils.c" } @@ -455,112 +455,112 @@ glong _tmp20_ = 0L; glong _tmp21_ = 0L; gchar* _tmp22_ = NULL; -#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1325 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = offset; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { #line 465 "gitg-utils.c" glong _tmp2_ = 0L; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = len; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); #line 471 "gitg-utils.c" } else { -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = FALSE; #line 475 "gitg-utils.c" } -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1327 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_) { #line 479 "gitg-utils.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; glong _tmp5_ = 0L; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = offset; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = len; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = _tmp5_; #line 491 "gitg-utils.c" } else { gint _tmp6_ = 0; gint _tmp7_ = 0; -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = strlen (self); -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = _tmp6_; -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; #line 501 "gitg-utils.c" } -#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = offset; -#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { #line 507 "gitg-utils.c" glong _tmp9_ = 0L; glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1335 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = string_length; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1335 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = offset; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1335 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" offset = _tmp9_ + _tmp10_; -#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = offset; -#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); #line 521 "gitg-utils.c" } else { glong _tmp12_ = 0L; glong _tmp13_ = 0L; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = offset; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = string_length; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); #line 531 "gitg-utils.c" } -#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1340 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = len; -#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1340 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { #line 537 "gitg-utils.c" glong _tmp15_ = 0L; glong _tmp16_ = 0L; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1341 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1341 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = offset; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1341 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; #line 546 "gitg-utils.c" } -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = offset; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = len; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = string_length; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1343 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = offset; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = len; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp22_; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1344 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 566 "gitg-utils.c" } @@ -752,7 +752,7 @@ #line 22 "/home/jesse/dev/gitg/libgitg/gitg-utils.vala" if (collect_values[0].v_pointer) { #line 755 "gitg-utils.c" - GitgUtils* object; + GitgUtils * object; object = collect_values[0].v_pointer; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-utils.vala" if (object->parent_instance.g_class == NULL) { @@ -779,7 +779,7 @@ static gchar* gitg_value_utils_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GitgUtils** object_p; + GitgUtils ** object_p; object_p = collect_values[0].v_pointer; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-utils.vala" if (!object_p) { @@ -831,7 +831,7 @@ void gitg_value_set_utils (GValue* value, gpointer v_object) { - GitgUtils* old; + GitgUtils * old; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-utils.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_UTILS)); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-utils.vala" @@ -862,7 +862,7 @@ void gitg_value_take_utils (GValue* value, gpointer v_object) { - GitgUtils* old; + GitgUtils * old; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-utils.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_UTILS)); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-utils.vala" @@ -906,7 +906,7 @@ } -static void gitg_utils_finalize (GitgUtils* obj) { +static void gitg_utils_finalize (GitgUtils * obj) { GitgUtils * self; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-utils.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_UTILS, GitgUtils); @@ -931,7 +931,7 @@ gpointer gitg_utils_ref (gpointer instance) { - GitgUtils* self; + GitgUtils * self; self = instance; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-utils.vala" g_atomic_int_inc (&self->ref_count); @@ -942,7 +942,7 @@ void gitg_utils_unref (gpointer instance) { - GitgUtils* self; + GitgUtils * self; self = instance; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-utils.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { diff -Nru gitg-3.22.0/libgitg/gitg-when-mapped.c gitg-3.23.0/libgitg/gitg-when-mapped.c --- gitg-3.22.0/libgitg/gitg-when-mapped.c 2016-09-18 12:01:42.000000000 +0000 +++ gitg-3.23.0/libgitg/gitg-when-mapped.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-when-mapped.c generated by valac 0.32.1, the Vala compiler +/* gitg-when-mapped.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-when-mapped.vala, do not modify */ /* @@ -95,7 +95,7 @@ static void block38_data_unref (void * _userdata_); static void ___lambda79_ (Block38Data* _data38_); static void ____lambda79__gtk_widget_map (GtkWidget* _sender, gpointer self); -static void gitg_when_mapped_finalize (GitgWhenMapped* obj); +static void gitg_when_mapped_finalize (GitgWhenMapped * obj); static void _gitg_when_mapped_weak_notify_gweak_notify (gpointer self, GObject* object) { @@ -469,7 +469,7 @@ #line 22 "/home/jesse/dev/gitg/libgitg/gitg-when-mapped.vala" if (collect_values[0].v_pointer) { #line 472 "gitg-when-mapped.c" - GitgWhenMapped* object; + GitgWhenMapped * object; object = collect_values[0].v_pointer; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-when-mapped.vala" if (object->parent_instance.g_class == NULL) { @@ -496,7 +496,7 @@ static gchar* gitg_value_when_mapped_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GitgWhenMapped** object_p; + GitgWhenMapped ** object_p; object_p = collect_values[0].v_pointer; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-when-mapped.vala" if (!object_p) { @@ -548,7 +548,7 @@ void gitg_value_set_when_mapped (GValue* value, gpointer v_object) { - GitgWhenMapped* old; + GitgWhenMapped * old; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-when-mapped.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_WHEN_MAPPED)); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-when-mapped.vala" @@ -579,7 +579,7 @@ void gitg_value_take_when_mapped (GValue* value, gpointer v_object) { - GitgWhenMapped* old; + GitgWhenMapped * old; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-when-mapped.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TYPE_WHEN_MAPPED)); #line 22 "/home/jesse/dev/gitg/libgitg/gitg-when-mapped.vala" @@ -627,7 +627,7 @@ } -static void gitg_when_mapped_finalize (GitgWhenMapped* obj) { +static void gitg_when_mapped_finalize (GitgWhenMapped * obj) { GitgWhenMapped * self; GtkWidget* _tmp0_ = NULL; GObject* _tmp9_ = NULL; @@ -718,7 +718,7 @@ gpointer gitg_when_mapped_ref (gpointer instance) { - GitgWhenMapped* self; + GitgWhenMapped * self; self = instance; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-when-mapped.vala" g_atomic_int_inc (&self->ref_count); @@ -729,7 +729,7 @@ void gitg_when_mapped_unref (gpointer instance) { - GitgWhenMapped* self; + GitgWhenMapped * self; self = instance; #line 22 "/home/jesse/dev/gitg/libgitg/gitg-when-mapped.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { diff -Nru gitg-3.22.0/libgitg/libgitg-1.0.pc gitg-3.23.0/libgitg/libgitg-1.0.pc --- gitg-3.22.0/libgitg/libgitg-1.0.pc 2016-09-18 12:01:39.000000000 +0000 +++ gitg-3.23.0/libgitg/libgitg-1.0.pc 2016-11-26 13:24:47.000000000 +0000 @@ -5,7 +5,7 @@ Name: gitg Description: gitg library -Version: 3.22.0 +Version: 3.23.0 Requires: libgit2-glib-1.0 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 gthread-2.0 gtk+-3.0 gio-unix-2.0 Libs: -L${libdir} -lgitg-1.0 Cflags: -I${includedir}/libgitg-1.0 diff -Nru gitg-3.22.0/libgitg/libgitg-1.0.vapi gitg-3.23.0/libgitg/libgitg-1.0.vapi --- gitg-3.22.0/libgitg/libgitg-1.0.vapi 2016-08-25 21:13:56.000000000 +0000 +++ gitg-3.23.0/libgitg/libgitg-1.0.vapi 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* libgitg-1.0.vapi generated by valac 0.32.1, do not modify. */ +/* libgitg-1.0.vapi generated by valac 0.34.0.108-f56ac, do not modify. */ [CCode (gir_namespace = "Gitg", gir_version = "1.0")] namespace Gitg { diff -Nru gitg-3.22.0/libgitg/libgitg.h gitg-3.23.0/libgitg/libgitg.h --- gitg-3.22.0/libgitg/libgitg.h 2016-08-25 21:13:56.000000000 +0000 +++ gitg-3.23.0/libgitg/libgitg.h 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* libgitg.h generated by valac 0.32.1, the Vala compiler, do not modify */ +/* libgitg.h generated by valac 0.34.0.108-f56ac, the Vala compiler, do not modify */ #ifndef __LIBGITG_LIBGITG_H__ @@ -1235,7 +1235,7 @@ GitgLanes* gitg_lanes_new (void); GitgLanes* gitg_lanes_construct (GType object_type); void gitg_lanes_reset (GitgLanes* self, GgitOId** reserved, int reserved_length1, GeeHashSet* roots); -gboolean gitg_lanes_next (GitgLanes* self, GitgCommit* next, GSList** lanes, gint* nextpos); +gboolean gitg_lanes_next (GitgLanes* self, GitgCommit* next, GSList* * lanes, gint* nextpos); gint gitg_lanes_get_inactive_max (GitgLanes* self); void gitg_lanes_set_inactive_max (GitgLanes* self, gint value); gint gitg_lanes_get_inactive_collapse (GitgLanes* self); diff -Nru gitg-3.22.0/libgitg/Makefile.am gitg-3.23.0/libgitg/Makefile.am --- gitg-3.22.0/libgitg/Makefile.am 2016-09-18 11:59:28.000000000 +0000 +++ gitg-3.23.0/libgitg/Makefile.am 2016-11-26 08:32:25.000000000 +0000 @@ -67,6 +67,12 @@ libgitg/gitg-credentials-manager.vala \ libgitg/gitg-date.vala \ libgitg/gitg-diff-stat.vala \ + libgitg/gitg-diff-image-composite.vala \ + libgitg/gitg-diff-image-difference.vala \ + libgitg/gitg-diff-image-overlay.vala \ + libgitg/gitg-diff-image-side-by-side.vala \ + libgitg/gitg-diff-image-slider.vala \ + libgitg/gitg-diff-image-surface-cache.vala \ libgitg/gitg-diff-view.vala \ libgitg/gitg-diff-view-file.vala \ libgitg/gitg-diff-view-file-info.vala \ @@ -74,6 +80,7 @@ libgitg/gitg-diff-view-file-renderer.vala \ libgitg/gitg-diff-view-file-renderer-binary.vala \ libgitg/gitg-diff-view-file-renderer-text.vala \ + libgitg/gitg-diff-view-file-renderer-image.vala \ libgitg/gitg-diff-view-lines-renderer.vala \ libgitg/gitg-diff-selectable.vala \ libgitg/gitg-diff-view-commit-details.vala \ diff -Nru gitg-3.22.0/libgitg/resources/resources.xml gitg-3.23.0/libgitg/resources/resources.xml --- gitg-3.22.0/libgitg/resources/resources.xml 2016-09-18 11:59:28.000000000 +0000 +++ gitg-3.23.0/libgitg/resources/resources.xml 2016-11-26 08:32:25.000000000 +0000 @@ -5,6 +5,7 @@ ui/gitg-authentication-dialog.ui ui/gitg-diff-view.ui ui/gitg-diff-view-file.ui + ui/gitg-diff-view-file-renderer-image.ui ui/gitg-diff-view-file-renderer-text.ui ui/gitg-diff-view-file-renderer-binary.ui ui/gitg-diff-view-options.ui diff -Nru gitg-3.22.0/libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui gitg-3.23.0/libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui --- gitg-3.22.0/libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui 1970-01-01 00:00:00.000000000 +0000 +++ gitg-3.23.0/libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui 2016-11-26 08:32:25.000000000 +0000 @@ -0,0 +1,123 @@ + + + + + + 0 + 1 + 0.5 + + + 0 + 1 + 0.5 + + diff -Nru gitg-3.22.0/libgitg/resources/ui/libgitg-style.css gitg-3.23.0/libgitg/resources/ui/libgitg-style.css --- gitg-3.22.0/libgitg/resources/ui/libgitg-style.css 2016-09-12 19:53:14.000000000 +0000 +++ gitg-3.23.0/libgitg/resources/ui/libgitg-style.css 2016-11-26 08:32:25.000000000 +0000 @@ -117,3 +117,11 @@ .dark .language-frame { background-color: #535353; } + +GitgDiffImageSideBySide.old { + border: 10px solid #ddddff; +} + +GitgDiffImageSideBySide.new { + border: 10px solid #ddffdd; +} diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-action.c gitg-3.23.0/libgitg-ext/gitg-ext-action.c --- gitg-3.22.0/libgitg-ext/gitg-ext-action.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-action.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-action.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-action.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-action.vala, do not modify */ /* diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-activity.c gitg-3.23.0/libgitg-ext/gitg-ext-activity.c --- gitg-3.22.0/libgitg-ext/gitg-ext-activity.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-activity.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-activity.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-activity.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-activity.vala, do not modify */ /* diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-application.c gitg-3.23.0/libgitg-ext/gitg-ext-application.c --- gitg-3.22.0/libgitg-ext/gitg-ext-application.c 2016-08-18 17:25:45.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-application.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-application.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-application.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-application.vala, do not modify */ /* @@ -100,6 +100,12 @@ typedef struct _GitgExtRemoteLookupIface GitgExtRemoteLookupIface; #define GITG_EXT_TYPE_EXTERNAL_CHANGE_HINT (gitg_ext_external_change_hint_get_type ()) +enum { + GITG_EXT_APPLICATION_REPOSITORY_CHANGED_EXTERNALLY_SIGNAL, + GITG_EXT_APPLICATION_REPOSITORY_COMMITS_CHANGED_SIGNAL, + GITG_EXT_APPLICATION_LAST_SIGNAL +}; +static guint gitg_ext_application_signals[GITG_EXT_APPLICATION_LAST_SIGNAL] = {0}; struct _GitgExtUIElementIface { GTypeInterface parent_iface; @@ -206,7 +212,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 61 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" return GITG_EXT_APPLICATION_GET_INTERFACE (self)->get_verified_committer (self); -#line 210 "gitg-ext-application.c" +#line 216 "gitg-ext-application.c" } @@ -223,7 +229,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 76 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" return GITG_EXT_APPLICATION_GET_INTERFACE (self)->get_activity_by_id (self, id); -#line 227 "gitg-ext-application.c" +#line 233 "gitg-ext-application.c" } @@ -232,7 +238,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 77 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" return GITG_EXT_APPLICATION_GET_INTERFACE (self)->set_activity_by_id (self, id); -#line 236 "gitg-ext-application.c" +#line 242 "gitg-ext-application.c" } @@ -241,21 +247,21 @@ g_return_if_fail (self != NULL); #line 79 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" GITG_EXT_APPLICATION_GET_INTERFACE (self)->user_query (self, query); -#line 245 "gitg-ext-application.c" +#line 251 "gitg-ext-application.c" } void gitg_ext_application_user_query_async (GitgExtApplication* self, GitgExtUserQuery* query, GAsyncReadyCallback _callback_, gpointer _user_data_) { #line 31 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" GITG_EXT_APPLICATION_GET_INTERFACE (self)->user_query_async (self, query, _callback_, _user_data_); -#line 252 "gitg-ext-application.c" +#line 258 "gitg-ext-application.c" } GtkResponseType gitg_ext_application_user_query_finish (GitgExtApplication* self, GAsyncResult* _res_) { #line 31 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" return GITG_EXT_APPLICATION_GET_INTERFACE (self)->user_query_finish (self, _res_); -#line 259 "gitg-ext-application.c" +#line 265 "gitg-ext-application.c" } @@ -264,7 +270,7 @@ g_return_if_fail (self != NULL); #line 82 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" GITG_EXT_APPLICATION_GET_INTERFACE (self)->show_infobar (self, primary_msg, secondary_msg, type); -#line 268 "gitg-ext-application.c" +#line 274 "gitg-ext-application.c" } @@ -273,7 +279,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 88 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" return GITG_EXT_APPLICATION_GET_INTERFACE (self)->open_new (self, repository, hint); -#line 277 "gitg-ext-application.c" +#line 283 "gitg-ext-application.c" } @@ -282,7 +288,7 @@ g_return_if_fail (self != NULL); #line 92 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" GITG_EXT_APPLICATION_GET_INTERFACE (self)->open_repository (self, path); -#line 286 "gitg-ext-application.c" +#line 292 "gitg-ext-application.c" } @@ -291,7 +297,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 36 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" return GITG_EXT_APPLICATION_GET_INTERFACE (self)->get_repository (self); -#line 295 "gitg-ext-application.c" +#line 301 "gitg-ext-application.c" } @@ -300,7 +306,7 @@ g_return_if_fail (self != NULL); #line 36 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" GITG_EXT_APPLICATION_GET_INTERFACE (self)->set_repository (self, value); -#line 304 "gitg-ext-application.c" +#line 310 "gitg-ext-application.c" } @@ -309,7 +315,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" return GITG_EXT_APPLICATION_GET_INTERFACE (self)->get_message_bus (self); -#line 313 "gitg-ext-application.c" +#line 319 "gitg-ext-application.c" } @@ -318,7 +324,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 49 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" return GITG_EXT_APPLICATION_GET_INTERFACE (self)->get_current_activity (self); -#line 322 "gitg-ext-application.c" +#line 328 "gitg-ext-application.c" } @@ -327,7 +333,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 54 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" return GITG_EXT_APPLICATION_GET_INTERFACE (self)->get_environment (self); -#line 331 "gitg-ext-application.c" +#line 337 "gitg-ext-application.c" } @@ -336,7 +342,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 66 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" return GITG_EXT_APPLICATION_GET_INTERFACE (self)->get_notifications (self); -#line 340 "gitg-ext-application.c" +#line 346 "gitg-ext-application.c" } @@ -345,7 +351,7 @@ g_return_val_if_fail (self != NULL, FALSE); #line 86 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" return GITG_EXT_APPLICATION_GET_INTERFACE (self)->get_busy (self); -#line 349 "gitg-ext-application.c" +#line 355 "gitg-ext-application.c" } @@ -354,7 +360,7 @@ g_return_if_fail (self != NULL); #line 86 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" GITG_EXT_APPLICATION_GET_INTERFACE (self)->set_busy (self, value); -#line 358 "gitg-ext-application.c" +#line 364 "gitg-ext-application.c" } @@ -363,7 +369,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 90 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" return GITG_EXT_APPLICATION_GET_INTERFACE (self)->get_remote_lookup (self); -#line 367 "gitg-ext-application.c" +#line 373 "gitg-ext-application.c" } @@ -374,31 +380,31 @@ if (!initialized) { #line 31 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" initialized = TRUE; -#line 378 "gitg-ext-application.c" +#line 384 "gitg-ext-application.c" /** * The currently open repository. */ #line 31 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" g_object_interface_install_property (iface, g_param_spec_object ("repository", "repository", "repository", GITG_TYPE_REPOSITORY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); -#line 384 "gitg-ext-application.c" +#line 390 "gitg-ext-application.c" /** * An application wide message bus over which plugins can communicate. */ #line 31 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" g_object_interface_install_property (iface, g_param_spec_object ("message-bus", "message-bus", "message-bus", GITG_EXT_TYPE_MESSAGE_BUS, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 390 "gitg-ext-application.c" +#line 396 "gitg-ext-application.c" /** * The current application main activity. */ #line 31 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" g_object_interface_install_property (iface, g_param_spec_object ("current-activity", "current-activity", "current-activity", GITG_EXT_TYPE_ACTIVITY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 396 "gitg-ext-application.c" +#line 402 "gitg-ext-application.c" /** * The environment with which the application was opened. */ #line 31 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" g_object_interface_install_property (iface, g_param_spec_object ("environment", "environment", "environment", GEE_TYPE_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 402 "gitg-ext-application.c" +#line 408 "gitg-ext-application.c" /** * Get the notifications manager for the application. */ @@ -409,10 +415,10 @@ #line 31 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" g_object_interface_install_property (iface, g_param_spec_object ("remote-lookup", "remote-lookup", "remote-lookup", GITG_EXT_TYPE_REMOTE_LOOKUP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 31 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" - g_signal_new ("repository_changed_externally", GITG_EXT_TYPE_APPLICATION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__FLAGS, G_TYPE_NONE, 1, GITG_EXT_TYPE_EXTERNAL_CHANGE_HINT); + gitg_ext_application_signals[GITG_EXT_APPLICATION_REPOSITORY_CHANGED_EXTERNALLY_SIGNAL] = g_signal_new ("repository_changed_externally", GITG_EXT_TYPE_APPLICATION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__FLAGS, G_TYPE_NONE, 1, GITG_EXT_TYPE_EXTERNAL_CHANGE_HINT); #line 31 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-application.vala" - g_signal_new ("repository_commits_changed", GITG_EXT_TYPE_APPLICATION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 416 "gitg-ext-application.c" + gitg_ext_application_signals[GITG_EXT_APPLICATION_REPOSITORY_COMMITS_CHANGED_SIGNAL] = g_signal_new ("repository_commits_changed", GITG_EXT_TYPE_APPLICATION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 422 "gitg-ext-application.c" } } diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-assembly-info.c gitg-3.23.0/libgitg-ext/gitg-ext-assembly-info.c --- gitg-3.22.0/libgitg-ext/gitg-ext-assembly-info.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-assembly-info.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-assembly-info.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-assembly-info.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-assembly-info.vala, do not modify */ /* diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-command-line.c gitg-3.23.0/libgitg-ext/gitg-ext-command-line.c --- gitg-3.22.0/libgitg-ext/gitg-ext-command-line.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-command-line.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-command-line.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-command-line.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-command-line.vala, do not modify */ /* diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-command-lines.c gitg-3.23.0/libgitg-ext/gitg-ext-command-lines.c --- gitg-3.22.0/libgitg-ext/gitg-ext-command-lines.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-command-lines.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-command-lines.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-command-lines.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-command-lines.vala, do not modify */ /* @@ -224,7 +224,7 @@ void gitg_ext_command_line_parse_finished (GitgExtCommandLine* self); void gitg_ext_command_lines_apply (GitgExtCommandLines* self, GitgExtApplication* application); void gitg_ext_command_line_apply (GitgExtCommandLine* self, GitgExtApplication* application); -static void gitg_ext_command_lines_finalize (GObject* obj); +static void gitg_ext_command_lines_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -473,7 +473,7 @@ } -static void gitg_ext_command_lines_finalize (GObject* obj) { +static void gitg_ext_command_lines_finalize (GObject * obj) { GitgExtCommandLines * self; #line 22 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-command-lines.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_EXT_TYPE_COMMAND_LINES, GitgExtCommandLines); diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-commit-action.c gitg-3.23.0/libgitg-ext/gitg-ext-commit-action.c --- gitg-3.22.0/libgitg-ext/gitg-ext-commit-action.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-commit-action.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-commit-action.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-commit-action.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-commit-action.vala, do not modify */ /* @@ -122,6 +122,11 @@ typedef struct _GitgExtRefActionInterface GitgExtRefActionInterface; typedef struct _GitgExtRefActionInterfaceIface GitgExtRefActionInterfaceIface; +enum { + GITG_EXT_COMMIT_ACTION_FINISHED_SIGNAL, + GITG_EXT_COMMIT_ACTION_LAST_SIGNAL +}; +static guint gitg_ext_commit_action_signals[GITG_EXT_COMMIT_ACTION_LAST_SIGNAL] = {0}; struct _GitgExtActivityIface { GTypeInterface parent_iface; @@ -232,7 +237,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 25 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-commit-action.vala" return GITG_EXT_COMMIT_ACTION_GET_INTERFACE (self)->get_action_interface (self); -#line 236 "gitg-ext-commit-action.c" +#line 241 "gitg-ext-commit-action.c" } @@ -241,7 +246,7 @@ g_return_if_fail (self != NULL); #line 25 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-commit-action.vala" GITG_EXT_COMMIT_ACTION_GET_INTERFACE (self)->set_action_interface (self, value); -#line 245 "gitg-ext-commit-action.c" +#line 250 "gitg-ext-commit-action.c" } @@ -250,7 +255,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 26 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-commit-action.vala" return GITG_EXT_COMMIT_ACTION_GET_INTERFACE (self)->get_commit (self); -#line 254 "gitg-ext-commit-action.c" +#line 259 "gitg-ext-commit-action.c" } @@ -259,7 +264,7 @@ g_return_if_fail (self != NULL); #line 26 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-commit-action.vala" GITG_EXT_COMMIT_ACTION_GET_INTERFACE (self)->set_commit (self, value); -#line 263 "gitg-ext-commit-action.c" +#line 268 "gitg-ext-commit-action.c" } @@ -275,8 +280,8 @@ #line 23 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-commit-action.vala" g_object_interface_install_property (iface, g_param_spec_object ("commit", "commit", "commit", GITG_TYPE_COMMIT, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); #line 23 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-commit-action.vala" - g_signal_new ("finished", GITG_EXT_TYPE_COMMIT_ACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 280 "gitg-ext-commit-action.c" + gitg_ext_commit_action_signals[GITG_EXT_COMMIT_ACTION_FINISHED_SIGNAL] = g_signal_new ("finished", GITG_EXT_TYPE_COMMIT_ACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 285 "gitg-ext-commit-action.c" } } diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-history.c gitg-3.23.0/libgitg-ext/gitg-ext-history.c --- gitg-3.22.0/libgitg-ext/gitg-ext-history.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-history.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-history.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-history.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-history.vala, do not modify */ /* @@ -106,6 +106,11 @@ typedef struct _GitgExtHistory GitgExtHistory; typedef struct _GitgExtHistoryIface GitgExtHistoryIface; +enum { + GITG_EXT_HISTORY_SELECTION_CHANGED_SIGNAL, + GITG_EXT_HISTORY_LAST_SIGNAL +}; +static guint gitg_ext_history_signals[GITG_EXT_HISTORY_LAST_SIGNAL] = {0}; typedef gboolean (*GitgExtForeachCommitSelectionFunc) (GgitCommit* object, void* user_data); struct _GitgExtNotificationIface { @@ -192,7 +197,7 @@ g_return_if_fail (self != NULL); #line 29 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-history.vala" GITG_EXT_HISTORY_GET_INTERFACE (self)->foreach_selected (self, func, func_target); -#line 196 "gitg-ext-history.c" +#line 201 "gitg-ext-history.c" } @@ -201,7 +206,7 @@ g_return_if_fail (self != NULL); #line 31 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-history.vala" GITG_EXT_HISTORY_GET_INTERFACE (self)->select (self, commit); -#line 205 "gitg-ext-history.c" +#line 210 "gitg-ext-history.c" } @@ -213,8 +218,8 @@ #line 25 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-history.vala" initialized = TRUE; #line 25 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-history.vala" - g_signal_new ("selection_changed", GITG_EXT_TYPE_HISTORY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 218 "gitg-ext-history.c" + gitg_ext_history_signals[GITG_EXT_HISTORY_SELECTION_CHANGED_SIGNAL] = g_signal_new ("selection_changed", GITG_EXT_TYPE_HISTORY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 223 "gitg-ext-history.c" } } diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-history-panel.c gitg-3.23.0/libgitg-ext/gitg-ext-history-panel.c --- gitg-3.22.0/libgitg-ext/gitg-ext-history-panel.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-history-panel.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-history-panel.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-history-panel.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-history-panel.vala, do not modify */ /* diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-message-bus.c gitg-3.23.0/libgitg-ext/gitg-ext-message-bus.c --- gitg-3.22.0/libgitg-ext/gitg-ext-message-bus.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-message-bus.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-message-bus.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-message-bus.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-message-bus.vala, do not modify */ /* @@ -102,6 +102,13 @@ #define __g_list_free__gitg_ext_message_bus_listener_unref0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free__gitg_ext_message_bus_listener_unref0_ (var), NULL))) typedef struct _GitgExtMessageBusParamSpecMessage GitgExtMessageBusParamSpecMessage; typedef struct _GitgExtMessageBusParamSpecIdMap GitgExtMessageBusParamSpecIdMap; +enum { + GITG_EXT_MESSAGE_BUS_REGISTERED_SIGNAL, + GITG_EXT_MESSAGE_BUS_UNREGISTERED_SIGNAL, + GITG_EXT_MESSAGE_BUS_DISPATCH_SIGNAL, + GITG_EXT_MESSAGE_BUS_LAST_SIGNAL +}; +static guint gitg_ext_message_bus_signals[GITG_EXT_MESSAGE_BUS_LAST_SIGNAL] = {0}; typedef void (*GitgExtMessageCallback) (GitgExtMessage* message, void* user_data); struct _GitgExtMessageBus { @@ -272,18 +279,18 @@ enum { GITG_EXT_MESSAGE_BUS_LISTENER_DUMMY_PROPERTY }; -static void gitg_ext_message_bus_listener_finalize (GitgExtMessageBusListener* obj); +static void gitg_ext_message_bus_listener_finalize (GitgExtMessageBusListener * obj); enum { GITG_EXT_MESSAGE_BUS_MESSAGE_DUMMY_PROPERTY }; static void _gitg_ext_message_bus_listener_unref0_ (gpointer var); static void _g_list_free__gitg_ext_message_bus_listener_unref0_ (GList* self); -static void gitg_ext_message_bus_message_finalize (GitgExtMessageBusMessage* obj); +static void gitg_ext_message_bus_message_finalize (GitgExtMessageBusMessage * obj); enum { GITG_EXT_MESSAGE_BUS_ID_MAP_DUMMY_PROPERTY }; -static void gitg_ext_message_bus_id_map_finalize (GitgExtMessageBusIdMap* obj); -static void gitg_ext_message_bus_finalize (GObject* obj); +static void gitg_ext_message_bus_id_map_finalize (GitgExtMessageBusIdMap * obj); +static void gitg_ext_message_bus_finalize (GObject * obj); static guint _gitg_ext_message_id_hash_ghash_func (gconstpointer key) { @@ -291,7 +298,7 @@ result = gitg_ext_message_id_hash (key); #line 88 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return result; -#line 295 "gitg-ext-message-bus.c" +#line 302 "gitg-ext-message-bus.c" } @@ -300,28 +307,28 @@ result = gitg_ext_message_id_equal (a, (GitgExtMessageId*) b); #line 88 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return result; -#line 304 "gitg-ext-message-bus.c" +#line 311 "gitg-ext-message-bus.c" } static void _g_object_unref0_ (gpointer var) { #line 88 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" (var == NULL) ? NULL : (var = (g_object_unref (var), NULL)); -#line 311 "gitg-ext-message-bus.c" +#line 318 "gitg-ext-message-bus.c" } static void _gitg_ext_message_bus_message_unref0_ (gpointer var) { #line 88 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" (var == NULL) ? NULL : (var = (gitg_ext_message_bus_message_unref (var), NULL)); -#line 318 "gitg-ext-message-bus.c" +#line 325 "gitg-ext-message-bus.c" } static void _gitg_ext_message_bus_id_map_unref0_ (gpointer var) { #line 89 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" (var == NULL) ? NULL : (var = (gitg_ext_message_bus_id_map_unref (var), NULL)); -#line 325 "gitg-ext-message-bus.c" +#line 332 "gitg-ext-message-bus.c" } @@ -358,21 +365,21 @@ self->priv->d_types = _tmp4_; #line 86 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return self; -#line 362 "gitg-ext-message-bus.c" +#line 369 "gitg-ext-message-bus.c" } GitgExtMessageBus* gitg_ext_message_bus_new (void) { #line 86 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return gitg_ext_message_bus_construct (GITG_EXT_TYPE_MESSAGE_BUS); -#line 369 "gitg-ext-message-bus.c" +#line 376 "gitg-ext-message-bus.c" } static gpointer _g_object_ref0 (gpointer self) { #line 101 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return self ? g_object_ref (self) : NULL; -#line 376 "gitg-ext-message-bus.c" +#line 383 "gitg-ext-message-bus.c" } @@ -385,7 +392,7 @@ _tmp0_ = gitg_ext_message_bus_s_instance; #line 95 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (_tmp0_ == NULL) { -#line 389 "gitg-ext-message-bus.c" +#line 396 "gitg-ext-message-bus.c" GitgExtMessageBus* _tmp1_ = NULL; GitgExtMessageBus* _tmp2_ = NULL; #line 97 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" @@ -398,7 +405,7 @@ _tmp2_ = gitg_ext_message_bus_s_instance; #line 98 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" g_object_add_weak_pointer ((GObject*) _tmp2_, &gitg_ext_message_bus_s_instance); -#line 402 "gitg-ext-message-bus.c" +#line 409 "gitg-ext-message-bus.c" } #line 101 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _tmp3_ = gitg_ext_message_bus_s_instance; @@ -408,14 +415,14 @@ result = _tmp4_; #line 101 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return result; -#line 412 "gitg-ext-message-bus.c" +#line 419 "gitg-ext-message-bus.c" } static gpointer _gitg_ext_message_bus_listener_ref0 (gpointer self) { #line 106 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return self ? gitg_ext_message_bus_listener_ref (self) : NULL; -#line 419 "gitg-ext-message-bus.c" +#line 426 "gitg-ext-message-bus.c" } @@ -432,7 +439,7 @@ _tmp0_ = msg; #line 106 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _tmp1_ = _tmp0_->listeners; -#line 436 "gitg-ext-message-bus.c" +#line 443 "gitg-ext-message-bus.c" { GList* l_collection = NULL; GList* l_it = NULL; @@ -440,14 +447,14 @@ l_collection = _tmp1_; #line 106 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" for (l_it = l_collection; l_it != NULL; l_it = l_it->next) { -#line 444 "gitg-ext-message-bus.c" +#line 451 "gitg-ext-message-bus.c" GitgExtMessageBusListener* _tmp2_ = NULL; GitgExtMessageBusListener* l = NULL; #line 106 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _tmp2_ = _gitg_ext_message_bus_listener_ref0 ((GitgExtMessageBusListener*) l_it->data); #line 106 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" l = _tmp2_; -#line 451 "gitg-ext-message-bus.c" +#line 458 "gitg-ext-message-bus.c" { GitgExtMessageBusListener* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; @@ -457,7 +464,7 @@ _tmp4_ = _tmp3_->blocked; #line 108 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (!_tmp4_) { -#line 461 "gitg-ext-message-bus.c" +#line 468 "gitg-ext-message-bus.c" GitgExtMessageBusListener* _tmp5_ = NULL; GitgExtMessageCallback _tmp6_ = NULL; void* _tmp6__target = NULL; @@ -472,11 +479,11 @@ _tmp7_ = message; #line 110 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _tmp6_ (_tmp7_, _tmp6__target); -#line 476 "gitg-ext-message-bus.c" +#line 483 "gitg-ext-message-bus.c" } #line 106 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _gitg_ext_message_bus_listener_unref0 (l); -#line 480 "gitg-ext-message-bus.c" +#line 487 "gitg-ext-message-bus.c" } } } @@ -508,13 +515,13 @@ result = G_TYPE_INVALID; #line 121 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return result; -#line 512 "gitg-ext-message-bus.c" +#line 519 "gitg-ext-message-bus.c" } else { #line 125 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" result = ret; #line 125 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return result; -#line 518 "gitg-ext-message-bus.c" +#line 525 "gitg-ext-message-bus.c" } } @@ -540,7 +547,7 @@ _tmp1_ = gitg_ext_message_bus_is_registered (self, _tmp0_); #line 131 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (_tmp1_) { -#line 544 "gitg-ext-message-bus.c" +#line 551 "gitg-ext-message-bus.c" GitgExtMessageId* _tmp2_ = NULL; gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; @@ -560,7 +567,7 @@ _g_free0 (_tmp5_); #line 134 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return; -#line 563 "gitg-ext-message-bus.c" +#line 570 "gitg-ext-message-bus.c" } #line 137 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _tmp6_ = id; @@ -581,10 +588,10 @@ #line 141 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _tmp12_ = cp; #line 141 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" - g_signal_emit_by_name (self, "registered", _tmp12_); + g_signal_emit (self, gitg_ext_message_bus_signals[GITG_EXT_MESSAGE_BUS_REGISTERED_SIGNAL], 0, _tmp12_); #line 129 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _g_object_unref0 (cp); -#line 587 "gitg-ext-message-bus.c" +#line 594 "gitg-ext-message-bus.c" } @@ -610,7 +617,7 @@ if (!_tmp3_) { #line 148 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _tmp2_ = TRUE; -#line 613 "gitg-ext-message-bus.c" +#line 620 "gitg-ext-message-bus.c" } else { GHashTable* _tmp4_ = NULL; GitgExtMessageId* _tmp5_ = NULL; @@ -623,21 +630,21 @@ _tmp6_ = g_hash_table_remove (_tmp4_, _tmp5_); #line 148 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _tmp2_ = _tmp6_; -#line 626 "gitg-ext-message-bus.c" +#line 633 "gitg-ext-message-bus.c" } #line 148 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (_tmp2_) { -#line 630 "gitg-ext-message-bus.c" +#line 637 "gitg-ext-message-bus.c" GitgExtMessageId* _tmp7_ = NULL; #line 150 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _tmp7_ = cp; #line 150 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" - g_signal_emit_by_name (self, "unregistered", _tmp7_); -#line 636 "gitg-ext-message-bus.c" + g_signal_emit (self, gitg_ext_message_bus_signals[GITG_EXT_MESSAGE_BUS_UNREGISTERED_SIGNAL], 0, _tmp7_); +#line 643 "gitg-ext-message-bus.c" } #line 144 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _g_object_unref0 (cp); -#line 640 "gitg-ext-message-bus.c" +#line 647 "gitg-ext-message-bus.c" } @@ -651,7 +658,7 @@ _tmp0_ = id; #line 156 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" gitg_ext_message_bus_unregister_real (self, _tmp0_, TRUE); -#line 654 "gitg-ext-message-bus.c" +#line 661 "gitg-ext-message-bus.c" } @@ -660,7 +667,7 @@ g_atomic_int_inc (&_data1_->_ref_count_); #line 159 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return _data1_; -#line 663 "gitg-ext-message-bus.c" +#line 670 "gitg-ext-message-bus.c" } @@ -669,7 +676,7 @@ _data1_ = (Block1Data*) _userdata_; #line 159 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { -#line 672 "gitg-ext-message-bus.c" +#line 679 "gitg-ext-message-bus.c" GitgExtMessageBus* self; #line 159 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" self = _data1_->self; @@ -679,7 +686,7 @@ _g_object_unref0 (self); #line 159 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" g_slice_free (Block1Data, _data1_); -#line 682 "gitg-ext-message-bus.c" +#line 689 "gitg-ext-message-bus.c" } } @@ -705,7 +712,7 @@ _tmp3_ = _data1_->object_path; #line 162 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (g_strcmp0 (_tmp2_, _tmp3_) == 0) { -#line 708 "gitg-ext-message-bus.c" +#line 715 "gitg-ext-message-bus.c" GitgExtMessageId* _tmp4_ = NULL; #line 164 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _tmp4_ = key; @@ -715,13 +722,13 @@ result = TRUE; #line 165 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return result; -#line 718 "gitg-ext-message-bus.c" +#line 725 "gitg-ext-message-bus.c" } else { #line 169 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" result = FALSE; #line 169 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return result; -#line 724 "gitg-ext-message-bus.c" +#line 731 "gitg-ext-message-bus.c" } } @@ -731,7 +738,7 @@ result = __lambda4_ (self, (GitgExtMessageId*) key, (GType) ((gintptr) value)); #line 161 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return result; -#line 734 "gitg-ext-message-bus.c" +#line 741 "gitg-ext-message-bus.c" } @@ -766,7 +773,7 @@ block1_data_unref (_data1_); #line 159 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _data1_ = NULL; -#line 769 "gitg-ext-message-bus.c" +#line 776 "gitg-ext-message-bus.c" } @@ -789,14 +796,14 @@ result = _tmp2_; #line 176 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return result; -#line 792 "gitg-ext-message-bus.c" +#line 799 "gitg-ext-message-bus.c" } static gpointer _gitg_ext_message_bus_message_ref0 (gpointer self) { #line 183 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return self ? gitg_ext_message_bus_message_ref (self) : NULL; -#line 799 "gitg-ext-message-bus.c" +#line 806 "gitg-ext-message-bus.c" } @@ -833,7 +840,7 @@ result = ret; #line 184 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return result; -#line 836 "gitg-ext-message-bus.c" +#line 843 "gitg-ext-message-bus.c" } @@ -865,17 +872,17 @@ _tmp5_ = message; #line 191 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (_tmp5_ == NULL) { -#line 868 "gitg-ext-message-bus.c" +#line 875 "gitg-ext-message-bus.c" gboolean _tmp6_ = FALSE; #line 191 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _tmp6_ = create; #line 191 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _tmp4_ = !_tmp6_; -#line 874 "gitg-ext-message-bus.c" +#line 881 "gitg-ext-message-bus.c" } else { #line 191 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _tmp4_ = FALSE; -#line 878 "gitg-ext-message-bus.c" +#line 885 "gitg-ext-message-bus.c" } #line 191 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (_tmp4_) { @@ -885,13 +892,13 @@ _gitg_ext_message_bus_message_unref0 (message); #line 193 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return result; -#line 888 "gitg-ext-message-bus.c" +#line 895 "gitg-ext-message-bus.c" } #line 196 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _tmp7_ = message; #line 196 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (_tmp7_ == NULL) { -#line 894 "gitg-ext-message-bus.c" +#line 901 "gitg-ext-message-bus.c" GitgExtMessageId* _tmp8_ = NULL; GitgExtMessageBusMessage* _tmp9_ = NULL; #line 198 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" @@ -902,20 +909,20 @@ _gitg_ext_message_bus_message_unref0 (message); #line 198 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" message = _tmp9_; -#line 905 "gitg-ext-message-bus.c" +#line 912 "gitg-ext-message-bus.c" } #line 201 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" result = message; #line 201 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return result; -#line 911 "gitg-ext-message-bus.c" +#line 918 "gitg-ext-message-bus.c" } static gpointer _gitg_ext_message_bus_id_map_ref0 (gpointer self) { #line 213 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return self ? gitg_ext_message_bus_id_map_ref (self) : NULL; -#line 918 "gitg-ext-message-bus.c" +#line 925 "gitg-ext-message-bus.c" } @@ -1008,7 +1015,7 @@ callback_target_destroy_notify = NULL; #line 214 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return result; -#line 1011 "gitg-ext-message-bus.c" +#line 1018 "gitg-ext-message-bus.c" } @@ -1053,7 +1060,7 @@ _tmp8_ = _tmp7_->listeners; #line 225 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (_tmp8_ == NULL) { -#line 1056 "gitg-ext-message-bus.c" +#line 1063 "gitg-ext-message-bus.c" GHashTable* _tmp9_ = NULL; GitgExtMessageBusMessage* _tmp10_ = NULL; GitgExtMessageId* _tmp11_ = NULL; @@ -1065,7 +1072,7 @@ _tmp11_ = _tmp10_->id; #line 227 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" g_hash_table_remove (_tmp9_, _tmp11_); -#line 1068 "gitg-ext-message-bus.c" +#line 1075 "gitg-ext-message-bus.c" } } @@ -1083,7 +1090,7 @@ _tmp1_ = _tmp0_->data; #line 233 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" ((GitgExtMessageBusListener*) _tmp1_)->blocked = TRUE; -#line 1086 "gitg-ext-message-bus.c" +#line 1093 "gitg-ext-message-bus.c" } @@ -1100,7 +1107,7 @@ _tmp1_ = _tmp0_->data; #line 238 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" ((GitgExtMessageBusListener*) _tmp1_)->blocked = FALSE; -#line 1103 "gitg-ext-message-bus.c" +#line 1110 "gitg-ext-message-bus.c" } @@ -1147,7 +1154,7 @@ callback_target_destroy_notify = NULL; #line 245 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return result; -#line 1150 "gitg-ext-message-bus.c" +#line 1157 "gitg-ext-message-bus.c" } @@ -1184,7 +1191,7 @@ _gitg_ext_message_bus_id_map_unref0 (idmap); #line 256 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return; -#line 1187 "gitg-ext-message-bus.c" +#line 1194 "gitg-ext-message-bus.c" } #line 259 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _tmp5_ = processor; @@ -1202,14 +1209,14 @@ _tmp5_ (_tmp7_, _tmp9_, _tmp5__target); #line 250 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _gitg_ext_message_bus_id_map_unref0 (idmap); -#line 1205 "gitg-ext-message-bus.c" +#line 1212 "gitg-ext-message-bus.c" } static void _gitg_ext_message_bus_remove_listener_gitg_ext_message_bus_match_callback (GitgExtMessageBusMessage* message, GList* listeners, gpointer self) { #line 264 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" gitg_ext_message_bus_remove_listener ((GitgExtMessageBus*) self, message, listeners); -#line 1212 "gitg-ext-message-bus.c" +#line 1219 "gitg-ext-message-bus.c" } @@ -1221,14 +1228,14 @@ _tmp0_ = id; #line 264 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" gitg_ext_message_bus_process_by_id (self, _tmp0_, _gitg_ext_message_bus_remove_listener_gitg_ext_message_bus_match_callback, self); -#line 1224 "gitg-ext-message-bus.c" +#line 1231 "gitg-ext-message-bus.c" } static void _gitg_ext_message_bus_block_listener_gitg_ext_message_bus_match_callback (GitgExtMessageBusMessage* message, GList* listeners, gpointer self) { #line 269 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" gitg_ext_message_bus_block_listener ((GitgExtMessageBus*) self, message, listeners); -#line 1231 "gitg-ext-message-bus.c" +#line 1238 "gitg-ext-message-bus.c" } @@ -1240,14 +1247,14 @@ _tmp0_ = id; #line 269 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" gitg_ext_message_bus_process_by_id (self, _tmp0_, _gitg_ext_message_bus_block_listener_gitg_ext_message_bus_match_callback, self); -#line 1243 "gitg-ext-message-bus.c" +#line 1250 "gitg-ext-message-bus.c" } static void _gitg_ext_message_bus_unblock_listener_gitg_ext_message_bus_match_callback (GitgExtMessageBusMessage* message, GList* listeners, gpointer self) { #line 274 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" gitg_ext_message_bus_unblock_listener ((GitgExtMessageBus*) self, message, listeners); -#line 1250 "gitg-ext-message-bus.c" +#line 1257 "gitg-ext-message-bus.c" } @@ -1259,7 +1266,7 @@ _tmp0_ = id; #line 274 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" gitg_ext_message_bus_process_by_id (self, _tmp0_, _gitg_ext_message_bus_unblock_listener_gitg_ext_message_bus_match_callback, self); -#line 1262 "gitg-ext-message-bus.c" +#line 1269 "gitg-ext-message-bus.c" } @@ -1272,8 +1279,8 @@ #line 279 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _tmp0_ = message; #line 279 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" - g_signal_emit_by_name (self, "dispatch", _tmp0_); -#line 1276 "gitg-ext-message-bus.c" + g_signal_emit (self, gitg_ext_message_bus_signals[GITG_EXT_MESSAGE_BUS_DISPATCH_SIGNAL], 0, _tmp0_); +#line 1283 "gitg-ext-message-bus.c" } @@ -1298,7 +1305,7 @@ result = _tmp2_; #line 285 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return result; -#line 1301 "gitg-ext-message-bus.c" +#line 1308 "gitg-ext-message-bus.c" } @@ -1330,7 +1337,7 @@ _tmp2_ = type; #line 292 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (_tmp2_ == G_TYPE_INVALID) { -#line 1333 "gitg-ext-message-bus.c" +#line 1340 "gitg-ext-message-bus.c" GitgExtMessageId* _tmp3_ = NULL; gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; @@ -1351,7 +1358,7 @@ result = NULL; #line 295 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return result; -#line 1354 "gitg-ext-message-bus.c" +#line 1361 "gitg-ext-message-bus.c" } #line 298 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _tmp7_ = type; @@ -1371,7 +1378,7 @@ _tmp12_ = msg; #line 300 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (_tmp12_ != NULL) { -#line 1374 "gitg-ext-message-bus.c" +#line 1381 "gitg-ext-message-bus.c" GitgExtMessage* _tmp13_ = NULL; GitgExtMessageId* _tmp14_ = NULL; #line 302 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" @@ -1380,7 +1387,7 @@ _tmp14_ = id; #line 302 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" gitg_ext_message_set_id (_tmp13_, _tmp14_); -#line 1383 "gitg-ext-message-bus.c" +#line 1390 "gitg-ext-message-bus.c" } #line 305 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _tmp15_ = msg; @@ -1390,7 +1397,7 @@ result = msg; #line 307 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return result; -#line 1393 "gitg-ext-message-bus.c" +#line 1400 "gitg-ext-message-bus.c" } @@ -1417,7 +1424,7 @@ _tmp4_ = msg; #line 80 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (_tmp4_ != NULL) { -#line 1420 "gitg-ext-message-bus.c" +#line 1427 "gitg-ext-message-bus.c" GitgExtMessageBusMessage* _tmp5_ = NULL; GitgExtMessage* _tmp6_ = NULL; #line 82 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" @@ -1426,11 +1433,11 @@ _tmp6_ = message; #line 82 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" gitg_ext_message_bus_dispatch_message_real (self, _tmp5_, _tmp6_); -#line 1429 "gitg-ext-message-bus.c" +#line 1436 "gitg-ext-message-bus.c" } #line 76 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _gitg_ext_message_bus_message_unref0 (msg); -#line 1433 "gitg-ext-message-bus.c" +#line 1440 "gitg-ext-message-bus.c" } @@ -1480,21 +1487,21 @@ callback_target_destroy_notify = NULL; #line 34 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return self; -#line 1483 "gitg-ext-message-bus.c" +#line 1490 "gitg-ext-message-bus.c" } static GitgExtMessageBusListener* gitg_ext_message_bus_listener_new (guint id, GitgExtMessageCallback callback, void* callback_target, GDestroyNotify callback_target_destroy_notify) { #line 34 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return gitg_ext_message_bus_listener_construct (GITG_EXT_MESSAGE_BUS_TYPE_LISTENER, id, callback, callback_target, callback_target_destroy_notify); -#line 1490 "gitg-ext-message-bus.c" +#line 1497 "gitg-ext-message-bus.c" } static void gitg_ext_message_bus_value_listener_init (GValue* value) { #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" value->data[0].v_pointer = NULL; -#line 1497 "gitg-ext-message-bus.c" +#line 1504 "gitg-ext-message-bus.c" } @@ -1503,7 +1510,7 @@ if (value->data[0].v_pointer) { #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" gitg_ext_message_bus_listener_unref (value->data[0].v_pointer); -#line 1506 "gitg-ext-message-bus.c" +#line 1513 "gitg-ext-message-bus.c" } } @@ -1513,11 +1520,11 @@ if (src_value->data[0].v_pointer) { #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" dest_value->data[0].v_pointer = gitg_ext_message_bus_listener_ref (src_value->data[0].v_pointer); -#line 1516 "gitg-ext-message-bus.c" +#line 1523 "gitg-ext-message-bus.c" } else { #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" dest_value->data[0].v_pointer = NULL; -#line 1520 "gitg-ext-message-bus.c" +#line 1527 "gitg-ext-message-bus.c" } } @@ -1525,66 +1532,66 @@ static gpointer gitg_ext_message_bus_value_listener_peek_pointer (const GValue* value) { #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return value->data[0].v_pointer; -#line 1528 "gitg-ext-message-bus.c" +#line 1535 "gitg-ext-message-bus.c" } static gchar* gitg_ext_message_bus_value_listener_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (collect_values[0].v_pointer) { -#line 1535 "gitg-ext-message-bus.c" - GitgExtMessageBusListener* object; +#line 1542 "gitg-ext-message-bus.c" + GitgExtMessageBusListener * object; object = collect_values[0].v_pointer; #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (object->parent_instance.g_class == NULL) { #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1542 "gitg-ext-message-bus.c" +#line 1549 "gitg-ext-message-bus.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1546 "gitg-ext-message-bus.c" +#line 1553 "gitg-ext-message-bus.c" } #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" value->data[0].v_pointer = gitg_ext_message_bus_listener_ref (object); -#line 1550 "gitg-ext-message-bus.c" +#line 1557 "gitg-ext-message-bus.c" } else { #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" value->data[0].v_pointer = NULL; -#line 1554 "gitg-ext-message-bus.c" +#line 1561 "gitg-ext-message-bus.c" } #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return NULL; -#line 1558 "gitg-ext-message-bus.c" +#line 1565 "gitg-ext-message-bus.c" } static gchar* gitg_ext_message_bus_value_listener_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GitgExtMessageBusListener** object_p; + GitgExtMessageBusListener ** object_p; object_p = collect_values[0].v_pointer; #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (!object_p) { #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1569 "gitg-ext-message-bus.c" +#line 1576 "gitg-ext-message-bus.c" } #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (!value->data[0].v_pointer) { #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" *object_p = NULL; -#line 1575 "gitg-ext-message-bus.c" +#line 1582 "gitg-ext-message-bus.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" *object_p = value->data[0].v_pointer; -#line 1579 "gitg-ext-message-bus.c" +#line 1586 "gitg-ext-message-bus.c" } else { #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" *object_p = gitg_ext_message_bus_listener_ref (value->data[0].v_pointer); -#line 1583 "gitg-ext-message-bus.c" +#line 1590 "gitg-ext-message-bus.c" } #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return NULL; -#line 1587 "gitg-ext-message-bus.c" +#line 1594 "gitg-ext-message-bus.c" } @@ -1598,7 +1605,7 @@ G_PARAM_SPEC (spec)->value_type = object_type; #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return G_PARAM_SPEC (spec); -#line 1601 "gitg-ext-message-bus.c" +#line 1608 "gitg-ext-message-bus.c" } @@ -1607,12 +1614,12 @@ g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_EXT_MESSAGE_BUS_TYPE_LISTENER), NULL); #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return value->data[0].v_pointer; -#line 1610 "gitg-ext-message-bus.c" +#line 1617 "gitg-ext-message-bus.c" } static void gitg_ext_message_bus_value_set_listener (GValue* value, gpointer v_object) { - GitgExtMessageBusListener* old; + GitgExtMessageBusListener * old; #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_EXT_MESSAGE_BUS_TYPE_LISTENER)); #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" @@ -1627,23 +1634,23 @@ value->data[0].v_pointer = v_object; #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" gitg_ext_message_bus_listener_ref (value->data[0].v_pointer); -#line 1630 "gitg-ext-message-bus.c" +#line 1637 "gitg-ext-message-bus.c" } else { #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" value->data[0].v_pointer = NULL; -#line 1634 "gitg-ext-message-bus.c" +#line 1641 "gitg-ext-message-bus.c" } #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (old) { #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" gitg_ext_message_bus_listener_unref (old); -#line 1640 "gitg-ext-message-bus.c" +#line 1647 "gitg-ext-message-bus.c" } } static void gitg_ext_message_bus_value_take_listener (GValue* value, gpointer v_object) { - GitgExtMessageBusListener* old; + GitgExtMessageBusListener * old; #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_EXT_MESSAGE_BUS_TYPE_LISTENER)); #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" @@ -1656,17 +1663,17 @@ g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" value->data[0].v_pointer = v_object; -#line 1659 "gitg-ext-message-bus.c" +#line 1666 "gitg-ext-message-bus.c" } else { #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" value->data[0].v_pointer = NULL; -#line 1663 "gitg-ext-message-bus.c" +#line 1670 "gitg-ext-message-bus.c" } #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (old) { #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" gitg_ext_message_bus_listener_unref (old); -#line 1669 "gitg-ext-message-bus.c" +#line 1676 "gitg-ext-message-bus.c" } } @@ -1676,18 +1683,18 @@ gitg_ext_message_bus_listener_parent_class = g_type_class_peek_parent (klass); #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" ((GitgExtMessageBusListenerClass *) klass)->finalize = gitg_ext_message_bus_listener_finalize; -#line 1679 "gitg-ext-message-bus.c" +#line 1686 "gitg-ext-message-bus.c" } static void gitg_ext_message_bus_listener_instance_init (GitgExtMessageBusListener * self) { #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" self->ref_count = 1; -#line 1686 "gitg-ext-message-bus.c" +#line 1693 "gitg-ext-message-bus.c" } -static void gitg_ext_message_bus_listener_finalize (GitgExtMessageBusListener* obj) { +static void gitg_ext_message_bus_listener_finalize (GitgExtMessageBusListener * obj) { GitgExtMessageBusListener * self; #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_EXT_MESSAGE_BUS_TYPE_LISTENER, GitgExtMessageBusListener); @@ -1701,7 +1708,7 @@ self->callback_target = NULL; #line 32 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" self->callback_target_destroy_notify = NULL; -#line 1704 "gitg-ext-message-bus.c" +#line 1711 "gitg-ext-message-bus.c" } @@ -1720,18 +1727,18 @@ static gpointer gitg_ext_message_bus_listener_ref (gpointer instance) { - GitgExtMessageBusListener* self; + GitgExtMessageBusListener * self; self = instance; #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" g_atomic_int_inc (&self->ref_count); #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return instance; -#line 1729 "gitg-ext-message-bus.c" +#line 1736 "gitg-ext-message-bus.c" } static void gitg_ext_message_bus_listener_unref (gpointer instance) { - GitgExtMessageBusListener* self; + GitgExtMessageBusListener * self; self = instance; #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1739,7 +1746,7 @@ GITG_EXT_MESSAGE_BUS_LISTENER_GET_CLASS (self)->finalize (self); #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1742 "gitg-ext-message-bus.c" +#line 1749 "gitg-ext-message-bus.c" } } @@ -1747,7 +1754,7 @@ static void _gitg_ext_message_bus_listener_unref0_ (gpointer var) { #line 47 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" (var == NULL) ? NULL : (var = (gitg_ext_message_bus_listener_unref (var), NULL)); -#line 1750 "gitg-ext-message-bus.c" +#line 1757 "gitg-ext-message-bus.c" } @@ -1756,7 +1763,7 @@ g_list_foreach (self, (GFunc) _gitg_ext_message_bus_listener_unref0_, NULL); #line 47 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" g_list_free (self); -#line 1759 "gitg-ext-message-bus.c" +#line 1766 "gitg-ext-message-bus.c" } @@ -1782,21 +1789,21 @@ self->listeners = NULL; #line 49 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return self; -#line 1785 "gitg-ext-message-bus.c" +#line 1792 "gitg-ext-message-bus.c" } static GitgExtMessageBusMessage* gitg_ext_message_bus_message_new (GitgExtMessageId* id) { #line 49 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return gitg_ext_message_bus_message_construct (GITG_EXT_MESSAGE_BUS_TYPE_MESSAGE, id); -#line 1792 "gitg-ext-message-bus.c" +#line 1799 "gitg-ext-message-bus.c" } static void gitg_ext_message_bus_value_message_init (GValue* value) { #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" value->data[0].v_pointer = NULL; -#line 1799 "gitg-ext-message-bus.c" +#line 1806 "gitg-ext-message-bus.c" } @@ -1805,7 +1812,7 @@ if (value->data[0].v_pointer) { #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" gitg_ext_message_bus_message_unref (value->data[0].v_pointer); -#line 1808 "gitg-ext-message-bus.c" +#line 1815 "gitg-ext-message-bus.c" } } @@ -1815,11 +1822,11 @@ if (src_value->data[0].v_pointer) { #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" dest_value->data[0].v_pointer = gitg_ext_message_bus_message_ref (src_value->data[0].v_pointer); -#line 1818 "gitg-ext-message-bus.c" +#line 1825 "gitg-ext-message-bus.c" } else { #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" dest_value->data[0].v_pointer = NULL; -#line 1822 "gitg-ext-message-bus.c" +#line 1829 "gitg-ext-message-bus.c" } } @@ -1827,66 +1834,66 @@ static gpointer gitg_ext_message_bus_value_message_peek_pointer (const GValue* value) { #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return value->data[0].v_pointer; -#line 1830 "gitg-ext-message-bus.c" +#line 1837 "gitg-ext-message-bus.c" } static gchar* gitg_ext_message_bus_value_message_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (collect_values[0].v_pointer) { -#line 1837 "gitg-ext-message-bus.c" - GitgExtMessageBusMessage* object; +#line 1844 "gitg-ext-message-bus.c" + GitgExtMessageBusMessage * object; object = collect_values[0].v_pointer; #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (object->parent_instance.g_class == NULL) { #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1844 "gitg-ext-message-bus.c" +#line 1851 "gitg-ext-message-bus.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1848 "gitg-ext-message-bus.c" +#line 1855 "gitg-ext-message-bus.c" } #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" value->data[0].v_pointer = gitg_ext_message_bus_message_ref (object); -#line 1852 "gitg-ext-message-bus.c" +#line 1859 "gitg-ext-message-bus.c" } else { #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" value->data[0].v_pointer = NULL; -#line 1856 "gitg-ext-message-bus.c" +#line 1863 "gitg-ext-message-bus.c" } #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return NULL; -#line 1860 "gitg-ext-message-bus.c" +#line 1867 "gitg-ext-message-bus.c" } static gchar* gitg_ext_message_bus_value_message_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GitgExtMessageBusMessage** object_p; + GitgExtMessageBusMessage ** object_p; object_p = collect_values[0].v_pointer; #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (!object_p) { #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1871 "gitg-ext-message-bus.c" +#line 1878 "gitg-ext-message-bus.c" } #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (!value->data[0].v_pointer) { #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" *object_p = NULL; -#line 1877 "gitg-ext-message-bus.c" +#line 1884 "gitg-ext-message-bus.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" *object_p = value->data[0].v_pointer; -#line 1881 "gitg-ext-message-bus.c" +#line 1888 "gitg-ext-message-bus.c" } else { #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" *object_p = gitg_ext_message_bus_message_ref (value->data[0].v_pointer); -#line 1885 "gitg-ext-message-bus.c" +#line 1892 "gitg-ext-message-bus.c" } #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return NULL; -#line 1889 "gitg-ext-message-bus.c" +#line 1896 "gitg-ext-message-bus.c" } @@ -1900,7 +1907,7 @@ G_PARAM_SPEC (spec)->value_type = object_type; #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return G_PARAM_SPEC (spec); -#line 1903 "gitg-ext-message-bus.c" +#line 1910 "gitg-ext-message-bus.c" } @@ -1909,12 +1916,12 @@ g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_EXT_MESSAGE_BUS_TYPE_MESSAGE), NULL); #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return value->data[0].v_pointer; -#line 1912 "gitg-ext-message-bus.c" +#line 1919 "gitg-ext-message-bus.c" } static void gitg_ext_message_bus_value_set_message (GValue* value, gpointer v_object) { - GitgExtMessageBusMessage* old; + GitgExtMessageBusMessage * old; #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_EXT_MESSAGE_BUS_TYPE_MESSAGE)); #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" @@ -1929,23 +1936,23 @@ value->data[0].v_pointer = v_object; #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" gitg_ext_message_bus_message_ref (value->data[0].v_pointer); -#line 1932 "gitg-ext-message-bus.c" +#line 1939 "gitg-ext-message-bus.c" } else { #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" value->data[0].v_pointer = NULL; -#line 1936 "gitg-ext-message-bus.c" +#line 1943 "gitg-ext-message-bus.c" } #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (old) { #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" gitg_ext_message_bus_message_unref (old); -#line 1942 "gitg-ext-message-bus.c" +#line 1949 "gitg-ext-message-bus.c" } } static void gitg_ext_message_bus_value_take_message (GValue* value, gpointer v_object) { - GitgExtMessageBusMessage* old; + GitgExtMessageBusMessage * old; #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_EXT_MESSAGE_BUS_TYPE_MESSAGE)); #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" @@ -1958,17 +1965,17 @@ g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" value->data[0].v_pointer = v_object; -#line 1961 "gitg-ext-message-bus.c" +#line 1968 "gitg-ext-message-bus.c" } else { #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" value->data[0].v_pointer = NULL; -#line 1965 "gitg-ext-message-bus.c" +#line 1972 "gitg-ext-message-bus.c" } #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (old) { #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" gitg_ext_message_bus_message_unref (old); -#line 1971 "gitg-ext-message-bus.c" +#line 1978 "gitg-ext-message-bus.c" } } @@ -1978,18 +1985,18 @@ gitg_ext_message_bus_message_parent_class = g_type_class_peek_parent (klass); #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" ((GitgExtMessageBusMessageClass *) klass)->finalize = gitg_ext_message_bus_message_finalize; -#line 1981 "gitg-ext-message-bus.c" +#line 1988 "gitg-ext-message-bus.c" } static void gitg_ext_message_bus_message_instance_init (GitgExtMessageBusMessage * self) { #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" self->ref_count = 1; -#line 1988 "gitg-ext-message-bus.c" +#line 1995 "gitg-ext-message-bus.c" } -static void gitg_ext_message_bus_message_finalize (GitgExtMessageBusMessage* obj) { +static void gitg_ext_message_bus_message_finalize (GitgExtMessageBusMessage * obj) { GitgExtMessageBusMessage * self; #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_EXT_MESSAGE_BUS_TYPE_MESSAGE, GitgExtMessageBusMessage); @@ -1999,7 +2006,7 @@ _g_object_unref0 (self->id); #line 47 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" __g_list_free__gitg_ext_message_bus_listener_unref0_0 (self->listeners); -#line 2002 "gitg-ext-message-bus.c" +#line 2009 "gitg-ext-message-bus.c" } @@ -2018,18 +2025,18 @@ static gpointer gitg_ext_message_bus_message_ref (gpointer instance) { - GitgExtMessageBusMessage* self; + GitgExtMessageBusMessage * self; self = instance; #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" g_atomic_int_inc (&self->ref_count); #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return instance; -#line 2027 "gitg-ext-message-bus.c" +#line 2034 "gitg-ext-message-bus.c" } static void gitg_ext_message_bus_message_unref (gpointer instance) { - GitgExtMessageBusMessage* self; + GitgExtMessageBusMessage * self; self = instance; #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2037,7 +2044,7 @@ GITG_EXT_MESSAGE_BUS_MESSAGE_GET_CLASS (self)->finalize (self); #line 44 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2040 "gitg-ext-message-bus.c" +#line 2047 "gitg-ext-message-bus.c" } } @@ -2060,21 +2067,21 @@ self->message = _tmp1_; #line 61 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return self; -#line 2063 "gitg-ext-message-bus.c" +#line 2070 "gitg-ext-message-bus.c" } static GitgExtMessageBusIdMap* gitg_ext_message_bus_id_map_new (GitgExtMessageBusMessage* message) { #line 61 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return gitg_ext_message_bus_id_map_construct (GITG_EXT_MESSAGE_BUS_TYPE_ID_MAP, message); -#line 2070 "gitg-ext-message-bus.c" +#line 2077 "gitg-ext-message-bus.c" } static void gitg_ext_message_bus_value_id_map_init (GValue* value) { #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" value->data[0].v_pointer = NULL; -#line 2077 "gitg-ext-message-bus.c" +#line 2084 "gitg-ext-message-bus.c" } @@ -2083,7 +2090,7 @@ if (value->data[0].v_pointer) { #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" gitg_ext_message_bus_id_map_unref (value->data[0].v_pointer); -#line 2086 "gitg-ext-message-bus.c" +#line 2093 "gitg-ext-message-bus.c" } } @@ -2093,11 +2100,11 @@ if (src_value->data[0].v_pointer) { #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" dest_value->data[0].v_pointer = gitg_ext_message_bus_id_map_ref (src_value->data[0].v_pointer); -#line 2096 "gitg-ext-message-bus.c" +#line 2103 "gitg-ext-message-bus.c" } else { #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" dest_value->data[0].v_pointer = NULL; -#line 2100 "gitg-ext-message-bus.c" +#line 2107 "gitg-ext-message-bus.c" } } @@ -2105,66 +2112,66 @@ static gpointer gitg_ext_message_bus_value_id_map_peek_pointer (const GValue* value) { #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return value->data[0].v_pointer; -#line 2108 "gitg-ext-message-bus.c" +#line 2115 "gitg-ext-message-bus.c" } static gchar* gitg_ext_message_bus_value_id_map_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (collect_values[0].v_pointer) { -#line 2115 "gitg-ext-message-bus.c" - GitgExtMessageBusIdMap* object; +#line 2122 "gitg-ext-message-bus.c" + GitgExtMessageBusIdMap * object; object = collect_values[0].v_pointer; #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (object->parent_instance.g_class == NULL) { #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2122 "gitg-ext-message-bus.c" +#line 2129 "gitg-ext-message-bus.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2126 "gitg-ext-message-bus.c" +#line 2133 "gitg-ext-message-bus.c" } #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" value->data[0].v_pointer = gitg_ext_message_bus_id_map_ref (object); -#line 2130 "gitg-ext-message-bus.c" +#line 2137 "gitg-ext-message-bus.c" } else { #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" value->data[0].v_pointer = NULL; -#line 2134 "gitg-ext-message-bus.c" +#line 2141 "gitg-ext-message-bus.c" } #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return NULL; -#line 2138 "gitg-ext-message-bus.c" +#line 2145 "gitg-ext-message-bus.c" } static gchar* gitg_ext_message_bus_value_id_map_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GitgExtMessageBusIdMap** object_p; + GitgExtMessageBusIdMap ** object_p; object_p = collect_values[0].v_pointer; #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (!object_p) { #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2149 "gitg-ext-message-bus.c" +#line 2156 "gitg-ext-message-bus.c" } #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (!value->data[0].v_pointer) { #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" *object_p = NULL; -#line 2155 "gitg-ext-message-bus.c" +#line 2162 "gitg-ext-message-bus.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" *object_p = value->data[0].v_pointer; -#line 2159 "gitg-ext-message-bus.c" +#line 2166 "gitg-ext-message-bus.c" } else { #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" *object_p = gitg_ext_message_bus_id_map_ref (value->data[0].v_pointer); -#line 2163 "gitg-ext-message-bus.c" +#line 2170 "gitg-ext-message-bus.c" } #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return NULL; -#line 2167 "gitg-ext-message-bus.c" +#line 2174 "gitg-ext-message-bus.c" } @@ -2178,7 +2185,7 @@ G_PARAM_SPEC (spec)->value_type = object_type; #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return G_PARAM_SPEC (spec); -#line 2181 "gitg-ext-message-bus.c" +#line 2188 "gitg-ext-message-bus.c" } @@ -2187,12 +2194,12 @@ g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_EXT_MESSAGE_BUS_TYPE_ID_MAP), NULL); #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return value->data[0].v_pointer; -#line 2190 "gitg-ext-message-bus.c" +#line 2197 "gitg-ext-message-bus.c" } static void gitg_ext_message_bus_value_set_id_map (GValue* value, gpointer v_object) { - GitgExtMessageBusIdMap* old; + GitgExtMessageBusIdMap * old; #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_EXT_MESSAGE_BUS_TYPE_ID_MAP)); #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" @@ -2207,23 +2214,23 @@ value->data[0].v_pointer = v_object; #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" gitg_ext_message_bus_id_map_ref (value->data[0].v_pointer); -#line 2210 "gitg-ext-message-bus.c" +#line 2217 "gitg-ext-message-bus.c" } else { #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" value->data[0].v_pointer = NULL; -#line 2214 "gitg-ext-message-bus.c" +#line 2221 "gitg-ext-message-bus.c" } #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (old) { #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" gitg_ext_message_bus_id_map_unref (old); -#line 2220 "gitg-ext-message-bus.c" +#line 2227 "gitg-ext-message-bus.c" } } static void gitg_ext_message_bus_value_take_id_map (GValue* value, gpointer v_object) { - GitgExtMessageBusIdMap* old; + GitgExtMessageBusIdMap * old; #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_EXT_MESSAGE_BUS_TYPE_ID_MAP)); #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" @@ -2236,17 +2243,17 @@ g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" value->data[0].v_pointer = v_object; -#line 2239 "gitg-ext-message-bus.c" +#line 2246 "gitg-ext-message-bus.c" } else { #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" value->data[0].v_pointer = NULL; -#line 2243 "gitg-ext-message-bus.c" +#line 2250 "gitg-ext-message-bus.c" } #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (old) { #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" gitg_ext_message_bus_id_map_unref (old); -#line 2249 "gitg-ext-message-bus.c" +#line 2256 "gitg-ext-message-bus.c" } } @@ -2256,18 +2263,18 @@ gitg_ext_message_bus_id_map_parent_class = g_type_class_peek_parent (klass); #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" ((GitgExtMessageBusIdMapClass *) klass)->finalize = gitg_ext_message_bus_id_map_finalize; -#line 2259 "gitg-ext-message-bus.c" +#line 2266 "gitg-ext-message-bus.c" } static void gitg_ext_message_bus_id_map_instance_init (GitgExtMessageBusIdMap * self) { #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" self->ref_count = 1; -#line 2266 "gitg-ext-message-bus.c" +#line 2273 "gitg-ext-message-bus.c" } -static void gitg_ext_message_bus_id_map_finalize (GitgExtMessageBusIdMap* obj) { +static void gitg_ext_message_bus_id_map_finalize (GitgExtMessageBusIdMap * obj) { GitgExtMessageBusIdMap * self; #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_EXT_MESSAGE_BUS_TYPE_ID_MAP, GitgExtMessageBusIdMap); @@ -2275,7 +2282,7 @@ g_signal_handlers_destroy (self); #line 58 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" _gitg_ext_message_bus_message_unref0 (self->message); -#line 2278 "gitg-ext-message-bus.c" +#line 2285 "gitg-ext-message-bus.c" } @@ -2294,18 +2301,18 @@ static gpointer gitg_ext_message_bus_id_map_ref (gpointer instance) { - GitgExtMessageBusIdMap* self; + GitgExtMessageBusIdMap * self; self = instance; #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" g_atomic_int_inc (&self->ref_count); #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" return instance; -#line 2303 "gitg-ext-message-bus.c" +#line 2310 "gitg-ext-message-bus.c" } static void gitg_ext_message_bus_id_map_unref (gpointer instance) { - GitgExtMessageBusIdMap* self; + GitgExtMessageBusIdMap * self; self = instance; #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2313,7 +2320,7 @@ GITG_EXT_MESSAGE_BUS_ID_MAP_GET_CLASS (self)->finalize (self); #line 56 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2316 "gitg-ext-message-bus.c" +#line 2323 "gitg-ext-message-bus.c" } } @@ -2328,23 +2335,23 @@ #line 25 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" G_OBJECT_CLASS (klass)->finalize = gitg_ext_message_bus_finalize; #line 25 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" - g_signal_new ("registered", GITG_EXT_TYPE_MESSAGE_BUS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GITG_EXT_TYPE_MESSAGE_ID); + gitg_ext_message_bus_signals[GITG_EXT_MESSAGE_BUS_REGISTERED_SIGNAL] = g_signal_new ("registered", GITG_EXT_TYPE_MESSAGE_BUS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GITG_EXT_TYPE_MESSAGE_ID); #line 25 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" - g_signal_new ("unregistered", GITG_EXT_TYPE_MESSAGE_BUS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GITG_EXT_TYPE_MESSAGE_ID); + gitg_ext_message_bus_signals[GITG_EXT_MESSAGE_BUS_UNREGISTERED_SIGNAL] = g_signal_new ("unregistered", GITG_EXT_TYPE_MESSAGE_BUS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GITG_EXT_TYPE_MESSAGE_ID); #line 25 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" - g_signal_new ("dispatch", GITG_EXT_TYPE_MESSAGE_BUS, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgExtMessageBusClass, dispatch), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GITG_EXT_TYPE_MESSAGE); -#line 2336 "gitg-ext-message-bus.c" + gitg_ext_message_bus_signals[GITG_EXT_MESSAGE_BUS_DISPATCH_SIGNAL] = g_signal_new ("dispatch", GITG_EXT_TYPE_MESSAGE_BUS, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgExtMessageBusClass, dispatch), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GITG_EXT_TYPE_MESSAGE); +#line 2343 "gitg-ext-message-bus.c" } static void gitg_ext_message_bus_instance_init (GitgExtMessageBus * self) { #line 25 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" self->priv = GITG_EXT_MESSAGE_BUS_GET_PRIVATE (self); -#line 2343 "gitg-ext-message-bus.c" +#line 2350 "gitg-ext-message-bus.c" } -static void gitg_ext_message_bus_finalize (GObject* obj) { +static void gitg_ext_message_bus_finalize (GObject * obj) { GitgExtMessageBus * self; #line 25 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_EXT_TYPE_MESSAGE_BUS, GitgExtMessageBus); @@ -2356,7 +2363,7 @@ _g_hash_table_unref0 (self->priv->d_types); #line 25 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-bus.vala" G_OBJECT_CLASS (gitg_ext_message_bus_parent_class)->finalize (obj); -#line 2359 "gitg-ext-message-bus.c" +#line 2366 "gitg-ext-message-bus.c" } diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-message.c gitg-3.23.0/libgitg-ext/gitg-ext-message.c --- gitg-3.22.0/libgitg-ext/gitg-ext-message.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-message.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-message.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-message.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-message.vala, do not modify */ /* @@ -80,7 +80,7 @@ GitgExtMessageId* gitg_ext_message_get_id (GitgExtMessage* self); void gitg_ext_message_set_id (GitgExtMessage* self, GitgExtMessageId* value); GitgExtMessageId* gitg_ext_message_id_copy (GitgExtMessageId* self); -static void gitg_ext_message_finalize (GObject* obj); +static void gitg_ext_message_finalize (GObject * obj); static void _vala_gitg_ext_message_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_ext_message_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -237,21 +237,25 @@ void gitg_ext_message_set_id (GitgExtMessage* self, GitgExtMessageId* value) { - GitgExtMessageId* _tmp0_ = NULL; - GitgExtMessageId* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message.vala" g_return_if_fail (self != NULL); +#line 29 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message.vala" + if (gitg_ext_message_get_id (self) != value) { +#line 245 "gitg-ext-message.c" + GitgExtMessageId* _tmp0_ = NULL; + GitgExtMessageId* _tmp1_ = NULL; #line 31 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message.vala" - _tmp0_ = value; + _tmp0_ = value; #line 31 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message.vala" - _tmp1_ = gitg_ext_message_id_copy (_tmp0_); + _tmp1_ = gitg_ext_message_id_copy (_tmp0_); #line 31 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message.vala" - _g_object_unref0 (self->priv->d_id); + _g_object_unref0 (self->priv->d_id); #line 31 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message.vala" - self->priv->d_id = _tmp1_; + self->priv->d_id = _tmp1_; #line 29 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message.vala" - g_object_notify ((GObject *) self, "id"); -#line 255 "gitg-ext-message.c" + g_object_notify ((GObject *) self, "id"); +#line 258 "gitg-ext-message.c" + } } @@ -268,18 +272,18 @@ G_OBJECT_CLASS (klass)->finalize = gitg_ext_message_finalize; #line 23 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_EXT_MESSAGE_ID, g_param_spec_object ("id", "id", "id", GITG_EXT_TYPE_MESSAGE_ID, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); -#line 272 "gitg-ext-message.c" +#line 276 "gitg-ext-message.c" } static void gitg_ext_message_instance_init (GitgExtMessage * self) { #line 23 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message.vala" self->priv = GITG_EXT_MESSAGE_GET_PRIVATE (self); -#line 279 "gitg-ext-message.c" +#line 283 "gitg-ext-message.c" } -static void gitg_ext_message_finalize (GObject* obj) { +static void gitg_ext_message_finalize (GObject * obj) { GitgExtMessage * self; #line 23 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_EXT_TYPE_MESSAGE, GitgExtMessage); @@ -287,7 +291,7 @@ _g_object_unref0 (self->priv->d_id); #line 23 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message.vala" G_OBJECT_CLASS (gitg_ext_message_parent_class)->finalize (obj); -#line 291 "gitg-ext-message.c" +#line 295 "gitg-ext-message.c" } @@ -314,13 +318,13 @@ g_value_set_object (value, gitg_ext_message_get_id (self)); #line 23 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message.vala" break; -#line 318 "gitg-ext-message.c" +#line 322 "gitg-ext-message.c" default: #line 23 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message.vala" break; -#line 324 "gitg-ext-message.c" +#line 328 "gitg-ext-message.c" } } @@ -336,13 +340,13 @@ gitg_ext_message_set_id (self, g_value_get_object (value)); #line 23 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message.vala" break; -#line 340 "gitg-ext-message.c" +#line 344 "gitg-ext-message.c" default: #line 23 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message.vala" break; -#line 346 "gitg-ext-message.c" +#line 350 "gitg-ext-message.c" } } diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-message-id.c gitg-3.23.0/libgitg-ext/gitg-ext-message-id.c --- gitg-3.22.0/libgitg-ext/gitg-ext-message-id.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-message-id.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-message-id.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-message-id.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-message-id.vala, do not modify */ /* @@ -74,7 +74,7 @@ gboolean gitg_ext_message_id_valid_object_path (const gchar* path); void gitg_ext_message_id_set_object_path (GitgExtMessageId* self, const gchar* value); void gitg_ext_message_id_set_method (GitgExtMessageId* self, const gchar* value); -static void gitg_ext_message_id_finalize (GObject* obj); +static void gitg_ext_message_id_finalize (GObject * obj); static void _vala_gitg_ext_message_id_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_ext_message_id_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -255,15 +255,15 @@ gchar result = '\0'; glong _tmp0_ = 0L; gchar _tmp1_ = '\0'; -#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1102 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1103 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = index; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1103 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1103 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1103 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 269 "gitg-ext-message-id.c" } @@ -457,21 +457,25 @@ void gitg_ext_message_id_set_object_path (GitgExtMessageId* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; #line 46 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" g_return_if_fail (self != NULL); #line 46 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" - _tmp0_ = value; + if (g_strcmp0 (value, gitg_ext_message_id_get_object_path (self)) != 0) { +#line 465 "gitg-ext-message-id.c" + const gchar* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; #line 46 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = value; #line 46 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" - _g_free0 (self->priv->_object_path); + _tmp1_ = g_strdup (_tmp0_); #line 46 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" - self->priv->_object_path = _tmp1_; + _g_free0 (self->priv->_object_path); #line 46 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" - g_object_notify ((GObject *) self, "object-path"); -#line 475 "gitg-ext-message-id.c" + self->priv->_object_path = _tmp1_; +#line 46 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" + g_object_notify ((GObject *) self, "object-path"); +#line 478 "gitg-ext-message-id.c" + } } @@ -486,26 +490,30 @@ result = _tmp0_; #line 51 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" return result; -#line 490 "gitg-ext-message-id.c" +#line 494 "gitg-ext-message-id.c" } void gitg_ext_message_id_set_method (GitgExtMessageId* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; #line 51 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" g_return_if_fail (self != NULL); #line 51 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" - _tmp0_ = value; + if (g_strcmp0 (value, gitg_ext_message_id_get_method (self)) != 0) { +#line 503 "gitg-ext-message-id.c" + const gchar* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; #line 51 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = value; #line 51 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" - _g_free0 (self->priv->_method); + _tmp1_ = g_strdup (_tmp0_); #line 51 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" - self->priv->_method = _tmp1_; + _g_free0 (self->priv->_method); #line 51 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" - g_object_notify ((GObject *) self, "method"); -#line 509 "gitg-ext-message-id.c" + self->priv->_method = _tmp1_; +#line 51 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" + g_object_notify ((GObject *) self, "method"); +#line 516 "gitg-ext-message-id.c" + } } @@ -537,7 +545,7 @@ result = _tmp5_; #line 62 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" return result; -#line 541 "gitg-ext-message-id.c" +#line 549 "gitg-ext-message-id.c" } @@ -552,19 +560,19 @@ G_OBJECT_CLASS (klass)->set_property = _vala_gitg_ext_message_id_set_property; #line 41 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" G_OBJECT_CLASS (klass)->finalize = gitg_ext_message_id_finalize; -#line 556 "gitg-ext-message-id.c" +#line 564 "gitg-ext-message-id.c" /** * Message object path. */ #line 41 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_EXT_MESSAGE_ID_OBJECT_PATH, g_param_spec_string ("object-path", "object-path", "object-path", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); -#line 562 "gitg-ext-message-id.c" +#line 570 "gitg-ext-message-id.c" /** * Message method. */ #line 41 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_EXT_MESSAGE_ID_METHOD, g_param_spec_string ("method", "method", "method", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); -#line 568 "gitg-ext-message-id.c" +#line 576 "gitg-ext-message-id.c" /** * Full id of the message. * @@ -574,18 +582,18 @@ */ #line 41 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_EXT_MESSAGE_ID_ID, g_param_spec_string ("id", "id", "id", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 578 "gitg-ext-message-id.c" +#line 586 "gitg-ext-message-id.c" } static void gitg_ext_message_id_instance_init (GitgExtMessageId * self) { #line 41 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" self->priv = GITG_EXT_MESSAGE_ID_GET_PRIVATE (self); -#line 585 "gitg-ext-message-id.c" +#line 593 "gitg-ext-message-id.c" } -static void gitg_ext_message_id_finalize (GObject* obj) { +static void gitg_ext_message_id_finalize (GObject * obj) { GitgExtMessageId * self; #line 41 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_EXT_TYPE_MESSAGE_ID, GitgExtMessageId); @@ -595,7 +603,7 @@ _g_free0 (self->priv->_method); #line 41 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" G_OBJECT_CLASS (gitg_ext_message_id_parent_class)->finalize (obj); -#line 599 "gitg-ext-message-id.c" +#line 607 "gitg-ext-message-id.c" } @@ -652,13 +660,13 @@ g_value_take_string (value, gitg_ext_message_id_get_id (self)); #line 41 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" break; -#line 656 "gitg-ext-message-id.c" +#line 664 "gitg-ext-message-id.c" default: #line 41 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 41 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" break; -#line 662 "gitg-ext-message-id.c" +#line 670 "gitg-ext-message-id.c" } } @@ -680,13 +688,13 @@ gitg_ext_message_id_set_method (self, g_value_get_string (value)); #line 41 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" break; -#line 684 "gitg-ext-message-id.c" +#line 692 "gitg-ext-message-id.c" default: #line 41 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 41 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-message-id.vala" break; -#line 690 "gitg-ext-message-id.c" +#line 698 "gitg-ext-message-id.c" } } diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-notification.c gitg-3.23.0/libgitg-ext/gitg-ext-notification.c --- gitg-3.22.0/libgitg-ext/gitg-ext-notification.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-notification.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-notification.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-notification.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-notification.vala, do not modify */ /* @@ -32,6 +32,11 @@ typedef struct _GitgExtNotification GitgExtNotification; typedef struct _GitgExtNotificationIface GitgExtNotificationIface; +enum { + GITG_EXT_NOTIFICATION_CLOSE_SIGNAL, + GITG_EXT_NOTIFICATION_LAST_SIGNAL +}; +static guint gitg_ext_notification_signals[GITG_EXT_NOTIFICATION_LAST_SIGNAL] = {0}; struct _GitgExtNotificationIface { GTypeInterface parent_iface; @@ -49,7 +54,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 26 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-notification.vala" return GITG_EXT_NOTIFICATION_GET_INTERFACE (self)->get_widget (self); -#line 53 "gitg-ext-notification.c" +#line 58 "gitg-ext-notification.c" } @@ -63,8 +68,8 @@ #line 23 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-notification.vala" g_object_interface_install_property (iface, g_param_spec_object ("widget", "widget", "widget", gtk_widget_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 23 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-notification.vala" - g_signal_new ("close", GITG_EXT_TYPE_NOTIFICATION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT); -#line 68 "gitg-ext-notification.c" + gitg_ext_notification_signals[GITG_EXT_NOTIFICATION_CLOSE_SIGNAL] = g_signal_new ("close", GITG_EXT_TYPE_NOTIFICATION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT); +#line 73 "gitg-ext-notification.c" } } diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-notifications.c gitg-3.23.0/libgitg-ext/gitg-ext-notifications.c --- gitg-3.22.0/libgitg-ext/gitg-ext-notifications.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-notifications.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-notifications.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-notifications.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-notifications.vala, do not modify */ /* diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-preferences.c gitg-3.23.0/libgitg-ext/gitg-ext-preferences.c --- gitg-3.22.0/libgitg-ext/gitg-ext-preferences.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-preferences.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-preferences.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-preferences.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-preferences.vala, do not modify */ /* diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-ref-action.c gitg-3.23.0/libgitg-ext/gitg-ext-ref-action.c --- gitg-3.22.0/libgitg-ext/gitg-ext-ref-action.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-ref-action.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-ref-action.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-ref-action.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-ref-action.vala, do not modify */ /* diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-ref-action-interface.c gitg-3.23.0/libgitg-ext/gitg-ext-ref-action-interface.c --- gitg-3.22.0/libgitg-ext/gitg-ext-ref-action-interface.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-ref-action-interface.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-ref-action-interface.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-ref-action-interface.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-ref-action-interface.vala, do not modify */ /* diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-remote-lookup.c gitg-3.23.0/libgitg-ext/gitg-ext-remote-lookup.c --- gitg-3.22.0/libgitg-ext/gitg-ext-remote-lookup.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-remote-lookup.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-remote-lookup.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-remote-lookup.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-remote-lookup.vala, do not modify */ /* diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-searchable.c gitg-3.23.0/libgitg-ext/gitg-ext-searchable.c --- gitg-3.22.0/libgitg-ext/gitg-ext-searchable.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-searchable.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-searchable.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-searchable.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-searchable.vala, do not modify */ /* diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-selectable.c gitg-3.23.0/libgitg-ext/gitg-ext-selectable.c --- gitg-3.22.0/libgitg-ext/gitg-ext-selectable.c 2016-09-18 12:01:42.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-selectable.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-selectable.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-selectable.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-selectable.vala, do not modify */ /* diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-ui.c gitg-3.23.0/libgitg-ext/gitg-ext-ui.c --- gitg-3.22.0/libgitg-ext/gitg-ext-ui.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-ui.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-ui.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-ui.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-ui.vala, do not modify */ /* @@ -76,7 +76,7 @@ GeeHashMap* gitg_ext_ui_from_builder (const gchar* path, ...); GitgExtUI* gitg_ext_ui_new (void); GitgExtUI* gitg_ext_ui_construct (GType object_type); -static void gitg_ext_ui_finalize (GitgExtUI* obj); +static void gitg_ext_ui_finalize (GitgExtUI * obj); GeeHashMap* gitg_ext_ui_from_builder (const gchar* path, ...) { @@ -277,7 +277,7 @@ #line 22 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui.vala" if (collect_values[0].v_pointer) { #line 280 "gitg-ext-ui.c" - GitgExtUI* object; + GitgExtUI * object; object = collect_values[0].v_pointer; #line 22 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui.vala" if (object->parent_instance.g_class == NULL) { @@ -304,7 +304,7 @@ static gchar* gitg_ext_value_ui_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GitgExtUI** object_p; + GitgExtUI ** object_p; object_p = collect_values[0].v_pointer; #line 22 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui.vala" if (!object_p) { @@ -356,7 +356,7 @@ void gitg_ext_value_set_ui (GValue* value, gpointer v_object) { - GitgExtUI* old; + GitgExtUI * old; #line 22 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_EXT_TYPE_UI)); #line 22 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui.vala" @@ -387,7 +387,7 @@ void gitg_ext_value_take_ui (GValue* value, gpointer v_object) { - GitgExtUI* old; + GitgExtUI * old; #line 22 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_EXT_TYPE_UI)); #line 22 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui.vala" @@ -431,7 +431,7 @@ } -static void gitg_ext_ui_finalize (GitgExtUI* obj) { +static void gitg_ext_ui_finalize (GitgExtUI * obj) { GitgExtUI * self; #line 22 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_EXT_TYPE_UI, GitgExtUI); @@ -456,7 +456,7 @@ gpointer gitg_ext_ui_ref (gpointer instance) { - GitgExtUI* self; + GitgExtUI * self; self = instance; #line 22 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui.vala" g_atomic_int_inc (&self->ref_count); @@ -467,7 +467,7 @@ void gitg_ext_ui_unref (gpointer instance) { - GitgExtUI* self; + GitgExtUI * self; self = instance; #line 22 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-ui-element.c gitg-3.23.0/libgitg-ext/gitg-ext-ui-element.c --- gitg-3.22.0/libgitg-ext/gitg-ext-ui-element.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-ui-element.c 2016-11-26 12:23:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-ui-element.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-ui-element.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-ui-element.vala, do not modify */ /* @@ -98,6 +98,11 @@ typedef struct _GitgExtRemoteLookup GitgExtRemoteLookup; typedef struct _GitgExtRemoteLookupIface GitgExtRemoteLookupIface; +enum { + GITG_EXT_UI_ELEMENT_ACTIVATE_SIGNAL, + GITG_EXT_UI_ELEMENT_LAST_SIGNAL +}; +static guint gitg_ext_ui_element_signals[GITG_EXT_UI_ELEMENT_LAST_SIGNAL] = {0}; struct _GitgExtActivityIface { GTypeInterface parent_iface; @@ -200,7 +205,7 @@ result = 0; #line 121 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" return result; -#line 204 "gitg-ext-ui-element.c" +#line 209 "gitg-ext-ui-element.c" } @@ -209,7 +214,7 @@ g_return_val_if_fail (self != NULL, 0); #line 119 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" return GITG_EXT_UI_ELEMENT_GET_INTERFACE (self)->negotiate_order (self, other); -#line 213 "gitg-ext-ui-element.c" +#line 218 "gitg-ext-ui-element.c" } @@ -218,7 +223,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 36 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" return GITG_EXT_UI_ELEMENT_GET_INTERFACE (self)->get_application (self); -#line 222 "gitg-ext-ui-element.c" +#line 227 "gitg-ext-ui-element.c" } @@ -227,7 +232,7 @@ g_return_if_fail (self != NULL); #line 36 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" GITG_EXT_UI_ELEMENT_GET_INTERFACE (self)->set_application (self, value); -#line 231 "gitg-ext-ui-element.c" +#line 236 "gitg-ext-ui-element.c" } @@ -236,7 +241,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 43 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" return GITG_EXT_UI_ELEMENT_GET_INTERFACE (self)->get_id (self); -#line 240 "gitg-ext-ui-element.c" +#line 245 "gitg-ext-ui-element.c" } @@ -245,7 +250,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 51 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" return GITG_EXT_UI_ELEMENT_GET_INTERFACE (self)->get_display_name (self); -#line 249 "gitg-ext-ui-element.c" +#line 254 "gitg-ext-ui-element.c" } @@ -254,7 +259,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 59 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" return GITG_EXT_UI_ELEMENT_GET_INTERFACE (self)->get_description (self); -#line 258 "gitg-ext-ui-element.c" +#line 263 "gitg-ext-ui-element.c" } @@ -263,7 +268,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 69 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" return GITG_EXT_UI_ELEMENT_GET_INTERFACE (self)->get_icon (self); -#line 267 "gitg-ext-ui-element.c" +#line 272 "gitg-ext-ui-element.c" } @@ -276,7 +281,7 @@ result = NULL; #line 69 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" return result; -#line 280 "gitg-ext-ui-element.c" +#line 285 "gitg-ext-ui-element.c" } @@ -285,7 +290,7 @@ g_return_val_if_fail (self != NULL, NULL); #line 80 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" return GITG_EXT_UI_ELEMENT_GET_INTERFACE (self)->get_widget (self); -#line 289 "gitg-ext-ui-element.c" +#line 294 "gitg-ext-ui-element.c" } @@ -298,7 +303,7 @@ result = NULL; #line 80 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" return result; -#line 302 "gitg-ext-ui-element.c" +#line 307 "gitg-ext-ui-element.c" } @@ -307,7 +312,7 @@ g_return_val_if_fail (self != NULL, FALSE); #line 93 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" return GITG_EXT_UI_ELEMENT_GET_INTERFACE (self)->get_available (self); -#line 311 "gitg-ext-ui-element.c" +#line 316 "gitg-ext-ui-element.c" } @@ -320,7 +325,7 @@ result = TRUE; #line 93 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" return result; -#line 324 "gitg-ext-ui-element.c" +#line 329 "gitg-ext-ui-element.c" } @@ -329,7 +334,7 @@ g_return_val_if_fail (self != NULL, FALSE); #line 105 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" return GITG_EXT_UI_ELEMENT_GET_INTERFACE (self)->get_enabled (self); -#line 333 "gitg-ext-ui-element.c" +#line 338 "gitg-ext-ui-element.c" } @@ -342,7 +347,7 @@ result = TRUE; #line 105 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" return result; -#line 346 "gitg-ext-ui-element.c" +#line 351 "gitg-ext-ui-element.c" } @@ -357,7 +362,7 @@ if (!initialized) { #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" initialized = TRUE; -#line 361 "gitg-ext-ui-element.c" +#line 366 "gitg-ext-ui-element.c" /** * The main gitg application interface. * @@ -367,7 +372,7 @@ */ #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" g_object_interface_install_property (iface, g_param_spec_object ("application", "application", "application", GITG_EXT_TYPE_APPLICATION, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); -#line 371 "gitg-ext-ui-element.c" +#line 376 "gitg-ext-ui-element.c" /** * A unique id for the ui element. * @@ -375,7 +380,7 @@ */ #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" g_object_interface_install_property (iface, g_param_spec_string ("id", "id", "id", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 379 "gitg-ext-ui-element.c" +#line 384 "gitg-ext-ui-element.c" /** * The display name of the ui element. * @@ -384,7 +389,7 @@ */ #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" g_object_interface_install_property (iface, g_param_spec_string ("display-name", "display-name", "display-name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 388 "gitg-ext-ui-element.c" +#line 393 "gitg-ext-ui-element.c" /** * The description of the ui element. * @@ -395,7 +400,7 @@ g_object_interface_install_property (iface, g_param_spec_string ("description", "description", "description", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" iface->activate = gitg_ext_ui_element_real_activate; -#line 399 "gitg-ext-ui-element.c" +#line 404 "gitg-ext-ui-element.c" /** * Activate the UIELement. * @@ -404,7 +409,7 @@ * setup when the ui element is activated. */ #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" - g_signal_new ("activate", GITG_EXT_TYPE_UI_ELEMENT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgExtUIElementIface, activate), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_ext_ui_element_signals[GITG_EXT_UI_ELEMENT_ACTIVATE_SIGNAL] = g_signal_new ("activate", GITG_EXT_TYPE_UI_ELEMENT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgExtUIElementIface, activate), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" iface->negotiate_order = gitg_ext_ui_element_real_negotiate_order; #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" @@ -415,7 +420,7 @@ iface->get_available = gitg_ext_ui_element_real_get_available; #line 27 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-ui-element.vala" iface->get_enabled = gitg_ext_ui_element_real_get_enabled; -#line 419 "gitg-ext-ui-element.c" +#line 424 "gitg-ext-ui-element.c" } } diff -Nru gitg-3.22.0/libgitg-ext/gitg-ext-user-query.c gitg-3.23.0/libgitg-ext/gitg-ext-user-query.c --- gitg-3.22.0/libgitg-ext/gitg-ext-user-query.c 2016-08-09 09:50:22.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/gitg-ext-user-query.c 2016-11-26 12:23:17.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ext-user-query.c generated by valac 0.32.1, the Vala compiler +/* gitg-ext-user-query.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ext-user-query.vala, do not modify */ /* @@ -50,6 +50,12 @@ typedef struct _GitgExtUserQuery GitgExtUserQuery; typedef struct _GitgExtUserQueryClass GitgExtUserQueryClass; typedef struct _GitgExtUserQueryPrivate GitgExtUserQueryPrivate; +enum { + GITG_EXT_USER_QUERY_QUIT_SIGNAL, + GITG_EXT_USER_QUERY_RESPONSE_SIGNAL, + GITG_EXT_USER_QUERY_LAST_SIGNAL +}; +static guint gitg_ext_user_query_signals[GITG_EXT_USER_QUERY_LAST_SIGNAL] = {0}; struct _GitgExtUserQueryResponse { GObject parent_instance; @@ -93,7 +99,7 @@ }; GitgExtUserQueryResponse* gitg_ext_user_query_response_new (const gchar* text, GtkResponseType response_type); GitgExtUserQueryResponse* gitg_ext_user_query_response_construct (GType object_type, const gchar* text, GtkResponseType response_type); -static void gitg_ext_user_query_response_finalize (GObject* obj); +static void gitg_ext_user_query_response_finalize (GObject * obj); GType gitg_ext_user_query_get_type (void) G_GNUC_CONST; #define GITG_EXT_USER_QUERY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_EXT_TYPE_USER_QUERY, GitgExtUserQueryPrivate)) enum { @@ -108,7 +114,7 @@ GitgExtUserQuery* gitg_ext_user_query_new_full (const gchar* title, const gchar* message, GtkMessageType message_type, ...); GitgExtUserQuery* gitg_ext_user_query_construct_full (GType object_type, const gchar* title, const gchar* message, GtkMessageType message_type, ...); GitgExtUserQuery* gitg_ext_user_query_constructv_full (GType object_type, const gchar* title, const gchar* message, GtkMessageType message_type, va_list _vala_va_list); -static void _vala_array_add1 (GitgExtUserQueryResponse*** array, int* length, int* size, GitgExtUserQueryResponse* value); +static void _vala_array_add1 (GitgExtUserQueryResponse** * array, int* length, int* size, GitgExtUserQueryResponse* value); void gitg_ext_user_query_set_responses (GitgExtUserQuery* self, GitgExtUserQueryResponse** value, int value_length1); void gitg_ext_user_query_set_default_response (GitgExtUserQuery* self, GtkResponseType value); GitgExtUserQuery* gitg_ext_user_query_new (void); @@ -127,7 +133,7 @@ gboolean gitg_ext_user_query_get_message_use_markup (GitgExtUserQuery* self); void gitg_ext_user_query_set_message_use_markup (GitgExtUserQuery* self, gboolean value); static void g_cclosure_user_marshal_BOOLEAN__ENUM (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void gitg_ext_user_query_finalize (GObject* obj); +static void gitg_ext_user_query_finalize (GObject * obj); static void _vala_gitg_ext_user_query_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_ext_user_query_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -157,14 +163,14 @@ self->response_type = _tmp2_; #line 28 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" return self; -#line 161 "gitg-ext-user-query.c" +#line 167 "gitg-ext-user-query.c" } GitgExtUserQueryResponse* gitg_ext_user_query_response_new (const gchar* text, GtkResponseType response_type) { #line 28 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" return gitg_ext_user_query_response_construct (GITG_EXT_TYPE_USER_QUERY_RESPONSE, text, response_type); -#line 168 "gitg-ext-user-query.c" +#line 174 "gitg-ext-user-query.c" } @@ -173,7 +179,7 @@ gitg_ext_user_query_response_parent_class = g_type_class_peek_parent (klass); #line 23 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" G_OBJECT_CLASS (klass)->finalize = gitg_ext_user_query_response_finalize; -#line 177 "gitg-ext-user-query.c" +#line 183 "gitg-ext-user-query.c" } @@ -181,7 +187,7 @@ } -static void gitg_ext_user_query_response_finalize (GObject* obj) { +static void gitg_ext_user_query_response_finalize (GObject * obj) { GitgExtUserQueryResponse * self; #line 23 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_EXT_TYPE_USER_QUERY_RESPONSE, GitgExtUserQueryResponse); @@ -189,7 +195,7 @@ _g_free0 (self->text); #line 23 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" G_OBJECT_CLASS (gitg_ext_user_query_response_parent_class)->finalize (obj); -#line 193 "gitg-ext-user-query.c" +#line 199 "gitg-ext-user-query.c" } @@ -205,20 +211,20 @@ } -static void _vala_array_add1 (GitgExtUserQueryResponse*** array, int* length, int* size, GitgExtUserQueryResponse* value) { +static void _vala_array_add1 (GitgExtUserQueryResponse** * array, int* length, int* size, GitgExtUserQueryResponse* value) { #line 62 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" if ((*length) == (*size)) { #line 62 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" *size = (*size) ? (2 * (*size)) : 4; #line 62 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" *array = g_renew (GitgExtUserQueryResponse*, *array, (*size) + 1); -#line 216 "gitg-ext-user-query.c" +#line 222 "gitg-ext-user-query.c" } #line 62 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" (*array)[(*length)++] = value; #line 62 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" (*array)[*length] = NULL; -#line 222 "gitg-ext-user-query.c" +#line 228 "gitg-ext-user-query.c" } @@ -260,7 +266,7 @@ _resps_size_ = resps_length1; #line 55 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" while (TRUE) { -#line 264 "gitg-ext-user-query.c" +#line 270 "gitg-ext-user-query.c" gchar* text = NULL; const gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; @@ -284,7 +290,7 @@ _g_free0 (text); #line 59 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" break; -#line 288 "gitg-ext-user-query.c" +#line 294 "gitg-ext-user-query.c" } #line 62 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" _tmp7_ = resps; @@ -300,7 +306,7 @@ _vala_array_add1 (&resps, &resps_length1, &_resps_size_, _tmp10_); #line 55 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" _g_free0 (text); -#line 304 "gitg-ext-user-query.c" +#line 310 "gitg-ext-user-query.c" } #line 65 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" _tmp11_ = resps; @@ -314,7 +320,7 @@ _tmp12__length1 = resps_length1; #line 67 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" if (_tmp12__length1 > 0) { -#line 318 "gitg-ext-user-query.c" +#line 324 "gitg-ext-user-query.c" GitgExtUserQueryResponse** _tmp13_ = NULL; gint _tmp13__length1 = 0; GitgExtUserQueryResponse** _tmp14_ = NULL; @@ -335,7 +341,7 @@ _tmp16_ = _tmp15_->response_type; #line 68 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" gitg_ext_user_query_set_default_response (self, _tmp16_); -#line 339 "gitg-ext-user-query.c" +#line 345 "gitg-ext-user-query.c" } #line 48 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" resps = (_vala_array_free (resps, resps_length1, (GDestroyNotify) g_object_unref), NULL); @@ -343,7 +349,7 @@ va_end (l); #line 48 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" return self; -#line 347 "gitg-ext-user-query.c" +#line 353 "gitg-ext-user-query.c" } @@ -353,7 +359,7 @@ va_start (_vala_va_list_obj, message_type); #line 48 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" return gitg_ext_user_query_constructv_full (GITG_EXT_TYPE_USER_QUERY, title, message, message_type, _vala_va_list_obj); -#line 357 "gitg-ext-user-query.c" +#line 363 "gitg-ext-user-query.c" } @@ -363,7 +369,7 @@ va_start (_vala_va_list_obj, message_type); #line 48 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" return gitg_ext_user_query_constructv_full (object_type, title, message, message_type, _vala_va_list_obj); -#line 367 "gitg-ext-user-query.c" +#line 373 "gitg-ext-user-query.c" } @@ -373,14 +379,14 @@ self = (GitgExtUserQuery*) g_object_new (object_type, NULL); #line 35 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" return self; -#line 377 "gitg-ext-user-query.c" +#line 383 "gitg-ext-user-query.c" } GitgExtUserQuery* gitg_ext_user_query_new (void) { #line 35 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" return gitg_ext_user_query_construct (GITG_EXT_TYPE_USER_QUERY); -#line 384 "gitg-ext-user-query.c" +#line 390 "gitg-ext-user-query.c" } @@ -395,26 +401,30 @@ result = _tmp0_; #line 37 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" return result; -#line 399 "gitg-ext-user-query.c" +#line 405 "gitg-ext-user-query.c" } void gitg_ext_user_query_set_title (GitgExtUserQuery* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; #line 37 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" g_return_if_fail (self != NULL); #line 37 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - _tmp0_ = value; + if (g_strcmp0 (value, gitg_ext_user_query_get_title (self)) != 0) { +#line 414 "gitg-ext-user-query.c" + const gchar* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; #line 37 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = value; #line 37 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - _g_free0 (self->priv->_title); + _tmp1_ = g_strdup (_tmp0_); +#line 37 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" + _g_free0 (self->priv->_title); #line 37 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - self->priv->_title = _tmp1_; + self->priv->_title = _tmp1_; #line 37 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - g_object_notify ((GObject *) self, "title"); -#line 418 "gitg-ext-user-query.c" + g_object_notify ((GObject *) self, "title"); +#line 427 "gitg-ext-user-query.c" + } } @@ -429,26 +439,30 @@ result = _tmp0_; #line 38 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" return result; -#line 433 "gitg-ext-user-query.c" +#line 443 "gitg-ext-user-query.c" } void gitg_ext_user_query_set_message (GitgExtUserQuery* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; #line 38 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" g_return_if_fail (self != NULL); #line 38 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - _tmp0_ = value; + if (g_strcmp0 (value, gitg_ext_user_query_get_message (self)) != 0) { +#line 452 "gitg-ext-user-query.c" + const gchar* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; #line 38 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = value; #line 38 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - _g_free0 (self->priv->_message); + _tmp1_ = g_strdup (_tmp0_); #line 38 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - self->priv->_message = _tmp1_; + _g_free0 (self->priv->_message); #line 38 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - g_object_notify ((GObject *) self, "message"); -#line 452 "gitg-ext-user-query.c" + self->priv->_message = _tmp1_; +#line 38 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" + g_object_notify ((GObject *) self, "message"); +#line 465 "gitg-ext-user-query.c" + } } @@ -463,21 +477,25 @@ result = _tmp0_; #line 39 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" return result; -#line 467 "gitg-ext-user-query.c" +#line 481 "gitg-ext-user-query.c" } void gitg_ext_user_query_set_message_type (GitgExtUserQuery* self, GtkMessageType value) { - GtkMessageType _tmp0_ = 0; #line 39 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" g_return_if_fail (self != NULL); #line 39 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - _tmp0_ = value; + if (gitg_ext_user_query_get_message_type (self) != value) { +#line 490 "gitg-ext-user-query.c" + GtkMessageType _tmp0_ = 0; #line 39 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - self->priv->_message_type = _tmp0_; + _tmp0_ = value; #line 39 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - g_object_notify ((GObject *) self, "message-type"); -#line 481 "gitg-ext-user-query.c" + self->priv->_message_type = _tmp0_; +#line 39 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" + g_object_notify ((GObject *) self, "message-type"); +#line 498 "gitg-ext-user-query.c" + } } @@ -492,21 +510,25 @@ result = _tmp0_; #line 40 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" return result; -#line 496 "gitg-ext-user-query.c" +#line 514 "gitg-ext-user-query.c" } void gitg_ext_user_query_set_default_response (GitgExtUserQuery* self, GtkResponseType value) { - GtkResponseType _tmp0_ = 0; #line 40 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" g_return_if_fail (self != NULL); #line 40 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - _tmp0_ = value; + if (gitg_ext_user_query_get_default_response (self) != value) { +#line 523 "gitg-ext-user-query.c" + GtkResponseType _tmp0_ = 0; +#line 40 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" + _tmp0_ = value; #line 40 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - self->priv->_default_response = _tmp0_; + self->priv->_default_response = _tmp0_; #line 40 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - g_object_notify ((GObject *) self, "default-response"); -#line 510 "gitg-ext-user-query.c" + g_object_notify ((GObject *) self, "default-response"); +#line 531 "gitg-ext-user-query.c" + } } @@ -530,20 +552,20 @@ if (result_length1) { #line 41 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" *result_length1 = _tmp1__length1; -#line 534 "gitg-ext-user-query.c" +#line 556 "gitg-ext-user-query.c" } #line 41 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" result = _tmp1_; #line 41 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" return result; -#line 540 "gitg-ext-user-query.c" +#line 562 "gitg-ext-user-query.c" } static gpointer _g_object_ref0 (gpointer self) { #line 41 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" return self ? g_object_ref (self) : NULL; -#line 547 "gitg-ext-user-query.c" +#line 569 "gitg-ext-user-query.c" } @@ -554,17 +576,17 @@ result = g_new0 (GitgExtUserQueryResponse*, length + 1); #line 41 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" for (i = 0; i < length; i++) { -#line 558 "gitg-ext-user-query.c" +#line 580 "gitg-ext-user-query.c" GitgExtUserQueryResponse* _tmp0_ = NULL; #line 41 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 41 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" result[i] = _tmp0_; -#line 564 "gitg-ext-user-query.c" +#line 586 "gitg-ext-user-query.c" } #line 41 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" return result; -#line 568 "gitg-ext-user-query.c" +#line 590 "gitg-ext-user-query.c" } @@ -591,7 +613,7 @@ self->priv->_responses_length1 = _tmp1__length1; #line 41 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" self->priv->__responses_size_ = self->priv->_responses_length1; -#line 595 "gitg-ext-user-query.c" +#line 617 "gitg-ext-user-query.c" } @@ -606,21 +628,25 @@ result = _tmp0_; #line 42 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" return result; -#line 610 "gitg-ext-user-query.c" +#line 632 "gitg-ext-user-query.c" } void gitg_ext_user_query_set_default_is_destructive (GitgExtUserQuery* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 42 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" g_return_if_fail (self != NULL); #line 42 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - _tmp0_ = value; + if (gitg_ext_user_query_get_default_is_destructive (self) != value) { +#line 641 "gitg-ext-user-query.c" + gboolean _tmp0_ = FALSE; #line 42 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - self->priv->_default_is_destructive = _tmp0_; + _tmp0_ = value; #line 42 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - g_object_notify ((GObject *) self, "default-is-destructive"); -#line 624 "gitg-ext-user-query.c" + self->priv->_default_is_destructive = _tmp0_; +#line 42 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" + g_object_notify ((GObject *) self, "default-is-destructive"); +#line 649 "gitg-ext-user-query.c" + } } @@ -635,21 +661,25 @@ result = _tmp0_; #line 43 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" return result; -#line 639 "gitg-ext-user-query.c" +#line 665 "gitg-ext-user-query.c" } void gitg_ext_user_query_set_message_use_markup (GitgExtUserQuery* self, gboolean value) { - gboolean _tmp0_ = FALSE; #line 43 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" g_return_if_fail (self != NULL); #line 43 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - _tmp0_ = value; + if (gitg_ext_user_query_get_message_use_markup (self) != value) { +#line 674 "gitg-ext-user-query.c" + gboolean _tmp0_ = FALSE; #line 43 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - self->priv->_message_use_markup = _tmp0_; + _tmp0_ = value; #line 43 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - g_object_notify ((GObject *) self, "message-use-markup"); -#line 653 "gitg-ext-user-query.c" + self->priv->_message_use_markup = _tmp0_; +#line 43 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" + g_object_notify ((GObject *) self, "message-use-markup"); +#line 682 "gitg-ext-user-query.c" + } } @@ -671,13 +701,13 @@ data1 = closure->data; #line 35 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" data2 = param_values->data[0].v_pointer; -#line 675 "gitg-ext-user-query.c" +#line 705 "gitg-ext-user-query.c" } else { #line 35 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" data1 = param_values->data[0].v_pointer; #line 35 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" data2 = closure->data; -#line 681 "gitg-ext-user-query.c" +#line 711 "gitg-ext-user-query.c" } #line 35 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" callback = (GMarshalFunc_BOOLEAN__ENUM) (marshal_data ? marshal_data : cc->callback); @@ -685,7 +715,7 @@ v_return = callback (data1, g_value_get_enum (param_values + 1), data2); #line 35 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" g_value_set_boolean (return_value, v_return); -#line 689 "gitg-ext-user-query.c" +#line 719 "gitg-ext-user-query.c" } @@ -713,10 +743,10 @@ #line 35 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_EXT_USER_QUERY_MESSAGE_USE_MARKUP, g_param_spec_boolean ("message-use-markup", "message-use-markup", "message-use-markup", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); #line 35 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - g_signal_new ("quit", GITG_EXT_TYPE_USER_QUERY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_ext_user_query_signals[GITG_EXT_USER_QUERY_QUIT_SIGNAL] = g_signal_new ("quit", GITG_EXT_TYPE_USER_QUERY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 35 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" - g_signal_new ("response", GITG_EXT_TYPE_USER_QUERY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_BOOLEAN__ENUM, G_TYPE_BOOLEAN, 1, GTK_TYPE_RESPONSE_TYPE); -#line 720 "gitg-ext-user-query.c" + gitg_ext_user_query_signals[GITG_EXT_USER_QUERY_RESPONSE_SIGNAL] = g_signal_new ("response", GITG_EXT_TYPE_USER_QUERY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_BOOLEAN__ENUM, G_TYPE_BOOLEAN, 1, GTK_TYPE_RESPONSE_TYPE); +#line 750 "gitg-ext-user-query.c" } @@ -725,11 +755,11 @@ self->priv = GITG_EXT_USER_QUERY_GET_PRIVATE (self); #line 40 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" self->priv->_default_response = GTK_RESPONSE_CLOSE; -#line 729 "gitg-ext-user-query.c" +#line 759 "gitg-ext-user-query.c" } -static void gitg_ext_user_query_finalize (GObject* obj) { +static void gitg_ext_user_query_finalize (GObject * obj) { GitgExtUserQuery * self; #line 35 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_EXT_TYPE_USER_QUERY, GitgExtUserQuery); @@ -741,7 +771,7 @@ self->priv->_responses = (_vala_array_free (self->priv->_responses, self->priv->_responses_length1, (GDestroyNotify) g_object_unref), NULL); #line 35 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" G_OBJECT_CLASS (gitg_ext_user_query_parent_class)->finalize (obj); -#line 745 "gitg-ext-user-query.c" +#line 775 "gitg-ext-user-query.c" } @@ -798,13 +828,13 @@ g_value_set_boolean (value, gitg_ext_user_query_get_message_use_markup (self)); #line 35 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" break; -#line 802 "gitg-ext-user-query.c" +#line 832 "gitg-ext-user-query.c" default: #line 35 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 35 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" break; -#line 808 "gitg-ext-user-query.c" +#line 838 "gitg-ext-user-query.c" } } @@ -850,13 +880,13 @@ gitg_ext_user_query_set_message_use_markup (self, g_value_get_boolean (value)); #line 35 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" break; -#line 854 "gitg-ext-user-query.c" +#line 884 "gitg-ext-user-query.c" default: #line 35 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 35 "/home/jesse/dev/gitg/libgitg-ext/gitg-ext-user-query.vala" break; -#line 860 "gitg-ext-user-query.c" +#line 890 "gitg-ext-user-query.c" } } diff -Nru gitg-3.22.0/libgitg-ext/libgitg-ext-1.0.pc gitg-3.23.0/libgitg-ext/libgitg-ext-1.0.pc --- gitg-3.22.0/libgitg-ext/libgitg-ext-1.0.pc 2016-09-18 12:01:39.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/libgitg-ext-1.0.pc 2016-11-26 13:24:47.000000000 +0000 @@ -5,7 +5,7 @@ Name: libgitg-ext Description: gitg extensions library -Version: 3.22.0 +Version: 3.23.0 Requires: libgit2-glib-1.0 libgitg-1.0 gtk+-3.0 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 gthread-2.0 gio-unix-2.0 Libs: -L${libdir} -lgitg-ext-1.0 Cflags: -I${includedir}/libgitg-ext-1.0 diff -Nru gitg-3.22.0/libgitg-ext/libgitg-ext-1.0.vapi gitg-3.23.0/libgitg-ext/libgitg-ext-1.0.vapi --- gitg-3.22.0/libgitg-ext/libgitg-ext-1.0.vapi 2016-09-18 12:01:42.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/libgitg-ext-1.0.vapi 2016-11-26 12:23:17.000000000 +0000 @@ -1,4 +1,4 @@ -/* libgitg-ext-1.0.vapi generated by valac 0.32.1, do not modify. */ +/* libgitg-ext-1.0.vapi generated by valac 0.34.0.108-f56ac, do not modify. */ [CCode (gir_namespace = "GitgExt", gir_version = "1.0")] namespace GitgExt { diff -Nru gitg-3.22.0/libgitg-ext/libgitg-ext.h gitg-3.23.0/libgitg-ext/libgitg-ext.h --- gitg-3.22.0/libgitg-ext/libgitg-ext.h 2016-09-18 12:01:42.000000000 +0000 +++ gitg-3.23.0/libgitg-ext/libgitg-ext.h 2016-11-26 12:23:17.000000000 +0000 @@ -1,4 +1,4 @@ -/* libgitg-ext.h generated by valac 0.32.1, the Vala compiler, do not modify */ +/* libgitg-ext.h generated by valac 0.34.0.108-f56ac, the Vala compiler, do not modify */ #ifndef __LIBGITG_EXT_LIBGITG_EXT_H__ diff -Nru gitg-3.22.0/m4/gnome-compiler-flags.m4 gitg-3.23.0/m4/gnome-compiler-flags.m4 --- gitg-3.22.0/m4/gnome-compiler-flags.m4 1970-01-01 00:00:00.000000000 +0000 +++ gitg-3.23.0/m4/gnome-compiler-flags.m4 2016-11-26 09:56:44.000000000 +0000 @@ -0,0 +1,184 @@ +# gnome-compiler-flags.m4 +# +# serial 4 +# + +dnl GNOME_COMPILE_WARNINGS +dnl Turn on many useful compiler warnings and substitute the result into +dnl WARN_CFLAGS +dnl For now, only works on GCC +dnl Pass the default value of the --enable-compile-warnings configure option as +dnl the first argument to the macro, defaulting to 'yes'. +dnl Additional warning/error flags can be passed as an optional second argument. +dnl +dnl For example: GNOME_COMPILE_WARNINGS([maximum],[-Werror=some-flag -Wfoobar]) +AU_DEFUN([GNOME_COMPILE_WARNINGS],[ + dnl ****************************** + dnl More compiler warnings + dnl ****************************** + + AC_ARG_ENABLE(compile-warnings, + AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], + [Turn on compiler warnings]),, + [enable_compile_warnings="m4_default([$1],[yes])"]) + + if test "x$GCC" != xyes; then + enable_compile_warnings=no + fi + + warning_flags= + realsave_CFLAGS="$CFLAGS" + + dnl These are warning flags that aren't marked as fatal. Can be + dnl overridden on a per-project basis with -Wno-foo. + base_warn_flags=" \ + -Wall \ + -Wstrict-prototypes \ + -Wnested-externs \ + " + + dnl These compiler flags typically indicate very broken or suspicious + dnl code. Some of them such as implicit-function-declaration are + dnl just not default because gcc compiles a lot of legacy code. + dnl We choose to make this set into explicit errors. + base_error_flags=" \ + -Werror=missing-prototypes \ + -Werror=implicit-function-declaration \ + -Werror=pointer-arith \ + -Werror=init-self \ + -Werror=format-security \ + -Werror=format=2 \ + -Werror=missing-include-dirs \ + -Werror=return-type \ + " + + dnl Additional warning or error flags provided by the module author to + dnl allow stricter standards to be imposed on a per-module basis. + dnl The author can pass -W or -Werror flags here as they see fit. + additional_flags="m4_default([$2],[])" + + case "$enable_compile_warnings" in + no) + warning_flags="-w" + ;; + minimum) + warning_flags="-Wall" + ;; + yes|maximum|error) + warning_flags="$base_warn_flags $base_error_flags $additional_flags" + ;; + *) + AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) + ;; + esac + + if test "$enable_compile_warnings" = "error" ; then + warning_flags="$warning_flags -Werror" + fi + + dnl Check whether GCC supports the warning options + for option in $warning_flags; do + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" + AC_MSG_CHECKING([whether gcc understands $option]) + AC_TRY_COMPILE([], [], + has_option=yes, + has_option=no,) + CFLAGS="$save_CFLAGS" + AC_MSG_RESULT([$has_option]) + if test $has_option = yes; then + tested_warning_flags="$tested_warning_flags $option" + fi + unset has_option + unset save_CFLAGS + done + unset option + CFLAGS="$realsave_CFLAGS" + AC_MSG_CHECKING(what warning flags to pass to the C compiler) + AC_MSG_RESULT($tested_warning_flags) + + AC_ARG_ENABLE(iso-c, + AS_HELP_STRING([--enable-iso-c], + [Try to warn if code is not ISO C ]),, + [enable_iso_c=no]) + + AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) + complCFLAGS= + if test "x$enable_iso_c" != "xno"; then + if test "x$GCC" = "xyes"; then + case " $CFLAGS " in + *[\ \ ]-ansi[\ \ ]*) ;; + *) complCFLAGS="$complCFLAGS -ansi" ;; + esac + case " $CFLAGS " in + *[\ \ ]-pedantic[\ \ ]*) ;; + *) complCFLAGS="$complCFLAGS -pedantic" ;; + esac + fi + fi + AC_MSG_RESULT($complCFLAGS) + + WARN_CFLAGS="$tested_warning_flags $complCFLAGS" + AC_SUBST(WARN_CFLAGS) +], +[[$0: This macro is deprecated. You should use AX_COMPILER_FLAGS instead and +eliminate use of --enable-iso-c. +See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_compiler_flags]]) + +dnl For C++, do basically the same thing. + +AU_DEFUN([GNOME_CXX_WARNINGS],[ + AC_ARG_ENABLE(cxx-warnings, + AS_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] + [Turn on compiler warnings.]),, + [enable_cxx_warnings="m4_default([$1],[minimum])"]) + + AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) + warnCXXFLAGS= + if test "x$GXX" != xyes; then + enable_cxx_warnings=no + fi + if test "x$enable_cxx_warnings" != "xno"; then + if test "x$GXX" = "xyes"; then + case " $CXXFLAGS " in + *[\ \ ]-Wall[\ \ ]*) ;; + *) warnCXXFLAGS="-Wall -Wno-unused" ;; + esac + + ## -W is not all that useful. And it cannot be controlled + ## with individual -Wno-xxx flags, unlike -Wall + if test "x$enable_cxx_warnings" = "xyes"; then + warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" + fi + fi + fi + AC_MSG_RESULT($warnCXXFLAGS) + + AC_ARG_ENABLE(iso-cxx, + AS_HELP_STRING([--enable-iso-cxx], + [Try to warn if code is not ISO C++ ]),, + [enable_iso_cxx=no]) + + AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) + complCXXFLAGS= + if test "x$enable_iso_cxx" != "xno"; then + if test "x$GXX" = "xyes"; then + case " $CXXFLAGS " in + *[\ \ ]-ansi[\ \ ]*) ;; + *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; + esac + + case " $CXXFLAGS " in + *[\ \ ]-pedantic[\ \ ]*) ;; + *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; + esac + fi + fi + AC_MSG_RESULT($complCXXFLAGS) + + WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" + AC_SUBST(WARN_CXXFLAGS) +], +[[$0: This macro is deprecated. You should use AX_COMPILER_FLAGS instead and +eliminate use of --enable-iso-cxx. +See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_compiler_flags]]) diff -Nru gitg-3.22.0/m4/gsettings.m4 gitg-3.23.0/m4/gsettings.m4 --- gitg-3.22.0/m4/gsettings.m4 1970-01-01 00:00:00.000000000 +0000 +++ gitg-3.23.0/m4/gsettings.m4 2016-11-26 09:56:44.000000000 +0000 @@ -0,0 +1,83 @@ +dnl GLIB_GSETTINGS +dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether +dnl the schema should be compiled +dnl + +AC_DEFUN([GLIB_GSETTINGS], +[ + m4_pattern_allow([AM_V_GEN]) + AC_ARG_ENABLE(schemas-compile, + AS_HELP_STRING([--disable-schemas-compile], + [Disable regeneration of gschemas.compiled on install]), + [case ${enableval} in + yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; + no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; + esac]) + AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) + PKG_PROG_PKG_CONFIG([0.16]) + AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) + fi + AC_SUBST(GLIB_COMPILE_SCHEMAS) + if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then + ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) + else + ifelse([$1],,[:],[$1]) + fi + + GSETTINGS_RULES=' +.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas + +mostlyclean-am: clean-gsettings-schemas + +gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) + +%.gschema.valid: %.gschema.xml $(gsettings__enum_file) + $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@ + +all-am: $(gsettings_SCHEMAS:.xml=.valid) +uninstall-am: uninstall-gsettings-schemas +install-data-am: install-gsettings-schemas + +.SECONDARY: $(gsettings_SCHEMAS) + +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) + @$(NORMAL_INSTALL) + if test -n "$^"; then \ + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ + fi + +uninstall-gsettings-schemas: + @$(NORMAL_UNINSTALL) + @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) + +clean-gsettings-schemas: + rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) + +ifdef gsettings_ENUM_NAMESPACE +$(gsettings__enum_file): $(gsettings_ENUM_FILES) + $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ +endif +' + _GSETTINGS_SUBST(GSETTINGS_RULES) +]) + +dnl _GSETTINGS_SUBST(VARIABLE) +dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +AC_DEFUN([_GSETTINGS_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) diff -Nru gitg-3.22.0/m4/introspection.m4 gitg-3.23.0/m4/introspection.m4 --- gitg-3.22.0/m4/introspection.m4 1970-01-01 00:00:00.000000000 +0000 +++ gitg-3.23.0/m4/introspection.m4 2016-11-26 09:56:44.000000000 +0000 @@ -0,0 +1,96 @@ +dnl -*- mode: autoconf -*- +dnl Copyright 2009 Johan Dahlin +dnl +dnl This file is free software; the author(s) gives unlimited +dnl permission to copy and/or distribute it, with or without +dnl modifications, as long as this notice is preserved. +dnl + +# serial 1 + +m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([LT_INIT],[$0])dnl setup libtool first + + dnl enable/disable introspection + m4_if([$2], [require], + [dnl + enable_introspection=yes + ],[dnl + AC_ARG_ENABLE(introspection, + AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], + [Enable introspection for this build]),, + [enable_introspection=auto]) + ])dnl + + AC_MSG_CHECKING([for gobject-introspection]) + + dnl presence/version checking + AS_CASE([$enable_introspection], + [no], [dnl + found_introspection="no (disabled, use --enable-introspection to enable)" + ],dnl + [yes],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0],, + AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], + found_introspection=yes, + AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) + ],dnl + [auto],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) + dnl Canonicalize enable_introspection + enable_introspection=$found_introspection + ],dnl + [dnl + AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) + ])dnl + + AC_MSG_RESULT([$found_introspection]) + + INTROSPECTION_SCANNER= + INTROSPECTION_COMPILER= + INTROSPECTION_GENERATE= + INTROSPECTION_GIRDIR= + INTROSPECTION_TYPELIBDIR= + if test "x$found_introspection" = "xyes"; then + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection + fi + AC_SUBST(INTROSPECTION_SCANNER) + AC_SUBST(INTROSPECTION_COMPILER) + AC_SUBST(INTROSPECTION_GENERATE) + AC_SUBST(INTROSPECTION_GIRDIR) + AC_SUBST(INTROSPECTION_TYPELIBDIR) + AC_SUBST(INTROSPECTION_CFLAGS) + AC_SUBST(INTROSPECTION_LIBS) + AC_SUBST(INTROSPECTION_MAKEFILE) + + AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") +]) + + +dnl Usage: +dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) + +AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) +]) + +dnl Usage: +dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) + + +AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) +]) diff -Nru gitg-3.22.0/m4/pkg.m4 gitg-3.23.0/m4/pkg.m4 --- gitg-3.22.0/m4/pkg.m4 1970-01-01 00:00:00.000000000 +0000 +++ gitg-3.23.0/m4/pkg.m4 2016-11-26 09:56:44.000000000 +0000 @@ -0,0 +1,275 @@ +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29.1) +dnl +dnl Copyright © 2004 Scott James Remnant . +dnl Copyright © 2012-2015 Dan Nicholson +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29.1]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])dnl PKG_PROG_PKG_CONFIG + +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])dnl _PKG_CONFIG + +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])dnl _PKG_SHORT_ERRORS_SUPPORTED + + +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])dnl PKG_CHECK_MODULES + + +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_INSTALLDIR + + +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_NOARCH_INSTALLDIR + + +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])dnl PKG_CHECK_VAR diff -Nru gitg-3.22.0/Makefile.in gitg-3.23.0/Makefile.in --- gitg-3.22.0/Makefile.in 2016-09-18 12:01:37.000000000 +0000 +++ gitg-3.23.0/Makefile.in 2016-11-26 13:24:44.000000000 +0000 @@ -106,14 +106,16 @@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/gnome-compiler-flags.m4 \ + $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ @@ -251,13 +253,20 @@ libgitg/gitg-color.vala libgitg/gitg-commit-list-view.vala \ libgitg/gitg-commit-model.vala libgitg/gitg-commit.vala \ libgitg/gitg-credentials-manager.vala libgitg/gitg-date.vala \ - libgitg/gitg-diff-stat.vala libgitg/gitg-diff-view.vala \ - libgitg/gitg-diff-view-file.vala \ + libgitg/gitg-diff-stat.vala \ + libgitg/gitg-diff-image-composite.vala \ + libgitg/gitg-diff-image-difference.vala \ + libgitg/gitg-diff-image-overlay.vala \ + libgitg/gitg-diff-image-side-by-side.vala \ + libgitg/gitg-diff-image-slider.vala \ + libgitg/gitg-diff-image-surface-cache.vala \ + libgitg/gitg-diff-view.vala libgitg/gitg-diff-view-file.vala \ libgitg/gitg-diff-view-file-info.vala \ libgitg/gitg-diff-view-file-selectable.vala \ libgitg/gitg-diff-view-file-renderer.vala \ libgitg/gitg-diff-view-file-renderer-binary.vala \ libgitg/gitg-diff-view-file-renderer-text.vala \ + libgitg/gitg-diff-view-file-renderer-image.vala \ libgitg/gitg-diff-view-lines-renderer.vala \ libgitg/gitg-diff-selectable.vala \ libgitg/gitg-diff-view-commit-details.vala \ @@ -289,6 +298,12 @@ libgitg/libgitg_libgitg_1_0_la-gitg-credentials-manager.lo \ libgitg/libgitg_libgitg_1_0_la-gitg-date.lo \ libgitg/libgitg_libgitg_1_0_la-gitg-diff-stat.lo \ + libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-composite.lo \ + libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-difference.lo \ + libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-overlay.lo \ + libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-side-by-side.lo \ + libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-slider.lo \ + libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-surface-cache.lo \ libgitg/libgitg_libgitg_1_0_la-gitg-diff-view.lo \ libgitg/libgitg_libgitg_1_0_la-gitg-diff-view-file.lo \ libgitg/libgitg_libgitg_1_0_la-gitg-diff-view-file-info.lo \ @@ -296,6 +311,7 @@ libgitg/libgitg_libgitg_1_0_la-gitg-diff-view-file-renderer.lo \ libgitg/libgitg_libgitg_1_0_la-gitg-diff-view-file-renderer-binary.lo \ libgitg/libgitg_libgitg_1_0_la-gitg-diff-view-file-renderer-text.lo \ + libgitg/libgitg_libgitg_1_0_la-gitg-diff-view-file-renderer-image.lo \ libgitg/libgitg_libgitg_1_0_la-gitg-diff-view-lines-renderer.lo \ libgitg/libgitg_libgitg_1_0_la-gitg-diff-selectable.lo \ libgitg/libgitg_libgitg_1_0_la-gitg-diff-view-commit-details.lo \ @@ -902,10 +918,17 @@ libgitg/gitg-color.c libgitg/gitg-commit-list-view.c \ libgitg/gitg-commit-model.c libgitg/gitg-commit.c \ libgitg/gitg-credentials-manager.c libgitg/gitg-date.c \ + libgitg/gitg-diff-image-composite.c \ + libgitg/gitg-diff-image-difference.c \ + libgitg/gitg-diff-image-overlay.c \ + libgitg/gitg-diff-image-side-by-side.c \ + libgitg/gitg-diff-image-slider.c \ + libgitg/gitg-diff-image-surface-cache.c \ libgitg/gitg-diff-selectable.c libgitg/gitg-diff-stat.c \ libgitg/gitg-diff-view-commit-details.c \ libgitg/gitg-diff-view-file-info.c \ libgitg/gitg-diff-view-file-renderer-binary.c \ + libgitg/gitg-diff-view-file-renderer-image.c \ libgitg/gitg-diff-view-file-renderer-text.c \ libgitg/gitg-diff-view-file-renderer.c \ libgitg/gitg-diff-view-file-selectable.c \ @@ -1378,6 +1401,12 @@ libgitg/gitg-credentials-manager.vala \ libgitg/gitg-date.vala \ libgitg/gitg-diff-stat.vala \ + libgitg/gitg-diff-image-composite.vala \ + libgitg/gitg-diff-image-difference.vala \ + libgitg/gitg-diff-image-overlay.vala \ + libgitg/gitg-diff-image-side-by-side.vala \ + libgitg/gitg-diff-image-slider.vala \ + libgitg/gitg-diff-image-surface-cache.vala \ libgitg/gitg-diff-view.vala \ libgitg/gitg-diff-view-file.vala \ libgitg/gitg-diff-view-file-info.vala \ @@ -1385,6 +1414,7 @@ libgitg/gitg-diff-view-file-renderer.vala \ libgitg/gitg-diff-view-file-renderer-binary.vala \ libgitg/gitg-diff-view-file-renderer-text.vala \ + libgitg/gitg-diff-view-file-renderer-image.vala \ libgitg/gitg-diff-view-lines-renderer.vala \ libgitg/gitg-diff-selectable.vala \ libgitg/gitg-diff-view-commit-details.vala \ @@ -2195,6 +2225,18 @@ libgitg/$(DEPDIR)/$(am__dirstamp) libgitg/libgitg_libgitg_1_0_la-gitg-diff-stat.lo: \ libgitg/$(am__dirstamp) libgitg/$(DEPDIR)/$(am__dirstamp) +libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-composite.lo: \ + libgitg/$(am__dirstamp) libgitg/$(DEPDIR)/$(am__dirstamp) +libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-difference.lo: \ + libgitg/$(am__dirstamp) libgitg/$(DEPDIR)/$(am__dirstamp) +libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-overlay.lo: \ + libgitg/$(am__dirstamp) libgitg/$(DEPDIR)/$(am__dirstamp) +libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-side-by-side.lo: \ + libgitg/$(am__dirstamp) libgitg/$(DEPDIR)/$(am__dirstamp) +libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-slider.lo: \ + libgitg/$(am__dirstamp) libgitg/$(DEPDIR)/$(am__dirstamp) +libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-surface-cache.lo: \ + libgitg/$(am__dirstamp) libgitg/$(DEPDIR)/$(am__dirstamp) libgitg/libgitg_libgitg_1_0_la-gitg-diff-view.lo: \ libgitg/$(am__dirstamp) libgitg/$(DEPDIR)/$(am__dirstamp) libgitg/libgitg_libgitg_1_0_la-gitg-diff-view-file.lo: \ @@ -2209,6 +2251,8 @@ libgitg/$(am__dirstamp) libgitg/$(DEPDIR)/$(am__dirstamp) libgitg/libgitg_libgitg_1_0_la-gitg-diff-view-file-renderer-text.lo: \ libgitg/$(am__dirstamp) libgitg/$(DEPDIR)/$(am__dirstamp) +libgitg/libgitg_libgitg_1_0_la-gitg-diff-view-file-renderer-image.lo: \ + libgitg/$(am__dirstamp) libgitg/$(DEPDIR)/$(am__dirstamp) libgitg/libgitg_libgitg_1_0_la-gitg-diff-view-lines-renderer.lo: \ libgitg/$(am__dirstamp) libgitg/$(DEPDIR)/$(am__dirstamp) libgitg/libgitg_libgitg_1_0_la-gitg-diff-selectable.lo: \ @@ -2723,11 +2767,18 @@ @AMDEP_TRUE@@am__include@ @am__quote@libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-commit.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-credentials-manager.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-date.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-composite.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-difference.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-overlay.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-side-by-side.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-slider.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-surface-cache.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-selectable.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-stat.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-view-commit-details.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-view-file-info.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-view-file-renderer-binary.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-view-file-renderer-image.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-view-file-renderer-text.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-view-file-renderer.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-view-file-selectable.Plo@am__quote@ @@ -3099,6 +3150,48 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgitg_libgitg_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libgitg_libgitg_1_0_la_CFLAGS) $(CFLAGS) -c -o libgitg/libgitg_libgitg_1_0_la-gitg-diff-stat.lo `test -f 'libgitg/gitg-diff-stat.c' || echo '$(srcdir)/'`libgitg/gitg-diff-stat.c +libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-composite.lo: libgitg/gitg-diff-image-composite.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgitg_libgitg_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libgitg_libgitg_1_0_la_CFLAGS) $(CFLAGS) -MT libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-composite.lo -MD -MP -MF libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-composite.Tpo -c -o libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-composite.lo `test -f 'libgitg/gitg-diff-image-composite.c' || echo '$(srcdir)/'`libgitg/gitg-diff-image-composite.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-composite.Tpo libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-composite.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgitg/gitg-diff-image-composite.c' object='libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-composite.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgitg_libgitg_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libgitg_libgitg_1_0_la_CFLAGS) $(CFLAGS) -c -o libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-composite.lo `test -f 'libgitg/gitg-diff-image-composite.c' || echo '$(srcdir)/'`libgitg/gitg-diff-image-composite.c + +libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-difference.lo: libgitg/gitg-diff-image-difference.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgitg_libgitg_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libgitg_libgitg_1_0_la_CFLAGS) $(CFLAGS) -MT libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-difference.lo -MD -MP -MF libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-difference.Tpo -c -o libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-difference.lo `test -f 'libgitg/gitg-diff-image-difference.c' || echo '$(srcdir)/'`libgitg/gitg-diff-image-difference.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-difference.Tpo libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-difference.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgitg/gitg-diff-image-difference.c' object='libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-difference.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgitg_libgitg_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libgitg_libgitg_1_0_la_CFLAGS) $(CFLAGS) -c -o libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-difference.lo `test -f 'libgitg/gitg-diff-image-difference.c' || echo '$(srcdir)/'`libgitg/gitg-diff-image-difference.c + +libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-overlay.lo: libgitg/gitg-diff-image-overlay.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgitg_libgitg_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libgitg_libgitg_1_0_la_CFLAGS) $(CFLAGS) -MT libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-overlay.lo -MD -MP -MF libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-overlay.Tpo -c -o libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-overlay.lo `test -f 'libgitg/gitg-diff-image-overlay.c' || echo '$(srcdir)/'`libgitg/gitg-diff-image-overlay.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-overlay.Tpo libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-overlay.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgitg/gitg-diff-image-overlay.c' object='libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-overlay.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgitg_libgitg_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libgitg_libgitg_1_0_la_CFLAGS) $(CFLAGS) -c -o libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-overlay.lo `test -f 'libgitg/gitg-diff-image-overlay.c' || echo '$(srcdir)/'`libgitg/gitg-diff-image-overlay.c + +libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-side-by-side.lo: libgitg/gitg-diff-image-side-by-side.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgitg_libgitg_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libgitg_libgitg_1_0_la_CFLAGS) $(CFLAGS) -MT libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-side-by-side.lo -MD -MP -MF libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-side-by-side.Tpo -c -o libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-side-by-side.lo `test -f 'libgitg/gitg-diff-image-side-by-side.c' || echo '$(srcdir)/'`libgitg/gitg-diff-image-side-by-side.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-side-by-side.Tpo libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-side-by-side.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgitg/gitg-diff-image-side-by-side.c' object='libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-side-by-side.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgitg_libgitg_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libgitg_libgitg_1_0_la_CFLAGS) $(CFLAGS) -c -o libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-side-by-side.lo `test -f 'libgitg/gitg-diff-image-side-by-side.c' || echo '$(srcdir)/'`libgitg/gitg-diff-image-side-by-side.c + +libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-slider.lo: libgitg/gitg-diff-image-slider.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgitg_libgitg_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libgitg_libgitg_1_0_la_CFLAGS) $(CFLAGS) -MT libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-slider.lo -MD -MP -MF libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-slider.Tpo -c -o libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-slider.lo `test -f 'libgitg/gitg-diff-image-slider.c' || echo '$(srcdir)/'`libgitg/gitg-diff-image-slider.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-slider.Tpo libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-slider.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgitg/gitg-diff-image-slider.c' object='libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-slider.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgitg_libgitg_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libgitg_libgitg_1_0_la_CFLAGS) $(CFLAGS) -c -o libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-slider.lo `test -f 'libgitg/gitg-diff-image-slider.c' || echo '$(srcdir)/'`libgitg/gitg-diff-image-slider.c + +libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-surface-cache.lo: libgitg/gitg-diff-image-surface-cache.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgitg_libgitg_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libgitg_libgitg_1_0_la_CFLAGS) $(CFLAGS) -MT libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-surface-cache.lo -MD -MP -MF libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-surface-cache.Tpo -c -o libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-surface-cache.lo `test -f 'libgitg/gitg-diff-image-surface-cache.c' || echo '$(srcdir)/'`libgitg/gitg-diff-image-surface-cache.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-surface-cache.Tpo libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-image-surface-cache.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgitg/gitg-diff-image-surface-cache.c' object='libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-surface-cache.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgitg_libgitg_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libgitg_libgitg_1_0_la_CFLAGS) $(CFLAGS) -c -o libgitg/libgitg_libgitg_1_0_la-gitg-diff-image-surface-cache.lo `test -f 'libgitg/gitg-diff-image-surface-cache.c' || echo '$(srcdir)/'`libgitg/gitg-diff-image-surface-cache.c + libgitg/libgitg_libgitg_1_0_la-gitg-diff-view.lo: libgitg/gitg-diff-view.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgitg_libgitg_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libgitg_libgitg_1_0_la_CFLAGS) $(CFLAGS) -MT libgitg/libgitg_libgitg_1_0_la-gitg-diff-view.lo -MD -MP -MF libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-view.Tpo -c -o libgitg/libgitg_libgitg_1_0_la-gitg-diff-view.lo `test -f 'libgitg/gitg-diff-view.c' || echo '$(srcdir)/'`libgitg/gitg-diff-view.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-view.Tpo libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-view.Plo @@ -3148,6 +3241,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgitg_libgitg_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libgitg_libgitg_1_0_la_CFLAGS) $(CFLAGS) -c -o libgitg/libgitg_libgitg_1_0_la-gitg-diff-view-file-renderer-text.lo `test -f 'libgitg/gitg-diff-view-file-renderer-text.c' || echo '$(srcdir)/'`libgitg/gitg-diff-view-file-renderer-text.c +libgitg/libgitg_libgitg_1_0_la-gitg-diff-view-file-renderer-image.lo: libgitg/gitg-diff-view-file-renderer-image.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgitg_libgitg_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libgitg_libgitg_1_0_la_CFLAGS) $(CFLAGS) -MT libgitg/libgitg_libgitg_1_0_la-gitg-diff-view-file-renderer-image.lo -MD -MP -MF libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-view-file-renderer-image.Tpo -c -o libgitg/libgitg_libgitg_1_0_la-gitg-diff-view-file-renderer-image.lo `test -f 'libgitg/gitg-diff-view-file-renderer-image.c' || echo '$(srcdir)/'`libgitg/gitg-diff-view-file-renderer-image.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-view-file-renderer-image.Tpo libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-view-file-renderer-image.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgitg/gitg-diff-view-file-renderer-image.c' object='libgitg/libgitg_libgitg_1_0_la-gitg-diff-view-file-renderer-image.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgitg_libgitg_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libgitg_libgitg_1_0_la_CFLAGS) $(CFLAGS) -c -o libgitg/libgitg_libgitg_1_0_la-gitg-diff-view-file-renderer-image.lo `test -f 'libgitg/gitg-diff-view-file-renderer-image.c' || echo '$(srcdir)/'`libgitg/gitg-diff-view-file-renderer-image.c + libgitg/libgitg_libgitg_1_0_la-gitg-diff-view-lines-renderer.lo: libgitg/gitg-diff-view-lines-renderer.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgitg_libgitg_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libgitg_libgitg_1_0_la_CFLAGS) $(CFLAGS) -MT libgitg/libgitg_libgitg_1_0_la-gitg-diff-view-lines-renderer.lo -MD -MP -MF libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-view-lines-renderer.Tpo -c -o libgitg/libgitg_libgitg_1_0_la-gitg-diff-view-lines-renderer.lo `test -f 'libgitg/gitg-diff-view-lines-renderer.c' || echo '$(srcdir)/'`libgitg/gitg-diff-view-lines-renderer.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-view-lines-renderer.Tpo libgitg/$(DEPDIR)/libgitg_libgitg_1_0_la-gitg-diff-view-lines-renderer.Plo @@ -4407,59 +4507,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tests/repository-list-box.c' object='tests/tests_repository_list_box-repository-list-box.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_repository_list_box_CPPFLAGS) $(CPPFLAGS) $(tests_repository_list_box_CFLAGS) $(CFLAGS) -c -o tests/tests_repository_list_box-repository-list-box.obj `if test -f 'tests/repository-list-box.c'; then $(CYGPATH_W) 'tests/repository-list-box.c'; else $(CYGPATH_W) '$(srcdir)/tests/repository-list-box.c'; fi` -$(srcdir)/tests/diff-view.c: $(srcdir)/tests_diff_view_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_diff_view_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_diff_view_vala.stamp; \ - fi -$(srcdir)/tests_diff_view_vala.stamp: tests/diff-view.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi - $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(tests_diff_view_VALAFLAGS) $(VALAFLAGS) -C tests/diff-view.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi - $(AM_V_at)mv -f $@-t $@ -$(srcdir)/tests/libgitg/main.c: $(srcdir)/tests_libgitg_test_libgitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; \ - fi -$(srcdir)/tests/libgitg/test-stage.c: $(srcdir)/tests_libgitg_test_libgitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; \ - fi -$(srcdir)/tests/libgitg/test-date.c: $(srcdir)/tests_libgitg_test_libgitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; \ - fi -$(srcdir)/tests/libgitg/test-commit.c: $(srcdir)/tests_libgitg_test_libgitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; \ - fi -$(srcdir)/tests/libgitg/test-encoding.c: $(srcdir)/tests_libgitg_test_libgitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; \ - fi -$(srcdir)/tests/libgitg/support-test.c: $(srcdir)/tests_libgitg_test_libgitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; \ - fi -$(srcdir)/tests/libgitg/support-main.c: $(srcdir)/tests_libgitg_test_libgitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; \ - fi -$(srcdir)/tests/libgitg/support-repository.c: $(srcdir)/tests_libgitg_test_libgitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; \ - fi -$(srcdir)/tests_libgitg_test_libgitg_vala.stamp: tests/libgitg/main.vala tests/libgitg/test-stage.vala tests/libgitg/test-date.vala tests/libgitg/test-commit.vala tests/libgitg/test-encoding.vala tests/libgitg/support-test.vala tests/libgitg/support-main.vala tests/libgitg/support-repository.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi - $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(tests_libgitg_test_libgitg_VALAFLAGS) $(VALAFLAGS) -C tests/libgitg/main.vala tests/libgitg/test-stage.vala tests/libgitg/test-date.vala tests/libgitg/test-commit.vala tests/libgitg/test-encoding.vala tests/libgitg/support-test.vala tests/libgitg/support-main.vala tests/libgitg/support-repository.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi - $(AM_V_at)mv -f $@-t $@ $(srcdir)/tests/progress-bin.c: $(srcdir)/tests_progress_bin_vala.stamp @if test -f $@; then :; else rm -f $(srcdir)/tests_progress_bin_vala.stamp; fi @if test -f $@; then :; else \ @@ -4469,85 +4516,6 @@ $(AM_V_at)rm -f $@ && echo stamp > $@-t $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(tests_progress_bin_VALAFLAGS) $(VALAFLAGS) -C tests/progress-bin.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi $(AM_V_at)mv -f $@-t $@ -$(srcdir)/tests/gitg/main.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ - fi -$(srcdir)/tests/gitg/test-checkout-ref.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ - fi -$(srcdir)/tests/gitg/test-merge-ref.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ - fi -$(srcdir)/tests/gitg/test-cherry-pick-commit.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ - fi -$(srcdir)/tests/gitg/simple-notification-mock.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ - fi -$(srcdir)/tests/gitg/application-mock.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ - fi -$(srcdir)/tests/gitg/notifications-mock.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ - fi -$(srcdir)/tests/gitg/ref-action-interface-mock.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ - fi -$(srcdir)/tests/gitg/support-test.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ - fi -$(srcdir)/tests/gitg/support-main.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ - fi -$(srcdir)/tests/gitg/support-repository.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ - fi -$(srcdir)/tests/gitg/gitg-ref-action-checkout.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ - fi -$(srcdir)/tests/gitg/gitg-ref-action-merge.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ - fi -$(srcdir)/tests/gitg/gitg-commit-action-cherry-pick.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ - fi -$(srcdir)/tests/gitg/gitg-action-support.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ - fi -$(srcdir)/tests_gitg_test_gitg_vala.stamp: tests/gitg/main.vala tests/gitg/test-checkout-ref.vala tests/gitg/test-merge-ref.vala tests/gitg/test-cherry-pick-commit.vala tests/gitg/simple-notification-mock.vala tests/gitg/application-mock.vala tests/gitg/notifications-mock.vala tests/gitg/ref-action-interface-mock.vala tests/gitg/support-test.vala tests/gitg/support-main.vala tests/gitg/support-repository.vala tests/gitg/gitg-ref-action-checkout.vala tests/gitg/gitg-ref-action-merge.vala tests/gitg/gitg-commit-action-cherry-pick.vala tests/gitg/gitg-action-support.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi - $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(tests_gitg_test_gitg_VALAFLAGS) $(VALAFLAGS) -C tests/gitg/main.vala tests/gitg/test-checkout-ref.vala tests/gitg/test-merge-ref.vala tests/gitg/test-cherry-pick-commit.vala tests/gitg/simple-notification-mock.vala tests/gitg/application-mock.vala tests/gitg/notifications-mock.vala tests/gitg/ref-action-interface-mock.vala tests/gitg/support-test.vala tests/gitg/support-main.vala tests/gitg/support-repository.vala tests/gitg/gitg-ref-action-checkout.vala tests/gitg/gitg-ref-action-merge.vala tests/gitg/gitg-commit-action-cherry-pick.vala tests/gitg/gitg-action-support.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi - $(AM_V_at)mv -f $@-t $@ $(srcdir)/gitg/commit/gitg-commit-dialog.c: $(srcdir)/gitg_gitg_vala.stamp @if test -f $@; then :; else rm -f $(srcdir)/gitg_gitg_vala.stamp; fi @if test -f $@; then :; else \ @@ -4792,157 +4760,160 @@ $(AM_V_at)rm -f $@ && echo stamp > $@-t $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(gitg_gitg_VALAFLAGS) $(VALAFLAGS) -C gitg/commit/gitg-commit-dialog.vala gitg/commit/gitg-commit-paned.vala gitg/commit/gitg-commit-sidebar.vala gitg/commit/gitg-commit-submodule-diff-view.vala gitg/commit/gitg-commit-submodule-history-view.vala gitg/commit/gitg-commit-submodule-info.vala gitg/commit/gitg-commit.vala gitg/gitg-action-support.vala gitg/gitg-animated-paned.vala gitg/gitg-application.vala gitg/gitg-author-details-dialog.vala gitg/gitg-builder.vala gitg/gitg-clone-dialog.vala gitg/gitg-commit-action-create-branch.vala gitg/gitg-commit-action-create-patch.vala gitg/gitg-commit-action-create-tag.vala gitg/gitg-commit-action-cherry-pick.vala gitg/gitg-convert.vala gitg/gitg-create-branch-dialog.vala gitg/gitg-create-tag-dialog.vala gitg/gitg-dash-view.vala gitg/gitg-dirs.vala gitg/gitg-notifications.vala gitg/gitg-plugins-engine.vala gitg/gitg-popup-menu.vala gitg/gitg-recursive-monitor.vala gitg/gitg-recursive-scanner.vala gitg/gitg-ref-action-checkout.vala gitg/gitg-ref-action-copy-name.vala gitg/gitg-ref-action-delete.vala gitg/gitg-ref-action-fetch.vala gitg/gitg-ref-action-merge.vala gitg/gitg-ref-action-rename.vala gitg/gitg-remote-manager.vala gitg/gitg-remote-notification.vala gitg/gitg-simple-notification.vala gitg/gitg-ui-elements.vala gitg/gitg-window.vala gitg/gitg.vala gitg/history/gitg-history-action-interface.vala gitg/history/gitg-history-command-line.vala gitg/history/gitg-history-paned.vala gitg/history/gitg-history-refs-list.vala gitg/history/gitg-history.vala gitg/preferences/gitg-preferences-commit.vala gitg/preferences/gitg-preferences-dialog.vala gitg/preferences/gitg-preferences-history.vala gitg/preferences/gitg-preferences-interface.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi $(AM_V_at)mv -f $@-t $@ -$(srcdir)/tests/repository-list-box.c: $(srcdir)/tests_repository_list_box_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/tests_repository_list_box_vala.stamp; fi +$(srcdir)/tests/diff-view.c: $(srcdir)/tests_diff_view_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_diff_view_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_repository_list_box_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_diff_view_vala.stamp; \ fi -$(srcdir)/tests_repository_list_box_vala.stamp: tests/repository-list-box.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi +$(srcdir)/tests_diff_view_vala.stamp: tests/diff-view.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(tests_repository_list_box_VALAFLAGS) $(VALAFLAGS) -C tests/repository-list-box.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(tests_diff_view_VALAFLAGS) $(VALAFLAGS) -C tests/diff-view.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi $(AM_V_at)mv -f $@-t $@ -$(srcdir)/plugins/diff/gitg-diff.c: $(srcdir)/plugins_diff_libdiff_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_diff_libdiff_la_vala.stamp; fi +$(srcdir)/tests/libgitg/main.c: $(srcdir)/tests_libgitg_test_libgitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_diff_libdiff_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; \ fi -$(srcdir)/plugins_diff_libdiff_la_vala.stamp: plugins/diff/gitg-diff.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi - $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_diff_libdiff_la_VALAFLAGS) $(VALAFLAGS) -C plugins/diff/gitg-diff.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi - $(AM_V_at)mv -f $@-t $@ -$(srcdir)/libgitg-ext/gitg-ext-action.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests/libgitg/test-stage.c: $(srcdir)/tests_libgitg_test_libgitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; \ fi -$(srcdir)/libgitg-ext/gitg-ext-activity.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests/libgitg/test-date.c: $(srcdir)/tests_libgitg_test_libgitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; \ fi -$(srcdir)/libgitg-ext/gitg-ext-application.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests/libgitg/test-commit.c: $(srcdir)/tests_libgitg_test_libgitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; \ fi -$(srcdir)/libgitg-ext/gitg-ext-assembly-info.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests/libgitg/test-encoding.c: $(srcdir)/tests_libgitg_test_libgitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; \ fi -$(srcdir)/libgitg-ext/gitg-ext-command-line.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests/libgitg/support-test.c: $(srcdir)/tests_libgitg_test_libgitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; \ fi -$(srcdir)/libgitg-ext/gitg-ext-command-lines.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests/libgitg/support-main.c: $(srcdir)/tests_libgitg_test_libgitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; \ fi -$(srcdir)/libgitg-ext/gitg-ext-commit-action.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests/libgitg/support-repository.c: $(srcdir)/tests_libgitg_test_libgitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_libgitg_test_libgitg_vala.stamp; \ fi -$(srcdir)/libgitg-ext/gitg-ext-history-panel.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests_libgitg_test_libgitg_vala.stamp: tests/libgitg/main.vala tests/libgitg/test-stage.vala tests/libgitg/test-date.vala tests/libgitg/test-commit.vala tests/libgitg/test-encoding.vala tests/libgitg/support-test.vala tests/libgitg/support-main.vala tests/libgitg/support-repository.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi + $(AM_V_at)rm -f $@ && echo stamp > $@-t + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(tests_libgitg_test_libgitg_VALAFLAGS) $(VALAFLAGS) -C tests/libgitg/main.vala tests/libgitg/test-stage.vala tests/libgitg/test-date.vala tests/libgitg/test-commit.vala tests/libgitg/test-encoding.vala tests/libgitg/support-test.vala tests/libgitg/support-main.vala tests/libgitg/support-repository.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi + $(AM_V_at)mv -f $@-t $@ +$(srcdir)/tests/repository-list-box.c: $(srcdir)/tests_repository_list_box_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_repository_list_box_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_repository_list_box_vala.stamp; \ fi -$(srcdir)/libgitg-ext/gitg-ext-history.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests_repository_list_box_vala.stamp: tests/repository-list-box.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi + $(AM_V_at)rm -f $@ && echo stamp > $@-t + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(tests_repository_list_box_VALAFLAGS) $(VALAFLAGS) -C tests/repository-list-box.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi + $(AM_V_at)mv -f $@-t $@ +$(srcdir)/tests/gitg/main.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ fi -$(srcdir)/libgitg-ext/gitg-ext-message-bus.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests/gitg/test-checkout-ref.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ fi -$(srcdir)/libgitg-ext/gitg-ext-message-id.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests/gitg/test-merge-ref.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ fi -$(srcdir)/libgitg-ext/gitg-ext-message.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests/gitg/test-cherry-pick-commit.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ fi -$(srcdir)/libgitg-ext/gitg-ext-notification.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ - fi -$(srcdir)/libgitg-ext/gitg-ext-notifications.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests/gitg/simple-notification-mock.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ fi -$(srcdir)/libgitg-ext/gitg-ext-preferences.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests/gitg/application-mock.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ fi -$(srcdir)/libgitg-ext/gitg-ext-ref-action-interface.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests/gitg/notifications-mock.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ fi -$(srcdir)/libgitg-ext/gitg-ext-ref-action.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests/gitg/ref-action-interface-mock.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ fi -$(srcdir)/libgitg-ext/gitg-ext-remote-lookup.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests/gitg/support-test.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ fi -$(srcdir)/libgitg-ext/gitg-ext-searchable.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests/gitg/support-main.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ fi -$(srcdir)/libgitg-ext/gitg-ext-selectable.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests/gitg/support-repository.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ fi -$(srcdir)/libgitg-ext/gitg-ext-ui-element.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests/gitg/gitg-ref-action-checkout.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ fi -$(srcdir)/libgitg-ext/gitg-ext-ui.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests/gitg/gitg-ref-action-merge.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ fi -$(srcdir)/libgitg-ext/gitg-ext-user-query.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests/gitg/gitg-commit-action-cherry-pick.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ fi -$(srcdir)/GitgExt-1.0.gir: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests/gitg/gitg-action-support.c: $(srcdir)/tests_gitg_test_gitg_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tests_gitg_test_gitg_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/tests_gitg_test_gitg_vala.stamp; \ fi -$(srcdir)/libgitg-ext/libgitg-ext-1.0.vapi: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/tests_gitg_test_gitg_vala.stamp: tests/gitg/main.vala tests/gitg/test-checkout-ref.vala tests/gitg/test-merge-ref.vala tests/gitg/test-cherry-pick-commit.vala tests/gitg/simple-notification-mock.vala tests/gitg/application-mock.vala tests/gitg/notifications-mock.vala tests/gitg/ref-action-interface-mock.vala tests/gitg/support-test.vala tests/gitg/support-main.vala tests/gitg/support-repository.vala tests/gitg/gitg-ref-action-checkout.vala tests/gitg/gitg-ref-action-merge.vala tests/gitg/gitg-commit-action-cherry-pick.vala tests/gitg/gitg-action-support.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi + $(AM_V_at)rm -f $@ && echo stamp > $@-t + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(tests_gitg_test_gitg_VALAFLAGS) $(VALAFLAGS) -C tests/gitg/main.vala tests/gitg/test-checkout-ref.vala tests/gitg/test-merge-ref.vala tests/gitg/test-cherry-pick-commit.vala tests/gitg/simple-notification-mock.vala tests/gitg/application-mock.vala tests/gitg/notifications-mock.vala tests/gitg/ref-action-interface-mock.vala tests/gitg/support-test.vala tests/gitg/support-main.vala tests/gitg/support-repository.vala tests/gitg/gitg-ref-action-checkout.vala tests/gitg/gitg-ref-action-merge.vala tests/gitg/gitg-commit-action-cherry-pick.vala tests/gitg/gitg-action-support.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi + $(AM_V_at)mv -f $@-t $@ +$(srcdir)/plugins/files/gitg-files.c: $(srcdir)/plugins_files_libfiles_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_files_libfiles_la_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_files_libfiles_la_vala.stamp; \ fi -$(srcdir)/libgitg-ext/libgitg-ext.h: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi +$(srcdir)/plugins/files/gitg-files-tree-store.c: $(srcdir)/plugins_files_libfiles_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_files_libfiles_la_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_files_libfiles_la_vala.stamp; \ fi -$(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp: libgitg-ext/gitg-ext-action.vala libgitg-ext/gitg-ext-activity.vala libgitg-ext/gitg-ext-application.vala libgitg-ext/gitg-ext-assembly-info.vala libgitg-ext/gitg-ext-command-line.vala libgitg-ext/gitg-ext-command-lines.vala libgitg-ext/gitg-ext-commit-action.vala libgitg-ext/gitg-ext-history-panel.vala libgitg-ext/gitg-ext-history.vala libgitg-ext/gitg-ext-message-bus.vala libgitg-ext/gitg-ext-message-id.vala libgitg-ext/gitg-ext-message.vala libgitg-ext/gitg-ext-notification.vala libgitg-ext/gitg-ext-notifications.vala libgitg-ext/gitg-ext-preferences.vala libgitg-ext/gitg-ext-ref-action-interface.vala libgitg-ext/gitg-ext-ref-action.vala libgitg-ext/gitg-ext-remote-lookup.vala libgitg-ext/gitg-ext-searchable.vala libgitg-ext/gitg-ext-selectable.vala libgitg-ext/gitg-ext-ui-element.vala libgitg-ext/gitg-ext-ui.vala libgitg-ext/gitg-ext-user-query.vala libgitg/libgitg-1.0.vapi +$(srcdir)/plugins_files_libfiles_la_vala.stamp: plugins/files/gitg-files.vala plugins/files/gitg-files-tree-store.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(libgitg_ext_libgitg_ext_1_0_la_VALAFLAGS) $(VALAFLAGS) -C libgitg-ext/gitg-ext-action.vala libgitg-ext/gitg-ext-activity.vala libgitg-ext/gitg-ext-application.vala libgitg-ext/gitg-ext-assembly-info.vala libgitg-ext/gitg-ext-command-line.vala libgitg-ext/gitg-ext-command-lines.vala libgitg-ext/gitg-ext-commit-action.vala libgitg-ext/gitg-ext-history-panel.vala libgitg-ext/gitg-ext-history.vala libgitg-ext/gitg-ext-message-bus.vala libgitg-ext/gitg-ext-message-id.vala libgitg-ext/gitg-ext-message.vala libgitg-ext/gitg-ext-notification.vala libgitg-ext/gitg-ext-notifications.vala libgitg-ext/gitg-ext-preferences.vala libgitg-ext/gitg-ext-ref-action-interface.vala libgitg-ext/gitg-ext-ref-action.vala libgitg-ext/gitg-ext-remote-lookup.vala libgitg-ext/gitg-ext-searchable.vala libgitg-ext/gitg-ext-selectable.vala libgitg-ext/gitg-ext-ui-element.vala libgitg-ext/gitg-ext-ui.vala libgitg-ext/gitg-ext-user-query.vala libgitg/libgitg-1.0.vapi + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_files_libfiles_la_VALAFLAGS) $(VALAFLAGS) -C plugins/files/gitg-files.vala plugins/files/gitg-files-tree-store.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi $(AM_V_at)mv -f $@-t $@ $(srcdir)/libgitg/gitg-assembly-info.c: $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp @if test -f $@; then :; else rm -f $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp; fi @@ -5014,6 +4985,36 @@ @if test -f $@; then :; else \ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp; \ fi +$(srcdir)/libgitg/gitg-diff-image-composite.c: $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg/gitg-diff-image-difference.c: $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg/gitg-diff-image-overlay.c: $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg/gitg-diff-image-side-by-side.c: $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg/gitg-diff-image-slider.c: $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg/gitg-diff-image-surface-cache.c: $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp; \ + fi $(srcdir)/libgitg/gitg-diff-view.c: $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp @if test -f $@; then :; else rm -f $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp; fi @if test -f $@; then :; else \ @@ -5049,6 +5050,11 @@ @if test -f $@; then :; else \ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp; \ fi +$(srcdir)/libgitg/gitg-diff-view-file-renderer-image.c: $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp; \ + fi $(srcdir)/libgitg/gitg-diff-view-lines-renderer.c: $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp @if test -f $@; then :; else rm -f $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp; fi @if test -f $@; then :; else \ @@ -5169,23 +5175,152 @@ @if test -f $@; then :; else \ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_libgitg_1_0_la_vala.stamp; \ fi -$(srcdir)/libgitg_libgitg_1_0_la_vala.stamp: libgitg/gitg-assembly-info.vala libgitg/gitg-async.vala libgitg/gitg-authentication-dialog.vala libgitg/gitg-avatar-cache.vala libgitg/gitg-branch-base.vala libgitg/gitg-branch.vala libgitg/gitg-cell-renderer-lanes.vala libgitg/gitg-color.vala libgitg/gitg-commit-list-view.vala libgitg/gitg-commit-model.vala libgitg/gitg-commit.vala libgitg/gitg-credentials-manager.vala libgitg/gitg-date.vala libgitg/gitg-diff-stat.vala libgitg/gitg-diff-view.vala libgitg/gitg-diff-view-file.vala libgitg/gitg-diff-view-file-info.vala libgitg/gitg-diff-view-file-selectable.vala libgitg/gitg-diff-view-file-renderer.vala libgitg/gitg-diff-view-file-renderer-binary.vala libgitg/gitg-diff-view-file-renderer-text.vala libgitg/gitg-diff-view-lines-renderer.vala libgitg/gitg-diff-selectable.vala libgitg/gitg-diff-view-commit-details.vala libgitg/gitg-diff-view-options.vala libgitg/gitg-hook.vala libgitg/gitg-init.vala libgitg/gitg-label-renderer.vala libgitg/gitg-lane.vala libgitg/gitg-lanes.vala libgitg/gitg-progress-bin.vala libgitg/gitg-ref-base.vala libgitg/gitg-ref.vala libgitg/gitg-remote.vala libgitg/gitg-repository-list-box.vala libgitg/gitg-repository.vala libgitg/gitg-resource.vala libgitg/gitg-sidebar.vala libgitg/gitg-stage-status-enumerator.vala libgitg/gitg-stage.vala libgitg/gitg-utils.vala libgitg/gitg-when-mapped.vala +$(srcdir)/libgitg_libgitg_1_0_la_vala.stamp: libgitg/gitg-assembly-info.vala libgitg/gitg-async.vala libgitg/gitg-authentication-dialog.vala libgitg/gitg-avatar-cache.vala libgitg/gitg-branch-base.vala libgitg/gitg-branch.vala libgitg/gitg-cell-renderer-lanes.vala libgitg/gitg-color.vala libgitg/gitg-commit-list-view.vala libgitg/gitg-commit-model.vala libgitg/gitg-commit.vala libgitg/gitg-credentials-manager.vala libgitg/gitg-date.vala libgitg/gitg-diff-stat.vala libgitg/gitg-diff-image-composite.vala libgitg/gitg-diff-image-difference.vala libgitg/gitg-diff-image-overlay.vala libgitg/gitg-diff-image-side-by-side.vala libgitg/gitg-diff-image-slider.vala libgitg/gitg-diff-image-surface-cache.vala libgitg/gitg-diff-view.vala libgitg/gitg-diff-view-file.vala libgitg/gitg-diff-view-file-info.vala libgitg/gitg-diff-view-file-selectable.vala libgitg/gitg-diff-view-file-renderer.vala libgitg/gitg-diff-view-file-renderer-binary.vala libgitg/gitg-diff-view-file-renderer-text.vala libgitg/gitg-diff-view-file-renderer-image.vala libgitg/gitg-diff-view-lines-renderer.vala libgitg/gitg-diff-selectable.vala libgitg/gitg-diff-view-commit-details.vala libgitg/gitg-diff-view-options.vala libgitg/gitg-hook.vala libgitg/gitg-init.vala libgitg/gitg-label-renderer.vala libgitg/gitg-lane.vala libgitg/gitg-lanes.vala libgitg/gitg-progress-bin.vala libgitg/gitg-ref-base.vala libgitg/gitg-ref.vala libgitg/gitg-remote.vala libgitg/gitg-repository-list-box.vala libgitg/gitg-repository.vala libgitg/gitg-resource.vala libgitg/gitg-sidebar.vala libgitg/gitg-stage-status-enumerator.vala libgitg/gitg-stage.vala libgitg/gitg-utils.vala libgitg/gitg-when-mapped.vala $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(libgitg_libgitg_1_0_la_VALAFLAGS) $(VALAFLAGS) -C libgitg/gitg-assembly-info.vala libgitg/gitg-async.vala libgitg/gitg-authentication-dialog.vala libgitg/gitg-avatar-cache.vala libgitg/gitg-branch-base.vala libgitg/gitg-branch.vala libgitg/gitg-cell-renderer-lanes.vala libgitg/gitg-color.vala libgitg/gitg-commit-list-view.vala libgitg/gitg-commit-model.vala libgitg/gitg-commit.vala libgitg/gitg-credentials-manager.vala libgitg/gitg-date.vala libgitg/gitg-diff-stat.vala libgitg/gitg-diff-view.vala libgitg/gitg-diff-view-file.vala libgitg/gitg-diff-view-file-info.vala libgitg/gitg-diff-view-file-selectable.vala libgitg/gitg-diff-view-file-renderer.vala libgitg/gitg-diff-view-file-renderer-binary.vala libgitg/gitg-diff-view-file-renderer-text.vala libgitg/gitg-diff-view-lines-renderer.vala libgitg/gitg-diff-selectable.vala libgitg/gitg-diff-view-commit-details.vala libgitg/gitg-diff-view-options.vala libgitg/gitg-hook.vala libgitg/gitg-init.vala libgitg/gitg-label-renderer.vala libgitg/gitg-lane.vala libgitg/gitg-lanes.vala libgitg/gitg-progress-bin.vala libgitg/gitg-ref-base.vala libgitg/gitg-ref.vala libgitg/gitg-remote.vala libgitg/gitg-repository-list-box.vala libgitg/gitg-repository.vala libgitg/gitg-resource.vala libgitg/gitg-sidebar.vala libgitg/gitg-stage-status-enumerator.vala libgitg/gitg-stage.vala libgitg/gitg-utils.vala libgitg/gitg-when-mapped.vala + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(libgitg_libgitg_1_0_la_VALAFLAGS) $(VALAFLAGS) -C libgitg/gitg-assembly-info.vala libgitg/gitg-async.vala libgitg/gitg-authentication-dialog.vala libgitg/gitg-avatar-cache.vala libgitg/gitg-branch-base.vala libgitg/gitg-branch.vala libgitg/gitg-cell-renderer-lanes.vala libgitg/gitg-color.vala libgitg/gitg-commit-list-view.vala libgitg/gitg-commit-model.vala libgitg/gitg-commit.vala libgitg/gitg-credentials-manager.vala libgitg/gitg-date.vala libgitg/gitg-diff-stat.vala libgitg/gitg-diff-image-composite.vala libgitg/gitg-diff-image-difference.vala libgitg/gitg-diff-image-overlay.vala libgitg/gitg-diff-image-side-by-side.vala libgitg/gitg-diff-image-slider.vala libgitg/gitg-diff-image-surface-cache.vala libgitg/gitg-diff-view.vala libgitg/gitg-diff-view-file.vala libgitg/gitg-diff-view-file-info.vala libgitg/gitg-diff-view-file-selectable.vala libgitg/gitg-diff-view-file-renderer.vala libgitg/gitg-diff-view-file-renderer-binary.vala libgitg/gitg-diff-view-file-renderer-text.vala libgitg/gitg-diff-view-file-renderer-image.vala libgitg/gitg-diff-view-lines-renderer.vala libgitg/gitg-diff-selectable.vala libgitg/gitg-diff-view-commit-details.vala libgitg/gitg-diff-view-options.vala libgitg/gitg-hook.vala libgitg/gitg-init.vala libgitg/gitg-label-renderer.vala libgitg/gitg-lane.vala libgitg/gitg-lanes.vala libgitg/gitg-progress-bin.vala libgitg/gitg-ref-base.vala libgitg/gitg-ref.vala libgitg/gitg-remote.vala libgitg/gitg-repository-list-box.vala libgitg/gitg-repository.vala libgitg/gitg-resource.vala libgitg/gitg-sidebar.vala libgitg/gitg-stage-status-enumerator.vala libgitg/gitg-stage.vala libgitg/gitg-utils.vala libgitg/gitg-when-mapped.vala $(AM_V_at)mv -f $@-t $@ -$(srcdir)/plugins/files/gitg-files.c: $(srcdir)/plugins_files_libfiles_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_files_libfiles_la_vala.stamp; fi +$(srcdir)/plugins/diff/gitg-diff.c: $(srcdir)/plugins_diff_libdiff_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/plugins_diff_libdiff_la_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_files_libfiles_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_diff_libdiff_la_vala.stamp; \ fi -$(srcdir)/plugins/files/gitg-files-tree-store.c: $(srcdir)/plugins_files_libfiles_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_files_libfiles_la_vala.stamp; fi +$(srcdir)/plugins_diff_libdiff_la_vala.stamp: plugins/diff/gitg-diff.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi + $(AM_V_at)rm -f $@ && echo stamp > $@-t + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_diff_libdiff_la_VALAFLAGS) $(VALAFLAGS) -C plugins/diff/gitg-diff.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi + $(AM_V_at)mv -f $@-t $@ +$(srcdir)/libgitg-ext/gitg-ext-action.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_files_libfiles_la_vala.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ fi -$(srcdir)/plugins_files_libfiles_la_vala.stamp: plugins/files/gitg-files.vala plugins/files/gitg-files-tree-store.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi +$(srcdir)/libgitg-ext/gitg-ext-activity.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/gitg-ext-application.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/gitg-ext-assembly-info.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/gitg-ext-command-line.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/gitg-ext-command-lines.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/gitg-ext-commit-action.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/gitg-ext-history-panel.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/gitg-ext-history.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/gitg-ext-message-bus.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/gitg-ext-message-id.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/gitg-ext-message.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/gitg-ext-notification.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/gitg-ext-notifications.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/gitg-ext-preferences.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/gitg-ext-ref-action-interface.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/gitg-ext-ref-action.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/gitg-ext-remote-lookup.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/gitg-ext-searchable.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/gitg-ext-selectable.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/gitg-ext-ui-element.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/gitg-ext-ui.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/gitg-ext-user-query.c: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/GitgExt-1.0.gir: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/libgitg-ext-1.0.vapi: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg-ext/libgitg-ext.h: $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; fi + @if test -f $@; then :; else \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp; \ + fi +$(srcdir)/libgitg_ext_libgitg_ext_1_0_la_vala.stamp: libgitg-ext/gitg-ext-action.vala libgitg-ext/gitg-ext-activity.vala libgitg-ext/gitg-ext-application.vala libgitg-ext/gitg-ext-assembly-info.vala libgitg-ext/gitg-ext-command-line.vala libgitg-ext/gitg-ext-command-lines.vala libgitg-ext/gitg-ext-commit-action.vala libgitg-ext/gitg-ext-history-panel.vala libgitg-ext/gitg-ext-history.vala libgitg-ext/gitg-ext-message-bus.vala libgitg-ext/gitg-ext-message-id.vala libgitg-ext/gitg-ext-message.vala libgitg-ext/gitg-ext-notification.vala libgitg-ext/gitg-ext-notifications.vala libgitg-ext/gitg-ext-preferences.vala libgitg-ext/gitg-ext-ref-action-interface.vala libgitg-ext/gitg-ext-ref-action.vala libgitg-ext/gitg-ext-remote-lookup.vala libgitg-ext/gitg-ext-searchable.vala libgitg-ext/gitg-ext-selectable.vala libgitg-ext/gitg-ext-ui-element.vala libgitg-ext/gitg-ext-ui.vala libgitg-ext/gitg-ext-user-query.vala libgitg/libgitg-1.0.vapi $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_files_libfiles_la_VALAFLAGS) $(VALAFLAGS) -C plugins/files/gitg-files.vala plugins/files/gitg-files-tree-store.vala libgitg-ext/libgitg-ext-1.0.vapi libgitg/libgitg-1.0.vapi + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(libgitg_ext_libgitg_ext_1_0_la_VALAFLAGS) $(VALAFLAGS) -C libgitg-ext/gitg-ext-action.vala libgitg-ext/gitg-ext-activity.vala libgitg-ext/gitg-ext-application.vala libgitg-ext/gitg-ext-assembly-info.vala libgitg-ext/gitg-ext-command-line.vala libgitg-ext/gitg-ext-command-lines.vala libgitg-ext/gitg-ext-commit-action.vala libgitg-ext/gitg-ext-history-panel.vala libgitg-ext/gitg-ext-history.vala libgitg-ext/gitg-ext-message-bus.vala libgitg-ext/gitg-ext-message-id.vala libgitg-ext/gitg-ext-message.vala libgitg-ext/gitg-ext-notification.vala libgitg-ext/gitg-ext-notifications.vala libgitg-ext/gitg-ext-preferences.vala libgitg-ext/gitg-ext-ref-action-interface.vala libgitg-ext/gitg-ext-ref-action.vala libgitg-ext/gitg-ext-remote-lookup.vala libgitg-ext/gitg-ext-searchable.vala libgitg-ext/gitg-ext-selectable.vala libgitg-ext/gitg-ext-ui-element.vala libgitg-ext/gitg-ext-ui.vala libgitg-ext/gitg-ext-user-query.vala libgitg/libgitg-1.0.vapi $(AM_V_at)mv -f $@-t $@ mostlyclean-libtool: @@ -6260,11 +6395,18 @@ -rm -f $(srcdir)/libgitg/gitg-commit.c -rm -f $(srcdir)/libgitg/gitg-credentials-manager.c -rm -f $(srcdir)/libgitg/gitg-date.c + -rm -f $(srcdir)/libgitg/gitg-diff-image-composite.c + -rm -f $(srcdir)/libgitg/gitg-diff-image-difference.c + -rm -f $(srcdir)/libgitg/gitg-diff-image-overlay.c + -rm -f $(srcdir)/libgitg/gitg-diff-image-side-by-side.c + -rm -f $(srcdir)/libgitg/gitg-diff-image-slider.c + -rm -f $(srcdir)/libgitg/gitg-diff-image-surface-cache.c -rm -f $(srcdir)/libgitg/gitg-diff-selectable.c -rm -f $(srcdir)/libgitg/gitg-diff-stat.c -rm -f $(srcdir)/libgitg/gitg-diff-view-commit-details.c -rm -f $(srcdir)/libgitg/gitg-diff-view-file-info.c -rm -f $(srcdir)/libgitg/gitg-diff-view-file-renderer-binary.c + -rm -f $(srcdir)/libgitg/gitg-diff-view-file-renderer-image.c -rm -f $(srcdir)/libgitg/gitg-diff-view-file-renderer-text.c -rm -f $(srcdir)/libgitg/gitg-diff-view-file-renderer.c -rm -f $(srcdir)/libgitg/gitg-diff-view-file-selectable.c @@ -6413,11 +6555,18 @@ -rm -f libgitg/gitg-commit.c -rm -f libgitg/gitg-credentials-manager.c -rm -f libgitg/gitg-date.c + -rm -f libgitg/gitg-diff-image-composite.c + -rm -f libgitg/gitg-diff-image-difference.c + -rm -f libgitg/gitg-diff-image-overlay.c + -rm -f libgitg/gitg-diff-image-side-by-side.c + -rm -f libgitg/gitg-diff-image-slider.c + -rm -f libgitg/gitg-diff-image-surface-cache.c -rm -f libgitg/gitg-diff-selectable.c -rm -f libgitg/gitg-diff-stat.c -rm -f libgitg/gitg-diff-view-commit-details.c -rm -f libgitg/gitg-diff-view-file-info.c -rm -f libgitg/gitg-diff-view-file-renderer-binary.c + -rm -f libgitg/gitg-diff-view-file-renderer-image.c -rm -f libgitg/gitg-diff-view-file-renderer-text.c -rm -f libgitg/gitg-diff-view-file-renderer.c -rm -f libgitg/gitg-diff-view-file-selectable.c diff -Nru gitg-3.22.0/NEWS gitg-3.23.0/NEWS --- gitg-3.22.0/NEWS 2016-09-18 12:00:53.000000000 +0000 +++ gitg-3.23.0/NEWS 2016-11-26 08:32:25.000000000 +0000 @@ -1,13 +1,3 @@ -= gitg 3.22.0 = -Version 3.22.0 was released on 2016-09-18 - -= gitg 3.21.92 = -Version 3.21.92 was released on 2016-09-12 - -== Bugs fixed == -- Show dash activity menu if shell does not show app menu -- Use same callbacks instance during remote connection life cycle - = gitg 3.21.91 = Version 3.21.91 was released on 2016-08-27 diff -Nru gitg-3.22.0/plugins/diff/gitg-diff.c gitg-3.23.0/plugins/diff/gitg-diff.c --- gitg-3.22.0/plugins/diff/gitg-diff.c 2016-09-18 12:01:49.000000000 +0000 +++ gitg-3.23.0/plugins/diff/gitg-diff.c 2016-11-26 13:23:43.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-diff.c generated by valac 0.32.1, the Vala compiler +/* gitg-diff.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-diff.vala, do not modify */ /* @@ -81,8 +81,8 @@ static gpointer gitg_diff_panel_parent_class = NULL; -static GitgExtUIElementIface* gitg_diff_panel_gitg_ext_ui_element_parent_iface = NULL; -static GitgExtHistoryPanelIface* gitg_diff_panel_gitg_ext_history_panel_parent_iface = NULL; +static GitgExtUIElementIface * gitg_diff_panel_gitg_ext_ui_element_parent_iface = NULL; +static GitgExtHistoryPanelIface * gitg_diff_panel_gitg_ext_history_panel_parent_iface = NULL; static GType gitg_diff_panel_type_id = 0; GType gitg_diff_panel_get_type (void) G_GNUC_CONST; @@ -116,7 +116,7 @@ static gint gitg_diff_panel_real_negotiate_order (GitgExtUIElement* base, GitgExtUIElement* other); GitgDiffPanel* gitg_diff_panel_new (void); GitgDiffPanel* gitg_diff_panel_construct (GType object_type); -static void gitg_diff_panel_finalize (GObject* obj); +static void gitg_diff_panel_finalize (GObject * obj); static void _vala_gitg_diff_panel_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_diff_panel_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); void peas_register_types (GTypeModule* module); @@ -622,21 +622,25 @@ static void gitg_diff_panel_real_set_application (GitgExtUIElement* base, GitgExtApplication* value) { GitgDiffPanel* self; - GitgExtApplication* _tmp0_ = NULL; - GitgExtApplication* _tmp1_ = NULL; #line 27 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" self = (GitgDiffPanel*) base; #line 27 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" - _tmp0_ = value; + if (gitg_diff_panel_real_get_application (self) != value) { +#line 630 "gitg-diff.c" + GitgExtApplication* _tmp0_ = NULL; + GitgExtApplication* _tmp1_ = NULL; #line 27 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 27 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" - _g_object_unref0 (self->priv->_application); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 27 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" + _g_object_unref0 (self->priv->_application); #line 27 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" - self->priv->_application = _tmp1_; + self->priv->_application = _tmp1_; #line 27 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" - g_object_notify ((GObject *) self, "application"); -#line 640 "gitg-diff.c" + g_object_notify ((GObject *) self, "application"); +#line 643 "gitg-diff.c" + } } @@ -655,27 +659,31 @@ result = _tmp1_; #line 28 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" return result; -#line 659 "gitg-diff.c" +#line 663 "gitg-diff.c" } static void gitg_diff_panel_real_set_history (GitgExtHistoryPanel* base, GitgExtHistory* value) { GitgDiffPanel* self; - GitgExtHistory* _tmp0_ = NULL; - GitgExtHistory* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" self = (GitgDiffPanel*) base; #line 28 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" - _tmp0_ = value; + if (gitg_diff_panel_real_get_history (self) != value) { +#line 673 "gitg-diff.c" + GitgExtHistory* _tmp0_ = NULL; + GitgExtHistory* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" - _g_object_unref0 (self->priv->_history); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 28 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" + _g_object_unref0 (self->priv->_history); #line 28 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" - self->priv->_history = _tmp1_; + self->priv->_history = _tmp1_; #line 28 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" - g_object_notify ((GObject *) self, "history"); -#line 679 "gitg-diff.c" + g_object_notify ((GObject *) self, "history"); +#line 686 "gitg-diff.c" + } } @@ -691,7 +699,7 @@ result = _tmp0_; #line 105 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" return result; -#line 695 "gitg-diff.c" +#line 703 "gitg-diff.c" } @@ -704,45 +712,39 @@ result = TRUE; #line 110 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" return result; -#line 708 "gitg-diff.c" +#line 716 "gitg-diff.c" } static gchar* gitg_diff_panel_real_get_display_name (GitgExtUIElement* base) { gchar* result; GitgDiffPanel* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 115 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" self = (GitgDiffPanel*) base; #line 115 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" - _tmp0_ = _ ("Diff"); + _tmp0_ = g_strdup (_ ("Diff")); #line 115 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 115 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" - result = _tmp1_; + result = _tmp0_; #line 115 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" return result; -#line 727 "gitg-diff.c" +#line 732 "gitg-diff.c" } static gchar* gitg_diff_panel_real_get_description (GitgExtUIElement* base) { gchar* result; GitgDiffPanel* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 120 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" self = (GitgDiffPanel*) base; #line 120 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" - _tmp0_ = _ ("Show the changes introduced by the selected commit"); -#line 120 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (_ ("Show the changes introduced by the selected commit")); #line 120 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" - result = _tmp1_; + result = _tmp0_; #line 120 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" return result; -#line 746 "gitg-diff.c" +#line 748 "gitg-diff.c" } @@ -758,7 +760,7 @@ result = _tmp0_; #line 125 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" return result; -#line 762 "gitg-diff.c" +#line 764 "gitg-diff.c" } @@ -777,7 +779,7 @@ result = _tmp1_; #line 156 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" return result; -#line 781 "gitg-diff.c" +#line 783 "gitg-diff.c" } @@ -790,7 +792,7 @@ result = TRUE; #line 161 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" return result; -#line 794 "gitg-diff.c" +#line 796 "gitg-diff.c" } @@ -827,7 +829,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_DIFF_PANEL_WIDGET, g_param_spec_object ("widget", "widget", "widget", gtk_widget_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 22 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_DIFF_PANEL_ENABLED, g_param_spec_boolean ("enabled", "enabled", "enabled", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 831 "gitg-diff.c" +#line 833 "gitg-diff.c" } @@ -835,7 +837,7 @@ #line 22 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" gitg_diff_panel_gitg_ext_ui_element_parent_iface = g_type_interface_peek_parent (iface); #line 22 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" - iface->negotiate_order = (gint (*)(GitgExtUIElement*, GitgExtUIElement*)) gitg_diff_panel_real_negotiate_order; + iface->negotiate_order = (gint (*) (GitgExtUIElement *, GitgExtUIElement*)) gitg_diff_panel_real_negotiate_order; #line 22 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" iface->get_application = gitg_diff_panel_real_get_application; #line 22 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" @@ -854,7 +856,7 @@ iface->get_widget = gitg_diff_panel_real_get_widget; #line 22 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" iface->get_enabled = gitg_diff_panel_real_get_enabled; -#line 858 "gitg-diff.c" +#line 860 "gitg-diff.c" } @@ -865,18 +867,18 @@ iface->get_history = gitg_diff_panel_real_get_history; #line 22 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" iface->set_history = gitg_diff_panel_real_set_history; -#line 869 "gitg-diff.c" +#line 871 "gitg-diff.c" } static void gitg_diff_panel_instance_init (GitgDiffPanel * self) { #line 22 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" self->priv = GITG_DIFF_PANEL_GET_PRIVATE (self); -#line 876 "gitg-diff.c" +#line 878 "gitg-diff.c" } -static void gitg_diff_panel_finalize (GObject* obj) { +static void gitg_diff_panel_finalize (GObject * obj) { GitgDiffPanel * self; #line 22 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_DIFF_TYPE_PANEL, GitgDiffPanel); @@ -890,7 +892,7 @@ _gitg_when_mapped_unref0 (self->priv->d_whenMapped); #line 22 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" G_OBJECT_CLASS (gitg_diff_panel_parent_class)->finalize (obj); -#line 894 "gitg-diff.c" +#line 896 "gitg-diff.c" } @@ -969,13 +971,13 @@ g_value_set_boolean (value, gitg_ext_ui_element_get_enabled ((GitgExtUIElement*) self)); #line 22 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" break; -#line 973 "gitg-diff.c" +#line 975 "gitg-diff.c" default: #line 22 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 22 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" break; -#line 979 "gitg-diff.c" +#line 981 "gitg-diff.c" } } @@ -997,13 +999,13 @@ gitg_ext_history_panel_set_history ((GitgExtHistoryPanel*) self, g_value_get_object (value)); #line 22 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" break; -#line 1001 "gitg-diff.c" +#line 1003 "gitg-diff.c" default: #line 22 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 22 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" break; -#line 1007 "gitg-diff.c" +#line 1009 "gitg-diff.c" } } @@ -1026,7 +1028,7 @@ peas_object_module_register_extension_type (mod, GITG_EXT_TYPE_HISTORY_PANEL, GITG_DIFF_TYPE_PANEL); #line 180 "/home/jesse/dev/gitg/plugins/diff/gitg-diff.vala" _g_object_unref0 (mod); -#line 1030 "gitg-diff.c" +#line 1032 "gitg-diff.c" } diff -Nru gitg-3.22.0/plugins/files/gitg-files.c gitg-3.23.0/plugins/files/gitg-files.c --- gitg-3.22.0/plugins/files/gitg-files.c 2016-08-09 09:50:52.000000000 +0000 +++ gitg-3.23.0/plugins/files/gitg-files.c 2016-11-26 13:23:43.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-files.c generated by valac 0.32.1, the Vala compiler +/* gitg-files.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-files.vala, do not modify */ /* @@ -99,8 +99,8 @@ static gpointer gitg_files_panel_parent_class = NULL; -static GitgExtUIElementIface* gitg_files_panel_gitg_ext_ui_element_parent_iface = NULL; -static GitgExtHistoryPanelIface* gitg_files_panel_gitg_ext_history_panel_parent_iface = NULL; +static GitgExtUIElementIface * gitg_files_panel_gitg_ext_ui_element_parent_iface = NULL; +static GitgExtHistoryPanelIface * gitg_files_panel_gitg_ext_history_panel_parent_iface = NULL; static GType gitg_files_panel_type_id = 0; GType gitg_files_panel_get_type (void) G_GNUC_CONST; @@ -152,7 +152,7 @@ GitgFilesTreeStore* gitg_files_tree_store_new (void); GitgFilesTreeStore* gitg_files_tree_store_construct (GType object_type); static void _gitg_files_panel_on_selection_changed_gitg_ext_history_selection_changed (GitgExtHistory* _sender, gpointer self); -static void gitg_files_panel_finalize (GObject* obj); +static void gitg_files_panel_finalize (GObject * obj); static void _vala_gitg_files_panel_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_files_panel_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); void peas_register_types (GTypeModule* module); @@ -1391,21 +1391,25 @@ static void gitg_files_panel_real_set_application (GitgExtUIElement* base, GitgExtApplication* value) { GitgFilesPanel* self; - GitgExtApplication* _tmp0_ = NULL; - GitgExtApplication* _tmp1_ = NULL; #line 27 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" self = (GitgFilesPanel*) base; #line 27 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" - _tmp0_ = value; + if (gitg_files_panel_real_get_application (self) != value) { +#line 1399 "gitg-files.c" + GitgExtApplication* _tmp0_ = NULL; + GitgExtApplication* _tmp1_ = NULL; #line 27 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 27 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" - _g_object_unref0 (self->priv->_application); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 27 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" + _g_object_unref0 (self->priv->_application); #line 27 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" - self->priv->_application = _tmp1_; + self->priv->_application = _tmp1_; #line 27 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" - g_object_notify ((GObject *) self, "application"); -#line 1409 "gitg-files.c" + g_object_notify ((GObject *) self, "application"); +#line 1412 "gitg-files.c" + } } @@ -1424,27 +1428,31 @@ result = _tmp1_; #line 28 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" return result; -#line 1428 "gitg-files.c" +#line 1432 "gitg-files.c" } static void gitg_files_panel_real_set_history (GitgExtHistoryPanel* base, GitgExtHistory* value) { GitgFilesPanel* self; - GitgExtHistory* _tmp0_ = NULL; - GitgExtHistory* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" self = (GitgFilesPanel*) base; #line 28 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" - _tmp0_ = value; + if (gitg_files_panel_real_get_history (self) != value) { +#line 1442 "gitg-files.c" + GitgExtHistory* _tmp0_ = NULL; + GitgExtHistory* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" - _g_object_unref0 (self->priv->_history); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 28 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" + _g_object_unref0 (self->priv->_history); #line 28 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" - self->priv->_history = _tmp1_; + self->priv->_history = _tmp1_; #line 28 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" - g_object_notify ((GObject *) self, "history"); -#line 1448 "gitg-files.c" + g_object_notify ((GObject *) self, "history"); +#line 1455 "gitg-files.c" + } } @@ -1460,7 +1468,7 @@ result = _tmp0_; #line 53 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" return result; -#line 1464 "gitg-files.c" +#line 1472 "gitg-files.c" } @@ -1473,45 +1481,39 @@ result = TRUE; #line 58 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" return result; -#line 1477 "gitg-files.c" +#line 1485 "gitg-files.c" } static gchar* gitg_files_panel_real_get_display_name (GitgExtUIElement* base) { gchar* result; GitgFilesPanel* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 63 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" self = (GitgFilesPanel*) base; #line 63 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" - _tmp0_ = _ ("Files"); + _tmp0_ = g_strdup (_ ("Files")); #line 63 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 63 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" - result = _tmp1_; + result = _tmp0_; #line 63 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" return result; -#line 1496 "gitg-files.c" +#line 1501 "gitg-files.c" } static gchar* gitg_files_panel_real_get_description (GitgExtUIElement* base) { gchar* result; GitgFilesPanel* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 68 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" self = (GitgFilesPanel*) base; #line 68 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" - _tmp0_ = _ ("Show the files in the tree of the selected commit"); -#line 68 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (_ ("Show the files in the tree of the selected commit")); #line 68 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" - result = _tmp1_; + result = _tmp0_; #line 68 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" return result; -#line 1515 "gitg-files.c" +#line 1517 "gitg-files.c" } @@ -1527,7 +1529,7 @@ result = _tmp0_; #line 73 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" return result; -#line 1531 "gitg-files.c" +#line 1533 "gitg-files.c" } @@ -1545,7 +1547,7 @@ if (_tmp0_ == NULL) { #line 179 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" gitg_files_panel_build_ui (self); -#line 1549 "gitg-files.c" +#line 1551 "gitg-files.c" } #line 182 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" _tmp1_ = self->priv->d_paned; @@ -1555,7 +1557,7 @@ result = _tmp2_; #line 182 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" return result; -#line 1559 "gitg-files.c" +#line 1561 "gitg-files.c" } @@ -1568,14 +1570,14 @@ result = TRUE; #line 272 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" return result; -#line 1572 "gitg-files.c" +#line 1574 "gitg-files.c" } static void _gitg_files_panel_on_selection_changed_gitg_ext_history_selection_changed (GitgExtHistory* _sender, gpointer self) { #line 48 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" gitg_files_panel_on_selection_changed ((GitgFilesPanel*) self, _sender); -#line 1579 "gitg-files.c" +#line 1581 "gitg-files.c" } @@ -1611,7 +1613,7 @@ _g_object_unref0 (_tmp3_); #line 44 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" return obj; -#line 1615 "gitg-files.c" +#line 1617 "gitg-files.c" } @@ -1646,7 +1648,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_FILES_PANEL_WIDGET, g_param_spec_object ("widget", "widget", "widget", gtk_widget_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 22 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_FILES_PANEL_ENABLED, g_param_spec_boolean ("enabled", "enabled", "enabled", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1650 "gitg-files.c" +#line 1652 "gitg-files.c" } @@ -1654,7 +1656,7 @@ #line 22 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" gitg_files_panel_gitg_ext_ui_element_parent_iface = g_type_interface_peek_parent (iface); #line 22 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" - iface->negotiate_order = (gint (*)(GitgExtUIElement*, GitgExtUIElement*)) gitg_files_panel_real_negotiate_order; + iface->negotiate_order = (gint (*) (GitgExtUIElement *, GitgExtUIElement*)) gitg_files_panel_real_negotiate_order; #line 22 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" iface->get_application = gitg_files_panel_real_get_application; #line 22 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" @@ -1673,7 +1675,7 @@ iface->get_widget = gitg_files_panel_real_get_widget; #line 22 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" iface->get_enabled = gitg_files_panel_real_get_enabled; -#line 1677 "gitg-files.c" +#line 1679 "gitg-files.c" } @@ -1684,18 +1686,18 @@ iface->get_history = gitg_files_panel_real_get_history; #line 22 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" iface->set_history = gitg_files_panel_real_set_history; -#line 1688 "gitg-files.c" +#line 1690 "gitg-files.c" } static void gitg_files_panel_instance_init (GitgFilesPanel * self) { #line 22 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" self->priv = GITG_FILES_PANEL_GET_PRIVATE (self); -#line 1695 "gitg-files.c" +#line 1697 "gitg-files.c" } -static void gitg_files_panel_finalize (GObject* obj) { +static void gitg_files_panel_finalize (GObject * obj) { GitgFilesPanel * self; #line 22 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_FILES_TYPE_PANEL, GitgFilesPanel); @@ -1725,7 +1727,7 @@ _gitg_when_mapped_unref0 (self->priv->d_whenMapped); #line 22 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" G_OBJECT_CLASS (gitg_files_panel_parent_class)->finalize (obj); -#line 1729 "gitg-files.c" +#line 1731 "gitg-files.c" } @@ -1804,13 +1806,13 @@ g_value_set_boolean (value, gitg_ext_ui_element_get_enabled ((GitgExtUIElement*) self)); #line 22 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" break; -#line 1808 "gitg-files.c" +#line 1810 "gitg-files.c" default: #line 22 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 22 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" break; -#line 1814 "gitg-files.c" +#line 1816 "gitg-files.c" } } @@ -1832,13 +1834,13 @@ gitg_ext_history_panel_set_history ((GitgExtHistoryPanel*) self, g_value_get_object (value)); #line 22 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" break; -#line 1836 "gitg-files.c" +#line 1838 "gitg-files.c" default: #line 22 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 22 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" break; -#line 1842 "gitg-files.c" +#line 1844 "gitg-files.c" } } @@ -1863,7 +1865,7 @@ peas_object_module_register_extension_type (mod, GITG_EXT_TYPE_HISTORY_PANEL, GITG_FILES_TYPE_PANEL); #line 292 "/home/jesse/dev/gitg/plugins/files/gitg-files.vala" _g_object_unref0 (mod); -#line 1867 "gitg-files.c" +#line 1869 "gitg-files.c" } diff -Nru gitg-3.22.0/plugins/files/gitg-files-tree-store.c gitg-3.23.0/plugins/files/gitg-files-tree-store.c --- gitg-3.22.0/plugins/files/gitg-files-tree-store.c 2016-08-09 09:50:52.000000000 +0000 +++ gitg-3.23.0/plugins/files/gitg-files-tree-store.c 2016-11-26 13:23:43.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-files-tree-store.c generated by valac 0.32.1, the Vala compiler +/* gitg-files-tree-store.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-files-tree-store.vala, do not modify */ /* @@ -119,7 +119,7 @@ static GObject * gitg_files_tree_store_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); static gint _gitg_files_tree_store___lambda6_ (GitgFilesTreeStore* self, GtkTreeModel* model, GtkTreeIter* a, GtkTreeIter* b); static gint __gitg_files_tree_store___lambda6__gtk_tree_iter_compare_func (GtkTreeModel* model, GtkTreeIter* a, GtkTreeIter* b, gpointer self); -static void gitg_files_tree_store_finalize (GObject* obj); +static void gitg_files_tree_store_finalize (GObject * obj); static void _vala_gitg_files_tree_store_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_files_tree_store_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -916,23 +916,27 @@ void gitg_files_tree_store_set_tree (GitgFilesTreeStore* self, GgitTree* value) { - GgitTree* _tmp0_ = NULL; - GgitTree* _tmp1_ = NULL; #line 37 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" g_return_if_fail (self != NULL); +#line 37 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" + if (gitg_files_tree_store_get_tree (self) != value) { +#line 924 "gitg-files-tree-store.c" + GgitTree* _tmp0_ = NULL; + GgitTree* _tmp1_ = NULL; #line 39 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" - _tmp0_ = value; + _tmp0_ = value; #line 39 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 39 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" - _g_object_unref0 (self->priv->d_tree); + _g_object_unref0 (self->priv->d_tree); #line 39 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" - self->priv->d_tree = _tmp1_; + self->priv->d_tree = _tmp1_; #line 40 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" - gitg_files_tree_store_update (self); + gitg_files_tree_store_update (self); #line 37 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" - g_object_notify ((GObject *) self, "tree"); -#line 936 "gitg-files-tree-store.c" + g_object_notify ((GObject *) self, "tree"); +#line 939 "gitg-files-tree-store.c" + } } @@ -972,7 +976,7 @@ _tmp5_ = bisdir; #line 57 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" if (_tmp4_ == _tmp5_) { -#line 976 "gitg-files-tree-store.c" +#line 980 "gitg-files-tree-store.c" GCompareFunc _tmp6_ = NULL; const gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; @@ -1012,7 +1016,7 @@ _g_free0 (aname); #line 59 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" return result; -#line 1016 "gitg-files-tree-store.c" +#line 1020 "gitg-files-tree-store.c" } else { gboolean _tmp15_ = FALSE; #line 62 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" @@ -1027,7 +1031,7 @@ _g_free0 (aname); #line 64 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" return result; -#line 1031 "gitg-files-tree-store.c" +#line 1035 "gitg-files-tree-store.c" } else { #line 68 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" result = 1; @@ -1037,14 +1041,14 @@ _g_free0 (aname); #line 68 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" return result; -#line 1041 "gitg-files-tree-store.c" +#line 1045 "gitg-files-tree-store.c" } } #line 48 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" _g_free0 (bname); #line 48 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" _g_free0 (aname); -#line 1048 "gitg-files-tree-store.c" +#line 1052 "gitg-files-tree-store.c" } @@ -1053,7 +1057,7 @@ result = _gitg_files_tree_store___lambda6_ ((GitgFilesTreeStore*) self, model, a, b); #line 48 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" return result; -#line 1057 "gitg-files-tree-store.c" +#line 1061 "gitg-files-tree-store.c" } @@ -1073,7 +1077,7 @@ #line 46 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" _tmp0_ = g_new0 (GType, 4); #line 46 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" - _tmp0_[0] = G_TYPE_ICON; + _tmp0_[0] = g_icon_get_type (); #line 46 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" _tmp0_[1] = G_TYPE_STRING; #line 46 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" @@ -1094,7 +1098,7 @@ gtk_tree_sortable_set_sort_column_id ((GtkTreeSortable*) self, 0, GTK_SORT_ASCENDING); #line 44 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" return obj; -#line 1098 "gitg-files-tree-store.c" +#line 1102 "gitg-files-tree-store.c" } @@ -1119,7 +1123,7 @@ _ggit_tree_entry_unref0 ((*dest).entry); #line 25 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" (*dest).entry = _tmp3_; -#line 1123 "gitg-files-tree-store.c" +#line 1127 "gitg-files-tree-store.c" } @@ -1128,7 +1132,7 @@ _g_free0 ((*self).root); #line 28 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" _ggit_tree_entry_unref0 ((*self).entry); -#line 1132 "gitg-files-tree-store.c" +#line 1136 "gitg-files-tree-store.c" } @@ -1140,7 +1144,7 @@ gitg_files_tree_store_item_copy (self, dup); #line 25 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" return dup; -#line 1144 "gitg-files-tree-store.c" +#line 1148 "gitg-files-tree-store.c" } @@ -1149,7 +1153,7 @@ gitg_files_tree_store_item_destroy (self); #line 25 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" g_free (self); -#line 1153 "gitg-files-tree-store.c" +#line 1157 "gitg-files-tree-store.c" } @@ -1181,18 +1185,18 @@ G_OBJECT_CLASS (klass)->finalize = gitg_files_tree_store_finalize; #line 23 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_FILES_TREE_STORE_TREE, g_param_spec_object ("tree", "tree", "tree", ggit_tree_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); -#line 1185 "gitg-files-tree-store.c" +#line 1189 "gitg-files-tree-store.c" } static void gitg_files_tree_store_instance_init (GitgFilesTreeStore * self) { #line 23 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" self->priv = GITG_FILES_TREE_STORE_GET_PRIVATE (self); -#line 1192 "gitg-files-tree-store.c" +#line 1196 "gitg-files-tree-store.c" } -static void gitg_files_tree_store_finalize (GObject* obj) { +static void gitg_files_tree_store_finalize (GObject * obj) { GitgFilesTreeStore * self; #line 23 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_FILES_TYPE_TREE_STORE, GitgFilesTreeStore); @@ -1200,7 +1204,7 @@ _g_object_unref0 (self->priv->d_tree); #line 23 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" G_OBJECT_CLASS (gitg_files_tree_store_parent_class)->finalize (obj); -#line 1204 "gitg-files-tree-store.c" +#line 1208 "gitg-files-tree-store.c" } @@ -1227,13 +1231,13 @@ g_value_set_object (value, gitg_files_tree_store_get_tree (self)); #line 23 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" break; -#line 1231 "gitg-files-tree-store.c" +#line 1235 "gitg-files-tree-store.c" default: #line 23 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" break; -#line 1237 "gitg-files-tree-store.c" +#line 1241 "gitg-files-tree-store.c" } } @@ -1249,13 +1253,13 @@ gitg_files_tree_store_set_tree (self, g_value_get_object (value)); #line 23 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" break; -#line 1253 "gitg-files-tree-store.c" +#line 1257 "gitg-files-tree-store.c" default: #line 23 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/plugins/files/gitg-files-tree-store.vala" break; -#line 1259 "gitg-files-tree-store.c" +#line 1263 "gitg-files-tree-store.c" } } diff -Nru gitg-3.22.0/po/cs.po gitg-3.23.0/po/cs.po --- gitg-3.22.0/po/cs.po 2016-09-18 11:59:28.000000000 +0000 +++ gitg-3.23.0/po/cs.po 2016-11-26 08:32:35.000000000 +0000 @@ -10,8 +10,8 @@ "Project-Id-Version: gitg master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gitg&keywords=I18N+L10N&component=gitg\n" -"POT-Creation-Date: 2016-08-19 08:55+0000\n" -"PO-Revision-Date: 2016-08-19 11:13+0200\n" +"POT-Creation-Date: 2016-11-01 18:57+0000\n" +"PO-Revision-Date: 2016-11-08 12:39+0100\n" "Last-Translator: Marek Černocký \n" "Language-Team: čeština \n" "Language: cs\n" @@ -479,7 +479,7 @@ #: ../gitg/commit/gitg-commit.vala:1340 ../gitg/commit/gitg-commit.vala:1506 #: ../gitg/commit/gitg-commit.vala:1621 #: ../gitg/gitg-commit-action-create-patch.vala:145 -#: ../gitg/gitg-dash-view.vala:442 ../gitg/gitg-window.vala:189 +#: ../gitg/gitg-dash-view.vala:444 ../gitg/gitg-window.vala:190 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:2 #: ../gitg/resources/ui/gitg-clone-dialog.ui.h:2 #: ../gitg/resources/ui/gitg-commit-dialog.ui.h:2 @@ -850,20 +850,20 @@ msgid "In the mean time, you may want to %sset up your git profile%s." msgstr "V mezidobí si můžete nastavit %ssvůj profil pro git%s." -#: ../gitg/gitg-dash-view.vala:387 +#: ../gitg/gitg-dash-view.vala:389 msgid "Failed to clone repository" msgstr "Selhalo klonování repozitáře" -#: ../gitg/gitg-dash-view.vala:418 +#: ../gitg/gitg-dash-view.vala:420 msgid "Failed to add repository" msgstr "Selhalo přidání repozitáře" -#: ../gitg/gitg-dash-view.vala:434 +#: ../gitg/gitg-dash-view.vala:436 msgid "Create new repository" msgstr "Vytvořit nový repozitář" #. Translators: %s is a file name -#: ../gitg/gitg-dash-view.vala:437 +#: ../gitg/gitg-dash-view.vala:439 #, c-format msgid "" "The location %s does not appear to be a valid git repository. Would " @@ -872,15 +872,15 @@ "Vypadá to, že umístění %s není platný repozitář git. Přejete si " "inicializovat v tomto umístění nový repozitář git?" -#: ../gitg/gitg-dash-view.vala:443 +#: ../gitg/gitg-dash-view.vala:445 msgid "Create repository" msgstr "Vytvořit repozitář" -#: ../gitg/gitg-dash-view.vala:459 +#: ../gitg/gitg-dash-view.vala:461 msgid "Failed to create repository" msgstr "Selhalo vytvoření repozitáře" -#: ../gitg/gitg-dash-view.vala:529 +#: ../gitg/gitg-dash-view.vala:531 #, c-format msgid "Scanning for repositories in %s" msgstr "Vyhledávají se repozitáře v %s" @@ -1120,32 +1120,38 @@ msgid "Failed to rename" msgstr "Selhalo přejmenování" -#: ../gitg/gitg-window.vala:186 +#: ../gitg/gitg-remote-notification.vala:90 +#: ../gitg/gitg-simple-notification.vala:99 +#: ../gitg/resources/ui/gitg-window.ui.h:10 +msgid "Close" +msgstr "Zavřít" + +#: ../gitg/gitg-window.vala:187 msgid "Add Repository" msgstr "Přidání repozitáře" -#: ../gitg/gitg-window.vala:190 +#: ../gitg/gitg-window.vala:191 msgid "_Add" msgstr "Přid_at" -#: ../gitg/gitg-window.vala:192 +#: ../gitg/gitg-window.vala:193 msgid "_Scan for all git repositories from this directory" msgstr "Vyhledat všechny repozitáře git v této _složce" -#: ../gitg/gitg-window.vala:498 +#: ../gitg/gitg-window.vala:501 msgid "Projects" msgstr "Projekty" -#: ../gitg/gitg-window.vala:748 +#: ../gitg/gitg-window.vala:751 msgid "Select items" msgstr "Vybrat položky" -#: ../gitg/gitg-window.vala:955 +#: ../gitg/gitg-window.vala:958 #, c-format msgid "'%s' is not a Git repository." msgstr "„%s“ není repozitář Git." -#: ../gitg/gitg-window.vala:1104 +#: ../gitg/gitg-window.vala:1107 msgid "" "Your user name and email are not configured yet. Please go to the user " "configuration and provide your name and email." @@ -1153,7 +1159,7 @@ "Vaše uživatelské jméno a e-mail doposud nejsou nastaveny. Jděte prosím do " "nastavení uživatele a poskytněte své jméno a e-mail." -#: ../gitg/gitg-window.vala:1108 +#: ../gitg/gitg-window.vala:1111 msgid "" "Your user name is not configured yet. Please go to the user configuration " "and provide your name." @@ -1161,7 +1167,7 @@ "Vaše uživatelské jméno doposud není nastaveno. Jděte prosím do nastavení " "uživatele a poskytněte své jméno." -#: ../gitg/gitg-window.vala:1112 +#: ../gitg/gitg-window.vala:1115 msgid "" "Your email is not configured yet. Please go to the user configuration and " "provide your email." @@ -1169,16 +1175,10 @@ "Váš e-mail doposud není nastaven. Jděte prosím do nastavení uživatele a " "poskytněte svůj e-mail." -#: ../gitg/gitg-window.vala:1115 +#: ../gitg/gitg-window.vala:1118 msgid "Missing author details" msgstr "Schází údaje o autorovi" -#: ../gitg/gitg-remote-notification.vala:90 -#: ../gitg/gitg-simple-notification.vala:99 -#: ../gitg/resources/ui/gitg-window.ui.h:10 -msgid "Close" -msgstr "Zavřít" - #: ../gitg/history/gitg-history-command-line.vala:42 msgid "Select all commits by default in the history activity" msgstr "Vybrat ve výchozím stavu všechna zařazení v historii aktivit" @@ -1205,18 +1205,18 @@ #: ../gitg/history/gitg-history-refs-list.vala:165 #, c-format -msgid "%d ahead, %d behind" -msgstr "%d vpředu, %d vzadu" +msgid "%zu ahead, %zu behind" +msgstr "%zu vpředu, %zu vzadu" #: ../gitg/history/gitg-history-refs-list.vala:169 #, c-format -msgid "%d ahead" -msgstr "%d vpředu" +msgid "%zu ahead" +msgstr "%zu vpředu" #: ../gitg/history/gitg-history-refs-list.vala:173 #, c-format -msgid "%d behind" -msgstr "%d vzadu" +msgid "%zu behind" +msgstr "%zu vzadu" #: ../gitg/history/gitg-history-refs-list.vala:207 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:4 @@ -1321,6 +1321,34 @@ msgid "%b %e %Y, %I:%M %p" msgstr "%e. %B %Y, %l∶%M %p" +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:39 +#, c-format +msgid "before (%s)" +msgstr "před (%s)" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:45 +#, c-format +msgid "removed (%s)" +msgstr "odstraněno (%s)" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:67 +#, c-format +msgid "after (%s)" +msgstr "po (%s)" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:73 +#, c-format +msgid "added (%s)" +msgstr "přidáno (%s)" + #: ../libgitg/gitg-diff-view-commit-details.vala:145 msgid "Collapse all" msgstr "Sbalit vše" @@ -1335,15 +1363,15 @@ msgid "Committed by %s" msgstr "Zařadil %s" -#: ../libgitg/gitg-diff-view-file.vala:172 +#: ../libgitg/gitg-diff-view-file.vala:177 msgid "_Open file" msgstr "_Otevřít soubor" -#: ../libgitg/gitg-diff-view-file.vala:204 +#: ../libgitg/gitg-diff-view-file.vala:209 msgid "Open containing _folder" msgstr "Otevřít rodičovskou _složku" -#: ../libgitg/gitg-diff-view-file.vala:224 +#: ../libgitg/gitg-diff-view-file.vala:229 msgid "_Copy file path" msgstr "_Kopírovat cestu k souboru" @@ -1359,7 +1387,7 @@ msgid "%s at %s" msgstr "%s v %s" -#: ../libgitg/gitg-repository-list-box.vala:418 +#: ../libgitg/gitg-repository-list-box.vala:541 msgid "Cloning…" msgstr "Klonuje se…" @@ -1763,6 +1791,22 @@ msgid "Unable to display changes for binary file" msgstr "Pro binární soubor nelze zobrazit změny" +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:1 +msgid "Side by side" +msgstr "Vedle sebe" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:2 +msgid "Slider" +msgstr "Posuvník" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:3 +msgid "Overlay" +msgstr "Překrýt" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:4 +msgid "Difference" +msgstr "Rozdíl" + #: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:1 msgid "Tab width:" msgstr "Šířka tabulátoru:" @@ -1789,8 +1833,3 @@ "disk)" msgstr "Odstranit repozitář ze seznamu (nesmaže repozitář z disku)" -#~ msgid "_Help" -#~ msgstr "_Nápověda" - -#~ msgid "column" -#~ msgstr "sloupec" diff -Nru gitg-3.22.0/po/da.po gitg-3.23.0/po/da.po --- gitg-3.22.0/po/da.po 2016-09-18 11:59:37.000000000 +0000 +++ gitg-3.23.0/po/da.po 2016-11-26 08:32:27.000000000 +0000 @@ -1156,6 +1156,12 @@ msgid "Failed to rename" msgstr "Kunne ikke omdøbe" +#: ../gitg/gitg-remote-notification.vala:90 +#: ../gitg/gitg-simple-notification.vala:99 +#: ../gitg/resources/ui/gitg-window.ui.h:10 +msgid "Close" +msgstr "Luk" + #: ../gitg/gitg-window.vala:187 msgid "Add Repository" msgstr "Tilføj arkiv" @@ -1209,12 +1215,6 @@ msgid "Missing author details" msgstr "Mangler forfatteroplysninger" -#: ../gitg/gitg-remote-notification.vala:90 -#: ../gitg/gitg-simple-notification.vala:99 -#: ../gitg/resources/ui/gitg-window.ui.h:10 -msgid "Close" -msgstr "Luk" - #: ../gitg/history/gitg-history-command-line.vala:42 msgid "Select all commits by default in the history activity" msgstr "Vælg alle commits som standard i historikaktiviteten" @@ -1354,6 +1354,34 @@ msgid "%b %e %Y, %I:%M %p" msgstr "%e. %b %Y, %I:%M %p" +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:39 +#, c-format +msgid "before (%s)" +msgstr "" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:45 +#, c-format +msgid "removed (%s)" +msgstr "" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:67 +#, c-format +msgid "after (%s)" +msgstr "" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:73 +#, c-format +msgid "added (%s)" +msgstr "" + #: ../libgitg/gitg-diff-view-commit-details.vala:145 msgid "Collapse all" msgstr "Sammenfold alle" @@ -1368,15 +1396,15 @@ msgid "Committed by %s" msgstr "Committet af %s" -#: ../libgitg/gitg-diff-view-file.vala:172 +#: ../libgitg/gitg-diff-view-file.vala:177 msgid "_Open file" msgstr "_Åbn fil" -#: ../libgitg/gitg-diff-view-file.vala:204 +#: ../libgitg/gitg-diff-view-file.vala:209 msgid "Open containing _folder" msgstr "Åbn indeholdende _mappe" -#: ../libgitg/gitg-diff-view-file.vala:224 +#: ../libgitg/gitg-diff-view-file.vala:229 msgid "_Copy file path" msgstr "_Kopiér filsti" @@ -1801,6 +1829,23 @@ msgid "Unable to display changes for binary file" msgstr "Kan ikke vise ændringer for binær fil" +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:1 +msgid "Side by side" +msgstr "" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:2 +msgid "Slider" +msgstr "" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:3 +msgid "Overlay" +msgstr "" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:4 +#, fuzzy +msgid "Difference" +msgstr "Referencer" + #: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:1 msgid "Tab width:" msgstr "Tabulatorbredde:" diff -Nru gitg-3.22.0/po/de.po gitg-3.23.0/po/de.po --- gitg-3.22.0/po/de.po 2016-09-18 11:59:28.000000000 +0000 +++ gitg-3.23.0/po/de.po 2016-11-26 08:32:35.000000000 +0000 @@ -21,8 +21,8 @@ "Project-Id-Version: gitg master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gitg&keywords=I18N+L10N&component=gitg\n" -"POT-Creation-Date: 2016-08-19 08:55+0000\n" -"PO-Revision-Date: 2016-08-21 11:48+0200\n" +"POT-Creation-Date: 2016-11-01 18:57+0000\n" +"PO-Revision-Date: 2016-11-15 11:57+0100\n" "Last-Translator: Mario Blättermann \n" "Language-Team: Deutsch \n" "Language: de\n" @@ -30,7 +30,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.11\n" #: ../contrib/xml/xml-reader.c:327 #, c-format @@ -502,7 +502,7 @@ #: ../gitg/commit/gitg-commit.vala:1340 ../gitg/commit/gitg-commit.vala:1506 #: ../gitg/commit/gitg-commit.vala:1621 #: ../gitg/gitg-commit-action-create-patch.vala:145 -#: ../gitg/gitg-dash-view.vala:442 ../gitg/gitg-window.vala:189 +#: ../gitg/gitg-dash-view.vala:444 ../gitg/gitg-window.vala:190 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:2 #: ../gitg/resources/ui/gitg-clone-dialog.ui.h:2 #: ../gitg/resources/ui/gitg-commit-dialog.ui.h:2 @@ -887,20 +887,20 @@ msgstr "" "In der Zwischenzeit bietet es sich an, %sIhr git-Profil einzurichten%s." -#: ../gitg/gitg-dash-view.vala:387 +#: ../gitg/gitg-dash-view.vala:389 msgid "Failed to clone repository" msgstr "Klonen des Softwarebestands ist fehlgeschlagen" -#: ../gitg/gitg-dash-view.vala:418 +#: ../gitg/gitg-dash-view.vala:420 msgid "Failed to add repository" msgstr "Softwarebestand hinzufügen ist fehlgeschlagen" -#: ../gitg/gitg-dash-view.vala:434 +#: ../gitg/gitg-dash-view.vala:436 msgid "Create new repository" msgstr "Einen neuen Softwarebestand erstellen" #. Translators: %s is a file name -#: ../gitg/gitg-dash-view.vala:437 +#: ../gitg/gitg-dash-view.vala:439 #, c-format msgid "" "The location %s does not appear to be a valid git repository. Would " @@ -909,15 +909,15 @@ "Der Ort %s scheint kein gültiger git-Softwarebestand zu sein. Möchten " "Sie an diesem Ort einen neuen git-Softwarebestand initialisieren?" -#: ../gitg/gitg-dash-view.vala:443 +#: ../gitg/gitg-dash-view.vala:445 msgid "Create repository" msgstr "Softwarebestand erstellen" -#: ../gitg/gitg-dash-view.vala:459 +#: ../gitg/gitg-dash-view.vala:461 msgid "Failed to create repository" msgstr "Erstellen des Softwarebestandes ist fehlgeschlagen" -#: ../gitg/gitg-dash-view.vala:529 +#: ../gitg/gitg-dash-view.vala:531 #, c-format msgid "Scanning for repositories in %s" msgstr "Nach Softwarebeständen in %s wird gesucht" @@ -1160,32 +1160,38 @@ msgid "Failed to rename" msgstr "Umbenennen ist gescheitert" -#: ../gitg/gitg-window.vala:186 +#: ../gitg/gitg-remote-notification.vala:90 +#: ../gitg/gitg-simple-notification.vala:99 +#: ../gitg/resources/ui/gitg-window.ui.h:10 +msgid "Close" +msgstr "Schließen" + +#: ../gitg/gitg-window.vala:187 msgid "Add Repository" msgstr "Softwarebestand hinzufügen" -#: ../gitg/gitg-window.vala:190 +#: ../gitg/gitg-window.vala:191 msgid "_Add" msgstr "_Hinzufügen" -#: ../gitg/gitg-window.vala:192 +#: ../gitg/gitg-window.vala:193 msgid "_Scan for all git repositories from this directory" msgstr "Von diesem Ordner aus nach allen git-Softwarebeständen _suchen" -#: ../gitg/gitg-window.vala:498 +#: ../gitg/gitg-window.vala:501 msgid "Projects" msgstr "Projekte" -#: ../gitg/gitg-window.vala:748 +#: ../gitg/gitg-window.vala:751 msgid "Select items" msgstr "Objekte auswählen" -#: ../gitg/gitg-window.vala:955 +#: ../gitg/gitg-window.vala:958 #, c-format msgid "'%s' is not a Git repository." msgstr "»%s« ist kein gültiger Git-Softwarebestand." -#: ../gitg/gitg-window.vala:1104 +#: ../gitg/gitg-window.vala:1107 msgid "" "Your user name and email are not configured yet. Please go to the user " "configuration and provide your name and email." @@ -1194,7 +1200,7 @@ "in die Benutzerkonfiguration und geben Sie Ihren Namen und Ihre E-Mail-" "Adresse ein." -#: ../gitg/gitg-window.vala:1108 +#: ../gitg/gitg-window.vala:1111 msgid "" "Your user name is not configured yet. Please go to the user configuration " "and provide your name." @@ -1202,7 +1208,7 @@ "Ihr Benutzername ist noch nicht eingerichtet. Bitte wechseln Sie in die " "Benutzerkonfiguration und geben Sie Ihren Namen ein." -#: ../gitg/gitg-window.vala:1112 +#: ../gitg/gitg-window.vala:1115 msgid "" "Your email is not configured yet. Please go to the user configuration and " "provide your email." @@ -1210,16 +1216,10 @@ "Ihre E-Mail ist noch nicht eingerichtet. Bitte wechseln Sie in die " "Benutzerkonfiguration und geben Sie Ihre E-Mail-Adresse ein." -#: ../gitg/gitg-window.vala:1115 +#: ../gitg/gitg-window.vala:1118 msgid "Missing author details" msgstr "Details des Autors fehlen" -#: ../gitg/gitg-remote-notification.vala:90 -#: ../gitg/gitg-simple-notification.vala:99 -#: ../gitg/resources/ui/gitg-window.ui.h:10 -msgid "Close" -msgstr "Schließen" - #: ../gitg/history/gitg-history-command-line.vala:42 msgid "Select all commits by default in the history activity" msgstr "Per Voreinstellung alle Einspielungen in der Aktivitätenchronik wählen" @@ -1248,18 +1248,18 @@ #: ../gitg/history/gitg-history-refs-list.vala:165 #, c-format -msgid "%d ahead, %d behind" -msgstr "%d voraus, %d zurück" +msgid "%zu ahead, %zu behind" +msgstr "%zu voraus, %zu zurück" #: ../gitg/history/gitg-history-refs-list.vala:169 #, c-format -msgid "%d ahead" -msgstr "%d voraus" +msgid "%zu ahead" +msgstr "%zu voraus" #: ../gitg/history/gitg-history-refs-list.vala:173 #, c-format -msgid "%d behind" -msgstr "%d zurück" +msgid "%zu behind" +msgstr "%zu zurück" #: ../gitg/history/gitg-history-refs-list.vala:207 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:4 @@ -1361,6 +1361,34 @@ msgid "%b %e %Y, %I:%M %p" msgstr "%e. %b %Y, %I:%M %p" +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:39 +#, c-format +msgid "before (%s)" +msgstr "vorher (%s)" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:45 +#, c-format +msgid "removed (%s)" +msgstr "entfernt (%s)" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:67 +#, c-format +msgid "after (%s)" +msgstr "danach (%s)" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:73 +#, c-format +msgid "added (%s)" +msgstr "hinzugefügt (%s)" + #: ../libgitg/gitg-diff-view-commit-details.vala:145 msgid "Collapse all" msgstr "Alle einklappen" @@ -1375,15 +1403,15 @@ msgid "Committed by %s" msgstr "Eingespielt von %s" -#: ../libgitg/gitg-diff-view-file.vala:172 +#: ../libgitg/gitg-diff-view-file.vala:177 msgid "_Open file" msgstr "_Datei öffnen" -#: ../libgitg/gitg-diff-view-file.vala:204 +#: ../libgitg/gitg-diff-view-file.vala:209 msgid "Open containing _folder" msgstr "Enthaltenden _Ordner öffnen" -#: ../libgitg/gitg-diff-view-file.vala:224 +#: ../libgitg/gitg-diff-view-file.vala:229 msgid "_Copy file path" msgstr "Dateipfad k_opieren" @@ -1399,7 +1427,7 @@ msgid "%s at %s" msgstr "%s bei %s" -#: ../libgitg/gitg-repository-list-box.vala:418 +#: ../libgitg/gitg-repository-list-box.vala:541 msgid "Cloning…" msgstr "Klonen …" @@ -1807,6 +1835,22 @@ msgid "Unable to display changes for binary file" msgstr "Änderungen der Binärdatei können nicht angezeigt werden" +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:1 +msgid "Side by side" +msgstr "Nebeneinander" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:2 +msgid "Slider" +msgstr "Schieber" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:3 +msgid "Overlay" +msgstr "Überlagerung" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:4 +msgid "Difference" +msgstr "Differenz" + #: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:1 msgid "Tab width:" msgstr "Tabulatorbreite:" diff -Nru gitg-3.22.0/po/fi.po gitg-3.23.0/po/fi.po --- gitg-3.22.0/po/fi.po 2016-09-18 11:59:28.000000000 +0000 +++ gitg-3.23.0/po/fi.po 2016-11-26 08:32:25.000000000 +0000 @@ -9,8 +9,8 @@ "Project-Id-Version: gitg master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gitg&keywords=I18N+L10N&component=gitg\n" -"POT-Creation-Date: 2016-08-19 08:55+0000\n" -"PO-Revision-Date: 2016-08-21 13:40+0300\n" +"POT-Creation-Date: 2016-08-31 15:28+0000\n" +"PO-Revision-Date: 2016-09-04 20:18+0300\n" "Last-Translator: Jiri Grönroos \n" "Language-Team: suomi \n" "Language: fi\n" @@ -62,11 +62,11 @@ #: ../data/org.gnome.gitg.gschema.xml.in.in.h:7 msgid "Use Gravatar" -msgstr "" +msgstr "Käytä Gravataria" #: ../data/org.gnome.gitg.gschema.xml.in.in.h:8 msgid "Enable the use of gravatar to display user avatars." -msgstr "" +msgstr "Ota käyttöön gravatar-palvelua nähdäksesi käyttäjien kuvat." #: ../data/org.gnome.gitg.gschema.xml.in.in.h:9 msgid "Enable Monitoring" @@ -436,7 +436,7 @@ #: ../gitg/commit/gitg-commit.vala:1340 ../gitg/commit/gitg-commit.vala:1506 #: ../gitg/commit/gitg-commit.vala:1621 #: ../gitg/gitg-commit-action-create-patch.vala:145 -#: ../gitg/gitg-dash-view.vala:442 ../gitg/gitg-window.vala:189 +#: ../gitg/gitg-dash-view.vala:444 ../gitg/gitg-window.vala:190 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:2 #: ../gitg/resources/ui/gitg-clone-dialog.ui.h:2 #: ../gitg/resources/ui/gitg-commit-dialog.ui.h:2 @@ -806,20 +806,20 @@ msgid "In the mean time, you may want to %sset up your git profile%s." msgstr "Voit sen aikana %smäärittää git-profiilisi tiedot%s." -#: ../gitg/gitg-dash-view.vala:387 +#: ../gitg/gitg-dash-view.vala:389 msgid "Failed to clone repository" msgstr "Tietovaraston kloonaaminen epäonnistui" -#: ../gitg/gitg-dash-view.vala:418 +#: ../gitg/gitg-dash-view.vala:420 msgid "Failed to add repository" msgstr "Tietovaraston lisääminen epäonnistui" -#: ../gitg/gitg-dash-view.vala:434 +#: ../gitg/gitg-dash-view.vala:436 msgid "Create new repository" msgstr "Luo uusi tietovarasto" #. Translators: %s is a file name -#: ../gitg/gitg-dash-view.vala:437 +#: ../gitg/gitg-dash-view.vala:439 #, c-format msgid "" "The location %s does not appear to be a valid git repository. Would " @@ -828,15 +828,15 @@ "Sijainti %s ei vaikuta kelvolliselta git-tietovarastolta. Haluatko " "alustaa uuden git-tietovaraston tähän sijaintiin?" -#: ../gitg/gitg-dash-view.vala:443 +#: ../gitg/gitg-dash-view.vala:445 msgid "Create repository" msgstr "Luo tietovarasto" -#: ../gitg/gitg-dash-view.vala:459 +#: ../gitg/gitg-dash-view.vala:461 msgid "Failed to create repository" msgstr "Tietovaraston luominen epäonnistui" -#: ../gitg/gitg-dash-view.vala:529 +#: ../gitg/gitg-dash-view.vala:531 #, c-format msgid "Scanning for repositories in %s" msgstr "Etsitään tietovarastoja kohteesta %s" @@ -854,7 +854,6 @@ #: ../gitg/gitg-ref-action-checkout.vala:101 #, c-format -#| msgid "Failed to delete branch %s" msgid "Failed to checkout branch: %s" msgstr "Haaran uloskuittaus epäonnistui: %s" @@ -1079,32 +1078,38 @@ msgid "Failed to rename" msgstr "Nimen muuttaminen epäonnistui" -#: ../gitg/gitg-window.vala:186 +#: ../gitg/gitg-remote-notification.vala:90 +#: ../gitg/gitg-simple-notification.vala:99 +#: ../gitg/resources/ui/gitg-window.ui.h:10 +msgid "Close" +msgstr "Sulje" + +#: ../gitg/gitg-window.vala:187 msgid "Add Repository" msgstr "Lisää tietovarasto" -#: ../gitg/gitg-window.vala:190 +#: ../gitg/gitg-window.vala:191 msgid "_Add" msgstr "_Lisää" -#: ../gitg/gitg-window.vala:192 +#: ../gitg/gitg-window.vala:193 msgid "_Scan for all git repositories from this directory" msgstr "_Etsi kaikkia git-tietovarastoja tästä hakemistosta" -#: ../gitg/gitg-window.vala:498 +#: ../gitg/gitg-window.vala:501 msgid "Projects" msgstr "Projektit" -#: ../gitg/gitg-window.vala:748 +#: ../gitg/gitg-window.vala:751 msgid "Select items" msgstr "Valitse kohteet" -#: ../gitg/gitg-window.vala:955 +#: ../gitg/gitg-window.vala:958 #, c-format msgid "'%s' is not a Git repository." msgstr "\"%s\" ei ole Git-tietovarasto." -#: ../gitg/gitg-window.vala:1104 +#: ../gitg/gitg-window.vala:1107 msgid "" "Your user name and email are not configured yet. Please go to the user " "configuration and provide your name and email." @@ -1112,7 +1117,7 @@ "Käyttäjänimeäsi ja sähköpostiosoitettasi ei ole vielä määritelty. Määritä " "kyseiset tiedot käyttäjäasetuksissa." -#: ../gitg/gitg-window.vala:1108 +#: ../gitg/gitg-window.vala:1111 msgid "" "Your user name is not configured yet. Please go to the user configuration " "and provide your name." @@ -1120,7 +1125,7 @@ "Käyttäjänimeäsi ei ole vielä määritelty. Määritä kyseinen tieto " "käyttäjäasetuksissa." -#: ../gitg/gitg-window.vala:1112 +#: ../gitg/gitg-window.vala:1115 msgid "" "Your email is not configured yet. Please go to the user configuration and " "provide your email." @@ -1128,16 +1133,10 @@ "Sähköpostiosoitettasi ei ole vielä määritelty. Määritä kyseinen tieto " "käyttäjäasetuksissa." -#: ../gitg/gitg-window.vala:1115 +#: ../gitg/gitg-window.vala:1118 msgid "Missing author details" msgstr "Tekijän tiedot puuttuvat" -#: ../gitg/gitg-remote-notification.vala:90 -#: ../gitg/gitg-simple-notification.vala:99 -#: ../gitg/resources/ui/gitg-window.ui.h:10 -msgid "Close" -msgstr "Sulje" - #: ../gitg/history/gitg-history-command-line.vala:42 msgid "Select all commits by default in the history activity" msgstr "" @@ -1279,6 +1278,34 @@ msgid "%b %e %Y, %I:%M %p" msgstr "%e. %b %Y, %I:%M %p" +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:39 +#, c-format +msgid "before (%s)" +msgstr "ennen (%s)" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:45 +#, c-format +msgid "removed (%s)" +msgstr "poistettu (%s)" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:67 +#, c-format +msgid "after (%s)" +msgstr "jälkeen (%s)" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:73 +#, c-format +msgid "added (%s)" +msgstr "lisätty (%s)" + #: ../libgitg/gitg-diff-view-commit-details.vala:145 msgid "Collapse all" msgstr "Supista kaikki" @@ -1293,17 +1320,15 @@ msgid "Committed by %s" msgstr "Pysyvän muutoksen teki %s" -#: ../libgitg/gitg-diff-view-file.vala:172 -#| msgid "D_elete file" -#| msgid_plural "D_elete files" +#: ../libgitg/gitg-diff-view-file.vala:177 msgid "_Open file" msgstr "_Avaa tiedosto" -#: ../libgitg/gitg-diff-view-file.vala:204 +#: ../libgitg/gitg-diff-view-file.vala:209 msgid "Open containing _folder" msgstr "Avaa sisältävä _kansio" -#: ../libgitg/gitg-diff-view-file.vala:224 +#: ../libgitg/gitg-diff-view-file.vala:229 msgid "_Copy file path" msgstr "_Kopioi tiedoston polku" @@ -1319,7 +1344,7 @@ msgid "%s at %s" msgstr "%s sijainnissa %s" -#: ../libgitg/gitg-repository-list-box.vala:418 +#: ../libgitg/gitg-repository-list-box.vala:541 msgid "Cloning…" msgstr "Kloonataan…" @@ -1725,6 +1750,23 @@ msgid "Unable to display changes for binary file" msgstr "Muutoksia ei voi näyttää binääritiedostolle" +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:1 +msgid "Side by side" +msgstr "" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:2 +msgid "Slider" +msgstr "" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:3 +msgid "Overlay" +msgstr "" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:4 +#| msgid "References" +msgid "Difference" +msgstr "Ero" + #: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:1 msgid "Tab width:" msgstr "Sarkaimen leveys:" diff -Nru gitg-3.22.0/po/fr.po gitg-3.23.0/po/fr.po --- gitg-3.22.0/po/fr.po 2016-09-18 11:59:28.000000000 +0000 +++ gitg-3.23.0/po/fr.po 2016-11-26 08:32:25.000000000 +0000 @@ -17,8 +17,8 @@ "Project-Id-Version: gitg\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gitg&keywords=I18N+L10N&component=gitg\n" -"POT-Creation-Date: 2016-08-27 11:08+0000\n" -"PO-Revision-Date: 2016-09-04 22:29+0200\n" +"POT-Creation-Date: 2016-09-04 21:12+0000\n" +"PO-Revision-Date: 2016-09-04 23:14+0200\n" "Last-Translator: Alain Lojewski \n" "Language-Team: French \n" "Language: fr\n" @@ -503,7 +503,7 @@ #: ../gitg/commit/gitg-commit.vala:1340 ../gitg/commit/gitg-commit.vala:1506 #: ../gitg/commit/gitg-commit.vala:1621 #: ../gitg/gitg-commit-action-create-patch.vala:145 -#: ../gitg/gitg-dash-view.vala:444 ../gitg/gitg-window.vala:189 +#: ../gitg/gitg-dash-view.vala:444 ../gitg/gitg-window.vala:190 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:2 #: ../gitg/resources/ui/gitg-clone-dialog.ui.h:2 #: ../gitg/resources/ui/gitg-commit-dialog.ui.h:2 @@ -1164,32 +1164,38 @@ msgid "Failed to rename" msgstr "Impossible de renommer" -#: ../gitg/gitg-window.vala:186 +#: ../gitg/gitg-remote-notification.vala:90 +#: ../gitg/gitg-simple-notification.vala:99 +#: ../gitg/resources/ui/gitg-window.ui.h:10 +msgid "Close" +msgstr "Fermer" + +#: ../gitg/gitg-window.vala:187 msgid "Add Repository" msgstr "Ajouter un dépôt" -#: ../gitg/gitg-window.vala:190 +#: ../gitg/gitg-window.vala:191 msgid "_Add" msgstr "_Ajouter" -#: ../gitg/gitg-window.vala:192 +#: ../gitg/gitg-window.vala:193 msgid "_Scan for all git repositories from this directory" msgstr "_Scanner à la recherche de tous les dépôts à partir de ce répertoire" -#: ../gitg/gitg-window.vala:498 +#: ../gitg/gitg-window.vala:501 msgid "Projects" msgstr "Projets" -#: ../gitg/gitg-window.vala:748 +#: ../gitg/gitg-window.vala:751 msgid "Select items" msgstr "Sélectionner des éléments" -#: ../gitg/gitg-window.vala:955 +#: ../gitg/gitg-window.vala:958 #, c-format msgid "'%s' is not a Git repository." msgstr "« %s » n'est pas un dépôt Git valide." -#: ../gitg/gitg-window.vala:1104 +#: ../gitg/gitg-window.vala:1107 msgid "" "Your user name and email are not configured yet. Please go to the user " "configuration and provide your name and email." @@ -1198,7 +1204,7 @@ "configurés. Veuillez renseigner ces informations dans le panneau de " "configuration" -#: ../gitg/gitg-window.vala:1108 +#: ../gitg/gitg-window.vala:1111 msgid "" "Your user name is not configured yet. Please go to the user configuration " "and provide your name." @@ -1206,7 +1212,7 @@ "Votre nom d'utilisateur n'est pas configuré. Veuillez renseigner votre nom " "d'utilisateur dans le panneau de configuration" -#: ../gitg/gitg-window.vala:1112 +#: ../gitg/gitg-window.vala:1115 msgid "" "Your email is not configured yet. Please go to the user configuration and " "provide your email." @@ -1214,16 +1220,10 @@ "Votre adresse électronique n'est pas configurée. Veuillez renseigner votre " "adresse électronique dans le panneau de configuration" -#: ../gitg/gitg-window.vala:1115 +#: ../gitg/gitg-window.vala:1118 msgid "Missing author details" msgstr "Il manque des informations sur l'auteur" -#: ../gitg/gitg-remote-notification.vala:90 -#: ../gitg/gitg-simple-notification.vala:99 -#: ../gitg/resources/ui/gitg-window.ui.h:10 -msgid "Close" -msgstr "Fermer" - #: ../gitg/history/gitg-history-command-line.vala:42 msgid "Select all commits by default in the history activity" msgstr "" @@ -1369,6 +1369,34 @@ msgid "%b %e %Y, %I:%M %p" msgstr "%e %b %Y, %I:%M %p" +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:39 +#, c-format +msgid "before (%s)" +msgstr "avant (%s)" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:45 +#, c-format +msgid "removed (%s)" +msgstr "supprimé (%s)" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:67 +#, c-format +msgid "after (%s)" +msgstr "après (%s)" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:73 +#, c-format +msgid "added (%s)" +msgstr "ajouté (%s)" + #: ../libgitg/gitg-diff-view-commit-details.vala:145 msgid "Collapse all" msgstr "Tout réduire" @@ -1383,15 +1411,15 @@ msgid "Committed by %s" msgstr "Commité par %s" -#: ../libgitg/gitg-diff-view-file.vala:172 +#: ../libgitg/gitg-diff-view-file.vala:177 msgid "_Open file" msgstr "_Ouvrir un fichier" -#: ../libgitg/gitg-diff-view-file.vala:204 +#: ../libgitg/gitg-diff-view-file.vala:209 msgid "Open containing _folder" msgstr "Ouvrir le dossier _parent" -#: ../libgitg/gitg-diff-view-file.vala:224 +#: ../libgitg/gitg-diff-view-file.vala:229 msgid "_Copy file path" msgstr "_Copier le chemin de fichier" @@ -1817,6 +1845,22 @@ msgid "Unable to display changes for binary file" msgstr "Impossible d'afficher les changements pour le fichier binaire" +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:1 +msgid "Side by side" +msgstr "Côte à côte" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:2 +msgid "Slider" +msgstr "" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:3 +msgid "Overlay" +msgstr "" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:4 +msgid "Difference" +msgstr "Différences" + #: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:1 msgid "Tab width:" msgstr "Largeur de tabulation :" @@ -1842,45 +1886,3 @@ "Remove the repository from the list (does not delete the repository from " "disk)" msgstr "Retirer le dépôt de la liste (ne supprime pas le dépôt du disque)" - -#~ msgid "_Help" -#~ msgstr "Aid_e" - -#~ msgid "column" -#~ msgstr "colonne" - -#~ msgid "Unable to open the .gitconfig file." -#~ msgstr "Impossible d'ouvrir le fichier de configuration .gitconfig." - -#~ msgid "_Delete" -#~ msgstr "_Supprimer" - -#~ msgid "stage" -#~ msgstr "stage" - -#~ msgid "unstage" -#~ msgstr "unstage" - -#~ msgid "Loading diff…" -#~ msgstr "Chargement du diff…" - -#~ msgid "Notes:" -#~ msgstr "Notes :" - -#~ msgid "Diff against:" -#~ msgstr "Différences par rapport à :" - -#~ msgid "Note: The Git config file '%s' does not exist." -#~ msgstr "Note : le fichier de configuration « %s » n'existe pas." - -#~ msgid "_Open Repository…" -#~ msgstr "_Ouvrir un dépôt…" - -#~ msgid "_Clone Repository…" -#~ msgstr "_Cloner un dépôt…" - -#~ msgid "Show changes inline" -#~ msgstr "Afficher les changements intégrés" - -#~ msgid "Developer tools" -#~ msgstr "Outils du développeur" diff -Nru gitg-3.22.0/po/gl.po gitg-3.23.0/po/gl.po --- gitg-3.22.0/po/gl.po 2016-09-18 11:59:28.000000000 +0000 +++ gitg-3.23.0/po/gl.po 2016-09-18 12:07:56.000000000 +0000 @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: gitg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-08 11:03+0200\n" -"PO-Revision-Date: 2016-09-08 11:05+0200\n" +"POT-Creation-Date: 2016-02-24 10:06+0100\n" +"PO-Revision-Date: 2016-02-25 12:57+0200\n" "Last-Translator: Fran Dieguez \n" -"Language-Team: Galician\n" +"Language-Team: gnome-l10n-gl@gnome.org\n" "Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -343,41 +343,41 @@ msgstr "Non é posíbel comprobar a ortografía do idioma: %s" #: ../gitg/commit/gitg-commit-dialog.vala:508 -#: ../gitg/commit/gitg-commit.vala:1076 +#: ../gitg/commit/gitg-commit.vala:1067 msgid "There are no changes to be committed" msgstr "Non hai cambios para remitir" #: ../gitg/commit/gitg-commit-dialog.vala:509 -#: ../gitg/commit/gitg-commit.vala:1077 +#: ../gitg/commit/gitg-commit.vala:1068 msgid "Use amend to change the commit message of the previous commit" msgstr "Use engadir para cambiar a mensaxe de remisión da anterior remisión" -#: ../gitg/commit/gitg-commit.vala:113 +#: ../gitg/commit/gitg-commit.vala:104 msgctxt "Activity" msgid "Commit" msgstr "Commit" -#: ../gitg/commit/gitg-commit.vala:118 +#: ../gitg/commit/gitg-commit.vala:109 msgid "Create new commits and manage the staging area" msgstr "Crear novas remisións e xestionar a reserva" -#: ../gitg/commit/gitg-commit.vala:193 +#: ../gitg/commit/gitg-commit.vala:184 msgid "_Stage selection" msgstr "Selección de _reserva" -#: ../gitg/commit/gitg-commit.vala:232 +#: ../gitg/commit/gitg-commit.vala:223 #, c-format msgid "Failed to stage the removal of submodule `%s'" msgstr "Produciuse un fallo ao reservar a eliminación do submódulo «%s»" -#: ../gitg/commit/gitg-commit.vala:248 +#: ../gitg/commit/gitg-commit.vala:239 #, c-format msgid "Failed to open the repository of submodule `%s' while trying to stage" msgstr "" "Produciuse un fallo ao abrir o repositorio do submódulo «%s» ao tentar " "reservar" -#: ../gitg/commit/gitg-commit.vala:262 +#: ../gitg/commit/gitg-commit.vala:253 #, c-format msgid "" "Failed to lookup the working directory commit of submodule `%s' while trying " @@ -386,101 +386,101 @@ "Produciuse un fallo ao buscar o directorio de traballo de «commit» do " "submódulo «%s» ao tentar reservar" -#: ../gitg/commit/gitg-commit.vala:275 +#: ../gitg/commit/gitg-commit.vala:266 #, c-format msgid "Failed to stage the submodule `%s'" msgstr "Produciuse un fallo ao reservar o submódulo «%s»" -#: ../gitg/commit/gitg-commit.vala:297 +#: ../gitg/commit/gitg-commit.vala:288 #, c-format msgid "Failed to stage the removal of file `%s'" msgstr "Produciuse un fallo ao reservar a eliminación do ficheiro «%s»" -#: ../gitg/commit/gitg-commit.vala:311 +#: ../gitg/commit/gitg-commit.vala:302 #, c-format msgid "Failed to stage the file `%s'" msgstr "Produciuse un fallo ao reservar o ficheiro «%s» " -#: ../gitg/commit/gitg-commit.vala:583 +#: ../gitg/commit/gitg-commit.vala:574 msgid "_Unstage selection" msgstr "Selección de _desreserva" -#: ../gitg/commit/gitg-commit.vala:649 +#: ../gitg/commit/gitg-commit.vala:640 #, c-format msgid "Failed to unstage the removal of file `%s'" msgstr "Produciuse un fallo ao desreservar a eliminación do ficheiro «%s»" -#: ../gitg/commit/gitg-commit.vala:650 +#: ../gitg/commit/gitg-commit.vala:641 #, c-format msgid "Failed to unstage the file `%s'" msgstr "Produciuse un fallo desreservar o ficheiro «%s»" -#: ../gitg/commit/gitg-commit.vala:657 +#: ../gitg/commit/gitg-commit.vala:648 #, c-format msgid "Failed to unstage the removal of submodule `%s'" msgstr "Produciuse un fallo ao desreservar a eliminación do submódulo «%s»" -#: ../gitg/commit/gitg-commit.vala:658 +#: ../gitg/commit/gitg-commit.vala:649 #, c-format msgid "Failed to unstage the submodule `%s'" msgstr "Produciuse un fallo desreservar o submódulo «%s»" #. Populate staged items -#: ../gitg/commit/gitg-commit.vala:862 +#: ../gitg/commit/gitg-commit.vala:853 msgid "Staged" msgstr "Reservado" -#: ../gitg/commit/gitg-commit.vala:870 +#: ../gitg/commit/gitg-commit.vala:861 msgid "No staged files" msgstr "Non hai ningún ficheiro reservado" #. Populate unstaged items -#: ../gitg/commit/gitg-commit.vala:893 +#: ../gitg/commit/gitg-commit.vala:884 msgid "Unstaged" msgstr "Sen reservar" -#: ../gitg/commit/gitg-commit.vala:901 +#: ../gitg/commit/gitg-commit.vala:892 msgid "No unstaged files" msgstr "Non hai ficheiro sen reservar" #. Populate untracked items -#: ../gitg/commit/gitg-commit.vala:924 +#: ../gitg/commit/gitg-commit.vala:915 msgid "Untracked" msgstr "Sen seguimento" -#: ../gitg/commit/gitg-commit.vala:928 +#: ../gitg/commit/gitg-commit.vala:919 msgid "No untracked files" msgstr "Non hai ficheiro sen seguimento" -#: ../gitg/commit/gitg-commit.vala:953 +#: ../gitg/commit/gitg-commit.vala:944 msgid "Submodule" msgstr "Submódulo" -#: ../gitg/commit/gitg-commit.vala:957 +#: ../gitg/commit/gitg-commit.vala:948 msgid "No dirty submodules" msgstr "Non hai submódulos sucios" -#: ../gitg/commit/gitg-commit.vala:1106 +#: ../gitg/commit/gitg-commit.vala:1095 msgid "Failed to commit" msgstr "Produciuse un fallo ao remitir" -#: ../gitg/commit/gitg-commit.vala:1122 +#: ../gitg/commit/gitg-commit.vala:1111 msgid "Failed to pass pre-commit" msgstr "Produciuse un fallo ao pasar a pre-remisión" -#: ../gitg/commit/gitg-commit.vala:1330 ../gitg/commit/gitg-commit.vala:1480 +#: ../gitg/commit/gitg-commit.vala:1314 ../gitg/commit/gitg-commit.vala:1464 msgid "Discard changes" msgstr "Rexeitar os cambios" -#: ../gitg/commit/gitg-commit.vala:1331 +#: ../gitg/commit/gitg-commit.vala:1315 msgid "Are you sure you want to permanently discard the selected changes?" msgstr "" "Ten certeza que quere rexeitar de forma permanente os cambios seleccionados?" -#: ../gitg/commit/gitg-commit.vala:1340 ../gitg/commit/gitg-commit.vala:1506 -#: ../gitg/commit/gitg-commit.vala:1621 +#: ../gitg/commit/gitg-commit.vala:1324 ../gitg/commit/gitg-commit.vala:1490 +#: ../gitg/commit/gitg-commit.vala:1605 #: ../gitg/gitg-commit-action-create-patch.vala:145 -#: ../gitg/gitg-dash-view.vala:444 ../gitg/gitg-window.vala:190 +#: ../gitg/gitg-dash-view.vala:437 ../gitg/gitg-window.vala:190 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:2 #: ../gitg/resources/ui/gitg-clone-dialog.ui.h:2 #: ../gitg/resources/ui/gitg-commit-dialog.ui.h:2 @@ -491,27 +491,27 @@ msgid "_Cancel" msgstr "_Cancelar" -#: ../gitg/commit/gitg-commit.vala:1341 ../gitg/commit/gitg-commit.vala:1507 +#: ../gitg/commit/gitg-commit.vala:1325 ../gitg/commit/gitg-commit.vala:1491 msgid "Discard" msgstr "Rexeitar" -#: ../gitg/commit/gitg-commit.vala:1370 +#: ../gitg/commit/gitg-commit.vala:1354 msgid "Failed to discard selection" msgstr "Produciuse un fallo ao rexeitar a selección" -#: ../gitg/commit/gitg-commit.vala:1400 +#: ../gitg/commit/gitg-commit.vala:1384 msgid "Failed to stage selection" msgstr "Produciuse un fallo na selección da reserva" -#: ../gitg/commit/gitg-commit.vala:1404 +#: ../gitg/commit/gitg-commit.vala:1388 msgid "Failed to unstage selection" msgstr "Produciuse un fallo na selección de desreserva" -#: ../gitg/commit/gitg-commit.vala:1464 +#: ../gitg/commit/gitg-commit.vala:1448 msgid "Failed to discard changes" msgstr "Produciuse un fallo ao rexeitar os cambios" -#: ../gitg/commit/gitg-commit.vala:1485 +#: ../gitg/commit/gitg-commit.vala:1469 #, c-format msgid "" "Are you sure you want to permanently discard all changes made to the file `" @@ -520,7 +520,7 @@ "Ten certeza que quere rexeitar de forma permanente todos os cambios feitos " "no ficheiro «%s»?" -#: ../gitg/commit/gitg-commit.vala:1496 +#: ../gitg/commit/gitg-commit.vala:1480 #, c-format msgid "" "Are you sure you want to permanently discard all changes made to the files " @@ -529,46 +529,46 @@ "Ten certeza que quere rexeitar de forma permanente todos os cambios feitos " "nos ficheiros %s e «%s»?" -#: ../gitg/commit/gitg-commit.vala:1579 +#: ../gitg/commit/gitg-commit.vala:1563 msgid "Failed to delete files" msgstr "Produciuse un fallo ao eliminar os ficheiros" -#: ../gitg/commit/gitg-commit.vala:1595 +#: ../gitg/commit/gitg-commit.vala:1579 msgid "Delete file" msgid_plural "Delete files" msgstr[0] "Eliminar ficheiro" msgstr[1] "Eliminar ficheiros" -#: ../gitg/commit/gitg-commit.vala:1600 +#: ../gitg/commit/gitg-commit.vala:1584 #, c-format msgid "Are you sure you want to permanently delete the file `%s'?" msgstr "Ten certeza que quere eliminar de forma permanente o ficheiro «%s»?" -#: ../gitg/commit/gitg-commit.vala:1611 +#: ../gitg/commit/gitg-commit.vala:1595 #, c-format msgid "Are you sure you want to permanently delete the files %s and `%s'?" msgstr "" "Ten certeza que quere eliminar de forma permanente os ficheiros %s e «%s»?" -#: ../gitg/commit/gitg-commit.vala:1657 +#: ../gitg/commit/gitg-commit.vala:1640 msgid "_Stage changes" msgstr "Cambios _reservados" -#: ../gitg/commit/gitg-commit.vala:1669 +#: ../gitg/commit/gitg-commit.vala:1650 msgid "_Unstage changes" msgstr "Cambios _non reservados" -#: ../gitg/commit/gitg-commit.vala:1681 +#: ../gitg/commit/gitg-commit.vala:1660 msgid "_Discard changes" msgstr "_Rexeitar cambios" -#: ../gitg/commit/gitg-commit.vala:1693 +#: ../gitg/commit/gitg-commit.vala:1670 msgid "D_elete file" msgid_plural "D_elete files" msgstr[0] "_Eliminar ficheiro" msgstr[1] "_Eliminar ficheiros" -#: ../gitg/commit/gitg-commit.vala:1723 +#: ../gitg/commit/gitg-commit.vala:1693 msgid "_Edit file" msgstr "_Editar ficheiro" @@ -652,19 +652,19 @@ msgid "- Git repository viewer" msgstr "- Explorador de repositorios Git" -#: ../gitg/gitg-application.vala:222 +#: ../gitg/gitg-application.vala:226 msgid "gitg is a Git repository viewer for gtk+/GNOME" msgstr "gitg é un explorador de repositorios Git para gtk+/GNOME" -#: ../gitg/gitg-application.vala:231 +#: ../gitg/gitg-application.vala:235 msgid "translator-credits" msgstr "Fran Dieguez , 2014." -#: ../gitg/gitg-application.vala:234 +#: ../gitg/gitg-application.vala:238 msgid "gitg homepage" msgstr "Páxina web de gitg" -#: ../gitg/gitg-application.vala:364 +#: ../gitg/gitg-application.vala:369 msgid "" "We are terribly sorry, but gitg requires libgit2 (a library on which gitg " "depends) to be compiled with threading support.\n" @@ -685,23 +685,23 @@ "distribución para que fornezan libgit2 sen compatibilidade de fíos." #. ex: ts=4 noet -#: ../gitg/gitg-author-details-dialog.vala:97 -#: ../gitg/gitg-author-details-dialog.vala:117 +#: ../gitg/gitg-author-details-dialog.vala:85 +#: ../gitg/gitg-author-details-dialog.vala:105 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:1 msgid "Author Details" msgstr "Detalles do autor" -#: ../gitg/gitg-author-details-dialog.vala:98 +#: ../gitg/gitg-author-details-dialog.vala:86 msgid "Enter default details used for all repositories:" msgstr "Escriba a información predeterminada usada para os repositorios:" #. Translators: %s is the repository name -#: ../gitg/gitg-author-details-dialog.vala:120 +#: ../gitg/gitg-author-details-dialog.vala:108 #, c-format msgid "Override global details for repository '%s':" msgstr "Sobrescribir a información global para o repositorio «%s»:" -#: ../gitg/gitg-author-details-dialog.vala:232 +#: ../gitg/gitg-author-details-dialog.vala:220 msgid "Failed to set Git user config." msgstr "Produciuse un fallo ao estabelecer a configuración de Git do usuario." @@ -832,41 +832,37 @@ msgid "Provide a message to create an annotated tag" msgstr "Fornceza unha mensaxe para crear unha etiqueta anotada" -#: ../gitg/gitg-dash-view.vala:87 -msgid "Select and manage projects" -msgstr "Seleccionar e xestionar proxectos" - -#: ../gitg/gitg-dash-view.vala:176 +#: ../gitg/gitg-dash-view.vala:171 msgid "_Remove" msgstr "_Eliminar" #. Translators: the two %s will be replaced to create a link to perform the scanning action. -#: ../gitg/gitg-dash-view.vala:232 +#: ../gitg/gitg-dash-view.vala:227 #, c-format msgid "We can also %sscan your home directory%s for git repositories." msgstr "" "Tamén pode %sanalizar o seu cartafol persoal%s para buscar repositorios git." #. Translators: the two %s will be used to create a link to the author dialog. -#: ../gitg/gitg-dash-view.vala:235 +#: ../gitg/gitg-dash-view.vala:230 #, c-format msgid "In the mean time, you may want to %sset up your git profile%s." msgstr "Namentres, pode querer %sconfigurar o seu perfíl de git%s." -#: ../gitg/gitg-dash-view.vala:389 +#: ../gitg/gitg-dash-view.vala:382 msgid "Failed to clone repository" msgstr "Produciuse un fallo ao clonar o repositorio" -#: ../gitg/gitg-dash-view.vala:420 +#: ../gitg/gitg-dash-view.vala:413 msgid "Failed to add repository" msgstr "Produciuse un fallo ao engadir o repositorio" -#: ../gitg/gitg-dash-view.vala:436 +#: ../gitg/gitg-dash-view.vala:429 msgid "Create new repository" msgstr "Crear novo repositorio" #. Translators: %s is a file name -#: ../gitg/gitg-dash-view.vala:439 +#: ../gitg/gitg-dash-view.vala:432 #, c-format msgid "" "The location %s does not appear to be a valid git repository. Would " @@ -875,15 +871,15 @@ "A localización %s non semella ser un repositorio git válido. Desexa " "inicializar un novo repositorio nesa localización?" -#: ../gitg/gitg-dash-view.vala:445 +#: ../gitg/gitg-dash-view.vala:438 msgid "Create repository" msgstr "Crear repositorio" -#: ../gitg/gitg-dash-view.vala:461 +#: ../gitg/gitg-dash-view.vala:454 msgid "Failed to create repository" msgstr "Produciuse un fallo ao crear o repositorio" -#: ../gitg/gitg-dash-view.vala:531 +#: ../gitg/gitg-dash-view.vala:524 #, c-format msgid "Scanning for repositories in %s" msgstr "Buscando repositorio en %s" @@ -1135,20 +1131,16 @@ msgid "_Scan for all git repositories from this directory" msgstr "_Analizar para todos os repositorios git desde este cartafol" -#: ../gitg/gitg-window.vala:501 +#: ../gitg/gitg-window.vala:481 msgid "Projects" msgstr "Proxectos" -#: ../gitg/gitg-window.vala:751 -msgid "Select items" -msgstr "Seleccionar elementos" - -#: ../gitg/gitg-window.vala:958 +#: ../gitg/gitg-window.vala:912 #, c-format msgid "'%s' is not a Git repository." msgstr "«%s» non é un repositorio Git." -#: ../gitg/gitg-window.vala:1107 +#: ../gitg/gitg-window.vala:1061 msgid "" "Your user name and email are not configured yet. Please go to the user " "configuration and provide your name and email." @@ -1156,7 +1148,7 @@ "O seu nome de usuario e correo electrónico non están configurados aínda. " "Vaia á configuración do usuario e forneza un nome e correo." -#: ../gitg/gitg-window.vala:1111 +#: ../gitg/gitg-window.vala:1065 msgid "" "Your user name is not configured yet. Please go to the user configuration " "and provide your name." @@ -1164,7 +1156,7 @@ "O seu nome de usuario non están configurado aínda. Vaia á configuración do " "usuario e forneza un nome." -#: ../gitg/gitg-window.vala:1115 +#: ../gitg/gitg-window.vala:1069 msgid "" "Your email is not configured yet. Please go to the user configuration and " "provide your email." @@ -1172,7 +1164,7 @@ "O seu correo electrónico non están configurado aínda. Vaia á configuración " "do usuario e forneza un correo." -#: ../gitg/gitg-window.vala:1118 +#: ../gitg/gitg-window.vala:1072 msgid "Missing author details" msgstr "Falta a información do autor" @@ -1236,17 +1228,17 @@ msgid "Remotes" msgstr "Remotos" -#: ../gitg/history/gitg-history.vala:342 +#: ../gitg/history/gitg-history.vala:306 #: ../gitg/preferences/gitg-preferences-history.vala:218 #: ../gitg/resources/ui/gitg-preferences-interface.ui.h:3 msgid "History" msgstr "Historial" -#: ../gitg/history/gitg-history.vala:347 +#: ../gitg/history/gitg-history.vala:311 msgid "Examine the history of the repository" msgstr "Examinar o historial do repositorio" -#: ../gitg/history/gitg-history.vala:843 +#: ../gitg/history/gitg-history.vala:796 msgid "Mainline" msgstr "Liña principal" @@ -1259,13 +1251,6 @@ msgid "Interface" msgstr "Interface" -#. Translators: %s will be replaced with a URL indicating the resource -#. for which the authentication is required. -#: ../libgitg/gitg-authentication-dialog.vala:69 -#, c-format -msgid "Password required for %s" -msgstr "Requírese un contrasinal para %s" - #: ../libgitg/gitg-date.vala:346 msgid "Now" msgstr "Agora" @@ -1323,32 +1308,20 @@ msgid "%b %e %Y, %I:%M %p" msgstr "%e de %b de %Y, %I:%M %p" -#: ../libgitg/gitg-diff-view-commit-details.vala:145 +#: ../libgitg/gitg-diff-view-commit-details.vala:142 msgid "Collapse all" msgstr "Contraer todo" -#: ../libgitg/gitg-diff-view-commit-details.vala:149 +#: ../libgitg/gitg-diff-view-commit-details.vala:146 #: ../libgitg/resources/ui/gitg-diff-view-commit-details.ui.h:2 msgid "Expand all" msgstr "Expandir todo" -#: ../libgitg/gitg-diff-view-commit-details.vala:202 +#: ../libgitg/gitg-diff-view-commit-details.vala:199 #, c-format msgid "Committed by %s" msgstr "Remitido por %s" -#: ../libgitg/gitg-diff-view-file.vala:172 -msgid "_Open file" -msgstr "_Abrir ficheiro" - -#: ../libgitg/gitg-diff-view-file.vala:204 -msgid "Open containing _folder" -msgstr "_Abrir cartafol contedor" - -#: ../libgitg/gitg-diff-view-file.vala:224 -msgid "_Copy file path" -msgstr "_Copiar a ruta do ficheiro" - #. Translators: this is used to construct: "at ", to indicate where the repository is at. #: ../libgitg/gitg-repository-list-box.vala:154 #, c-format @@ -1361,7 +1334,7 @@ msgid "%s at %s" msgstr "%s en %s" -#: ../libgitg/gitg-repository-list-box.vala:541 +#: ../libgitg/gitg-repository-list-box.vala:409 msgid "Cloning…" msgstr "Clonando…" @@ -1372,12 +1345,12 @@ "Non foi posíbel ler a mensaxe de remisión despois de executar o hook commit-" "msg: %s" -#: ../plugins/diff/gitg-diff.vala:115 +#: ../plugins/diff/gitg-diff.vala:112 #: ../gitg/resources/ui/gitg-preferences-interface.ui.h:11 msgid "Diff" msgstr "Diff" -#: ../plugins/diff/gitg-diff.vala:120 +#: ../plugins/diff/gitg-diff.vala:117 msgid "Show the changes introduced by the selected commit" msgstr "Mostrar os cambios introducidos pola remisión seleccionados" @@ -1540,14 +1513,18 @@ msgstr "Atallos de _teclado" #: ../gitg/resources/ui/gitg-menus.ui.h:5 +msgid "_Help" +msgstr "A_xuda" + +#: ../gitg/resources/ui/gitg-menus.ui.h:6 msgid "_About" msgstr "So_bre" -#: ../gitg/resources/ui/gitg-menus.ui.h:6 +#: ../gitg/resources/ui/gitg-menus.ui.h:7 msgid "_Quit" msgstr "_Saír" -#: ../gitg/resources/ui/gitg-menus.ui.h:7 +#: ../gitg/resources/ui/gitg-menus.ui.h:8 msgid "_Reload" msgstr "_Recargar" @@ -1653,8 +1630,7 @@ #: ../gitg/resources/ui/gitg-preferences-interface.ui.h:12 msgid "Enable syntax highlighting of source code in diff views" -msgstr "" -"Activar o realzado de sintaxe do código fonte nas vistas de diferencias" +msgstr "Activar o realzado de sintaxe do código fonte nas vistas de diferencias" #: ../gitg/resources/ui/gitg-preferences.ui.h:1 msgid "Preferences" @@ -1764,10 +1740,6 @@ msgid "Parents" msgstr "Pais" -#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-binary.ui.h:1 -msgid "Unable to display changes for binary file" -msgstr "Non foi posíbel mostrar os cambios no ficheiro binario" - #: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:1 msgid "Tab width:" msgstr "Ancho da tabulación:" @@ -1794,11 +1766,9 @@ "disk)" msgstr "Quitar o repositorio da lista (non elimina o repositorio do disco)" -#~ msgid "_Help" -#~ msgstr "A_xuda" - -#~ msgid "column" -#~ msgstr "columna" +#: ../plugins/files/resources/view-files.ui.h:1 +msgid "column" +msgstr "columna" #~ msgid "Unable to open the .gitconfig file." #~ msgstr "Non foi posíbel abrir o ficheiro .gitconfig." @@ -1806,6 +1776,9 @@ #~ msgid "_Delete" #~ msgstr "_Eliminar" +#~ msgid "_Open" +#~ msgstr "_Abrir" + #~ msgid "stage" #~ msgstr "preseleccionar" diff -Nru gitg-3.22.0/po/hu.po gitg-3.23.0/po/hu.po --- gitg-3.22.0/po/hu.po 2016-09-18 11:59:28.000000000 +0000 +++ gitg-3.23.0/po/hu.po 2016-11-26 08:32:35.000000000 +0000 @@ -10,16 +10,16 @@ "Project-Id-Version: gitg master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gitg&keywords=I18N+L10N&component=gitg\n" -"POT-Creation-Date: 2016-08-19 08:55+0000\n" -"PO-Revision-Date: 2016-08-20 14:19+0200\n" -"Last-Translator: Balázs Úr \n" +"POT-Creation-Date: 2016-11-01 18:57+0000\n" +"PO-Revision-Date: 2016-11-03 14:31+0100\n" +"Last-Translator: Meskó Balázs \n" "Language-Team: Hungarian \n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Poedit 1.8.11\n" #: ../contrib/xml/xml-reader.c:327 #, c-format @@ -475,7 +475,7 @@ #: ../gitg/commit/gitg-commit.vala:1340 ../gitg/commit/gitg-commit.vala:1506 #: ../gitg/commit/gitg-commit.vala:1621 #: ../gitg/gitg-commit-action-create-patch.vala:145 -#: ../gitg/gitg-dash-view.vala:442 ../gitg/gitg-window.vala:189 +#: ../gitg/gitg-dash-view.vala:444 ../gitg/gitg-window.vala:190 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:2 #: ../gitg/resources/ui/gitg-clone-dialog.ui.h:2 #: ../gitg/resources/ui/gitg-commit-dialog.ui.h:2 @@ -845,20 +845,20 @@ msgid "In the mean time, you may want to %sset up your git profile%s." msgstr "Mindeközben beállíthatja a %ssaját git profilját%s." -#: ../gitg/gitg-dash-view.vala:387 +#: ../gitg/gitg-dash-view.vala:389 msgid "Failed to clone repository" msgstr "Nem sikerült a tároló klónozása" -#: ../gitg/gitg-dash-view.vala:418 +#: ../gitg/gitg-dash-view.vala:420 msgid "Failed to add repository" msgstr "Nem sikerült a tároló hozzáadása" -#: ../gitg/gitg-dash-view.vala:434 +#: ../gitg/gitg-dash-view.vala:436 msgid "Create new repository" msgstr "Új tároló létrehozása" #. Translators: %s is a file name -#: ../gitg/gitg-dash-view.vala:437 +#: ../gitg/gitg-dash-view.vala:439 #, c-format msgid "" "The location %s does not appear to be a valid git repository. Would " @@ -867,15 +867,15 @@ "A(z) %s hely nem tűnik érvényes git tárolónak. Szeretne egy új git " "tárolót létrehozni ezen a helyen?" -#: ../gitg/gitg-dash-view.vala:443 +#: ../gitg/gitg-dash-view.vala:445 msgid "Create repository" msgstr "Tároló létrehozása" -#: ../gitg/gitg-dash-view.vala:459 +#: ../gitg/gitg-dash-view.vala:461 msgid "Failed to create repository" msgstr "Nem sikerült tárolót létrehozni" -#: ../gitg/gitg-dash-view.vala:529 +#: ../gitg/gitg-dash-view.vala:531 #, c-format msgid "Scanning for repositories in %s" msgstr "Tárolók keresése itt: %s" @@ -1115,32 +1115,38 @@ msgid "Failed to rename" msgstr "Nem sikerült átnevezni" -#: ../gitg/gitg-window.vala:186 +#: ../gitg/gitg-remote-notification.vala:90 +#: ../gitg/gitg-simple-notification.vala:99 +#: ../gitg/resources/ui/gitg-window.ui.h:10 +msgid "Close" +msgstr "Bezárás" + +#: ../gitg/gitg-window.vala:187 msgid "Add Repository" msgstr "Tároló hozzáadása" -#: ../gitg/gitg-window.vala:190 +#: ../gitg/gitg-window.vala:191 msgid "_Add" msgstr "_Hozzáadás" -#: ../gitg/gitg-window.vala:192 +#: ../gitg/gitg-window.vala:193 msgid "_Scan for all git repositories from this directory" msgstr "Minden git tároló _megkeresése ebben a könyvtárban" -#: ../gitg/gitg-window.vala:498 +#: ../gitg/gitg-window.vala:501 msgid "Projects" msgstr "Projektek" -#: ../gitg/gitg-window.vala:748 +#: ../gitg/gitg-window.vala:751 msgid "Select items" msgstr "Elemek kiválasztása" -#: ../gitg/gitg-window.vala:955 +#: ../gitg/gitg-window.vala:958 #, c-format msgid "'%s' is not a Git repository." msgstr "„%s” nem Git tároló." -#: ../gitg/gitg-window.vala:1104 +#: ../gitg/gitg-window.vala:1107 msgid "" "Your user name and email are not configured yet. Please go to the user " "configuration and provide your name and email." @@ -1148,7 +1154,7 @@ "A felhasználóneve és e-mail címe még nincs beállítva. Nyissa meg a " "felhasználói beállításokat, és adja meg nevét és e-mail címét." -#: ../gitg/gitg-window.vala:1108 +#: ../gitg/gitg-window.vala:1111 msgid "" "Your user name is not configured yet. Please go to the user configuration " "and provide your name." @@ -1156,7 +1162,7 @@ "A felhasználóneve még nincs beállítva. Nyissa meg a felhasználói " "beállításokat, és adja meg nevét." -#: ../gitg/gitg-window.vala:1112 +#: ../gitg/gitg-window.vala:1115 msgid "" "Your email is not configured yet. Please go to the user configuration and " "provide your email." @@ -1164,16 +1170,10 @@ "Az e-mail címe még nincs beállítva. Nyissa meg a felhasználói beállításokat, " "és adja meg e-mail címét." -#: ../gitg/gitg-window.vala:1115 +#: ../gitg/gitg-window.vala:1118 msgid "Missing author details" msgstr "Hiányzó szerzői adatok" -#: ../gitg/gitg-remote-notification.vala:90 -#: ../gitg/gitg-simple-notification.vala:99 -#: ../gitg/resources/ui/gitg-window.ui.h:10 -msgid "Close" -msgstr "Bezárás" - #: ../gitg/history/gitg-history-command-line.vala:42 msgid "Select all commits by default in the history activity" msgstr "" @@ -1206,18 +1206,18 @@ #: ../gitg/history/gitg-history-refs-list.vala:165 #, c-format -msgid "%d ahead, %d behind" -msgstr "előtte: %d, mögötte: %d" +msgid "%zu ahead, %zu behind" +msgstr "előtte: %zu, mögötte: %zu" #: ../gitg/history/gitg-history-refs-list.vala:169 #, c-format -msgid "%d ahead" -msgstr "előtte: %d" +msgid "%zu ahead" +msgstr "előtte: %zu" #: ../gitg/history/gitg-history-refs-list.vala:173 #, c-format -msgid "%d behind" -msgstr "mögött: %d" +msgid "%zu behind" +msgstr "mögötte: %zu" #: ../gitg/history/gitg-history-refs-list.vala:207 #: ../gitg/resources/ui/gitg-preferences-history.ui.h:4 @@ -1319,6 +1319,34 @@ msgid "%b %e %Y, %I:%M %p" msgstr "%Y. %b %e., %I.%M %p" +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:39 +#, c-format +msgid "before (%s)" +msgstr "előtte (%s)" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:45 +#, c-format +msgid "removed (%s)" +msgstr "eltávolítva (%s)" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:67 +#, c-format +msgid "after (%s)" +msgstr "utána (%s)" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:73 +#, c-format +msgid "added (%s)" +msgstr "hozzáadva (%s)" + #: ../libgitg/gitg-diff-view-commit-details.vala:145 msgid "Collapse all" msgstr "Összes összecsukása" @@ -1333,16 +1361,15 @@ msgid "Committed by %s" msgstr "Véglegesítette: %s" -#: ../libgitg/gitg-diff-view-file.vala:172 -#| msgid "_Open" +#: ../libgitg/gitg-diff-view-file.vala:177 msgid "_Open file" msgstr "Fájl _megnyitása" -#: ../libgitg/gitg-diff-view-file.vala:204 +#: ../libgitg/gitg-diff-view-file.vala:209 msgid "Open containing _folder" msgstr "_Tartalmazó mappa megnyitása" -#: ../libgitg/gitg-diff-view-file.vala:224 +#: ../libgitg/gitg-diff-view-file.vala:229 msgid "_Copy file path" msgstr "Fájlútvonal _másolása" @@ -1358,7 +1385,7 @@ msgid "%s at %s" msgstr "%s, itt: %s" -#: ../libgitg/gitg-repository-list-box.vala:418 +#: ../libgitg/gitg-repository-list-box.vala:541 msgid "Cloning…" msgstr "Klónozás…" @@ -1763,6 +1790,22 @@ msgid "Unable to display changes for binary file" msgstr "Nem lehet megjeleníteni a bináris fájl változtatásait" +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:1 +msgid "Side by side" +msgstr "Egymás mellett" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:2 +msgid "Slider" +msgstr "Csúszka" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:3 +msgid "Overlay" +msgstr "Rávetítés" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:4 +msgid "Difference" +msgstr "Különbség" + #: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:1 msgid "Tab width:" msgstr "Tabulátorszélesség:" @@ -1788,4 +1831,3 @@ "Remove the repository from the list (does not delete the repository from " "disk)" msgstr "A tároló eltávolítása a listából (de nem a lemezről)" - diff -Nru gitg-3.22.0/po/it.po gitg-3.23.0/po/it.po --- gitg-3.22.0/po/it.po 2016-08-25 22:20:16.000000000 +0000 +++ gitg-3.23.0/po/it.po 2016-11-26 08:32:35.000000000 +0000 @@ -17,8 +17,8 @@ "Project-Id-Version: gitg\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gitg&keywords=I18N+L10N&component=gitg\n" -"POT-Creation-Date: 2016-03-20 07:22+0000\n" -"PO-Revision-Date: 2016-03-20 18:06+0100\n" +"POT-Creation-Date: 2016-08-27 11:08+0000\n" +"PO-Revision-Date: 2016-10-07 08:38+0200\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" "Language: it\n" @@ -26,7 +26,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Generator: Poedit 1.8.7\n" +"X-Generator: Poedit 1.8.9\n" #: ../contrib/xml/xml-reader.c:327 #, c-format @@ -348,41 +348,41 @@ msgstr "Impossibile impostare la lingua per il controllo ortografico: %s" #: ../gitg/commit/gitg-commit-dialog.vala:508 -#: ../gitg/commit/gitg-commit.vala:1067 +#: ../gitg/commit/gitg-commit.vala:1076 msgid "There are no changes to be committed" msgstr "Non ci sono modifiche di cui eseguire il commit" #: ../gitg/commit/gitg-commit-dialog.vala:509 -#: ../gitg/commit/gitg-commit.vala:1068 +#: ../gitg/commit/gitg-commit.vala:1077 msgid "Use amend to change the commit message of the previous commit" msgstr "Usare «amend» per modificare il messaggio del commit precedente" -#: ../gitg/commit/gitg-commit.vala:104 +#: ../gitg/commit/gitg-commit.vala:113 msgctxt "Activity" msgid "Commit" msgstr "Commit" -#: ../gitg/commit/gitg-commit.vala:109 +#: ../gitg/commit/gitg-commit.vala:118 msgid "Create new commits and manage the staging area" msgstr "Crea nuovi commit e gestisci l'area d'indicizzazione" -#: ../gitg/commit/gitg-commit.vala:184 +#: ../gitg/commit/gitg-commit.vala:193 msgid "_Stage selection" msgstr "_Indicizza selezione" -#: ../gitg/commit/gitg-commit.vala:223 +#: ../gitg/commit/gitg-commit.vala:232 #, c-format msgid "Failed to stage the removal of submodule `%s'" msgstr "Indicizzazione della rimozione del sotto-modulo «%s» non riuscita" -#: ../gitg/commit/gitg-commit.vala:239 +#: ../gitg/commit/gitg-commit.vala:248 #, c-format msgid "Failed to open the repository of submodule `%s' while trying to stage" msgstr "" "Apertura, durante l'indicizzazione, del repository del sotto-modulo «%s» non " "riuscita" -#: ../gitg/commit/gitg-commit.vala:253 +#: ../gitg/commit/gitg-commit.vala:262 #, c-format msgid "" "Failed to lookup the working directory commit of submodule `%s' while trying " @@ -391,100 +391,100 @@ "Ricerca, durante l'indicizzazione, della directory di lavoro del commit del " "sotto-modulo «%s» non riuscita" -#: ../gitg/commit/gitg-commit.vala:266 +#: ../gitg/commit/gitg-commit.vala:275 #, c-format msgid "Failed to stage the submodule `%s'" msgstr "Indicizzazione del sotto-modulo «%s» non riuscita" -#: ../gitg/commit/gitg-commit.vala:288 +#: ../gitg/commit/gitg-commit.vala:297 #, c-format msgid "Failed to stage the removal of file `%s'" msgstr "Indicizzazione della rimozione del file «%s» non riuscita" -#: ../gitg/commit/gitg-commit.vala:302 +#: ../gitg/commit/gitg-commit.vala:311 #, c-format msgid "Failed to stage the file `%s'" msgstr "Indicizzazione del file «%s» non riuscita" -#: ../gitg/commit/gitg-commit.vala:574 +#: ../gitg/commit/gitg-commit.vala:583 msgid "_Unstage selection" msgstr "_De-indicizza selezione" -#: ../gitg/commit/gitg-commit.vala:640 +#: ../gitg/commit/gitg-commit.vala:649 #, c-format msgid "Failed to unstage the removal of file `%s'" msgstr "De-indicizzazione della rimozione del file «%s» non riuscita" -#: ../gitg/commit/gitg-commit.vala:641 +#: ../gitg/commit/gitg-commit.vala:650 #, c-format msgid "Failed to unstage the file `%s'" msgstr "De-indicizzazione del file «%s» non riuscita" -#: ../gitg/commit/gitg-commit.vala:648 +#: ../gitg/commit/gitg-commit.vala:657 #, c-format msgid "Failed to unstage the removal of submodule `%s'" msgstr "De-indicizzazione della rimozione del sotto-modulo «%s» non riuscita" -#: ../gitg/commit/gitg-commit.vala:649 +#: ../gitg/commit/gitg-commit.vala:658 #, c-format msgid "Failed to unstage the submodule `%s'" msgstr "De-indicizzazione del sotto-modulo «%s» non riuscita" #. Populate staged items -#: ../gitg/commit/gitg-commit.vala:853 +#: ../gitg/commit/gitg-commit.vala:862 msgid "Staged" msgstr "Indicizzato" -#: ../gitg/commit/gitg-commit.vala:861 +#: ../gitg/commit/gitg-commit.vala:870 msgid "No staged files" msgstr "Nessun file indicizzato" #. Populate unstaged items -#: ../gitg/commit/gitg-commit.vala:884 +#: ../gitg/commit/gitg-commit.vala:893 msgid "Unstaged" msgstr "Non indicizzato" -#: ../gitg/commit/gitg-commit.vala:892 +#: ../gitg/commit/gitg-commit.vala:901 msgid "No unstaged files" msgstr "Nessun file non indicizzato" #. Populate untracked items -#: ../gitg/commit/gitg-commit.vala:915 +#: ../gitg/commit/gitg-commit.vala:924 msgid "Untracked" msgstr "Non monitorato" -#: ../gitg/commit/gitg-commit.vala:919 +#: ../gitg/commit/gitg-commit.vala:928 msgid "No untracked files" msgstr "Nessun file non monitorato" -#: ../gitg/commit/gitg-commit.vala:944 +#: ../gitg/commit/gitg-commit.vala:953 msgid "Submodule" msgstr "Sotto-modulo" -#: ../gitg/commit/gitg-commit.vala:948 +#: ../gitg/commit/gitg-commit.vala:957 msgid "No dirty submodules" msgstr "Nessun sotto-modulo contaminato" -#: ../gitg/commit/gitg-commit.vala:1095 +#: ../gitg/commit/gitg-commit.vala:1106 msgid "Failed to commit" msgstr "Commit non riuscito" -#: ../gitg/commit/gitg-commit.vala:1111 +#: ../gitg/commit/gitg-commit.vala:1122 msgid "Failed to pass pre-commit" msgstr "Verifica pre-commit non riuscita" -#: ../gitg/commit/gitg-commit.vala:1314 ../gitg/commit/gitg-commit.vala:1464 +#: ../gitg/commit/gitg-commit.vala:1330 ../gitg/commit/gitg-commit.vala:1480 msgid "Discard changes" msgstr "Scarta le modifiche" -#: ../gitg/commit/gitg-commit.vala:1315 +#: ../gitg/commit/gitg-commit.vala:1331 msgid "Are you sure you want to permanently discard the selected changes?" msgstr "Scartare definitivamente le modifiche selezionate?" -#: ../gitg/commit/gitg-commit.vala:1324 ../gitg/commit/gitg-commit.vala:1490 -#: ../gitg/commit/gitg-commit.vala:1605 +#: ../gitg/commit/gitg-commit.vala:1340 ../gitg/commit/gitg-commit.vala:1506 +#: ../gitg/commit/gitg-commit.vala:1621 #: ../gitg/gitg-commit-action-create-patch.vala:145 -#: ../gitg/gitg-dash-view.vala:437 ../gitg/gitg-window.vala:190 +#: ../gitg/gitg-dash-view.vala:444 ../gitg/gitg-window.vala:189 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:2 #: ../gitg/resources/ui/gitg-clone-dialog.ui.h:2 #: ../gitg/resources/ui/gitg-commit-dialog.ui.h:2 @@ -495,79 +495,79 @@ msgid "_Cancel" msgstr "A_nnulla" -#: ../gitg/commit/gitg-commit.vala:1325 ../gitg/commit/gitg-commit.vala:1491 +#: ../gitg/commit/gitg-commit.vala:1341 ../gitg/commit/gitg-commit.vala:1507 msgid "Discard" msgstr "Scarta" -#: ../gitg/commit/gitg-commit.vala:1354 +#: ../gitg/commit/gitg-commit.vala:1370 msgid "Failed to discard selection" msgstr "Scarto della selezione non riuscito" -#: ../gitg/commit/gitg-commit.vala:1384 +#: ../gitg/commit/gitg-commit.vala:1400 msgid "Failed to stage selection" msgstr "Indicizzazione della selezione non riuscita" -#: ../gitg/commit/gitg-commit.vala:1388 +#: ../gitg/commit/gitg-commit.vala:1404 msgid "Failed to unstage selection" msgstr "De-indicizzazione della selezione non riuscita" -#: ../gitg/commit/gitg-commit.vala:1448 +#: ../gitg/commit/gitg-commit.vala:1464 msgid "Failed to discard changes" msgstr "Scarto delle modifiche non riuscito" -#: ../gitg/commit/gitg-commit.vala:1469 +#: ../gitg/commit/gitg-commit.vala:1485 #, c-format msgid "" "Are you sure you want to permanently discard all changes made to the file `" "%s'?" msgstr "Scartare definitivamente tutte le modifiche fatte al file «%s»?" -#: ../gitg/commit/gitg-commit.vala:1480 +#: ../gitg/commit/gitg-commit.vala:1496 #, c-format msgid "" "Are you sure you want to permanently discard all changes made to the files " "%s and `%s'?" msgstr "Scartare definitivamente tutte le modifiche fatte ai file «%s» e «%s»?" -#: ../gitg/commit/gitg-commit.vala:1563 +#: ../gitg/commit/gitg-commit.vala:1579 msgid "Failed to delete files" msgstr "Eliminazione dei file non riuscita" -#: ../gitg/commit/gitg-commit.vala:1579 +#: ../gitg/commit/gitg-commit.vala:1595 msgid "Delete file" msgid_plural "Delete files" msgstr[0] "Elimina file" msgstr[1] "Elimina file" -#: ../gitg/commit/gitg-commit.vala:1584 +#: ../gitg/commit/gitg-commit.vala:1600 #, c-format msgid "Are you sure you want to permanently delete the file `%s'?" msgstr "Eliminare definitivamente il file «%s»?" -#: ../gitg/commit/gitg-commit.vala:1595 +#: ../gitg/commit/gitg-commit.vala:1611 #, c-format msgid "Are you sure you want to permanently delete the files %s and `%s'?" msgstr "Eliminare definitivamente i file %s e «%s»?" -#: ../gitg/commit/gitg-commit.vala:1640 +#: ../gitg/commit/gitg-commit.vala:1657 msgid "_Stage changes" msgstr "_Indicizza modifiche" -#: ../gitg/commit/gitg-commit.vala:1650 +#: ../gitg/commit/gitg-commit.vala:1669 msgid "_Unstage changes" msgstr "_De-indicizza modifiche" -#: ../gitg/commit/gitg-commit.vala:1660 +#: ../gitg/commit/gitg-commit.vala:1681 msgid "_Discard changes" msgstr "_Scarta modifiche" -#: ../gitg/commit/gitg-commit.vala:1670 +#: ../gitg/commit/gitg-commit.vala:1693 msgid "D_elete file" msgid_plural "D_elete files" msgstr[0] "_Elimina file" msgstr[1] "_Elimina file" -#: ../gitg/commit/gitg-commit.vala:1693 +#: ../gitg/commit/gitg-commit.vala:1723 msgid "_Edit file" msgstr "_Modifica file" @@ -651,19 +651,19 @@ msgid "- Git repository viewer" msgstr "- Visualizzatore di repository git" -#: ../gitg/gitg-application.vala:226 +#: ../gitg/gitg-application.vala:222 msgid "gitg is a Git repository viewer for gtk+/GNOME" msgstr "gitg è un visualizzatore di repository git per gtk+/GNOME" -#: ../gitg/gitg-application.vala:235 +#: ../gitg/gitg-application.vala:231 msgid "translator-credits" msgstr "Milo Casagrande " -#: ../gitg/gitg-application.vala:238 +#: ../gitg/gitg-application.vala:234 msgid "gitg homepage" msgstr "Sito web di gitg" -#: ../gitg/gitg-application.vala:369 +#: ../gitg/gitg-application.vala:364 msgid "" "We are terribly sorry, but gitg requires libgit2 (a library on which gitg " "depends) to be compiled with threading support.\n" @@ -684,23 +684,23 @@ "distribuzione in uso." #. ex: ts=4 noet -#: ../gitg/gitg-author-details-dialog.vala:85 -#: ../gitg/gitg-author-details-dialog.vala:105 +#: ../gitg/gitg-author-details-dialog.vala:97 +#: ../gitg/gitg-author-details-dialog.vala:117 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:1 msgid "Author Details" msgstr "Dettagli autore" -#: ../gitg/gitg-author-details-dialog.vala:86 +#: ../gitg/gitg-author-details-dialog.vala:98 msgid "Enter default details used for all repositories:" msgstr "Inserire i dettagli predefiniti per tutti i repository:" #. Translators: %s is the repository name -#: ../gitg/gitg-author-details-dialog.vala:108 +#: ../gitg/gitg-author-details-dialog.vala:120 #, c-format msgid "Override global details for repository '%s':" msgstr "Scavalcare i dettagli globali per il repository «%s»:" -#: ../gitg/gitg-author-details-dialog.vala:220 +#: ../gitg/gitg-author-details-dialog.vala:232 msgid "Failed to set Git user config." msgstr "Impostazione della configurazione utente git non riuscita." @@ -832,12 +832,16 @@ msgid "Provide a message to create an annotated tag" msgstr "Fornire un messaggio per creare un tag" -#: ../gitg/gitg-dash-view.vala:171 +#: ../gitg/gitg-dash-view.vala:87 +msgid "Select and manage projects" +msgstr "Seleziona e gestisci progetti" + +#: ../gitg/gitg-dash-view.vala:176 msgid "_Remove" msgstr "_Rimuovi" #. Translators: the two %s will be replaced to create a link to perform the scanning action. -#: ../gitg/gitg-dash-view.vala:227 +#: ../gitg/gitg-dash-view.vala:232 #, c-format msgid "We can also %sscan your home directory%s for git repositories." msgstr "" @@ -845,25 +849,25 @@ "repository git." #. Translators: the two %s will be used to create a link to the author dialog. -#: ../gitg/gitg-dash-view.vala:230 +#: ../gitg/gitg-dash-view.vala:235 #, c-format msgid "In the mean time, you may want to %sset up your git profile%s." msgstr "Nel frattempo, è possibile %simpostare il proprio profilo git%s." -#: ../gitg/gitg-dash-view.vala:382 +#: ../gitg/gitg-dash-view.vala:389 msgid "Failed to clone repository" msgstr "Clone del repository non riuscito" -#: ../gitg/gitg-dash-view.vala:413 +#: ../gitg/gitg-dash-view.vala:420 msgid "Failed to add repository" msgstr "Aggiunta del repository non riuscita" -#: ../gitg/gitg-dash-view.vala:429 +#: ../gitg/gitg-dash-view.vala:436 msgid "Create new repository" msgstr "Crea nuovo repository" #. Translators: %s is a file name -#: ../gitg/gitg-dash-view.vala:432 +#: ../gitg/gitg-dash-view.vala:439 #, c-format msgid "" "The location %s does not appear to be a valid git repository. Would " @@ -872,15 +876,15 @@ "La posizione %s non sembra essere un repository git valido. " "Inizializzare un nuovo repository git su questa posizione?" -#: ../gitg/gitg-dash-view.vala:438 +#: ../gitg/gitg-dash-view.vala:445 msgid "Create repository" msgstr "Crea repository" -#: ../gitg/gitg-dash-view.vala:454 +#: ../gitg/gitg-dash-view.vala:461 msgid "Failed to create repository" msgstr "Creazione del repository non riuscita" -#: ../gitg/gitg-dash-view.vala:524 +#: ../gitg/gitg-dash-view.vala:531 #, c-format msgid "Scanning for repositories in %s" msgstr "Ricerca repository in %s" @@ -1120,28 +1124,32 @@ msgid "Failed to rename" msgstr "Rinomina non riuscita" -#: ../gitg/gitg-window.vala:187 +#: ../gitg/gitg-window.vala:186 msgid "Add Repository" msgstr "Aggiungi repository" -#: ../gitg/gitg-window.vala:191 +#: ../gitg/gitg-window.vala:190 msgid "_Add" msgstr "A_ggiungi" -#: ../gitg/gitg-window.vala:193 +#: ../gitg/gitg-window.vala:192 msgid "_Scan for all git repositories from this directory" msgstr "_Cerca repository a partire da questa directory" -#: ../gitg/gitg-window.vala:481 +#: ../gitg/gitg-window.vala:498 msgid "Projects" msgstr "Progetti" -#: ../gitg/gitg-window.vala:912 +#: ../gitg/gitg-window.vala:748 +msgid "Select items" +msgstr "Seleziona elementi" + +#: ../gitg/gitg-window.vala:955 #, c-format msgid "'%s' is not a Git repository." msgstr "«%s» non è un repository git." -#: ../gitg/gitg-window.vala:1061 +#: ../gitg/gitg-window.vala:1104 msgid "" "Your user name and email are not configured yet. Please go to the user " "configuration and provide your name and email." @@ -1149,7 +1157,7 @@ "L'indirizzo email e il nome utente non sono ancora stati configurati. Aprire " "la configurazione utente e fornirli entrambi." -#: ../gitg/gitg-window.vala:1065 +#: ../gitg/gitg-window.vala:1108 msgid "" "Your user name is not configured yet. Please go to the user configuration " "and provide your name." @@ -1157,7 +1165,7 @@ "Il nome utente non è ancora stato configurato. Aprire la configurazione " "utente e fornirne uno." -#: ../gitg/gitg-window.vala:1069 +#: ../gitg/gitg-window.vala:1112 msgid "" "Your email is not configured yet. Please go to the user configuration and " "provide your email." @@ -1165,7 +1173,7 @@ "L'indirizzo email non è ancora stato configurato. Aprire la configurazione " "utente e fornirne uno." -#: ../gitg/gitg-window.vala:1072 +#: ../gitg/gitg-window.vala:1115 msgid "Missing author details" msgstr "Dettagli autore mancanti" @@ -1227,17 +1235,17 @@ msgid "Remotes" msgstr "Remoti" -#: ../gitg/history/gitg-history.vala:306 +#: ../gitg/history/gitg-history.vala:342 #: ../gitg/preferences/gitg-preferences-history.vala:218 #: ../gitg/resources/ui/gitg-preferences-interface.ui.h:3 msgid "History" msgstr "Cronologia" -#: ../gitg/history/gitg-history.vala:311 +#: ../gitg/history/gitg-history.vala:347 msgid "Examine the history of the repository" msgstr "Esamina la cronologia del repository" -#: ../gitg/history/gitg-history.vala:796 +#: ../gitg/history/gitg-history.vala:843 msgid "Mainline" msgstr "Mainline" @@ -1250,6 +1258,13 @@ msgid "Interface" msgstr "Interfaccia" +#. Translators: %s will be replaced with a URL indicating the resource +#. for which the authentication is required. +#: ../libgitg/gitg-authentication-dialog.vala:69 +#, c-format +msgid "Password required for %s" +msgstr "Richiesta password per %s" + #: ../libgitg/gitg-date.vala:346 msgid "Now" msgstr "Ora" @@ -1307,20 +1322,32 @@ msgid "%b %e %Y, %I:%M %p" msgstr "%e %b %Y, %I:%M %p" -#: ../libgitg/gitg-diff-view-commit-details.vala:142 +#: ../libgitg/gitg-diff-view-commit-details.vala:145 msgid "Collapse all" msgstr "Chiudi tutto" -#: ../libgitg/gitg-diff-view-commit-details.vala:146 +#: ../libgitg/gitg-diff-view-commit-details.vala:149 #: ../libgitg/resources/ui/gitg-diff-view-commit-details.ui.h:2 msgid "Expand all" msgstr "Espandi tutto" -#: ../libgitg/gitg-diff-view-commit-details.vala:199 +#: ../libgitg/gitg-diff-view-commit-details.vala:202 #, c-format msgid "Committed by %s" msgstr "Commit eseguito da %s" +#: ../libgitg/gitg-diff-view-file.vala:172 +msgid "_Open file" +msgstr "_Apri file" + +#: ../libgitg/gitg-diff-view-file.vala:204 +msgid "Open containing _folder" +msgstr "Apri _cartella contenente" + +#: ../libgitg/gitg-diff-view-file.vala:224 +msgid "_Copy file path" +msgstr "_Copia percorso file" + #. Translators: this is used to construct: "at ", to indicate where the repository is at. #: ../libgitg/gitg-repository-list-box.vala:154 #, c-format @@ -1333,8 +1360,7 @@ msgid "%s at %s" msgstr "%s in %s" -#: ../libgitg/gitg-repository-list-box.vala:409 -#| msgid "Cloning..." +#: ../libgitg/gitg-repository-list-box.vala:541 msgid "Cloning…" msgstr "Creazione clone…" @@ -1345,12 +1371,12 @@ "Impossibile leggere il messaggio di commit dopo l'esecuzione dell'hook " "commit-msg: %s" -#: ../plugins/diff/gitg-diff.vala:112 +#: ../plugins/diff/gitg-diff.vala:115 #: ../gitg/resources/ui/gitg-preferences-interface.ui.h:11 msgid "Diff" msgstr "Diff" -#: ../plugins/diff/gitg-diff.vala:117 +#: ../plugins/diff/gitg-diff.vala:120 msgid "Show the changes introduced by the selected commit" msgstr "Mostra le modifiche introdotte dal commit selezionato" @@ -1513,18 +1539,14 @@ msgstr "_Scorciatoie da tastiera" #: ../gitg/resources/ui/gitg-menus.ui.h:5 -msgid "_Help" -msgstr "A_iuto" - -#: ../gitg/resources/ui/gitg-menus.ui.h:6 msgid "_About" msgstr "I_nformazioni" -#: ../gitg/resources/ui/gitg-menus.ui.h:7 +#: ../gitg/resources/ui/gitg-menus.ui.h:6 msgid "_Quit" msgstr "_Chiudi" -#: ../gitg/resources/ui/gitg-menus.ui.h:8 +#: ../gitg/resources/ui/gitg-menus.ui.h:7 msgid "_Reload" msgstr "_Ricarica" @@ -1740,6 +1762,10 @@ msgid "Parents" msgstr "Genitori" +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-binary.ui.h:1 +msgid "Unable to display changes for binary file" +msgstr "Impossibile visualizzare le modifiche per un file binario" + #: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:1 msgid "Tab width:" msgstr "Larghezza tabulazione:" @@ -1765,7 +1791,3 @@ "Remove the repository from the list (does not delete the repository from " "disk)" msgstr "Rimuovere il repository dall'elenco (non lo elimina dal disco)" - -#: ../plugins/files/resources/view-files.ui.h:1 -msgid "column" -msgstr "colonna" diff -Nru gitg-3.22.0/po/ko.po gitg-3.23.0/po/ko.po --- gitg-3.22.0/po/ko.po 2016-09-18 11:59:28.000000000 +0000 +++ gitg-3.23.0/po/ko.po 2016-11-26 08:32:25.000000000 +0000 @@ -8,8 +8,8 @@ "Project-Id-Version: gitg master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gitg&keywords=I18N+L10N&component=gitg\n" -"POT-Creation-Date: 2016-08-27 11:08+0000\n" -"PO-Revision-Date: 2016-08-31 06:42+0900\n" +"POT-Creation-Date: 2016-08-27 11:14+0000\n" +"PO-Revision-Date: 2016-08-31 06:40+0900\n" "Last-Translator: Seong-ho Cho \n" "Language-Team: 한국어 \n" "Language: ko\n" @@ -1089,6 +1089,12 @@ msgid "Failed to rename" msgstr "이름 바꾸기에 실패했습니다" +#: ../gitg/gitg-remote-notification.vala:90 +#: ../gitg/gitg-simple-notification.vala:99 +#: ../gitg/resources/ui/gitg-window.ui.h:10 +msgid "Close" +msgstr "닫기" + #: ../gitg/gitg-window.vala:186 msgid "Add Repository" msgstr "저장소 추가" @@ -1142,12 +1148,6 @@ msgid "Missing author details" msgstr "작성자 세부 내용이 빠졌습니다" -#: ../gitg/gitg-remote-notification.vala:90 -#: ../gitg/gitg-simple-notification.vala:99 -#: ../gitg/resources/ui/gitg-window.ui.h:10 -msgid "Close" -msgstr "닫기" - #: ../gitg/history/gitg-history-command-line.vala:42 msgid "Select all commits by default in the history activity" msgstr "기록 활동에서 모든 커밋을 기본으로 선택" @@ -1284,6 +1284,34 @@ msgid "%b %e %Y, %I:%M %p" msgstr "%Y년 %b %e일 %p %I:%M" +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:39 +#, c-format +msgid "before (%s)" +msgstr "이전(%s)" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:45 +#, c-format +msgid "removed (%s)" +msgstr "제거함(%s)" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:67 +#, c-format +msgid "after (%s)" +msgstr "다음(%s)" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:73 +#, c-format +msgid "added (%s)" +msgstr "추가함(%s)" + #: ../libgitg/gitg-diff-view-commit-details.vala:145 msgid "Collapse all" msgstr "모두 숨기기" @@ -1298,15 +1326,15 @@ msgid "Committed by %s" msgstr "%s이(가) 제출함" -#: ../libgitg/gitg-diff-view-file.vala:172 +#: ../libgitg/gitg-diff-view-file.vala:177 msgid "_Open file" msgstr "파일 열기(_O)" -#: ../libgitg/gitg-diff-view-file.vala:204 +#: ../libgitg/gitg-diff-view-file.vala:209 msgid "Open containing _folder" msgstr "포함 폴더 열기(_F)" -#: ../libgitg/gitg-diff-view-file.vala:224 +#: ../libgitg/gitg-diff-view-file.vala:229 msgid "_Copy file path" msgstr "파일 경로 복사(_C)" @@ -1730,6 +1758,22 @@ msgid "Unable to display changes for binary file" msgstr "이진 파일 변경 내역을 표시할 수 없습니다" +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:1 +msgid "Side by side" +msgstr "나란히" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:2 +msgid "Slider" +msgstr "슬라이더" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:3 +msgid "Overlay" +msgstr "오버레이" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:4 +msgid "Difference" +msgstr "차이점" + #: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:1 msgid "Tab width:" msgstr "탭 간격:" diff -Nru gitg-3.22.0/po/lt.po gitg-3.23.0/po/lt.po --- gitg-3.22.0/po/lt.po 2016-09-18 11:59:28.000000000 +0000 +++ gitg-3.23.0/po/lt.po 2016-11-26 08:32:25.000000000 +0000 @@ -9,8 +9,8 @@ "Project-Id-Version: gitg\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gitg&keywords=I18N+L10N&component=gitg\n" -"POT-Creation-Date: 2016-08-31 15:27+0000\n" -"PO-Revision-Date: 2016-09-04 16:41+0300\n" +"POT-Creation-Date: 2016-08-31 15:28+0000\n" +"PO-Revision-Date: 2016-09-04 16:39+0300\n" "Last-Translator: Aurimas Černius \n" "Language-Team: Lietuvių \n" "Language: lt\n" @@ -1111,6 +1111,12 @@ msgid "Failed to rename" msgstr "Nepavyko pervadinti" +#: ../gitg/gitg-remote-notification.vala:90 +#: ../gitg/gitg-simple-notification.vala:99 +#: ../gitg/resources/ui/gitg-window.ui.h:10 +msgid "Close" +msgstr "Užverti" + #: ../gitg/gitg-window.vala:187 msgid "Add Repository" msgstr "Pridėti saugyklą" @@ -1164,12 +1170,6 @@ msgid "Missing author details" msgstr "Trūksta autoriaus informacijos" -#: ../gitg/gitg-remote-notification.vala:90 -#: ../gitg/gitg-simple-notification.vala:99 -#: ../gitg/resources/ui/gitg-window.ui.h:10 -msgid "Close" -msgstr "Užverti" - #: ../gitg/history/gitg-history-command-line.vala:42 msgid "Select all commits by default in the history activity" msgstr "Numatytai pažymėti visus patvirtinimus istorijos veikloje" @@ -1312,6 +1312,34 @@ msgid "%b %e %Y, %I:%M %p" msgstr "%Yn%b %e, %I:%M" +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:39 +#, c-format +msgid "before (%s)" +msgstr "prieš (%s)" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:45 +#, c-format +msgid "removed (%s)" +msgstr "pašalinta (%s)" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:67 +#, c-format +msgid "after (%s)" +msgstr "po (%s)" + +#. Translators: this label is displayed below the image diff, %s +#. is substituted with the size of the image +#: ../libgitg/gitg-diff-image-side-by-side.vala:73 +#, c-format +msgid "added (%s)" +msgstr "pridėta (%s)" + #: ../libgitg/gitg-diff-view-commit-details.vala:145 msgid "Collapse all" msgstr "Suskleisti viską" @@ -1326,16 +1354,16 @@ msgid "Committed by %s" msgstr "Patvirtino %s" -#: ../libgitg/gitg-diff-view-file.vala:172 +#: ../libgitg/gitg-diff-view-file.vala:177 #| msgid "_Open" msgid "_Open file" msgstr "_Atverti failą" -#: ../libgitg/gitg-diff-view-file.vala:204 +#: ../libgitg/gitg-diff-view-file.vala:209 msgid "Open containing _folder" msgstr "Atverti _aplanką su failu" -#: ../libgitg/gitg-diff-view-file.vala:224 +#: ../libgitg/gitg-diff-view-file.vala:229 msgid "_Copy file path" msgstr "_Kopijuoti failo kelią" @@ -1756,6 +1784,23 @@ msgid "Unable to display changes for binary file" msgstr "Negalima parodyti dvejetainio failo pakeitimų" +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:1 +msgid "Side by side" +msgstr "Vienas šalia kito" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:2 +msgid "Slider" +msgstr "Slankiklis" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:3 +msgid "Overlay" +msgstr "Dangalas" + +#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui.h:4 +#| msgid "References" +msgid "Difference" +msgstr "Skirtumas" + #: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:1 msgid "Tab width:" msgstr "Tabuliavimo plotis:" diff -Nru gitg-3.22.0/po/POTFILES.in gitg-3.23.0/po/POTFILES.in --- gitg-3.22.0/po/POTFILES.in 2016-09-18 11:59:28.000000000 +0000 +++ gitg-3.23.0/po/POTFILES.in 2016-11-26 08:32:25.000000000 +0000 @@ -22,10 +22,10 @@ gitg/gitg-ref-action-fetch.vala gitg/gitg-ref-action-merge.vala gitg/gitg-ref-action-rename.vala -gitg/gitg.vala -gitg/gitg-window.vala gitg/gitg-remote-notification.vala gitg/gitg-simple-notification.vala +gitg/gitg.vala +gitg/gitg-window.vala gitg/history/gitg-history-command-line.vala gitg/history/gitg-history-refs-list.vala gitg/history/gitg-history.vala @@ -34,6 +34,7 @@ gitg/preferences/gitg-preferences-interface.vala libgitg/gitg-authentication-dialog.vala libgitg/gitg-date.vala +libgitg/gitg-diff-image-side-by-side.vala libgitg/gitg-diff-view-commit-details.vala libgitg/gitg-diff-view-file.vala libgitg/gitg-diff-view.vala @@ -64,6 +65,7 @@ [type: gettext/glade]libgitg/resources/ui/gitg-authentication-dialog.ui [type: gettext/glade]libgitg/resources/ui/gitg-diff-view-commit-details.ui [type: gettext/glade]libgitg/resources/ui/gitg-diff-view-file-renderer-binary.ui +[type: gettext/glade]libgitg/resources/ui/gitg-diff-view-file-renderer-image.ui [type: gettext/glade]libgitg/resources/ui/gitg-diff-view-options-spacing.ui [type: gettext/glade]libgitg/resources/ui/gitg-diff-view-options.ui [type: gettext/glade]libgitg/resources/ui/gitg-repository-list-box-row.ui diff -Nru gitg-3.22.0/po/POTFILES.skip gitg-3.23.0/po/POTFILES.skip --- gitg-3.22.0/po/POTFILES.skip 2016-09-18 11:59:28.000000000 +0000 +++ gitg-3.23.0/po/POTFILES.skip 2016-11-26 08:32:25.000000000 +0000 @@ -1,3 +1,5 @@ +# List of source files that should *not* be translated. +# Please keep this file sorted alphabetically. data/gitg.desktop.in data/org.gnome.gitg.gschema.xml.in sub/data/gitg.desktop.in @@ -33,9 +35,10 @@ libgitg/gitg-authentication-dialog.c libgitg/gitg-authentication-dialog.c libgitg/gitg-date.c +libgitg/gitg-diff-image-side-by-side.c +libgitg/gitg-diff-view.c libgitg/gitg-diff-view-commit-details.c libgitg/gitg-diff-view-file.c -libgitg/gitg-diff-view.c libgitg/gitg-repository-list-box.c libgitg/gitg-stage.c plugins/diff/gitg-diff.c diff -Nru gitg-3.22.0/po/sr@latin.po gitg-3.23.0/po/sr@latin.po --- gitg-3.22.0/po/sr@latin.po 2016-09-18 11:59:28.000000000 +0000 +++ gitg-3.23.0/po/sr@latin.po 2016-11-26 08:32:25.000000000 +0000 @@ -7,11 +7,11 @@ "Project-Id-Version: gitg\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gitg&ke" "ywords=I18N+L10N&component=gitg\n" -"POT-Creation-Date: 2016-08-27 11:08+0000\n" -"PO-Revision-Date: 2016-09-01 18:45+0200\n" +"POT-Creation-Date: 2016-02-20 07:19+0000\n" +"PO-Revision-Date: 2016-02-20 11:17+0200\n" "Last-Translator: Miroslav Nikolić \n" -"Language-Team: srpski \n" -"Language: sr\n" +"Language-Team: Serbian \n" +"Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -81,6 +81,9 @@ msgstr "Uključuje isticanje razlika" #: ../data/org.gnome.gitg.gschema.xml.in.in.h:12 +#| msgid "" +#| "Setting which determines whether or not spell checking is enabled when " +#| "writing a commit message." msgid "" "Setting that determines whether to enable syntax highlighting in diff views." msgstr "" @@ -343,40 +346,40 @@ msgstr "Ne mogu da postavim jezik provere pisanja: %s" #: ../gitg/commit/gitg-commit-dialog.vala:508 -#: ../gitg/commit/gitg-commit.vala:1076 +#: ../gitg/commit/gitg-commit.vala:1067 msgid "There are no changes to be committed" msgstr "Nema izmena za predaju" #: ../gitg/commit/gitg-commit-dialog.vala:509 -#: ../gitg/commit/gitg-commit.vala:1077 +#: ../gitg/commit/gitg-commit.vala:1068 msgid "Use amend to change the commit message of the previous commit" msgstr "Koristite dopunu da izmenite poruku predaje prethodne predaje" -#: ../gitg/commit/gitg-commit.vala:113 +#: ../gitg/commit/gitg-commit.vala:104 msgctxt "Activity" msgid "Commit" msgstr "Predaj" -#: ../gitg/commit/gitg-commit.vala:118 +#: ../gitg/commit/gitg-commit.vala:109 msgid "Create new commits and manage the staging area" msgstr "Napravite nove predaje i upravljajte pblašću uštekavanja" -#: ../gitg/commit/gitg-commit.vala:193 +#: ../gitg/commit/gitg-commit.vala:184 msgid "_Stage selection" msgstr "_Uštekaj izbor" -#: ../gitg/commit/gitg-commit.vala:232 +#: ../gitg/commit/gitg-commit.vala:223 #, c-format msgid "Failed to stage the removal of submodule `%s'" msgstr "Nisam uspeo da uštekam uklanjanje podmodula „%s“" -#: ../gitg/commit/gitg-commit.vala:248 +#: ../gitg/commit/gitg-commit.vala:239 #, c-format msgid "Failed to open the repository of submodule `%s' while trying to stage" msgstr "" "Nisam uspeo da otvorim riznicu podmodula „%s“ kada sam pokušao da uštekam" -#: ../gitg/commit/gitg-commit.vala:262 +#: ../gitg/commit/gitg-commit.vala:253 #, c-format msgid "" "Failed to lookup the working directory commit of submodule `%s' while trying " @@ -385,100 +388,100 @@ "Nisam uspeo da pretražim slanja radnog direktorijuma podmodula „%s“ kada sam " "pokušao da uštekam" -#: ../gitg/commit/gitg-commit.vala:275 +#: ../gitg/commit/gitg-commit.vala:266 #, c-format msgid "Failed to stage the submodule `%s'" msgstr "Nisam uspeo da uštekam podmodul „%s“" -#: ../gitg/commit/gitg-commit.vala:297 +#: ../gitg/commit/gitg-commit.vala:288 #, c-format msgid "Failed to stage the removal of file `%s'" msgstr "Nisam uspeo da uštekam uklanjanje datoteke „%s“" -#: ../gitg/commit/gitg-commit.vala:311 +#: ../gitg/commit/gitg-commit.vala:302 #, c-format msgid "Failed to stage the file `%s'" msgstr "Nisam uspeo da uštekam datoteku „%s“" -#: ../gitg/commit/gitg-commit.vala:583 +#: ../gitg/commit/gitg-commit.vala:574 msgid "_Unstage selection" msgstr "_Odštekaj izbor" -#: ../gitg/commit/gitg-commit.vala:649 +#: ../gitg/commit/gitg-commit.vala:640 #, c-format msgid "Failed to unstage the removal of file `%s'" msgstr "Nisam uspeo da odštekam uklanjanje datoteke „%s“" -#: ../gitg/commit/gitg-commit.vala:650 +#: ../gitg/commit/gitg-commit.vala:641 #, c-format msgid "Failed to unstage the file `%s'" msgstr "Nisam uspeo da odštekam datoteku „%s“" -#: ../gitg/commit/gitg-commit.vala:657 +#: ../gitg/commit/gitg-commit.vala:648 #, c-format msgid "Failed to unstage the removal of submodule `%s'" msgstr "Nisam uspeo da odštekam uklanjanje podmodula „%s“" -#: ../gitg/commit/gitg-commit.vala:658 +#: ../gitg/commit/gitg-commit.vala:649 #, c-format msgid "Failed to unstage the submodule `%s'" msgstr "Nisam uspeo da odštekam podmodul „%s“" #. Populate staged items -#: ../gitg/commit/gitg-commit.vala:862 +#: ../gitg/commit/gitg-commit.vala:853 msgid "Staged" msgstr "Uštekano" -#: ../gitg/commit/gitg-commit.vala:870 +#: ../gitg/commit/gitg-commit.vala:861 msgid "No staged files" msgstr "Nema uštekanih datoteka" #. Populate unstaged items -#: ../gitg/commit/gitg-commit.vala:893 +#: ../gitg/commit/gitg-commit.vala:884 msgid "Unstaged" msgstr "Odštekano" -#: ../gitg/commit/gitg-commit.vala:901 +#: ../gitg/commit/gitg-commit.vala:892 msgid "No unstaged files" msgstr "Nema odštekanih datoteka" #. Populate untracked items -#: ../gitg/commit/gitg-commit.vala:924 +#: ../gitg/commit/gitg-commit.vala:915 msgid "Untracked" msgstr "Nepraćene" -#: ../gitg/commit/gitg-commit.vala:928 +#: ../gitg/commit/gitg-commit.vala:919 msgid "No untracked files" msgstr "Nema nepraćenih datoteka" -#: ../gitg/commit/gitg-commit.vala:953 +#: ../gitg/commit/gitg-commit.vala:944 msgid "Submodule" msgstr "Podmodul" -#: ../gitg/commit/gitg-commit.vala:957 +#: ../gitg/commit/gitg-commit.vala:948 msgid "No dirty submodules" msgstr "Nema zaprljanih podmodula" -#: ../gitg/commit/gitg-commit.vala:1106 +#: ../gitg/commit/gitg-commit.vala:1095 msgid "Failed to commit" msgstr "Nisam uspeo da predam" -#: ../gitg/commit/gitg-commit.vala:1122 +#: ../gitg/commit/gitg-commit.vala:1111 msgid "Failed to pass pre-commit" msgstr "Nisam uspeo da prođem pred-predaju" -#: ../gitg/commit/gitg-commit.vala:1330 ../gitg/commit/gitg-commit.vala:1480 +#: ../gitg/commit/gitg-commit.vala:1314 ../gitg/commit/gitg-commit.vala:1464 msgid "Discard changes" msgstr "Odbaci izmene" -#: ../gitg/commit/gitg-commit.vala:1331 +#: ../gitg/commit/gitg-commit.vala:1315 msgid "Are you sure you want to permanently discard the selected changes?" msgstr "Da li ste sigurni da želite trajno da odbacite izabrane izmene?" -#: ../gitg/commit/gitg-commit.vala:1340 ../gitg/commit/gitg-commit.vala:1506 -#: ../gitg/commit/gitg-commit.vala:1621 +#: ../gitg/commit/gitg-commit.vala:1324 ../gitg/commit/gitg-commit.vala:1490 +#: ../gitg/commit/gitg-commit.vala:1605 #: ../gitg/gitg-commit-action-create-patch.vala:145 -#: ../gitg/gitg-dash-view.vala:444 ../gitg/gitg-window.vala:189 +#: ../gitg/gitg-dash-view.vala:437 ../gitg/gitg-window.vala:190 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:2 #: ../gitg/resources/ui/gitg-clone-dialog.ui.h:2 #: ../gitg/resources/ui/gitg-commit-dialog.ui.h:2 @@ -489,27 +492,27 @@ msgid "_Cancel" msgstr "_Otkaži" -#: ../gitg/commit/gitg-commit.vala:1341 ../gitg/commit/gitg-commit.vala:1507 +#: ../gitg/commit/gitg-commit.vala:1325 ../gitg/commit/gitg-commit.vala:1491 msgid "Discard" msgstr "Odbaci" -#: ../gitg/commit/gitg-commit.vala:1370 +#: ../gitg/commit/gitg-commit.vala:1354 msgid "Failed to discard selection" msgstr "Nisam uspeo da odbacim izbor" -#: ../gitg/commit/gitg-commit.vala:1400 +#: ../gitg/commit/gitg-commit.vala:1384 msgid "Failed to stage selection" msgstr "Nisam uspeo da uštekam izbor" -#: ../gitg/commit/gitg-commit.vala:1404 +#: ../gitg/commit/gitg-commit.vala:1388 msgid "Failed to unstage selection" msgstr "Nisam uspeo da odštekam izbor" -#: ../gitg/commit/gitg-commit.vala:1464 +#: ../gitg/commit/gitg-commit.vala:1448 msgid "Failed to discard changes" msgstr "Nisam uspeo da odbacim izmene" -#: ../gitg/commit/gitg-commit.vala:1485 +#: ../gitg/commit/gitg-commit.vala:1469 #, c-format msgid "" "Are you sure you want to permanently discard all changes made to the file `" @@ -518,7 +521,7 @@ "Da li ste sigurni da želite trajno da odbacite sve izmene načinjene nad " "datotekom „%s“?" -#: ../gitg/commit/gitg-commit.vala:1496 +#: ../gitg/commit/gitg-commit.vala:1480 #, c-format msgid "" "Are you sure you want to permanently discard all changes made to the files " @@ -527,11 +530,11 @@ "Da li ste sigurni da želite trajno da odbacite sve izmene načinjene nad " "datotekama „%s“ i „%s“?" -#: ../gitg/commit/gitg-commit.vala:1579 +#: ../gitg/commit/gitg-commit.vala:1563 msgid "Failed to delete files" msgstr "Nisam uspeo da obrišem datoteke" -#: ../gitg/commit/gitg-commit.vala:1595 +#: ../gitg/commit/gitg-commit.vala:1579 msgid "Delete file" msgid_plural "Delete files" msgstr[0] "Obriši datoteku" @@ -539,29 +542,29 @@ msgstr[2] "Obriši datoteke" msgstr[3] "Obriši jednu datoteku" -#: ../gitg/commit/gitg-commit.vala:1600 +#: ../gitg/commit/gitg-commit.vala:1584 #, c-format msgid "Are you sure you want to permanently delete the file `%s'?" msgstr "Da li sigurno želite da trajno obrišete datoteku „%s“?" -#: ../gitg/commit/gitg-commit.vala:1611 +#: ../gitg/commit/gitg-commit.vala:1595 #, c-format msgid "Are you sure you want to permanently delete the files %s and `%s'?" msgstr "Da li sigurno želite da trajno obrišete datoteke „%s“ i „%s“?" -#: ../gitg/commit/gitg-commit.vala:1657 +#: ../gitg/commit/gitg-commit.vala:1640 msgid "_Stage changes" msgstr "_Uštekaj izmene" -#: ../gitg/commit/gitg-commit.vala:1669 +#: ../gitg/commit/gitg-commit.vala:1650 msgid "_Unstage changes" msgstr "_Odštekaj izmene" -#: ../gitg/commit/gitg-commit.vala:1681 +#: ../gitg/commit/gitg-commit.vala:1660 msgid "_Discard changes" msgstr "_Odbaci izmene" -#: ../gitg/commit/gitg-commit.vala:1693 +#: ../gitg/commit/gitg-commit.vala:1670 msgid "D_elete file" msgid_plural "D_elete files" msgstr[0] "Obriši" @@ -569,7 +572,7 @@ msgstr[2] "Obriši _datoteke" msgstr[3] "Obriši jednu _datoteku" -#: ../gitg/commit/gitg-commit.vala:1723 +#: ../gitg/commit/gitg-commit.vala:1693 msgid "_Edit file" msgstr "_Uredi datoteku" @@ -652,11 +655,11 @@ msgid "- Git repository viewer" msgstr "— Pregledač gitove riznice" -#: ../gitg/gitg-application.vala:222 +#: ../gitg/gitg-application.vala:226 msgid "gitg is a Git repository viewer for gtk+/GNOME" msgstr "gitg je pregledač gitove riznice za gtk+/Gnom" -#: ../gitg/gitg-application.vala:231 +#: ../gitg/gitg-application.vala:235 msgid "translator-credits" msgstr "" "Miroslav Nikolić \n" @@ -664,11 +667,11 @@ "\n" "http://prevod.org — prevod na srpski jezik" -#: ../gitg/gitg-application.vala:234 +#: ../gitg/gitg-application.vala:238 msgid "gitg homepage" msgstr "Matična stranica gitg-a" -#: ../gitg/gitg-application.vala:364 +#: ../gitg/gitg-application.vala:369 msgid "" "We are terribly sorry, but gitg requires libgit2 (a library on which gitg " "depends) to be compiled with threading support.\n" @@ -689,23 +692,23 @@ "distribucije o dostavljanju „libgit2“ bez podrške za niti." #. ex: ts=4 noet -#: ../gitg/gitg-author-details-dialog.vala:97 -#: ../gitg/gitg-author-details-dialog.vala:117 +#: ../gitg/gitg-author-details-dialog.vala:85 +#: ../gitg/gitg-author-details-dialog.vala:105 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:1 msgid "Author Details" msgstr "Podaci o autoru" -#: ../gitg/gitg-author-details-dialog.vala:98 +#: ../gitg/gitg-author-details-dialog.vala:86 msgid "Enter default details used for all repositories:" msgstr "Unesite podrazumevane pojedinosti za sve riznice:" #. Translators: %s is the repository name -#: ../gitg/gitg-author-details-dialog.vala:120 +#: ../gitg/gitg-author-details-dialog.vala:108 #, c-format msgid "Override global details for repository '%s':" msgstr "Unesite pojedinosti za riznicu „%s“:" -#: ../gitg/gitg-author-details-dialog.vala:232 +#: ../gitg/gitg-author-details-dialog.vala:220 msgid "Failed to set Git user config." msgstr "Nisam uspeo da podesim podešavanja korisnika Gita" @@ -723,21 +726,28 @@ #: ../gitg/gitg-commit-action-cherry-pick.vala:117 #, c-format +#| msgid "Failed to lookup their commit: %s" msgid "Failed to lookup the commit for branch %s: %s" msgstr "Nisam uspeo da nađem predaju za granu %s: %s" #: ../gitg/gitg-commit-action-cherry-pick.vala:132 #, c-format +#| msgid "Failed to create commit: %s" msgid "Failed to cherry-pick the commit: %s" msgstr "Nisam uspeo da proberem predaju: %s" #: ../gitg/gitg-commit-action-cherry-pick.vala:144 #: ../gitg/gitg-commit-action-cherry-pick.vala:160 +#| msgid "Merge has conflicts" msgid "Cherry pick has conflicts" msgstr "Probiranje ima sukobe" #: ../gitg/gitg-commit-action-cherry-pick.vala:153 #, c-format +#| msgid "" +#| "The merge of %s into %s has caused conflicts, would you like to checkout " +#| "branch %s with the merge to your working directory to resolve the " +#| "conflicts?" msgid "" "The cherry pick of %s onto %s has caused conflicts, would you like to " "checkout branch %s with the cherry pick to your working directory to resolve " @@ -748,6 +758,9 @@ #: ../gitg/gitg-commit-action-cherry-pick.vala:157 #, c-format +#| msgid "" +#| "The merge of %s into %s has caused conflicts, would you like to checkout " +#| "the merge to your working directory to resolve the conflicts?" msgid "" "The cherry-pick of %s onto %s has caused conflicts, would you like to " "checkout the cherry pick to your working directory to resolve the conflicts?" @@ -762,24 +775,29 @@ msgstr "Overi" #: ../gitg/gitg-commit-action-cherry-pick.vala:168 +#| msgid "Merge failed with conflicts" msgid "Cherry pick failed with conflicts" msgstr "Probiranje nije uspelo zbog sukoba" #: ../gitg/gitg-commit-action-cherry-pick.vala:179 +#| msgid "Finished merge with conflicts in working directory" msgid "Cherry pick finished with conflicts in working directory" msgstr "Probiranje je završeno sa sukobima unutar radne fascikle" #: ../gitg/gitg-commit-action-cherry-pick.vala:199 #, c-format +#| msgid "Merge %s into %s" msgid "Cherry pick %s onto %s" msgstr "Proberi %s na %s" #: ../gitg/gitg-commit-action-cherry-pick.vala:224 +#| msgid "Successfully merged %s into %s" msgid "Successfully cherry picked" msgstr "Uspešno sam probrao" #: ../gitg/gitg-commit-action-cherry-pick.vala:261 #, c-format +#| msgid "Merge into %s" msgid "Cherry pick onto %s" msgstr "Proberi na %s" @@ -835,41 +853,38 @@ msgid "Provide a message to create an annotated tag" msgstr "Obezbedi poruku za stvaranje pribeležene oznake" -#: ../gitg/gitg-dash-view.vala:87 -msgid "Select and manage projects" -msgstr "Izaberi i upravljaj projektima" - -#: ../gitg/gitg-dash-view.vala:176 +#: ../gitg/gitg-dash-view.vala:171 +#| msgid "Remotes" msgid "_Remove" msgstr "_Ukloni" #. Translators: the two %s will be replaced to create a link to perform the scanning action. -#: ../gitg/gitg-dash-view.vala:232 +#: ../gitg/gitg-dash-view.vala:227 #, c-format msgid "We can also %sscan your home directory%s for git repositories." msgstr "" "Možemo i da %sskeniramo vašu ličnu fasciklu%s za pronalaženje git riznica." #. Translators: the two %s will be used to create a link to the author dialog. -#: ../gitg/gitg-dash-view.vala:235 +#: ../gitg/gitg-dash-view.vala:230 #, c-format msgid "In the mean time, you may want to %sset up your git profile%s." msgstr "U međuvremenu, možda bi mogli da %spodesite vaš git profil%s." -#: ../gitg/gitg-dash-view.vala:389 +#: ../gitg/gitg-dash-view.vala:382 msgid "Failed to clone repository" msgstr "Nisam uspeo da iskloniram riznicu" -#: ../gitg/gitg-dash-view.vala:420 +#: ../gitg/gitg-dash-view.vala:413 msgid "Failed to add repository" msgstr "Nisam uspeo da dodam riznicu" -#: ../gitg/gitg-dash-view.vala:436 +#: ../gitg/gitg-dash-view.vala:429 msgid "Create new repository" msgstr "Napravi novu riznicu" #. Translators: %s is a file name -#: ../gitg/gitg-dash-view.vala:439 +#: ../gitg/gitg-dash-view.vala:432 #, c-format msgid "" "The location %s does not appear to be a valid git repository. Would " @@ -878,15 +893,15 @@ "Putanja %s ne liči na ispravnu git riznicu. Želite li da postavim " "početnu git riznicu u ovoj fascikli?" -#: ../gitg/gitg-dash-view.vala:445 +#: ../gitg/gitg-dash-view.vala:438 msgid "Create repository" msgstr "Napravi riznicu" -#: ../gitg/gitg-dash-view.vala:461 +#: ../gitg/gitg-dash-view.vala:454 msgid "Failed to create repository" msgstr "Nisam uspeo da napravim riznicu" -#: ../gitg/gitg-dash-view.vala:531 +#: ../gitg/gitg-dash-view.vala:524 #, c-format msgid "Scanning for repositories in %s" msgstr "Pretražujem riznice u %s" @@ -1126,32 +1141,28 @@ msgid "Failed to rename" msgstr "Nisam uspeo da preimenujem" -#: ../gitg/gitg-window.vala:186 +#: ../gitg/gitg-window.vala:187 msgid "Add Repository" msgstr "Dodaj riznicu" -#: ../gitg/gitg-window.vala:190 +#: ../gitg/gitg-window.vala:191 msgid "_Add" msgstr "_Dodaj" -#: ../gitg/gitg-window.vala:192 +#: ../gitg/gitg-window.vala:193 msgid "_Scan for all git repositories from this directory" msgstr "_Skeniraj sve u ovoj fascikli i nađi sve git riznice" -#: ../gitg/gitg-window.vala:498 +#: ../gitg/gitg-window.vala:481 msgid "Projects" msgstr "Projekti" -#: ../gitg/gitg-window.vala:748 -msgid "Select items" -msgstr "Izaberite stavke" - -#: ../gitg/gitg-window.vala:955 +#: ../gitg/gitg-window.vala:912 #, c-format msgid "'%s' is not a Git repository." msgstr "„%s“ nije Gitova riznica." -#: ../gitg/gitg-window.vala:1104 +#: ../gitg/gitg-window.vala:1061 msgid "" "Your user name and email are not configured yet. Please go to the user " "configuration and provide your name and email." @@ -1159,7 +1170,7 @@ "Vaše korisničko ime i el. pošta još nisu podešeni. Idite na podešavanja " "korisnika i dostavite vaše ime i el. poštu." -#: ../gitg/gitg-window.vala:1108 +#: ../gitg/gitg-window.vala:1065 msgid "" "Your user name is not configured yet. Please go to the user configuration " "and provide your name." @@ -1167,7 +1178,7 @@ "Vaše korisničko ime još nije podešeno. Idite na podešavanja korisnika i " "dostavite vaše ime." -#: ../gitg/gitg-window.vala:1112 +#: ../gitg/gitg-window.vala:1069 msgid "" "Your email is not configured yet. Please go to the user configuration and " "provide your email." @@ -1175,7 +1186,7 @@ "Vaša el. pošta još nije podešena. Idite na podešavanja korisnika i dostavite " "vašu el. poštu." -#: ../gitg/gitg-window.vala:1115 +#: ../gitg/gitg-window.vala:1072 msgid "Missing author details" msgstr "Nedostaju podaci o autoru" @@ -1237,17 +1248,17 @@ msgid "Remotes" msgstr "Udaljeni" -#: ../gitg/history/gitg-history.vala:342 +#: ../gitg/history/gitg-history.vala:306 #: ../gitg/preferences/gitg-preferences-history.vala:218 #: ../gitg/resources/ui/gitg-preferences-interface.ui.h:3 msgid "History" msgstr "Istorija" -#: ../gitg/history/gitg-history.vala:347 +#: ../gitg/history/gitg-history.vala:311 msgid "Examine the history of the repository" msgstr "Proučite istorijat riznice" -#: ../gitg/history/gitg-history.vala:843 +#: ../gitg/history/gitg-history.vala:796 msgid "Mainline" msgstr "Glavna linija" @@ -1260,13 +1271,6 @@ msgid "Interface" msgstr "Sučelje" -#. Translators: %s will be replaced with a URL indicating the resource -#. for which the authentication is required. -#: ../libgitg/gitg-authentication-dialog.vala:69 -#, c-format -msgid "Password required for %s" -msgstr "Potrebna je lozinka za „%s“" - #: ../libgitg/gitg-date.vala:346 msgid "Now" msgstr "Sada" @@ -1330,33 +1334,21 @@ msgid "%b %e %Y, %I:%M %p" msgstr "%e. %b. %Y., u %I:%M %p" -#: ../libgitg/gitg-diff-view-commit-details.vala:145 +#: ../libgitg/gitg-diff-view-commit-details.vala:142 msgid "Collapse all" msgstr "Zatvori stablo" -#: ../libgitg/gitg-diff-view-commit-details.vala:149 +#: ../libgitg/gitg-diff-view-commit-details.vala:146 #: ../libgitg/resources/ui/gitg-diff-view-commit-details.ui.h:2 msgid "Expand all" msgstr "Raširi sve" -#: ../libgitg/gitg-diff-view-commit-details.vala:202 +#: ../libgitg/gitg-diff-view-commit-details.vala:199 #, c-format +#| msgid "Committed by:" msgid "Committed by %s" msgstr "Predao je %s" -#: ../libgitg/gitg-diff-view-file.vala:172 -#| msgid "_Open" -msgid "_Open file" -msgstr "_Otvori datoteku" - -#: ../libgitg/gitg-diff-view-file.vala:204 -msgid "Open containing _folder" -msgstr "Otvori sadržajnu _fasciklu" - -#: ../libgitg/gitg-diff-view-file.vala:224 -msgid "_Copy file path" -msgstr "_Umnoži putanju datoteke" - #. Translators: this is used to construct: "at ", to indicate where the repository is at. #: ../libgitg/gitg-repository-list-box.vala:154 #, c-format @@ -1369,7 +1361,8 @@ msgid "%s at %s" msgstr "%s u fascikli %s" -#: ../libgitg/gitg-repository-list-box.vala:541 +#: ../libgitg/gitg-repository-list-box.vala:409 +#| msgid "Cloning..." msgid "Cloning…" msgstr "Kloniram…" @@ -1379,12 +1372,12 @@ msgstr "" "Ne mogu da pročitam poruku predaje nakon pokretanja zakačke poruke predaje: %s" -#: ../plugins/diff/gitg-diff.vala:115 +#: ../plugins/diff/gitg-diff.vala:112 #: ../gitg/resources/ui/gitg-preferences-interface.ui.h:11 msgid "Diff" msgstr "Razlike" -#: ../plugins/diff/gitg-diff.vala:120 +#: ../plugins/diff/gitg-diff.vala:117 msgid "Show the changes introduced by the selected commit" msgstr "Prikažite razlike uvedene izabranom predajom" @@ -1536,7 +1529,7 @@ #: ../gitg/resources/ui/gitg-menus.ui.h:2 msgid "_Author Details" -msgstr "Podaci o _autoru" +msgstr "_Podaci o autoru" #: ../gitg/resources/ui/gitg-menus.ui.h:3 msgid "_Preferences" @@ -1544,23 +1537,27 @@ #: ../gitg/resources/ui/gitg-menus.ui.h:4 msgid "_Keyboard Shortcuts" -msgstr "Prečice _tastature" +msgstr "_Prečice tastature" #: ../gitg/resources/ui/gitg-menus.ui.h:5 +msgid "_Help" +msgstr "Po_moć" + +#: ../gitg/resources/ui/gitg-menus.ui.h:6 msgid "_About" msgstr "_O programu" -#: ../gitg/resources/ui/gitg-menus.ui.h:6 +#: ../gitg/resources/ui/gitg-menus.ui.h:7 msgid "_Quit" msgstr "_Izađi" -#: ../gitg/resources/ui/gitg-menus.ui.h:7 +#: ../gitg/resources/ui/gitg-menus.ui.h:8 msgid "_Reload" msgstr "Ponovo _učitaj" #: ../gitg/resources/ui/gitg-preferences-commit.ui.h:1 msgid "Show markup" -msgstr "Prikaži obeležja" +msgstr "Prikaži mark-ap obeležja" #: ../gitg/resources/ui/gitg-preferences-commit.ui.h:2 msgid "Display _subject margin at column:" @@ -1592,11 +1589,11 @@ #: ../gitg/resources/ui/gitg-preferences-history.ui.h:5 msgid "References" -msgstr "Upute" +msgstr "Reference" #: ../gitg/resources/ui/gitg-preferences-history.ui.h:6 msgid "Sort references in the sidebar by latest activity" -msgstr "Poređaj upute po skorašnjoj aktivnosti, u bočnoj površi" +msgstr "Poređaj reference po skorašnjoj aktivnosti, u straničniku" #: ../gitg/resources/ui/gitg-preferences-history.ui.h:7 msgid "Show upstream (remote) branch when selecting a local branch" @@ -1667,6 +1664,7 @@ msgstr "Postavke" #: ../gitg/resources/ui/gitg-shortcuts.ui.h:1 +#| msgid "_New Window" msgctxt "shortcut window" msgid "Windows" msgstr "Prozor" @@ -1682,6 +1680,7 @@ msgstr "Otvara izbornik prozora" #: ../gitg/resources/ui/gitg-shortcuts.ui.h:4 +#| msgid "_Open Repository…" msgctxt "shortcut window" msgid "Open a repository" msgstr "Otvara riznicu" @@ -1702,6 +1701,7 @@ msgstr "Zatvara radni prozor" #: ../gitg/resources/ui/gitg-shortcuts.ui.h:8 +#| msgid "Show the application's version" msgctxt "shortcut window" msgid "Quit the application" msgstr "Izlazi iz programa" @@ -1715,14 +1715,17 @@ msgstr "Preslikaj" #: ../gitg/resources/ui/gitg-window.ui.h:4 +#| msgid "_Clone repository" msgid "Clone repository" msgstr "Preslikajte riznicu" #: ../gitg/resources/ui/gitg-window.ui.h:5 +#| msgid "_Add" msgid "Add" msgstr "Dodaj" #: ../gitg/resources/ui/gitg-window.ui.h:6 +#| msgid "_Add repository" msgid "Add repository" msgstr "Dodajte riznicu" @@ -1767,26 +1770,27 @@ msgstr "Zapamti za _stalno" #: ../libgitg/resources/ui/gitg-diff-view-commit-details.ui.h:1 +#| msgid "Parents:" msgid "Parents" msgstr "Roditelji" -#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-binary.ui.h:1 -msgid "Unable to display changes for binary file" -msgstr "Ne mogu da prikažem izmene za binarnu datoteku" - #: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:1 +#| msgid "Tab width" msgid "Tab width:" msgstr "Širina tabulatora:" #: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:2 +#| msgid "Wrap lines" msgid "Wrap lines:" msgstr "Prelomi redove:" #: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:3 +#| msgid "Ignore whitespace changes" msgid "Ignore whitespace:" msgstr "Zanemari praznine:" #: ../libgitg/resources/ui/gitg-diff-view-options.ui.h:1 +#| msgid "Context" msgid "Context:" msgstr "Sadržaj:" @@ -1800,11 +1804,9 @@ "disk)" msgstr "Ukloni riznicu sa spiska (ne briše je sa diska)" -#~ msgid "_Help" -#~ msgstr "Po_moć" - -#~ msgid "column" -#~ msgstr "kolona" +#: ../plugins/files/resources/view-files.ui.h:1 +msgid "column" +msgstr "kolona" #~ msgid "_Delete" #~ msgstr "_Obriši" @@ -1836,6 +1838,9 @@ #~ msgid "Unable to open the .gitconfig file." #~ msgstr "Ne mogu da otvorim datoteku podešavanja „.gitconfig“." +#~ msgid "_Open" +#~ msgstr "_Otvori" + #~ msgid "Note: The Git config file '%s' does not exist." #~ msgstr "Napomena: Gitova datoteka podešavanja „%s“ ne postoji." diff -Nru gitg-3.22.0/po/sr.po gitg-3.23.0/po/sr.po --- gitg-3.22.0/po/sr.po 2016-09-18 11:59:28.000000000 +0000 +++ gitg-3.23.0/po/sr.po 2016-09-18 12:07:56.000000000 +0000 @@ -7,10 +7,10 @@ "Project-Id-Version: gitg\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gitg&ke" "ywords=I18N+L10N&component=gitg\n" -"POT-Creation-Date: 2016-08-27 11:08+0000\n" -"PO-Revision-Date: 2016-09-01 18:45+0200\n" +"POT-Creation-Date: 2016-02-20 07:19+0000\n" +"PO-Revision-Date: 2016-02-20 11:17+0200\n" "Last-Translator: Мирослав Николић \n" -"Language-Team: српски \n" +"Language-Team: Serbian \n" "Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -81,6 +81,9 @@ msgstr "Укључује истицање разлика" #: ../data/org.gnome.gitg.gschema.xml.in.in.h:12 +#| msgid "" +#| "Setting which determines whether or not spell checking is enabled when " +#| "writing a commit message." msgid "" "Setting that determines whether to enable syntax highlighting in diff views." msgstr "" @@ -343,40 +346,40 @@ msgstr "Не могу да поставим језик провере писања: %s" #: ../gitg/commit/gitg-commit-dialog.vala:508 -#: ../gitg/commit/gitg-commit.vala:1076 +#: ../gitg/commit/gitg-commit.vala:1067 msgid "There are no changes to be committed" msgstr "Нема измена за предају" #: ../gitg/commit/gitg-commit-dialog.vala:509 -#: ../gitg/commit/gitg-commit.vala:1077 +#: ../gitg/commit/gitg-commit.vala:1068 msgid "Use amend to change the commit message of the previous commit" msgstr "Користите допуну да измените поруку предаје претходне предаје" -#: ../gitg/commit/gitg-commit.vala:113 +#: ../gitg/commit/gitg-commit.vala:104 msgctxt "Activity" msgid "Commit" msgstr "Предај" -#: ../gitg/commit/gitg-commit.vala:118 +#: ../gitg/commit/gitg-commit.vala:109 msgid "Create new commits and manage the staging area" msgstr "Направите нове предаје и управљајте пблашћу уштекавања" -#: ../gitg/commit/gitg-commit.vala:193 +#: ../gitg/commit/gitg-commit.vala:184 msgid "_Stage selection" msgstr "_Уштекај избор" -#: ../gitg/commit/gitg-commit.vala:232 +#: ../gitg/commit/gitg-commit.vala:223 #, c-format msgid "Failed to stage the removal of submodule `%s'" msgstr "Нисам успео да уштекам уклањање подмодула „%s“" -#: ../gitg/commit/gitg-commit.vala:248 +#: ../gitg/commit/gitg-commit.vala:239 #, c-format msgid "Failed to open the repository of submodule `%s' while trying to stage" msgstr "" "Нисам успео да отворим ризницу подмодула „%s“ када сам покушао да уштекам" -#: ../gitg/commit/gitg-commit.vala:262 +#: ../gitg/commit/gitg-commit.vala:253 #, c-format msgid "" "Failed to lookup the working directory commit of submodule `%s' while trying " @@ -385,100 +388,100 @@ "Нисам успео да претражим слања радног директоријума подмодула „%s“ када сам " "покушао да уштекам" -#: ../gitg/commit/gitg-commit.vala:275 +#: ../gitg/commit/gitg-commit.vala:266 #, c-format msgid "Failed to stage the submodule `%s'" msgstr "Нисам успео да уштекам подмодул „%s“" -#: ../gitg/commit/gitg-commit.vala:297 +#: ../gitg/commit/gitg-commit.vala:288 #, c-format msgid "Failed to stage the removal of file `%s'" msgstr "Нисам успео да уштекам уклањање датотеке „%s“" -#: ../gitg/commit/gitg-commit.vala:311 +#: ../gitg/commit/gitg-commit.vala:302 #, c-format msgid "Failed to stage the file `%s'" msgstr "Нисам успео да уштекам датотеку „%s“" -#: ../gitg/commit/gitg-commit.vala:583 +#: ../gitg/commit/gitg-commit.vala:574 msgid "_Unstage selection" msgstr "_Одштекај избор" -#: ../gitg/commit/gitg-commit.vala:649 +#: ../gitg/commit/gitg-commit.vala:640 #, c-format msgid "Failed to unstage the removal of file `%s'" msgstr "Нисам успео да одштекам уклањање датотеке „%s“" -#: ../gitg/commit/gitg-commit.vala:650 +#: ../gitg/commit/gitg-commit.vala:641 #, c-format msgid "Failed to unstage the file `%s'" msgstr "Нисам успео да одштекам датотеку „%s“" -#: ../gitg/commit/gitg-commit.vala:657 +#: ../gitg/commit/gitg-commit.vala:648 #, c-format msgid "Failed to unstage the removal of submodule `%s'" msgstr "Нисам успео да одштекам уклањање подмодула „%s“" -#: ../gitg/commit/gitg-commit.vala:658 +#: ../gitg/commit/gitg-commit.vala:649 #, c-format msgid "Failed to unstage the submodule `%s'" msgstr "Нисам успео да одштекам подмодул „%s“" #. Populate staged items -#: ../gitg/commit/gitg-commit.vala:862 +#: ../gitg/commit/gitg-commit.vala:853 msgid "Staged" msgstr "Уштекано" -#: ../gitg/commit/gitg-commit.vala:870 +#: ../gitg/commit/gitg-commit.vala:861 msgid "No staged files" msgstr "Нема уштеканих датотека" #. Populate unstaged items -#: ../gitg/commit/gitg-commit.vala:893 +#: ../gitg/commit/gitg-commit.vala:884 msgid "Unstaged" msgstr "Одштекано" -#: ../gitg/commit/gitg-commit.vala:901 +#: ../gitg/commit/gitg-commit.vala:892 msgid "No unstaged files" msgstr "Нема одштеканих датотека" #. Populate untracked items -#: ../gitg/commit/gitg-commit.vala:924 +#: ../gitg/commit/gitg-commit.vala:915 msgid "Untracked" msgstr "Непраћене" -#: ../gitg/commit/gitg-commit.vala:928 +#: ../gitg/commit/gitg-commit.vala:919 msgid "No untracked files" msgstr "Нема непраћених датотека" -#: ../gitg/commit/gitg-commit.vala:953 +#: ../gitg/commit/gitg-commit.vala:944 msgid "Submodule" msgstr "Подмодул" -#: ../gitg/commit/gitg-commit.vala:957 +#: ../gitg/commit/gitg-commit.vala:948 msgid "No dirty submodules" msgstr "Нема запрљаних подмодула" -#: ../gitg/commit/gitg-commit.vala:1106 +#: ../gitg/commit/gitg-commit.vala:1095 msgid "Failed to commit" msgstr "Нисам успео да предам" -#: ../gitg/commit/gitg-commit.vala:1122 +#: ../gitg/commit/gitg-commit.vala:1111 msgid "Failed to pass pre-commit" msgstr "Нисам успео да прођем пред-предају" -#: ../gitg/commit/gitg-commit.vala:1330 ../gitg/commit/gitg-commit.vala:1480 +#: ../gitg/commit/gitg-commit.vala:1314 ../gitg/commit/gitg-commit.vala:1464 msgid "Discard changes" msgstr "Одбаци измене" -#: ../gitg/commit/gitg-commit.vala:1331 +#: ../gitg/commit/gitg-commit.vala:1315 msgid "Are you sure you want to permanently discard the selected changes?" msgstr "Да ли сте сигурни да желите трајно да одбаците изабране измене?" -#: ../gitg/commit/gitg-commit.vala:1340 ../gitg/commit/gitg-commit.vala:1506 -#: ../gitg/commit/gitg-commit.vala:1621 +#: ../gitg/commit/gitg-commit.vala:1324 ../gitg/commit/gitg-commit.vala:1490 +#: ../gitg/commit/gitg-commit.vala:1605 #: ../gitg/gitg-commit-action-create-patch.vala:145 -#: ../gitg/gitg-dash-view.vala:444 ../gitg/gitg-window.vala:189 +#: ../gitg/gitg-dash-view.vala:437 ../gitg/gitg-window.vala:190 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:2 #: ../gitg/resources/ui/gitg-clone-dialog.ui.h:2 #: ../gitg/resources/ui/gitg-commit-dialog.ui.h:2 @@ -489,27 +492,27 @@ msgid "_Cancel" msgstr "_Откажи" -#: ../gitg/commit/gitg-commit.vala:1341 ../gitg/commit/gitg-commit.vala:1507 +#: ../gitg/commit/gitg-commit.vala:1325 ../gitg/commit/gitg-commit.vala:1491 msgid "Discard" msgstr "Одбаци" -#: ../gitg/commit/gitg-commit.vala:1370 +#: ../gitg/commit/gitg-commit.vala:1354 msgid "Failed to discard selection" msgstr "Нисам успео да одбацим избор" -#: ../gitg/commit/gitg-commit.vala:1400 +#: ../gitg/commit/gitg-commit.vala:1384 msgid "Failed to stage selection" msgstr "Нисам успео да уштекам избор" -#: ../gitg/commit/gitg-commit.vala:1404 +#: ../gitg/commit/gitg-commit.vala:1388 msgid "Failed to unstage selection" msgstr "Нисам успео да одштекам избор" -#: ../gitg/commit/gitg-commit.vala:1464 +#: ../gitg/commit/gitg-commit.vala:1448 msgid "Failed to discard changes" msgstr "Нисам успео да одбацим измене" -#: ../gitg/commit/gitg-commit.vala:1485 +#: ../gitg/commit/gitg-commit.vala:1469 #, c-format msgid "" "Are you sure you want to permanently discard all changes made to the file `" @@ -518,7 +521,7 @@ "Да ли сте сигурни да желите трајно да одбаците све измене начињене над " "датотеком „%s“?" -#: ../gitg/commit/gitg-commit.vala:1496 +#: ../gitg/commit/gitg-commit.vala:1480 #, c-format msgid "" "Are you sure you want to permanently discard all changes made to the files " @@ -527,11 +530,11 @@ "Да ли сте сигурни да желите трајно да одбаците све измене начињене над " "датотекама „%s“ и „%s“?" -#: ../gitg/commit/gitg-commit.vala:1579 +#: ../gitg/commit/gitg-commit.vala:1563 msgid "Failed to delete files" msgstr "Нисам успео да обришем датотеке" -#: ../gitg/commit/gitg-commit.vala:1595 +#: ../gitg/commit/gitg-commit.vala:1579 msgid "Delete file" msgid_plural "Delete files" msgstr[0] "Обриши датотеку" @@ -539,29 +542,29 @@ msgstr[2] "Обриши датотеке" msgstr[3] "Обриши једну датотеку" -#: ../gitg/commit/gitg-commit.vala:1600 +#: ../gitg/commit/gitg-commit.vala:1584 #, c-format msgid "Are you sure you want to permanently delete the file `%s'?" msgstr "Да ли сигурно желите да трајно обришете датотеку „%s“?" -#: ../gitg/commit/gitg-commit.vala:1611 +#: ../gitg/commit/gitg-commit.vala:1595 #, c-format msgid "Are you sure you want to permanently delete the files %s and `%s'?" msgstr "Да ли сигурно желите да трајно обришете датотеке „%s“ и „%s“?" -#: ../gitg/commit/gitg-commit.vala:1657 +#: ../gitg/commit/gitg-commit.vala:1640 msgid "_Stage changes" msgstr "_Уштекај измене" -#: ../gitg/commit/gitg-commit.vala:1669 +#: ../gitg/commit/gitg-commit.vala:1650 msgid "_Unstage changes" msgstr "_Одштекај измене" -#: ../gitg/commit/gitg-commit.vala:1681 +#: ../gitg/commit/gitg-commit.vala:1660 msgid "_Discard changes" msgstr "_Одбаци измене" -#: ../gitg/commit/gitg-commit.vala:1693 +#: ../gitg/commit/gitg-commit.vala:1670 msgid "D_elete file" msgid_plural "D_elete files" msgstr[0] "Обриши" @@ -569,7 +572,7 @@ msgstr[2] "Обриши _датотеке" msgstr[3] "Обриши једну _датотеку" -#: ../gitg/commit/gitg-commit.vala:1723 +#: ../gitg/commit/gitg-commit.vala:1693 msgid "_Edit file" msgstr "_Уреди датотеку" @@ -652,11 +655,11 @@ msgid "- Git repository viewer" msgstr "— Прегледач гитове ризнице" -#: ../gitg/gitg-application.vala:222 +#: ../gitg/gitg-application.vala:226 msgid "gitg is a Git repository viewer for gtk+/GNOME" msgstr "гитг је прегледач гитове ризнице за гтк+/Гном" -#: ../gitg/gitg-application.vala:231 +#: ../gitg/gitg-application.vala:235 msgid "translator-credits" msgstr "" "Мирослав Николић \n" @@ -664,11 +667,11 @@ "\n" "http://prevod.org — превод на српски језик" -#: ../gitg/gitg-application.vala:234 +#: ../gitg/gitg-application.vala:238 msgid "gitg homepage" msgstr "Матична страница гитг-а" -#: ../gitg/gitg-application.vala:364 +#: ../gitg/gitg-application.vala:369 msgid "" "We are terribly sorry, but gitg requires libgit2 (a library on which gitg " "depends) to be compiled with threading support.\n" @@ -689,23 +692,23 @@ "дистрибуције о достављању „libgit2“ без подршке за нити." #. ex: ts=4 noet -#: ../gitg/gitg-author-details-dialog.vala:97 -#: ../gitg/gitg-author-details-dialog.vala:117 +#: ../gitg/gitg-author-details-dialog.vala:85 +#: ../gitg/gitg-author-details-dialog.vala:105 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:1 msgid "Author Details" msgstr "Подаци о аутору" -#: ../gitg/gitg-author-details-dialog.vala:98 +#: ../gitg/gitg-author-details-dialog.vala:86 msgid "Enter default details used for all repositories:" msgstr "Унесите подразумеване појединости за све ризнице:" #. Translators: %s is the repository name -#: ../gitg/gitg-author-details-dialog.vala:120 +#: ../gitg/gitg-author-details-dialog.vala:108 #, c-format msgid "Override global details for repository '%s':" msgstr "Унесите појединости за ризницу „%s“:" -#: ../gitg/gitg-author-details-dialog.vala:232 +#: ../gitg/gitg-author-details-dialog.vala:220 msgid "Failed to set Git user config." msgstr "Нисам успео да подесим подешавања корисника Гита" @@ -723,21 +726,28 @@ #: ../gitg/gitg-commit-action-cherry-pick.vala:117 #, c-format +#| msgid "Failed to lookup their commit: %s" msgid "Failed to lookup the commit for branch %s: %s" msgstr "Нисам успео да нађем предају за грану %s: %s" #: ../gitg/gitg-commit-action-cherry-pick.vala:132 #, c-format +#| msgid "Failed to create commit: %s" msgid "Failed to cherry-pick the commit: %s" msgstr "Нисам успео да проберем предају: %s" #: ../gitg/gitg-commit-action-cherry-pick.vala:144 #: ../gitg/gitg-commit-action-cherry-pick.vala:160 +#| msgid "Merge has conflicts" msgid "Cherry pick has conflicts" msgstr "Пробирање има сукобе" #: ../gitg/gitg-commit-action-cherry-pick.vala:153 #, c-format +#| msgid "" +#| "The merge of %s into %s has caused conflicts, would you like to checkout " +#| "branch %s with the merge to your working directory to resolve the " +#| "conflicts?" msgid "" "The cherry pick of %s onto %s has caused conflicts, would you like to " "checkout branch %s with the cherry pick to your working directory to resolve " @@ -748,6 +758,9 @@ #: ../gitg/gitg-commit-action-cherry-pick.vala:157 #, c-format +#| msgid "" +#| "The merge of %s into %s has caused conflicts, would you like to checkout " +#| "the merge to your working directory to resolve the conflicts?" msgid "" "The cherry-pick of %s onto %s has caused conflicts, would you like to " "checkout the cherry pick to your working directory to resolve the conflicts?" @@ -762,24 +775,29 @@ msgstr "Овери" #: ../gitg/gitg-commit-action-cherry-pick.vala:168 +#| msgid "Merge failed with conflicts" msgid "Cherry pick failed with conflicts" msgstr "Пробирање није успело због сукоба" #: ../gitg/gitg-commit-action-cherry-pick.vala:179 +#| msgid "Finished merge with conflicts in working directory" msgid "Cherry pick finished with conflicts in working directory" msgstr "Пробирање је завршено са сукобима унутар радне фасцикле" #: ../gitg/gitg-commit-action-cherry-pick.vala:199 #, c-format +#| msgid "Merge %s into %s" msgid "Cherry pick %s onto %s" msgstr "Пробери %s на %s" #: ../gitg/gitg-commit-action-cherry-pick.vala:224 +#| msgid "Successfully merged %s into %s" msgid "Successfully cherry picked" msgstr "Успешно сам пробрао" #: ../gitg/gitg-commit-action-cherry-pick.vala:261 #, c-format +#| msgid "Merge into %s" msgid "Cherry pick onto %s" msgstr "Пробери на %s" @@ -835,41 +853,38 @@ msgid "Provide a message to create an annotated tag" msgstr "Обезбеди поруку за стварање прибележене ознаке" -#: ../gitg/gitg-dash-view.vala:87 -msgid "Select and manage projects" -msgstr "Изабери и управљај пројектима" - -#: ../gitg/gitg-dash-view.vala:176 +#: ../gitg/gitg-dash-view.vala:171 +#| msgid "Remotes" msgid "_Remove" msgstr "_Уклони" #. Translators: the two %s will be replaced to create a link to perform the scanning action. -#: ../gitg/gitg-dash-view.vala:232 +#: ../gitg/gitg-dash-view.vala:227 #, c-format msgid "We can also %sscan your home directory%s for git repositories." msgstr "" "Можемо и да %sскенирамо вашу личну фасциклу%s за проналажење гит ризница." #. Translators: the two %s will be used to create a link to the author dialog. -#: ../gitg/gitg-dash-view.vala:235 +#: ../gitg/gitg-dash-view.vala:230 #, c-format msgid "In the mean time, you may want to %sset up your git profile%s." msgstr "У међувремену, можда би могли да %sподесите ваш гит профил%s." -#: ../gitg/gitg-dash-view.vala:389 +#: ../gitg/gitg-dash-view.vala:382 msgid "Failed to clone repository" msgstr "Нисам успео да исклонирам ризницу" -#: ../gitg/gitg-dash-view.vala:420 +#: ../gitg/gitg-dash-view.vala:413 msgid "Failed to add repository" msgstr "Нисам успео да додам ризницу" -#: ../gitg/gitg-dash-view.vala:436 +#: ../gitg/gitg-dash-view.vala:429 msgid "Create new repository" msgstr "Направи нову ризницу" #. Translators: %s is a file name -#: ../gitg/gitg-dash-view.vala:439 +#: ../gitg/gitg-dash-view.vala:432 #, c-format msgid "" "The location %s does not appear to be a valid git repository. Would " @@ -878,15 +893,15 @@ "Путања %s не личи на исправну гит ризницу. Желите ли да поставим " "почетну гит ризницу у овој фасцикли?" -#: ../gitg/gitg-dash-view.vala:445 +#: ../gitg/gitg-dash-view.vala:438 msgid "Create repository" msgstr "Направи ризницу" -#: ../gitg/gitg-dash-view.vala:461 +#: ../gitg/gitg-dash-view.vala:454 msgid "Failed to create repository" msgstr "Нисам успео да направим ризницу" -#: ../gitg/gitg-dash-view.vala:531 +#: ../gitg/gitg-dash-view.vala:524 #, c-format msgid "Scanning for repositories in %s" msgstr "Претражујем ризнице у %s" @@ -1126,32 +1141,28 @@ msgid "Failed to rename" msgstr "Нисам успео да преименујем" -#: ../gitg/gitg-window.vala:186 +#: ../gitg/gitg-window.vala:187 msgid "Add Repository" msgstr "Додај ризницу" -#: ../gitg/gitg-window.vala:190 +#: ../gitg/gitg-window.vala:191 msgid "_Add" msgstr "_Додај" -#: ../gitg/gitg-window.vala:192 +#: ../gitg/gitg-window.vala:193 msgid "_Scan for all git repositories from this directory" msgstr "_Скенирај све у овој фасцикли и нађи све гит ризнице" -#: ../gitg/gitg-window.vala:498 +#: ../gitg/gitg-window.vala:481 msgid "Projects" msgstr "Пројекти" -#: ../gitg/gitg-window.vala:748 -msgid "Select items" -msgstr "Изаберите ставке" - -#: ../gitg/gitg-window.vala:955 +#: ../gitg/gitg-window.vala:912 #, c-format msgid "'%s' is not a Git repository." msgstr "„%s“ није Гитова ризница." -#: ../gitg/gitg-window.vala:1104 +#: ../gitg/gitg-window.vala:1061 msgid "" "Your user name and email are not configured yet. Please go to the user " "configuration and provide your name and email." @@ -1159,7 +1170,7 @@ "Ваше корисничко име и ел. пошта још нису подешени. Идите на подешавања " "корисника и доставите ваше име и ел. пошту." -#: ../gitg/gitg-window.vala:1108 +#: ../gitg/gitg-window.vala:1065 msgid "" "Your user name is not configured yet. Please go to the user configuration " "and provide your name." @@ -1167,7 +1178,7 @@ "Ваше корисничко име још није подешено. Идите на подешавања корисника и " "доставите ваше име." -#: ../gitg/gitg-window.vala:1112 +#: ../gitg/gitg-window.vala:1069 msgid "" "Your email is not configured yet. Please go to the user configuration and " "provide your email." @@ -1175,7 +1186,7 @@ "Ваша ел. пошта још није подешена. Идите на подешавања корисника и доставите " "вашу ел. пошту." -#: ../gitg/gitg-window.vala:1115 +#: ../gitg/gitg-window.vala:1072 msgid "Missing author details" msgstr "Недостају подаци о аутору" @@ -1237,17 +1248,17 @@ msgid "Remotes" msgstr "Удаљени" -#: ../gitg/history/gitg-history.vala:342 +#: ../gitg/history/gitg-history.vala:306 #: ../gitg/preferences/gitg-preferences-history.vala:218 #: ../gitg/resources/ui/gitg-preferences-interface.ui.h:3 msgid "History" msgstr "Историја" -#: ../gitg/history/gitg-history.vala:347 +#: ../gitg/history/gitg-history.vala:311 msgid "Examine the history of the repository" msgstr "Проучите историјат ризнице" -#: ../gitg/history/gitg-history.vala:843 +#: ../gitg/history/gitg-history.vala:796 msgid "Mainline" msgstr "Главна линија" @@ -1260,13 +1271,6 @@ msgid "Interface" msgstr "Сучеље" -#. Translators: %s will be replaced with a URL indicating the resource -#. for which the authentication is required. -#: ../libgitg/gitg-authentication-dialog.vala:69 -#, c-format -msgid "Password required for %s" -msgstr "Потребна је лозинка за „%s“" - #: ../libgitg/gitg-date.vala:346 msgid "Now" msgstr "Сада" @@ -1330,33 +1334,21 @@ msgid "%b %e %Y, %I:%M %p" msgstr "%e. %b. %Y., у %I:%M %p" -#: ../libgitg/gitg-diff-view-commit-details.vala:145 +#: ../libgitg/gitg-diff-view-commit-details.vala:142 msgid "Collapse all" msgstr "Затвори стабло" -#: ../libgitg/gitg-diff-view-commit-details.vala:149 +#: ../libgitg/gitg-diff-view-commit-details.vala:146 #: ../libgitg/resources/ui/gitg-diff-view-commit-details.ui.h:2 msgid "Expand all" msgstr "Рашири све" -#: ../libgitg/gitg-diff-view-commit-details.vala:202 +#: ../libgitg/gitg-diff-view-commit-details.vala:199 #, c-format +#| msgid "Committed by:" msgid "Committed by %s" msgstr "Предао је %s" -#: ../libgitg/gitg-diff-view-file.vala:172 -#| msgid "_Open" -msgid "_Open file" -msgstr "_Отвори датотеку" - -#: ../libgitg/gitg-diff-view-file.vala:204 -msgid "Open containing _folder" -msgstr "Отвори садржајну _фасциклу" - -#: ../libgitg/gitg-diff-view-file.vala:224 -msgid "_Copy file path" -msgstr "_Умножи путању датотеке" - #. Translators: this is used to construct: "at ", to indicate where the repository is at. #: ../libgitg/gitg-repository-list-box.vala:154 #, c-format @@ -1369,7 +1361,8 @@ msgid "%s at %s" msgstr "%s у фасцикли %s" -#: ../libgitg/gitg-repository-list-box.vala:541 +#: ../libgitg/gitg-repository-list-box.vala:409 +#| msgid "Cloning..." msgid "Cloning…" msgstr "Клонирам…" @@ -1379,12 +1372,12 @@ msgstr "" "Не могу да прочитам поруку предаје након покретања закачке поруке предаје: %s" -#: ../plugins/diff/gitg-diff.vala:115 +#: ../plugins/diff/gitg-diff.vala:112 #: ../gitg/resources/ui/gitg-preferences-interface.ui.h:11 msgid "Diff" msgstr "Разлике" -#: ../plugins/diff/gitg-diff.vala:120 +#: ../plugins/diff/gitg-diff.vala:117 msgid "Show the changes introduced by the selected commit" msgstr "Прикажите разлике уведене изабраном предајом" @@ -1536,7 +1529,7 @@ #: ../gitg/resources/ui/gitg-menus.ui.h:2 msgid "_Author Details" -msgstr "Подаци о _аутору" +msgstr "_Подаци о аутору" #: ../gitg/resources/ui/gitg-menus.ui.h:3 msgid "_Preferences" @@ -1544,23 +1537,27 @@ #: ../gitg/resources/ui/gitg-menus.ui.h:4 msgid "_Keyboard Shortcuts" -msgstr "Пречице _тастатуре" +msgstr "_Пречице тастатуре" #: ../gitg/resources/ui/gitg-menus.ui.h:5 +msgid "_Help" +msgstr "По_моћ" + +#: ../gitg/resources/ui/gitg-menus.ui.h:6 msgid "_About" msgstr "_О програму" -#: ../gitg/resources/ui/gitg-menus.ui.h:6 +#: ../gitg/resources/ui/gitg-menus.ui.h:7 msgid "_Quit" msgstr "_Изађи" -#: ../gitg/resources/ui/gitg-menus.ui.h:7 +#: ../gitg/resources/ui/gitg-menus.ui.h:8 msgid "_Reload" msgstr "Поново _учитај" #: ../gitg/resources/ui/gitg-preferences-commit.ui.h:1 msgid "Show markup" -msgstr "Прикажи обележја" +msgstr "Прикажи марк-ап обележја" #: ../gitg/resources/ui/gitg-preferences-commit.ui.h:2 msgid "Display _subject margin at column:" @@ -1592,11 +1589,11 @@ #: ../gitg/resources/ui/gitg-preferences-history.ui.h:5 msgid "References" -msgstr "Упуте" +msgstr "Референце" #: ../gitg/resources/ui/gitg-preferences-history.ui.h:6 msgid "Sort references in the sidebar by latest activity" -msgstr "Поређај упуте по скорашњој активности, у бочној површи" +msgstr "Поређај референце по скорашњој активности, у страничнику" #: ../gitg/resources/ui/gitg-preferences-history.ui.h:7 msgid "Show upstream (remote) branch when selecting a local branch" @@ -1667,6 +1664,7 @@ msgstr "Поставке" #: ../gitg/resources/ui/gitg-shortcuts.ui.h:1 +#| msgid "_New Window" msgctxt "shortcut window" msgid "Windows" msgstr "Прозор" @@ -1682,6 +1680,7 @@ msgstr "Отвара изборник прозора" #: ../gitg/resources/ui/gitg-shortcuts.ui.h:4 +#| msgid "_Open Repository…" msgctxt "shortcut window" msgid "Open a repository" msgstr "Отвара ризницу" @@ -1702,6 +1701,7 @@ msgstr "Затвара радни прозор" #: ../gitg/resources/ui/gitg-shortcuts.ui.h:8 +#| msgid "Show the application's version" msgctxt "shortcut window" msgid "Quit the application" msgstr "Излази из програма" @@ -1715,14 +1715,17 @@ msgstr "Пресликај" #: ../gitg/resources/ui/gitg-window.ui.h:4 +#| msgid "_Clone repository" msgid "Clone repository" msgstr "Пресликајте ризницу" #: ../gitg/resources/ui/gitg-window.ui.h:5 +#| msgid "_Add" msgid "Add" msgstr "Додај" #: ../gitg/resources/ui/gitg-window.ui.h:6 +#| msgid "_Add repository" msgid "Add repository" msgstr "Додајте ризницу" @@ -1767,26 +1770,27 @@ msgstr "Запамти за _стално" #: ../libgitg/resources/ui/gitg-diff-view-commit-details.ui.h:1 +#| msgid "Parents:" msgid "Parents" msgstr "Родитељи" -#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-binary.ui.h:1 -msgid "Unable to display changes for binary file" -msgstr "Не могу да прикажем измене за бинарну датотеку" - #: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:1 +#| msgid "Tab width" msgid "Tab width:" msgstr "Ширина табулатора:" #: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:2 +#| msgid "Wrap lines" msgid "Wrap lines:" msgstr "Преломи редове:" #: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:3 +#| msgid "Ignore whitespace changes" msgid "Ignore whitespace:" msgstr "Занемари празнине:" #: ../libgitg/resources/ui/gitg-diff-view-options.ui.h:1 +#| msgid "Context" msgid "Context:" msgstr "Садржај:" @@ -1800,11 +1804,9 @@ "disk)" msgstr "Уклони ризницу са списка (не брише је са диска)" -#~ msgid "_Help" -#~ msgstr "По_моћ" - -#~ msgid "column" -#~ msgstr "колона" +#: ../plugins/files/resources/view-files.ui.h:1 +msgid "column" +msgstr "колона" #~ msgid "_Delete" #~ msgstr "_Обриши" @@ -1836,6 +1838,9 @@ #~ msgid "Unable to open the .gitconfig file." #~ msgstr "Не могу да отворим датотеку подешавања „.gitconfig“." +#~ msgid "_Open" +#~ msgstr "_Отвори" + #~ msgid "Note: The Git config file '%s' does not exist." #~ msgstr "Напомена: Гитова датотека подешавања „%s“ не постоји." diff -Nru gitg-3.22.0/po/sv.po gitg-3.23.0/po/sv.po --- gitg-3.22.0/po/sv.po 2016-09-18 11:59:28.000000000 +0000 +++ gitg-3.23.0/po/sv.po 2016-09-18 12:07:56.000000000 +0000 @@ -3,7 +3,7 @@ # This file is distributed under the same license as the gitg package. # Daniel Nylander , 2009. # Sebastian Rasmussen , 2014, 2015, 2016. -# Anders Jonsson , 2015, 2016. +# Anders Jonsson , 2015. # # Vokabulär # (synkroniserat med https://github.com/git/git/blob/master/po/sv.po) @@ -38,16 +38,16 @@ "Project-Id-Version: gitg\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gitg&keywords=I18N+L10N&component=gitg\n" -"POT-Creation-Date: 2016-09-04 21:12+0000\n" -"PO-Revision-Date: 2016-09-06 23:06+0200\n" -"Last-Translator: Anders Jonsson \n" +"POT-Creation-Date: 2016-02-12 19:19+0000\n" +"PO-Revision-Date: 2016-03-13 22:36+0100\n" +"Last-Translator: Sebastian Rasmussen \n" "Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.7.1\n" #: ../contrib/xml/xml-reader.c:327 #, c-format @@ -371,42 +371,42 @@ msgstr "Kan inte ställa in rättstavningsspråket: %s" #: ../gitg/commit/gitg-commit-dialog.vala:508 -#: ../gitg/commit/gitg-commit.vala:1076 +#: ../gitg/commit/gitg-commit.vala:1067 msgid "There are no changes to be committed" msgstr "Det finns inga ändringar att checka in" #: ../gitg/commit/gitg-commit-dialog.vala:509 -#: ../gitg/commit/gitg-commit.vala:1077 +#: ../gitg/commit/gitg-commit.vala:1068 msgid "Use amend to change the commit message of the previous commit" msgstr "" "Använd utöka för att ändra incheckningsmeddelandet för den föregående " "incheckningen" -#: ../gitg/commit/gitg-commit.vala:113 +#: ../gitg/commit/gitg-commit.vala:104 msgctxt "Activity" msgid "Commit" msgstr "Incheckning" -#: ../gitg/commit/gitg-commit.vala:118 +#: ../gitg/commit/gitg-commit.vala:109 msgid "Create new commits and manage the staging area" msgstr "Skapa nya incheckningar och hantera köområdet" -#: ../gitg/commit/gitg-commit.vala:193 +#: ../gitg/commit/gitg-commit.vala:184 msgid "_Stage selection" msgstr "_Köa upp markering" -#: ../gitg/commit/gitg-commit.vala:232 +#: ../gitg/commit/gitg-commit.vala:223 #, c-format msgid "Failed to stage the removal of submodule `%s'" msgstr "Misslyckades att köa upp borttagningen av undermodulen ”%s”" -#: ../gitg/commit/gitg-commit.vala:248 +#: ../gitg/commit/gitg-commit.vala:239 #, c-format msgid "Failed to open the repository of submodule `%s' while trying to stage" msgstr "" "Misslyckades att öppna arkivet för undermodul ”%s” vid försök att köa upp" -#: ../gitg/commit/gitg-commit.vala:262 +#: ../gitg/commit/gitg-commit.vala:253 #, c-format msgid "" "Failed to lookup the working directory commit of submodule `%s' while trying " @@ -415,101 +415,101 @@ "Misslyckades att slå upp incheckningen för arbetskatalog för undermodul ”%s” " "medan uppkörning pågick" -#: ../gitg/commit/gitg-commit.vala:275 +#: ../gitg/commit/gitg-commit.vala:266 #, c-format msgid "Failed to stage the submodule `%s'" msgstr "Misslyckades att köa upp undermodulen ”%s”" -#: ../gitg/commit/gitg-commit.vala:297 +#: ../gitg/commit/gitg-commit.vala:288 #, c-format msgid "Failed to stage the removal of file `%s'" msgstr "Misslyckades att köa upp borttagningen av filen ”%s”" -#: ../gitg/commit/gitg-commit.vala:311 +#: ../gitg/commit/gitg-commit.vala:302 #, c-format msgid "Failed to stage the file `%s'" msgstr "Misslyckades att köa upp filen ”%s”" -#: ../gitg/commit/gitg-commit.vala:583 +#: ../gitg/commit/gitg-commit.vala:574 msgid "_Unstage selection" msgstr "_Ta bort markering från kön" -#: ../gitg/commit/gitg-commit.vala:649 +#: ../gitg/commit/gitg-commit.vala:640 #, c-format msgid "Failed to unstage the removal of file `%s'" msgstr "Misslyckades att ta bort borttagningen av filen ”%s” från kön" -#: ../gitg/commit/gitg-commit.vala:650 +#: ../gitg/commit/gitg-commit.vala:641 #, c-format msgid "Failed to unstage the file `%s'" msgstr "Misslyckades att ta bort filen ”%s” från kön" -#: ../gitg/commit/gitg-commit.vala:657 +#: ../gitg/commit/gitg-commit.vala:648 #, c-format msgid "Failed to unstage the removal of submodule `%s'" msgstr "Misslyckades att ta bort borttagningen av undermodul ”%s” från kön" -#: ../gitg/commit/gitg-commit.vala:658 +#: ../gitg/commit/gitg-commit.vala:649 #, c-format msgid "Failed to unstage the submodule `%s'" msgstr "Misslyckades att ta bort undermodulen ”%s” från kön" #. Populate staged items -#: ../gitg/commit/gitg-commit.vala:862 +#: ../gitg/commit/gitg-commit.vala:853 msgid "Staged" msgstr "Köade" -#: ../gitg/commit/gitg-commit.vala:870 +#: ../gitg/commit/gitg-commit.vala:861 msgid "No staged files" msgstr "Inga köade filer" #. Populate unstaged items -#: ../gitg/commit/gitg-commit.vala:893 +#: ../gitg/commit/gitg-commit.vala:884 msgid "Unstaged" msgstr "Oköade" -#: ../gitg/commit/gitg-commit.vala:901 +#: ../gitg/commit/gitg-commit.vala:892 msgid "No unstaged files" msgstr "Inga oköade ändringar" #. Populate untracked items -#: ../gitg/commit/gitg-commit.vala:924 +#: ../gitg/commit/gitg-commit.vala:915 msgid "Untracked" msgstr "Ospårade" -#: ../gitg/commit/gitg-commit.vala:928 +#: ../gitg/commit/gitg-commit.vala:919 msgid "No untracked files" msgstr "Inga ospårade filer" -#: ../gitg/commit/gitg-commit.vala:953 +#: ../gitg/commit/gitg-commit.vala:944 msgid "Submodule" msgstr "Undermodul" -#: ../gitg/commit/gitg-commit.vala:957 +#: ../gitg/commit/gitg-commit.vala:948 msgid "No dirty submodules" msgstr "Inga smutsiga undermoduler" -#: ../gitg/commit/gitg-commit.vala:1106 +#: ../gitg/commit/gitg-commit.vala:1095 msgid "Failed to commit" msgstr "Misslyckades att checka in" -#: ../gitg/commit/gitg-commit.vala:1122 +#: ../gitg/commit/gitg-commit.vala:1111 msgid "Failed to pass pre-commit" msgstr "Misslyckades att passera pre-commit" -#: ../gitg/commit/gitg-commit.vala:1330 ../gitg/commit/gitg-commit.vala:1480 +#: ../gitg/commit/gitg-commit.vala:1314 ../gitg/commit/gitg-commit.vala:1464 msgid "Discard changes" msgstr "Förkasta ändringar" -#: ../gitg/commit/gitg-commit.vala:1331 +#: ../gitg/commit/gitg-commit.vala:1315 msgid "Are you sure you want to permanently discard the selected changes?" msgstr "" "Är du säker på att du permanent vill förkasta de markerade ändringarna?" -#: ../gitg/commit/gitg-commit.vala:1340 ../gitg/commit/gitg-commit.vala:1506 -#: ../gitg/commit/gitg-commit.vala:1621 +#: ../gitg/commit/gitg-commit.vala:1324 ../gitg/commit/gitg-commit.vala:1490 +#: ../gitg/commit/gitg-commit.vala:1605 #: ../gitg/gitg-commit-action-create-patch.vala:145 -#: ../gitg/gitg-dash-view.vala:444 ../gitg/gitg-window.vala:190 +#: ../gitg/gitg-dash-view.vala:437 ../gitg/gitg-window.vala:190 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:2 #: ../gitg/resources/ui/gitg-clone-dialog.ui.h:2 #: ../gitg/resources/ui/gitg-commit-dialog.ui.h:2 @@ -520,27 +520,27 @@ msgid "_Cancel" msgstr "_Avbryt" -#: ../gitg/commit/gitg-commit.vala:1341 ../gitg/commit/gitg-commit.vala:1507 +#: ../gitg/commit/gitg-commit.vala:1325 ../gitg/commit/gitg-commit.vala:1491 msgid "Discard" msgstr "Förkasta" -#: ../gitg/commit/gitg-commit.vala:1370 +#: ../gitg/commit/gitg-commit.vala:1354 msgid "Failed to discard selection" msgstr "Misslyckades att förkasta markeringen" -#: ../gitg/commit/gitg-commit.vala:1400 +#: ../gitg/commit/gitg-commit.vala:1384 msgid "Failed to stage selection" msgstr "Misslyckades att köa upp markeringen" -#: ../gitg/commit/gitg-commit.vala:1404 +#: ../gitg/commit/gitg-commit.vala:1388 msgid "Failed to unstage selection" msgstr "Misslyckades med att ta bort markeringen ur kön" -#: ../gitg/commit/gitg-commit.vala:1464 +#: ../gitg/commit/gitg-commit.vala:1448 msgid "Failed to discard changes" msgstr "Misslyckades med att förkasta ändringar" -#: ../gitg/commit/gitg-commit.vala:1485 +#: ../gitg/commit/gitg-commit.vala:1469 #, c-format msgid "" "Are you sure you want to permanently discard all changes made to the file `" @@ -549,7 +549,7 @@ "Är du säker på att du permanent vill förkasta alla ändringar som gjorts till " "filen ”%s”?" -#: ../gitg/commit/gitg-commit.vala:1496 +#: ../gitg/commit/gitg-commit.vala:1480 #, c-format msgid "" "Are you sure you want to permanently discard all changes made to the files " @@ -558,45 +558,45 @@ "Är du säker på att du permanent vill förkasta alla ändringar som gjorts till " "filerna %s och ”%s”?" -#: ../gitg/commit/gitg-commit.vala:1579 +#: ../gitg/commit/gitg-commit.vala:1563 msgid "Failed to delete files" msgstr "Misslyckades att ta bort filer" -#: ../gitg/commit/gitg-commit.vala:1595 +#: ../gitg/commit/gitg-commit.vala:1579 msgid "Delete file" msgid_plural "Delete files" msgstr[0] "Ta bort fil" msgstr[1] "Ta bort filer" -#: ../gitg/commit/gitg-commit.vala:1600 +#: ../gitg/commit/gitg-commit.vala:1584 #, c-format msgid "Are you sure you want to permanently delete the file `%s'?" msgstr "Är du säker på att du permanent vill ta bort filen ”%s”?" -#: ../gitg/commit/gitg-commit.vala:1611 +#: ../gitg/commit/gitg-commit.vala:1595 #, c-format msgid "Are you sure you want to permanently delete the files %s and `%s'?" msgstr "Är du säker på att du permanent vill ta bort filerna ”%s” och ”%s”?" -#: ../gitg/commit/gitg-commit.vala:1657 +#: ../gitg/commit/gitg-commit.vala:1640 msgid "_Stage changes" msgstr "_Köa ändringar" -#: ../gitg/commit/gitg-commit.vala:1669 +#: ../gitg/commit/gitg-commit.vala:1650 msgid "_Unstage changes" msgstr "_Ta bort ändringar ur kön" -#: ../gitg/commit/gitg-commit.vala:1681 +#: ../gitg/commit/gitg-commit.vala:1660 msgid "_Discard changes" msgstr "_Förkasta ändringar" -#: ../gitg/commit/gitg-commit.vala:1693 +#: ../gitg/commit/gitg-commit.vala:1670 msgid "D_elete file" msgid_plural "D_elete files" msgstr[0] "Ta _bort fil" msgstr[1] "Ta _bort filer" -#: ../gitg/commit/gitg-commit.vala:1723 +#: ../gitg/commit/gitg-commit.vala:1693 msgid "_Edit file" msgstr "_Redigera fil" @@ -680,11 +680,11 @@ msgid "- Git repository viewer" msgstr "- Git-arkivsvisare" -#: ../gitg/gitg-application.vala:222 +#: ../gitg/gitg-application.vala:226 msgid "gitg is a Git repository viewer for gtk+/GNOME" msgstr "gitg är en git-arkivsvisare för gtk+/GNOME" -#: ../gitg/gitg-application.vala:231 +#: ../gitg/gitg-application.vala:235 msgid "translator-credits" msgstr "" "Sebastian Rasmussen \n" @@ -692,11 +692,11 @@ "Skicka synpunkter på översättningen till\n" "." -#: ../gitg/gitg-application.vala:234 +#: ../gitg/gitg-application.vala:238 msgid "gitg homepage" msgstr "gitgs hemsida" -#: ../gitg/gitg-application.vala:364 +#: ../gitg/gitg-application.vala:369 msgid "" "We are terribly sorry, but gitg requires libgit2 (a library on which gitg " "depends) to be compiled with threading support.\n" @@ -717,23 +717,23 @@ "libgit2 saknar trådningsstöd." #. ex: ts=4 noet -#: ../gitg/gitg-author-details-dialog.vala:97 -#: ../gitg/gitg-author-details-dialog.vala:117 +#: ../gitg/gitg-author-details-dialog.vala:85 +#: ../gitg/gitg-author-details-dialog.vala:105 #: ../gitg/resources/ui/gitg-author-details-dialog.ui.h:1 msgid "Author Details" msgstr "Författardetaljer" -#: ../gitg/gitg-author-details-dialog.vala:98 +#: ../gitg/gitg-author-details-dialog.vala:86 msgid "Enter default details used for all repositories:" msgstr "Ange standarddetaljer som används för alla arkiv:" #. Translators: %s is the repository name -#: ../gitg/gitg-author-details-dialog.vala:120 +#: ../gitg/gitg-author-details-dialog.vala:108 #, c-format msgid "Override global details for repository '%s':" msgstr "Åsidosätt globala detaljer för arkivet ”%s”:" -#: ../gitg/gitg-author-details-dialog.vala:232 +#: ../gitg/gitg-author-details-dialog.vala:220 msgid "Failed to set Git user config." msgstr "Misslyckades att ställa in Git användarkonfiguration." @@ -863,40 +863,36 @@ msgid "Provide a message to create an annotated tag" msgstr "Ange ett meddelande för att skapa en annoterad tagg" -#: ../gitg/gitg-dash-view.vala:87 -msgid "Select and manage projects" -msgstr "Välj och hantera projekt" - -#: ../gitg/gitg-dash-view.vala:176 +#: ../gitg/gitg-dash-view.vala:171 msgid "_Remove" msgstr "_Ta bort" #. Translators: the two %s will be replaced to create a link to perform the scanning action. -#: ../gitg/gitg-dash-view.vala:232 +#: ../gitg/gitg-dash-view.vala:227 #, c-format msgid "We can also %sscan your home directory%s for git repositories." msgstr "Vi kan också %ssöka igenom din hemkatalog%s efter git-arkiv." #. Translators: the two %s will be used to create a link to the author dialog. -#: ../gitg/gitg-dash-view.vala:235 +#: ../gitg/gitg-dash-view.vala:230 #, c-format msgid "In the mean time, you may want to %sset up your git profile%s." msgstr "Under tiden kan du vilja %skonfigurera din git-profil%s." -#: ../gitg/gitg-dash-view.vala:389 +#: ../gitg/gitg-dash-view.vala:382 msgid "Failed to clone repository" msgstr "Misslyckades att klona arkiv" -#: ../gitg/gitg-dash-view.vala:420 +#: ../gitg/gitg-dash-view.vala:413 msgid "Failed to add repository" msgstr "Misslyckades att lägga till arkiv" -#: ../gitg/gitg-dash-view.vala:436 +#: ../gitg/gitg-dash-view.vala:429 msgid "Create new repository" msgstr "Skapa nytt arkiv" #. Translators: %s is a file name -#: ../gitg/gitg-dash-view.vala:439 +#: ../gitg/gitg-dash-view.vala:432 #, c-format msgid "" "The location %s does not appear to be a valid git repository. Would " @@ -905,15 +901,15 @@ "Platsen %s verkar inte vara ett giltigt git-arkiv. Vill du initiera " "ett nytt git-arkiv på denna plats?" -#: ../gitg/gitg-dash-view.vala:445 +#: ../gitg/gitg-dash-view.vala:438 msgid "Create repository" msgstr "Skapa arkiv" -#: ../gitg/gitg-dash-view.vala:461 +#: ../gitg/gitg-dash-view.vala:454 msgid "Failed to create repository" msgstr "Misslyckades att skapa arkiv" -#: ../gitg/gitg-dash-view.vala:531 +#: ../gitg/gitg-dash-view.vala:524 #, c-format msgid "Scanning for repositories in %s" msgstr "Söker efter arkiv i %s" @@ -1166,20 +1162,16 @@ msgid "_Scan for all git repositories from this directory" msgstr "_Sök efter alla git-arkiv från denna katalog" -#: ../gitg/gitg-window.vala:501 +#: ../gitg/gitg-window.vala:481 msgid "Projects" msgstr "Projekt" -#: ../gitg/gitg-window.vala:751 -msgid "Select items" -msgstr "Välj objekt" - -#: ../gitg/gitg-window.vala:958 +#: ../gitg/gitg-window.vala:912 #, c-format msgid "'%s' is not a Git repository." msgstr "”%s” är inte ett Git-arkiv." -#: ../gitg/gitg-window.vala:1107 +#: ../gitg/gitg-window.vala:1061 msgid "" "Your user name and email are not configured yet. Please go to the user " "configuration and provide your name and email." @@ -1187,7 +1179,7 @@ "Ditt användarnamn och e-post är inte konfigurerade än. Gå till " "användarkonfigurationen och ange ditt namn och e-post." -#: ../gitg/gitg-window.vala:1111 +#: ../gitg/gitg-window.vala:1065 msgid "" "Your user name is not configured yet. Please go to the user configuration " "and provide your name." @@ -1195,7 +1187,7 @@ "Ditt användarnamn är inte konfigurerat än. Gå till användarkonfigurationen " "och ange ditt namn." -#: ../gitg/gitg-window.vala:1115 +#: ../gitg/gitg-window.vala:1069 msgid "" "Your email is not configured yet. Please go to the user configuration and " "provide your email." @@ -1203,7 +1195,7 @@ "Din e-post är inte konfigurerad än. Gå till användarkonfigurationen och ange " "din e-post." -#: ../gitg/gitg-window.vala:1118 +#: ../gitg/gitg-window.vala:1072 msgid "Missing author details" msgstr "Saknar författardetaljer" @@ -1265,17 +1257,17 @@ msgid "Remotes" msgstr "Fjärrar" -#: ../gitg/history/gitg-history.vala:342 +#: ../gitg/history/gitg-history.vala:306 #: ../gitg/preferences/gitg-preferences-history.vala:218 #: ../gitg/resources/ui/gitg-preferences-interface.ui.h:3 msgid "History" msgstr "Historik" -#: ../gitg/history/gitg-history.vala:347 +#: ../gitg/history/gitg-history.vala:311 msgid "Examine the history of the repository" msgstr "Undersök arkivets historik" -#: ../gitg/history/gitg-history.vala:843 +#: ../gitg/history/gitg-history.vala:796 msgid "Mainline" msgstr "Huvudlinje" @@ -1288,13 +1280,6 @@ msgid "Interface" msgstr "Gränssnitt" -#. Translators: %s will be replaced with a URL indicating the resource -#. for which the authentication is required. -#: ../libgitg/gitg-authentication-dialog.vala:69 -#, c-format -msgid "Password required for %s" -msgstr "Lösenord krävs för %s" - #: ../libgitg/gitg-date.vala:346 msgid "Now" msgstr "Nu" @@ -1352,32 +1337,20 @@ msgid "%b %e %Y, %I:%M %p" msgstr "%e %b %Y, %I:%M %p" -#: ../libgitg/gitg-diff-view-commit-details.vala:145 +#: ../libgitg/gitg-diff-view-commit-details.vala:142 msgid "Collapse all" msgstr "Fäll ihop alla" -#: ../libgitg/gitg-diff-view-commit-details.vala:149 +#: ../libgitg/gitg-diff-view-commit-details.vala:146 #: ../libgitg/resources/ui/gitg-diff-view-commit-details.ui.h:2 msgid "Expand all" msgstr "Expandera alla" -#: ../libgitg/gitg-diff-view-commit-details.vala:202 +#: ../libgitg/gitg-diff-view-commit-details.vala:199 #, c-format msgid "Committed by %s" msgstr "Incheckad av %s" -#: ../libgitg/gitg-diff-view-file.vala:172 -msgid "_Open file" -msgstr "Ö_ppna fil" - -#: ../libgitg/gitg-diff-view-file.vala:204 -msgid "Open containing _folder" -msgstr "Öppna _innehållande mapp" - -#: ../libgitg/gitg-diff-view-file.vala:224 -msgid "_Copy file path" -msgstr "_Kopiera filsökväg" - #. Translators: this is used to construct: "at ", to indicate where the repository is at. #: ../libgitg/gitg-repository-list-box.vala:154 #, c-format @@ -1390,7 +1363,7 @@ msgid "%s at %s" msgstr "%s i %s" -#: ../libgitg/gitg-repository-list-box.vala:541 +#: ../libgitg/gitg-repository-list-box.vala:409 msgid "Cloning…" msgstr "Klonar…" @@ -1401,12 +1374,12 @@ "Kunde inte läsa incheckningsmeddelande efter att ha kört kroken commit-msg: " "%s" -#: ../plugins/diff/gitg-diff.vala:115 +#: ../plugins/diff/gitg-diff.vala:112 #: ../gitg/resources/ui/gitg-preferences-interface.ui.h:11 msgid "Diff" msgstr "Diff" -#: ../plugins/diff/gitg-diff.vala:120 +#: ../plugins/diff/gitg-diff.vala:117 msgid "Show the changes introduced by the selected commit" msgstr "Visa ändringarna som introducerades av den markerade incheckningen" @@ -1569,14 +1542,18 @@ msgstr "_Tangentbordsgenvägar" #: ../gitg/resources/ui/gitg-menus.ui.h:5 +msgid "_Help" +msgstr "_Hjälp" + +#: ../gitg/resources/ui/gitg-menus.ui.h:6 msgid "_About" msgstr "_Om" -#: ../gitg/resources/ui/gitg-menus.ui.h:6 +#: ../gitg/resources/ui/gitg-menus.ui.h:7 msgid "_Quit" msgstr "_Avsluta" -#: ../gitg/resources/ui/gitg-menus.ui.h:7 +#: ../gitg/resources/ui/gitg-menus.ui.h:8 msgid "_Reload" msgstr "_Läs om" @@ -1793,10 +1770,6 @@ msgid "Parents" msgstr "Föräldrar" -#: ../libgitg/resources/ui/gitg-diff-view-file-renderer-binary.ui.h:1 -msgid "Unable to display changes for binary file" -msgstr "Kan inte visa ändringar för binär fil" - #: ../libgitg/resources/ui/gitg-diff-view-options-spacing.ui.h:1 msgid "Tab width:" msgstr "Tabbredd:" @@ -1823,16 +1796,9 @@ "disk)" msgstr "Ta bort arkivet från listan (tar inte bort arkivet från disken)" -#, fuzzy -#~| msgid "References" -#~ msgid "Difference" -#~ msgstr "Referenser" - -#~ msgid "_Help" -#~ msgstr "_Hjälp" - -#~ msgid "column" -#~ msgstr "kolumn" +#: ../plugins/files/resources/view-files.ui.h:1 +msgid "column" +msgstr "kolumn" #~ msgid "Add…" #~ msgstr "Lägg till…" @@ -1872,3 +1838,6 @@ #~ msgid "_Clone Repository…" #~ msgstr "_Klona arkiv…" + +#~ msgid "_Open" +#~ msgstr "_Öppna" diff -Nru gitg-3.22.0/README gitg-3.23.0/README --- gitg-3.22.0/README 2016-09-18 12:03:59.000000000 +0000 +++ gitg-3.23.0/README 2016-11-26 08:32:25.000000000 +0000 @@ -4,7 +4,7 @@ Besides visualization, gitg also provides several utilities to manage your repository and commit your work. -The latest version of gitg is 3.22.0. +The latest version of gitg is 3.23.0. Website: https://wiki.gnome.org/Apps/Gitg Bugs: https://bugzilla.gnome.org/browse.cgi?product=gitg @@ -12,12 +12,12 @@ Mailing list: http://mail.gnome.org/mailman/listinfo/gitg-list = Installing gitg = -To install the latest version of gitg, make sure to download gitg-3.22.0.tar.xz +To install the latest version of gitg, make sure to download gitg-3.23.0.tar.xz from the download site. After downloading the following procedure installs gitg: - $ tar Jxf gitg-3.22.0.tar.xz - $ cd gitg-3.22.0 + $ tar Jxf gitg-3.23.0.tar.xz + $ cd gitg-3.23.0 $ ./configure $ make $ sudo make install diff -Nru gitg-3.22.0/tests/diff-view.c gitg-3.23.0/tests/diff-view.c --- gitg-3.22.0/tests/diff-view.c 2016-08-09 09:51:12.000000000 +0000 +++ gitg-3.23.0/tests/diff-view.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* diff-view.c generated by valac 0.32.1, the Vala compiler +/* diff-view.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from diff-view.vala, do not modify */ @@ -61,12 +61,12 @@ gint test_diff_view_main (gchar** args, int args_length1); static gchar** _vala_array_dup1 (gchar** self, int length); static gchar** _vala_array_dup2 (gchar** self, int length); -static void _vala_array_add1 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add1 (gchar** * array, int* length, int* size, gchar* value); static gboolean __lambda4_ (GtkWidget* w, GdkEventAny* ev); static gboolean ___lambda4__gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self); TestDiffView* test_diff_view_new (void); TestDiffView* test_diff_view_construct (GType object_type); -static void test_diff_view_finalize (TestDiffView* obj); +static void test_diff_view_finalize (TestDiffView * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); @@ -114,7 +114,7 @@ } -static void _vala_array_add1 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add1 (gchar** * array, int* length, int* size, gchar* value) { #line 37 "/home/jesse/dev/gitg/tests/diff-view.vala" if ((*length) == (*size)) { #line 37 "/home/jesse/dev/gitg/tests/diff-view.vala" @@ -1102,7 +1102,7 @@ #line 1 "/home/jesse/dev/gitg/tests/diff-view.vala" if (collect_values[0].v_pointer) { #line 1105 "diff-view.c" - TestDiffView* object; + TestDiffView * object; object = collect_values[0].v_pointer; #line 1 "/home/jesse/dev/gitg/tests/diff-view.vala" if (object->parent_instance.g_class == NULL) { @@ -1129,7 +1129,7 @@ static gchar* value_test_diff_view_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - TestDiffView** object_p; + TestDiffView ** object_p; object_p = collect_values[0].v_pointer; #line 1 "/home/jesse/dev/gitg/tests/diff-view.vala" if (!object_p) { @@ -1181,7 +1181,7 @@ void value_set_test_diff_view (GValue* value, gpointer v_object) { - TestDiffView* old; + TestDiffView * old; #line 1 "/home/jesse/dev/gitg/tests/diff-view.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEST_DIFF_VIEW)); #line 1 "/home/jesse/dev/gitg/tests/diff-view.vala" @@ -1212,7 +1212,7 @@ void value_take_test_diff_view (GValue* value, gpointer v_object) { - TestDiffView* old; + TestDiffView * old; #line 1 "/home/jesse/dev/gitg/tests/diff-view.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEST_DIFF_VIEW)); #line 1 "/home/jesse/dev/gitg/tests/diff-view.vala" @@ -1256,7 +1256,7 @@ } -static void test_diff_view_finalize (TestDiffView* obj) { +static void test_diff_view_finalize (TestDiffView * obj) { TestDiffView * self; #line 1 "/home/jesse/dev/gitg/tests/diff-view.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TEST_DIFF_VIEW, TestDiffView); @@ -1281,7 +1281,7 @@ gpointer test_diff_view_ref (gpointer instance) { - TestDiffView* self; + TestDiffView * self; self = instance; #line 1 "/home/jesse/dev/gitg/tests/diff-view.vala" g_atomic_int_inc (&self->ref_count); @@ -1292,7 +1292,7 @@ void test_diff_view_unref (gpointer instance) { - TestDiffView* self; + TestDiffView * self; self = instance; #line 1 "/home/jesse/dev/gitg/tests/diff-view.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { diff -Nru gitg-3.22.0/tests/gitg/application-mock.c gitg-3.23.0/tests/gitg/application-mock.c --- gitg-3.22.0/tests/gitg/application-mock.c 2016-08-09 09:51:19.000000000 +0000 +++ gitg-3.23.0/tests/gitg/application-mock.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* application-mock.c generated by valac 0.32.1, the Vala compiler +/* application-mock.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from application-mock.vala, do not modify */ /* @@ -175,7 +175,7 @@ static gpointer gitg_test_application_parent_class = NULL; static gpointer gitg_test_application_expected_user_query_parent_class = NULL; -static GitgExtApplicationIface* gitg_test_application_gitg_ext_application_parent_iface = NULL; +static GitgExtApplicationIface * gitg_test_application_gitg_ext_application_parent_iface = NULL; GType gitg_test_test_get_type (void) G_GNUC_CONST; GType gitg_test_repository_get_type (void) G_GNUC_CONST; @@ -220,9 +220,9 @@ enum { GITG_TEST_APPLICATION_EXPECTED_USER_QUERY_DUMMY_PROPERTY }; -static void gitg_test_application_expected_user_query_finalize (GObject* obj); +static void gitg_test_application_expected_user_query_finalize (GObject * obj); GgitSignature* gitg_test_repository_get_verified_committer (GitgTestRepository* self); -static void gitg_test_application_finalize (GObject* obj); +static void gitg_test_application_finalize (GObject * obj); static void _vala_gitg_test_application_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_test_application_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -919,8 +919,11 @@ #line 49 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" self = (GitgTestApplication*) base; #line 49 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" - g_object_notify ((GObject *) self, "repository"); -#line 924 "application-mock.c" + if (gitg_test_application_real_get_repository (self) != value) { +#line 49 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" + g_object_notify ((GObject *) self, "repository"); +#line 926 "application-mock.c" + } } @@ -933,7 +936,7 @@ result = NULL; #line 52 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" return result; -#line 937 "application-mock.c" +#line 940 "application-mock.c" } @@ -946,7 +949,7 @@ result = NULL; #line 53 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" return result; -#line 950 "application-mock.c" +#line 953 "application-mock.c" } @@ -962,7 +965,7 @@ result = (GeeMap*) _tmp0_; #line 54 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" return result; -#line 966 "application-mock.c" +#line 969 "application-mock.c" } @@ -976,7 +979,7 @@ _tmp0_ = gee_array_list_new (GITG_TYPE_SIMPLE_NOTIFICATION, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); #line 60 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" ret = _tmp0_; -#line 980 "application-mock.c" +#line 983 "application-mock.c" { GeeArrayList* _notification_list = NULL; GitgTestNotifications* _tmp1_ = NULL; @@ -1007,7 +1010,7 @@ _notification_index = -1; #line 62 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" while (TRUE) { -#line 1011 "application-mock.c" +#line 1014 "application-mock.c" gint _tmp7_ = 0; gint _tmp8_ = 0; gint _tmp9_ = 0; @@ -1029,7 +1032,7 @@ if (!(_tmp8_ < _tmp9_)) { #line 62 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" break; -#line 1033 "application-mock.c" +#line 1036 "application-mock.c" } #line 62 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" _tmp10_ = _notification_list; @@ -1047,17 +1050,17 @@ gee_abstract_collection_add ((GeeAbstractCollection*) _tmp13_, G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, GITG_TYPE_SIMPLE_NOTIFICATION) ? ((GitgSimpleNotification*) _tmp14_) : NULL); #line 62 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" _g_object_unref0 (notification); -#line 1051 "application-mock.c" +#line 1054 "application-mock.c" } #line 62 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" _g_object_unref0 (_notification_list); -#line 1055 "application-mock.c" +#line 1058 "application-mock.c" } #line 67 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" result = ret; #line 67 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" return result; -#line 1061 "application-mock.c" +#line 1064 "application-mock.c" } @@ -1076,7 +1079,7 @@ result = _tmp1_; #line 71 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" return result; -#line 1080 "application-mock.c" +#line 1083 "application-mock.c" } @@ -1089,7 +1092,7 @@ result = FALSE; #line 124 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" return result; -#line 1093 "application-mock.c" +#line 1096 "application-mock.c" } @@ -1098,8 +1101,11 @@ #line 124 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" self = (GitgTestApplication*) base; #line 124 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" - g_object_notify ((GObject *) self, "busy"); -#line 1103 "application-mock.c" + if (gitg_test_application_real_get_busy (self) != value) { +#line 124 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" + g_object_notify ((GObject *) self, "busy"); +#line 1108 "application-mock.c" + } } @@ -1112,7 +1118,7 @@ result = NULL; #line 131 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" return result; -#line 1116 "application-mock.c" +#line 1122 "application-mock.c" } @@ -1122,14 +1128,14 @@ self = (GitgTestApplicationExpectedUserQuery*) g_object_new (object_type, NULL); #line 24 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" return self; -#line 1126 "application-mock.c" +#line 1132 "application-mock.c" } static GitgTestApplicationExpectedUserQuery* gitg_test_application_expected_user_query_new (void) { #line 24 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" return gitg_test_application_expected_user_query_construct (GITG_TEST_APPLICATION_TYPE_EXPECTED_USER_QUERY); -#line 1133 "application-mock.c" +#line 1139 "application-mock.c" } @@ -1138,7 +1144,7 @@ gitg_test_application_expected_user_query_parent_class = g_type_class_peek_parent (klass); #line 24 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" G_OBJECT_CLASS (klass)->finalize = gitg_test_application_expected_user_query_finalize; -#line 1142 "application-mock.c" +#line 1148 "application-mock.c" } @@ -1146,7 +1152,7 @@ } -static void gitg_test_application_expected_user_query_finalize (GObject* obj) { +static void gitg_test_application_expected_user_query_finalize (GObject * obj) { GitgTestApplicationExpectedUserQuery * self; #line 24 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TEST_APPLICATION_TYPE_EXPECTED_USER_QUERY, GitgTestApplicationExpectedUserQuery); @@ -1154,7 +1160,7 @@ _g_object_unref0 (self->query); #line 24 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" G_OBJECT_CLASS (gitg_test_application_expected_user_query_parent_class)->finalize (obj); -#line 1158 "application-mock.c" +#line 1164 "application-mock.c" } @@ -1199,7 +1205,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_TEST_APPLICATION_BUSY, g_param_spec_boolean ("busy", "busy", "busy", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_TEST_APPLICATION_REMOTE_LOOKUP, g_param_spec_object ("remote-lookup", "remote-lookup", "remote-lookup", GITG_EXT_TYPE_REMOTE_LOOKUP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1203 "application-mock.c" +#line 1209 "application-mock.c" } @@ -1207,23 +1213,23 @@ #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" gitg_test_application_gitg_ext_application_parent_iface = g_type_interface_peek_parent (iface); #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" - iface->get_activity_by_id = (GitgExtActivity* (*)(GitgExtApplication*, const gchar*)) gitg_test_application_real_get_activity_by_id; + iface->get_activity_by_id = (GitgExtActivity* (*) (GitgExtApplication *, const gchar*)) gitg_test_application_real_get_activity_by_id; #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" - iface->set_activity_by_id = (GitgExtActivity* (*)(GitgExtApplication*, const gchar*)) gitg_test_application_real_set_activity_by_id; + iface->set_activity_by_id = (GitgExtActivity* (*) (GitgExtApplication *, const gchar*)) gitg_test_application_real_set_activity_by_id; #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" - iface->user_query = (void (*)(GitgExtApplication*, GitgExtUserQuery*)) gitg_test_application_real_user_query; + iface->user_query = (void (*) (GitgExtApplication *, GitgExtUserQuery*)) gitg_test_application_real_user_query; #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" - iface->user_query_async = (GtkResponseType (*)(GitgExtApplication*, GitgExtUserQuery*)) gitg_test_application_real_user_query_async; + iface->user_query_async = (GtkResponseType (*) (GitgExtApplication *, GitgExtUserQuery*)) gitg_test_application_real_user_query_async; #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" iface->user_query_finish = gitg_test_application_real_user_query_finish; #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" - iface->show_infobar = (void (*)(GitgExtApplication*, const gchar*, const gchar*, GtkMessageType)) gitg_test_application_real_show_infobar; + iface->show_infobar = (void (*) (GitgExtApplication *, const gchar*, const gchar*, GtkMessageType)) gitg_test_application_real_show_infobar; #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" - iface->open_new = (GitgExtApplication* (*)(GitgExtApplication*, GgitRepository*, const gchar*)) gitg_test_application_real_open_new; + iface->open_new = (GitgExtApplication* (*) (GitgExtApplication *, GgitRepository*, const gchar*)) gitg_test_application_real_open_new; #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" - iface->open_repository = (void (*)(GitgExtApplication*, GFile*)) gitg_test_application_real_open_repository; + iface->open_repository = (void (*) (GitgExtApplication *, GFile*)) gitg_test_application_real_open_repository; #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" - iface->get_verified_committer = (GgitSignature* (*)(GitgExtApplication*)) gitg_test_repository_get_verified_committer; + iface->get_verified_committer = (GgitSignature* (*) (GitgExtApplication *)) gitg_test_repository_get_verified_committer; #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" iface->get_repository = gitg_test_application_real_get_repository; #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" @@ -1242,18 +1248,18 @@ iface->set_busy = gitg_test_application_real_set_busy; #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" iface->get_remote_lookup = gitg_test_application_real_get_remote_lookup; -#line 1246 "application-mock.c" +#line 1252 "application-mock.c" } static void gitg_test_application_instance_init (GitgTestApplication * self) { #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" self->priv = GITG_TEST_APPLICATION_GET_PRIVATE (self); -#line 1253 "application-mock.c" +#line 1259 "application-mock.c" } -static void gitg_test_application_finalize (GObject* obj) { +static void gitg_test_application_finalize (GObject * obj) { GitgTestApplication * self; #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TEST_TYPE_APPLICATION, GitgTestApplication); @@ -1263,7 +1269,7 @@ _g_object_unref0 (self->priv->d_notifications); #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" G_OBJECT_CLASS (gitg_test_application_parent_class)->finalize (obj); -#line 1267 "application-mock.c" +#line 1273 "application-mock.c" } @@ -1334,13 +1340,13 @@ g_value_take_object (value, gitg_ext_application_get_remote_lookup ((GitgExtApplication*) self)); #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" break; -#line 1338 "application-mock.c" +#line 1344 "application-mock.c" default: #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" break; -#line 1344 "application-mock.c" +#line 1350 "application-mock.c" } } @@ -1362,13 +1368,13 @@ gitg_ext_application_set_busy ((GitgExtApplication*) self, g_value_get_boolean (value)); #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" break; -#line 1366 "application-mock.c" +#line 1372 "application-mock.c" default: #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 22 "/home/jesse/dev/gitg/tests/gitg/application-mock.vala" break; -#line 1372 "application-mock.c" +#line 1378 "application-mock.c" } } diff -Nru gitg-3.22.0/tests/gitg/gitg-action-support.c gitg-3.23.0/tests/gitg/gitg-action-support.c --- gitg-3.22.0/tests/gitg/gitg-action-support.c 2016-08-14 08:26:45.000000000 +0000 +++ gitg-3.23.0/tests/gitg/gitg-action-support.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-action-support.c generated by valac 0.32.1, the Vala compiler +/* gitg-action-support.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-action-support.vala, do not modify */ /* @@ -138,11 +138,10 @@ GgitSignature* _tmp6_; GError* err; GitgSimpleNotification* _tmp7_; - const gchar* _tmp8_; - GError* _tmp9_; - const gchar* _tmp10_; + GError* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; gchar* _tmp11_; - gchar* _tmp12_; GError * _inner_error_; }; @@ -157,22 +156,17 @@ gboolean result; gboolean _tmp0_; GitgExtUserQuery* q; - const gchar* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; + GitgExtUserQuery* _tmp1_; + GitgExtApplication* _tmp2_; + GitgExtApplication* _tmp3_; + GitgExtApplication* _tmp4_; GitgExtUserQuery* _tmp5_; - GitgExtApplication* _tmp6_; - GitgExtApplication* _tmp7_; - GitgExtApplication* _tmp8_; - GitgExtUserQuery* _tmp9_; - GtkResponseType _tmp10_; + GtkResponseType _tmp6_; + gboolean _tmp7_; + GitgSimpleNotification* _tmp8_; + GitgSimpleNotification* _tmp9_; + GitgRef* _tmp10_; gboolean _tmp11_; - GitgSimpleNotification* _tmp12_; - const gchar* _tmp13_; - GitgSimpleNotification* _tmp14_; - GitgRef* _tmp15_; - gboolean _tmp16_; }; struct _Block29Data { @@ -212,14 +206,12 @@ GitgRefActionCheckout* _tmp14_; gboolean _tmp15_; GitgSimpleNotification* _tmp16_; - const gchar* _tmp17_; GError* err; - GitgSimpleNotification* _tmp18_; + GitgSimpleNotification* _tmp17_; + GError* _tmp18_; const gchar* _tmp19_; - GError* _tmp20_; - const gchar* _tmp21_; - gchar* _tmp22_; - gchar* _tmp23_; + gchar* _tmp20_; + gchar* _tmp21_; GError * _inner_error_; }; @@ -254,78 +246,74 @@ GgitSignature* _tmp4_; GgitSignature* _tmp5_; GitgSimpleNotification* _tmp6_; - const gchar* _tmp7_; + GgitSignature* _tmp7_; GgitSignature* _tmp8_; - GgitSignature* _tmp9_; GitgStage* stage; + GitgExtApplication* _tmp10_; GitgExtApplication* _tmp11_; GitgExtApplication* _tmp12_; - GitgExtApplication* _tmp13_; + GitgRepository* _tmp13_; GitgRepository* _tmp14_; GitgRepository* _tmp15_; - GitgRepository* _tmp16_; + GitgStage* _tmp16_; GitgStage* _tmp17_; GitgStage* _tmp18_; - GitgStage* _tmp19_; GitgRef* head; gboolean ishead; - GitgRef* _tmp20_; - gboolean _tmp21_; + GitgRef* _tmp19_; + gboolean _tmp20_; GitgCommit* commit; - GgitObject* _tmp22_; - GitgRef* _tmp23_; + GgitObject* _tmp21_; + GitgRef* _tmp22_; + GgitObject* _tmp23_; GgitObject* _tmp24_; - GgitObject* _tmp25_; - GitgCommit* _tmp26_; + GitgCommit* _tmp25_; GError* e; - GitgSimpleNotification* _tmp27_; + GitgSimpleNotification* _tmp26_; + GError* _tmp27_; const gchar* _tmp28_; - GError* _tmp29_; - const gchar* _tmp30_; - gchar* _tmp31_; - gchar* _tmp32_; - gboolean _tmp33_; - GitgSimpleNotification* _tmp34_; - GitgRef* _tmp35_; - gboolean _tmp36_; - GitgCommit* _tmp37_; - GgitTree* _tmp38_; - GgitOId** _tmp39_; - gint _tmp39__length1; - GitgCommit* _tmp40_; - GgitOId* _tmp41_; - GgitOId** _tmp42_; + gchar* _tmp29_; + gchar* _tmp30_; + gboolean _tmp31_; + GitgSimpleNotification* _tmp32_; + GitgRef* _tmp33_; + gboolean _tmp34_; + GitgCommit* _tmp35_; + GgitTree* _tmp36_; + GgitOId** _tmp37_; + gint _tmp37__length1; + GitgCommit* _tmp38_; + GgitOId* _tmp39_; + GgitOId** _tmp40_; + GitgRef* _tmp41_; + gboolean _tmp42_; GitgRef* _tmp43_; - gboolean _tmp44_; - GitgRef* _tmp45_; - GitgRef* _tmp46_; - GgitOId* _tmp47_; - GitgStage* _tmp48_; - GgitIndex* _tmp49_; - const gchar* _tmp50_; - GgitSignature* _tmp51_; - GgitSignature* _tmp52_; - GgitOId** _tmp53_; - gint _tmp53__length1; - GgitOId* _tmp54_; - GgitOId* _tmp55_; + GitgRef* _tmp44_; + GgitOId* _tmp45_; + GitgStage* _tmp46_; + GgitIndex* _tmp47_; + const gchar* _tmp48_; + GgitSignature* _tmp49_; + GgitSignature* _tmp50_; + GgitOId** _tmp51_; + gint _tmp51__length1; + GgitOId* _tmp52_; + GgitOId* _tmp53_; GError* _vala1_e; - GitgSimpleNotification* _tmp56_; - const gchar* _tmp57_; - GError* _tmp58_; - const gchar* _tmp59_; - gchar* _tmp60_; - gchar* _tmp61_; - gboolean _tmp62_; + GitgSimpleNotification* _tmp54_; + GError* _tmp55_; + const gchar* _tmp56_; + gchar* _tmp57_; + gchar* _tmp58_; + gboolean _tmp59_; GError* _vala2_e; - GitgSimpleNotification* _tmp63_; - const gchar* _tmp64_; - GError* _tmp65_; - const gchar* _tmp66_; - gchar* _tmp67_; - gchar* _tmp68_; - GgitOId* _tmp69_; - GgitOId* _tmp70_; + GitgSimpleNotification* _tmp60_; + GError* _tmp61_; + const gchar* _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; + GgitOId* _tmp65_; + GgitOId* _tmp66_; GError * _inner_error_; }; @@ -367,7 +355,7 @@ static void ____lambda11__gitg_async_thread_func (gpointer self, GError** error); static void gitg_action_support_save_stash_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); void gitg_simple_notification_error (GitgSimpleNotification* self, const gchar* message); -gboolean gitg_action_support_reference_is_head (GitgActionSupport* self, GitgRef* reference, GitgRef** head); +gboolean gitg_action_support_reference_is_head (GitgActionSupport* self, GitgRef* reference, GitgRef* * head); static void gitg_action_support_stash_if_needed_data_free (gpointer _data); void gitg_action_support_stash_if_needed (GitgActionSupport* self, GitgSimpleNotification* notification, GitgRef* head, GAsyncReadyCallback _callback_, gpointer _user_data_); gboolean gitg_action_support_stash_if_needed_finish (GitgActionSupport* self, GAsyncResult* _res_); @@ -400,7 +388,7 @@ static GgitOId* _vala_GgitOId_copy (GgitOId* self); void gitg_action_support_set_application (GitgActionSupport* self, GitgExtApplication* value); void gitg_action_support_set_action_interface (GitgActionSupport* self, GitgExtRefActionInterface* value); -static void gitg_action_support_finalize (GObject* obj); +static void gitg_action_support_finalize (GObject * obj); static void _vala_gitg_action_support_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_action_support_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -423,14 +411,14 @@ self = (GitgActionSupport*) g_object_new (object_type, "application", _tmp0_, "action-interface", _tmp1_, NULL); #line 31 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return self; -#line 427 "gitg-action-support.c" +#line 415 "gitg-action-support.c" } GitgActionSupport* gitg_action_support_new (GitgExtApplication* application, GitgExtRefActionInterface* action_interface) { #line 31 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return gitg_action_support_construct (GITG_TYPE_ACTION_SUPPORT, application, action_interface); -#line 434 "gitg-action-support.c" +#line 422 "gitg-action-support.c" } @@ -441,14 +429,14 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_slice_free (GitgActionSupportWorkingDirectoryDirtyData, _data_); -#line 445 "gitg-action-support.c" +#line 433 "gitg-action-support.c" } static gpointer _g_object_ref0 (gpointer self) { #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return self ? g_object_ref (self) : NULL; -#line 452 "gitg-action-support.c" +#line 440 "gitg-action-support.c" } @@ -467,7 +455,7 @@ _data_->self = _tmp0_; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" gitg_action_support_working_directory_dirty_co (_data_); -#line 471 "gitg-action-support.c" +#line 459 "gitg-action-support.c" } @@ -480,7 +468,7 @@ result = _data_->result; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return result; -#line 484 "gitg-action-support.c" +#line 472 "gitg-action-support.c" } @@ -489,14 +477,14 @@ g_atomic_int_inc (&_data27_->_ref_count_); #line 36 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return _data27_; -#line 493 "gitg-action-support.c" +#line 481 "gitg-action-support.c" } static void _vala_GgitStatusOptions_free (GgitStatusOptions* self) { #line 36 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_boxed_free (ggit_status_options_get_type (), self); -#line 500 "gitg-action-support.c" +#line 488 "gitg-action-support.c" } @@ -505,7 +493,7 @@ _data27_ = (Block27Data*) _userdata_; #line 36 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" if (g_atomic_int_dec_and_test (&_data27_->_ref_count_)) { -#line 509 "gitg-action-support.c" +#line 497 "gitg-action-support.c" GitgActionSupport* self; #line 36 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" self = _data27_->self; @@ -515,7 +503,7 @@ _g_object_unref0 (self); #line 36 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_slice_free (Block27Data, _data27_); -#line 519 "gitg-action-support.c" +#line 507 "gitg-action-support.c" } } @@ -533,7 +521,7 @@ result = -1; #line 46 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return result; -#line 537 "gitg-action-support.c" +#line 525 "gitg-action-support.c" } @@ -542,7 +530,7 @@ result = __lambda10_ (self, path, status_flags); #line 44 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return result; -#line 546 "gitg-action-support.c" +#line 534 "gitg-action-support.c" } @@ -581,7 +569,7 @@ g_propagate_error (error, _inner_error_); #line 44 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return; -#line 585 "gitg-action-support.c" +#line 573 "gitg-action-support.c" } } @@ -589,7 +577,7 @@ static void ___lambda9__gitg_async_thread_func (gpointer self, GError** error) { #line 43 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" __lambda9_ (self, error); -#line 593 "gitg-action-support.c" +#line 581 "gitg-action-support.c" } @@ -603,7 +591,7 @@ _data_->_res_ = _res_; #line 43 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" gitg_action_support_working_directory_dirty_co (_data_); -#line 607 "gitg-action-support.c" +#line 595 "gitg-action-support.c" } @@ -612,16 +600,16 @@ switch (_data_->_state_) { #line 36 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" case 0: -#line 616 "gitg-action-support.c" +#line 604 "gitg-action-support.c" goto _state_0; #line 36 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" case 1: -#line 620 "gitg-action-support.c" +#line 608 "gitg-action-support.c" goto _state_1; default: #line 36 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_assert_not_reached (); -#line 625 "gitg-action-support.c" +#line 613 "gitg-action-support.c" } _state_0: #line 36 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -646,7 +634,7 @@ gitg_async_thread_try (___lambda9__gitg_async_thread_func, _data_->_data27_, gitg_action_support_working_directory_dirty_ready, _data_); #line 43 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 650 "gitg-action-support.c" +#line 638 "gitg-action-support.c" _state_1: #line 43 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" gitg_async_thread_try_finish (_data_->_res_); @@ -660,11 +648,11 @@ if (_data_->_state_ == 0) { #line 50 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 664 "gitg-action-support.c" +#line 652 "gitg-action-support.c" } else { #line 50 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 668 "gitg-action-support.c" +#line 656 "gitg-action-support.c" } #line 50 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); @@ -678,17 +666,17 @@ if (_data_->_state_ == 0) { #line 36 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 682 "gitg-action-support.c" +#line 670 "gitg-action-support.c" } else { #line 36 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 686 "gitg-action-support.c" +#line 674 "gitg-action-support.c" } #line 36 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 36 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 692 "gitg-action-support.c" +#line 680 "gitg-action-support.c" } @@ -701,7 +689,7 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_slice_free (GitgActionSupportSaveStashData, _data_); -#line 705 "gitg-action-support.c" +#line 693 "gitg-action-support.c" } @@ -740,7 +728,7 @@ _data_->head = _tmp4_; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" gitg_action_support_save_stash_co (_data_); -#line 744 "gitg-action-support.c" +#line 732 "gitg-action-support.c" } @@ -753,7 +741,7 @@ result = _data_->result; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return result; -#line 757 "gitg-action-support.c" +#line 745 "gitg-action-support.c" } @@ -762,7 +750,7 @@ g_atomic_int_inc (&_data28_->_ref_count_); #line 53 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return _data28_; -#line 766 "gitg-action-support.c" +#line 754 "gitg-action-support.c" } @@ -771,7 +759,7 @@ _data28_ = (Block28Data*) _userdata_; #line 53 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" if (g_atomic_int_dec_and_test (&_data28_->_ref_count_)) { -#line 775 "gitg-action-support.c" +#line 763 "gitg-action-support.c" GitgActionSupport* self; #line 53 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" self = _data28_->self; @@ -783,7 +771,7 @@ _g_object_unref0 (self); #line 53 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_slice_free (Block28Data, _data28_); -#line 787 "gitg-action-support.c" +#line 775 "gitg-action-support.c" } } @@ -805,124 +793,124 @@ glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1347 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { -#line 821 "gitg-action-support.c" +#line 809 "gitg-action-support.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; -#line 830 "gitg-action-support.c" +#line 818 "gitg-action-support.c" } -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { -#line 836 "gitg-action-support.c" +#line 824 "gitg-action-support.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; -#line 845 "gitg-action-support.c" +#line 833 "gitg-action-support.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { -#line 851 "gitg-action-support.c" +#line 839 "gitg-action-support.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; -#line 860 "gitg-action-support.c" +#line 848 "gitg-action-support.c" } else { -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = FALSE; -#line 864 "gitg-action-support.c" +#line 852 "gitg-action-support.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { -#line 872 "gitg-action-support.c" +#line 860 "gitg-action-support.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; -#line 881 "gitg-action-support.c" +#line 869 "gitg-action-support.c" } else { -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 885 "gitg-action-support.c" +#line 873 "gitg-action-support.c" } -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 907 "gitg-action-support.c" +#line 895 "gitg-action-support.c" } static void _vala_GgitOId_free (GgitOId* self) { #line 75 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_boxed_free (ggit_oid_get_type (), self); -#line 914 "gitg-action-support.c" +#line 902 "gitg-action-support.c" } static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 926 "gitg-action-support.c" +#line 914 "gitg-action-support.c" } @@ -947,7 +935,7 @@ _tmp0_ = _data28_->head; #line 68 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" if (_tmp0_ != NULL) { -#line 951 "gitg-action-support.c" +#line 939 "gitg-action-support.c" gchar* headname = NULL; GitgRef* _tmp1_ = NULL; GitgParsedRefName* _tmp2_ = NULL; @@ -974,7 +962,7 @@ _g_object_unref0 (_tmp4_); #line 70 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" headname = _tmp7_; -#line 978 "gitg-action-support.c" +#line 966 "gitg-action-support.c" { GgitRef* _tmp8_ = NULL; GitgRef* _tmp9_ = NULL; @@ -1014,7 +1002,7 @@ _tmp8_ = _tmp10_; #line 74 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1018 "gitg-action-support.c" +#line 1006 "gitg-action-support.c" goto __catch41_g_error; } #line 74 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -1035,7 +1023,7 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 74 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _g_object_unref0 (_tmp8_); -#line 1039 "gitg-action-support.c" +#line 1027 "gitg-action-support.c" goto __catch41_g_error; } #line 74 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -1048,7 +1036,7 @@ if (_tmp17_ == NULL) { #line 74 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _g_object_unref0 (_tmp16_); -#line 1052 "gitg-action-support.c" +#line 1040 "gitg-action-support.c" } #line 74 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" head_commit = _tmp17_; @@ -1108,7 +1096,7 @@ _g_object_unref0 (_tmp11_); #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _g_object_unref0 (_tmp8_); -#line 1112 "gitg-action-support.c" +#line 1100 "gitg-action-support.c" } goto __finally41; __catch41_g_error: @@ -1130,7 +1118,7 @@ _g_free0 (message); #line 82 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" message = _tmp37_; -#line 1134 "gitg-action-support.c" +#line 1122 "gitg-action-support.c" } __finally41: #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -1143,11 +1131,11 @@ _g_free0 (message); #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return; -#line 1147 "gitg-action-support.c" +#line 1135 "gitg-action-support.c" } #line 68 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _g_free0 (headname); -#line 1151 "gitg-action-support.c" +#line 1139 "gitg-action-support.c" } else { gchar* _tmp38_ = NULL; #line 87 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -1156,7 +1144,7 @@ _g_free0 (message); #line 87 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" message = _tmp38_; -#line 1160 "gitg-action-support.c" +#line 1148 "gitg-action-support.c" } #line 90 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _tmp39_ = gitg_action_support_get_application (self); @@ -1192,18 +1180,18 @@ _g_free0 (message); #line 90 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return; -#line 1196 "gitg-action-support.c" +#line 1184 "gitg-action-support.c" } #line 64 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _g_free0 (message); -#line 1200 "gitg-action-support.c" +#line 1188 "gitg-action-support.c" } static void ____lambda11__gitg_async_thread_func (gpointer self, GError** error) { #line 64 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" ___lambda11_ (self, error); -#line 1207 "gitg-action-support.c" +#line 1195 "gitg-action-support.c" } @@ -1217,7 +1205,7 @@ _data_->_res_ = _res_; #line 64 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" gitg_action_support_save_stash_co (_data_); -#line 1221 "gitg-action-support.c" +#line 1209 "gitg-action-support.c" } @@ -1226,16 +1214,16 @@ switch (_data_->_state_) { #line 53 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" case 0: -#line 1230 "gitg-action-support.c" +#line 1218 "gitg-action-support.c" goto _state_0; #line 53 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" case 1: -#line 1234 "gitg-action-support.c" +#line 1222 "gitg-action-support.c" goto _state_1; default: #line 53 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_assert_not_reached (); -#line 1239 "gitg-action-support.c" +#line 1227 "gitg-action-support.c" } _state_0: #line 53 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -1294,17 +1282,17 @@ if (_data_->_state_ == 0) { #line 59 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1298 "gitg-action-support.c" +#line 1286 "gitg-action-support.c" } else { #line 59 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1302 "gitg-action-support.c" +#line 1290 "gitg-action-support.c" } #line 59 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 59 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 1308 "gitg-action-support.c" +#line 1296 "gitg-action-support.c" } { #line 64 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -1313,13 +1301,13 @@ gitg_async_thread (____lambda11__gitg_async_thread_func, _data_->_data28_, gitg_action_support_save_stash_ready, _data_); #line 64 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 1317 "gitg-action-support.c" +#line 1305 "gitg-action-support.c" _state_1: #line 64 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" gitg_async_thread_finish (_data_->_res_, &_data_->_inner_error_); #line 64 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 1323 "gitg-action-support.c" +#line 1311 "gitg-action-support.c" goto __catch40_g_error; } } @@ -1337,27 +1325,23 @@ #line 95 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp8_ = NULL; #line 95 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp8_ = _ ("Failed to stash changes: %s"); + _data_->_tmp8_ = _data_->err; #line 95 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp9_ = NULL; #line 95 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp9_ = _data_->err; + _data_->_tmp9_ = _data_->_tmp8_->message; #line 95 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp10_ = NULL; #line 95 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp10_ = _data_->_tmp9_->message; + _data_->_tmp10_ = g_strdup_printf (_ ("Failed to stash changes: %s"), _data_->_tmp9_); #line 95 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp11_ = NULL; #line 95 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp11_ = g_strdup_printf (_data_->_tmp8_, _data_->_tmp10_); + _data_->_tmp11_ = _data_->_tmp10_; #line 95 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp12_ = NULL; -#line 95 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp12_ = _data_->_tmp11_; -#line 95 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - gitg_simple_notification_error (_data_->_tmp7_, _data_->_tmp12_); + gitg_simple_notification_error (_data_->_tmp7_, _data_->_tmp11_); #line 95 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _g_free0 (_data_->_tmp12_); + _g_free0 (_data_->_tmp11_); #line 96 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->result = FALSE; #line 96 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -1370,17 +1354,17 @@ if (_data_->_state_ == 0) { #line 96 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1374 "gitg-action-support.c" +#line 1358 "gitg-action-support.c" } else { #line 96 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1378 "gitg-action-support.c" +#line 1362 "gitg-action-support.c" } #line 96 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 96 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 1384 "gitg-action-support.c" +#line 1368 "gitg-action-support.c" } __finally40: #line 62 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -1395,7 +1379,7 @@ g_clear_error (&_data_->_inner_error_); #line 62 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 1399 "gitg-action-support.c" +#line 1383 "gitg-action-support.c" } #line 99 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->result = TRUE; @@ -1407,11 +1391,11 @@ if (_data_->_state_ == 0) { #line 99 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1411 "gitg-action-support.c" +#line 1395 "gitg-action-support.c" } else { #line 99 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1415 "gitg-action-support.c" +#line 1399 "gitg-action-support.c" } #line 99 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); @@ -1425,21 +1409,21 @@ if (_data_->_state_ == 0) { #line 53 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1429 "gitg-action-support.c" +#line 1413 "gitg-action-support.c" } else { #line 53 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1433 "gitg-action-support.c" +#line 1417 "gitg-action-support.c" } #line 53 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 53 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 1439 "gitg-action-support.c" +#line 1423 "gitg-action-support.c" } -gboolean gitg_action_support_reference_is_head (GitgActionSupport* self, GitgRef* reference, GitgRef** head) { +gboolean gitg_action_support_reference_is_head (GitgActionSupport* self, GitgRef* reference, GitgRef* * head) { gboolean result = FALSE; GgitBranch* branch = NULL; GitgRef* _tmp0_ = NULL; @@ -1471,7 +1455,7 @@ _g_object_unref0 (branch); #line 109 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return result; -#line 1475 "gitg-action-support.c" +#line 1459 "gitg-action-support.c" } { gboolean _tmp3_ = FALSE; @@ -1495,7 +1479,7 @@ _tmp3_ = _tmp5_; #line 114 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1499 "gitg-action-support.c" +#line 1483 "gitg-action-support.c" goto __catch42_g_error; } #line 114 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -1506,7 +1490,7 @@ _g_object_unref0 (branch); #line 116 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return result; -#line 1510 "gitg-action-support.c" +#line 1494 "gitg-action-support.c" } #line 119 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _tmp7_ = gitg_action_support_get_application (self); @@ -1532,7 +1516,7 @@ _tmp6_ = _tmp14_; #line 119 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1536 "gitg-action-support.c" +#line 1520 "gitg-action-support.c" goto __catch42_g_error; } #line 119 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -1545,7 +1529,7 @@ *head = _tmp15_; #line 112 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _g_object_unref0 (_tmp6_); -#line 1549 "gitg-action-support.c" +#line 1533 "gitg-action-support.c" } goto __finally42; __catch42_g_error: @@ -1554,7 +1538,7 @@ g_clear_error (&_inner_error_); #line 112 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _inner_error_ = NULL; -#line 1558 "gitg-action-support.c" +#line 1542 "gitg-action-support.c" } __finally42: #line 112 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -1567,7 +1551,7 @@ g_clear_error (&_inner_error_); #line 112 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 1571 "gitg-action-support.c" +#line 1555 "gitg-action-support.c" } #line 122 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _tmp16_ = *head; @@ -1577,7 +1561,7 @@ _g_object_unref0 (branch); #line 122 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return result; -#line 1581 "gitg-action-support.c" +#line 1565 "gitg-action-support.c" } @@ -1592,7 +1576,7 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_slice_free (GitgActionSupportStashIfNeededData, _data_); -#line 1596 "gitg-action-support.c" +#line 1580 "gitg-action-support.c" } @@ -1631,7 +1615,7 @@ _data_->head = _tmp4_; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" gitg_action_support_stash_if_needed_co (_data_); -#line 1635 "gitg-action-support.c" +#line 1619 "gitg-action-support.c" } @@ -1644,7 +1628,7 @@ result = _data_->result; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return result; -#line 1648 "gitg-action-support.c" +#line 1632 "gitg-action-support.c" } @@ -1658,7 +1642,7 @@ _data_->_res_ = _res_; #line 128 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" gitg_action_support_stash_if_needed_co (_data_); -#line 1662 "gitg-action-support.c" +#line 1646 "gitg-action-support.c" } @@ -1667,24 +1651,24 @@ switch (_data_->_state_) { #line 125 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" case 0: -#line 1671 "gitg-action-support.c" +#line 1655 "gitg-action-support.c" goto _state_0; #line 125 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" case 1: -#line 1675 "gitg-action-support.c" +#line 1659 "gitg-action-support.c" goto _state_1; #line 125 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" case 2: -#line 1679 "gitg-action-support.c" +#line 1663 "gitg-action-support.c" goto _state_2; #line 125 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" case 3: -#line 1683 "gitg-action-support.c" +#line 1667 "gitg-action-support.c" goto _state_3; default: #line 125 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_assert_not_reached (); -#line 1688 "gitg-action-support.c" +#line 1672 "gitg-action-support.c" } _state_0: #line 128 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -1693,7 +1677,7 @@ gitg_action_support_working_directory_dirty (_data_->self, gitg_action_support_stash_if_needed_ready, _data_); #line 128 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 1697 "gitg-action-support.c" +#line 1681 "gitg-action-support.c" _state_1: #line 128 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp0_ = FALSE; @@ -1704,72 +1688,52 @@ #line 130 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp1_ = NULL; #line 130 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp1_ = _ ("Unstaged changes"); -#line 130 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp2_ = NULL; -#line 130 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp2_ = _ ("You appear to have unstaged changes in your working directory. Would y" \ -"ou like to stash the changes before the checkout?"); -#line 130 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp3_ = NULL; -#line 130 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp3_ = _ ("Cancel"); -#line 130 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp4_ = NULL; -#line 130 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp4_ = _ ("Stash changes"); + _data_->_tmp1_ = gitg_ext_user_query_new_full (_ ("Unstaged changes"), _ ("You appear to have unstaged changes in your working directory. Would y" \ +"ou like to stash the changes before the checkout?"), GTK_MESSAGE_QUESTION, _ ("Cancel"), GTK_RESPONSE_CANCEL, _ ("Stash changes"), GTK_RESPONSE_OK, NULL); #line 130 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp5_ = NULL; -#line 130 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp5_ = gitg_ext_user_query_new_full (_data_->_tmp1_, _data_->_tmp2_, GTK_MESSAGE_QUESTION, _data_->_tmp3_, GTK_RESPONSE_CANCEL, _data_->_tmp4_, GTK_RESPONSE_OK, NULL); -#line 130 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->q = _data_->_tmp5_; + _data_->q = _data_->_tmp1_; #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp6_ = NULL; + _data_->_tmp2_ = NULL; #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp6_ = gitg_action_support_get_application (_data_->self); + _data_->_tmp2_ = gitg_action_support_get_application (_data_->self); #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp7_ = NULL; + _data_->_tmp3_ = NULL; #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp7_ = _data_->_tmp6_; + _data_->_tmp3_ = _data_->_tmp2_; #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp8_ = NULL; + _data_->_tmp4_ = NULL; #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp8_ = _data_->_tmp7_; + _data_->_tmp4_ = _data_->_tmp3_; #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp9_ = NULL; + _data_->_tmp5_ = NULL; #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp9_ = _data_->q; + _data_->_tmp5_ = _data_->q; #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_state_ = 2; #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - gitg_ext_application_user_query_async (_data_->_tmp8_, _data_->_tmp9_, gitg_action_support_stash_if_needed_ready, _data_); + gitg_ext_application_user_query_async (_data_->_tmp4_, _data_->_tmp5_, gitg_action_support_stash_if_needed_ready, _data_); #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 1749 "gitg-action-support.c" +#line 1717 "gitg-action-support.c" _state_2: #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp10_ = 0; + _data_->_tmp6_ = 0; #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp10_ = gitg_ext_application_user_query_finish (_data_->_tmp8_, _data_->_res_); + _data_->_tmp6_ = gitg_ext_application_user_query_finish (_data_->_tmp4_, _data_->_res_); #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp11_ = FALSE; + _data_->_tmp7_ = FALSE; #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp11_ = _data_->_tmp10_ != GTK_RESPONSE_OK; + _data_->_tmp7_ = _data_->_tmp6_ != GTK_RESPONSE_OK; #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _g_object_unref0 (_data_->_tmp8_); + _g_object_unref0 (_data_->_tmp4_); #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - if (_data_->_tmp11_) { + if (_data_->_tmp7_) { #line 138 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp12_ = NULL; + _data_->_tmp8_ = NULL; #line 138 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp12_ = _data_->notification; + _data_->_tmp8_ = _data_->notification; #line 138 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp13_ = NULL; -#line 138 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp13_ = _ ("Failed with conflicts"); -#line 138 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - gitg_simple_notification_error (_data_->_tmp12_, _data_->_tmp13_); + gitg_simple_notification_error (_data_->_tmp8_, _ ("Failed with conflicts")); #line 139 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->result = FALSE; #line 139 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -1778,40 +1742,40 @@ if (_data_->_state_ == 0) { #line 139 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1781 "gitg-action-support.c" +#line 1745 "gitg-action-support.c" } else { #line 139 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1785 "gitg-action-support.c" +#line 1749 "gitg-action-support.c" } #line 139 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 139 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 1791 "gitg-action-support.c" +#line 1755 "gitg-action-support.c" } #line 142 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp14_ = NULL; + _data_->_tmp9_ = NULL; #line 142 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp14_ = _data_->notification; + _data_->_tmp9_ = _data_->notification; #line 142 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp15_ = NULL; + _data_->_tmp10_ = NULL; #line 142 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp15_ = _data_->head; + _data_->_tmp10_ = _data_->head; #line 142 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_state_ = 3; #line 142 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - gitg_action_support_save_stash (_data_->self, _data_->_tmp14_, _data_->_tmp15_, gitg_action_support_stash_if_needed_ready, _data_); + gitg_action_support_save_stash (_data_->self, _data_->_tmp9_, _data_->_tmp10_, gitg_action_support_stash_if_needed_ready, _data_); #line 142 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 1807 "gitg-action-support.c" +#line 1771 "gitg-action-support.c" _state_3: #line 142 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp16_ = FALSE; + _data_->_tmp11_ = FALSE; #line 142 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp16_ = gitg_action_support_save_stash_finish (_data_->self, _data_->_res_); + _data_->_tmp11_ = gitg_action_support_save_stash_finish (_data_->self, _data_->_res_); #line 142 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - if (!_data_->_tmp16_) { + if (!_data_->_tmp11_) { #line 144 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->result = FALSE; #line 144 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -1820,21 +1784,21 @@ if (_data_->_state_ == 0) { #line 144 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1823 "gitg-action-support.c" +#line 1787 "gitg-action-support.c" } else { #line 144 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1827 "gitg-action-support.c" +#line 1791 "gitg-action-support.c" } #line 144 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 144 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 1833 "gitg-action-support.c" +#line 1797 "gitg-action-support.c" } #line 128 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _g_object_unref0 (_data_->q); -#line 1837 "gitg-action-support.c" +#line 1801 "gitg-action-support.c" } #line 148 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->result = TRUE; @@ -1842,11 +1806,11 @@ if (_data_->_state_ == 0) { #line 148 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1845 "gitg-action-support.c" +#line 1809 "gitg-action-support.c" } else { #line 148 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1849 "gitg-action-support.c" +#line 1813 "gitg-action-support.c" } #line 148 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); @@ -1856,17 +1820,17 @@ if (_data_->_state_ == 0) { #line 125 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1859 "gitg-action-support.c" +#line 1823 "gitg-action-support.c" } else { #line 125 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1863 "gitg-action-support.c" +#line 1827 "gitg-action-support.c" } #line 125 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 125 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 1869 "gitg-action-support.c" +#line 1833 "gitg-action-support.c" } @@ -1883,7 +1847,7 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_slice_free (GitgActionSupportCheckoutConflictsData, _data_); -#line 1886 "gitg-action-support.c" +#line 1850 "gitg-action-support.c" } @@ -1942,7 +1906,7 @@ _data_->head = _tmp8_; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" gitg_action_support_checkout_conflicts_co (_data_); -#line 1945 "gitg-action-support.c" +#line 1909 "gitg-action-support.c" } @@ -1955,7 +1919,7 @@ result = _data_->result; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return result; -#line 1958 "gitg-action-support.c" +#line 1922 "gitg-action-support.c" } @@ -1964,7 +1928,7 @@ g_atomic_int_inc (&_data29_->_ref_count_); #line 151 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return _data29_; -#line 1967 "gitg-action-support.c" +#line 1931 "gitg-action-support.c" } @@ -1973,7 +1937,7 @@ _data29_ = (Block29Data*) _userdata_; #line 151 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" if (g_atomic_int_dec_and_test (&_data29_->_ref_count_)) { -#line 1976 "gitg-action-support.c" +#line 1940 "gitg-action-support.c" GitgActionSupport* self; #line 151 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" self = _data29_->self; @@ -1983,7 +1947,7 @@ _g_object_unref0 (self); #line 151 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_slice_free (Block29Data, _data29_); -#line 1986 "gitg-action-support.c" +#line 1950 "gitg-action-support.c" } } @@ -1998,7 +1962,7 @@ _data_->_res_ = _res_; #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" gitg_action_support_checkout_conflicts_co (_data_); -#line 2001 "gitg-action-support.c" +#line 1965 "gitg-action-support.c" } @@ -2050,18 +2014,18 @@ _g_object_unref0 (opts); #line 176 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return; -#line 2053 "gitg-action-support.c" +#line 2017 "gitg-action-support.c" } #line 173 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _g_object_unref0 (opts); -#line 2057 "gitg-action-support.c" +#line 2021 "gitg-action-support.c" } static void ____lambda12__gitg_async_thread_func (gpointer self, GError** error) { #line 173 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" ___lambda12_ (self, error); -#line 2064 "gitg-action-support.c" +#line 2028 "gitg-action-support.c" } @@ -2070,24 +2034,24 @@ switch (_data_->_state_) { #line 151 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" case 0: -#line 2073 "gitg-action-support.c" +#line 2037 "gitg-action-support.c" goto _state_0; #line 151 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" case 1: -#line 2077 "gitg-action-support.c" +#line 2041 "gitg-action-support.c" goto _state_1; #line 151 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" case 2: -#line 2081 "gitg-action-support.c" +#line 2045 "gitg-action-support.c" goto _state_2; #line 151 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" case 3: -#line 2085 "gitg-action-support.c" +#line 2049 "gitg-action-support.c" goto _state_3; default: #line 151 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_assert_not_reached (); -#line 2090 "gitg-action-support.c" +#line 2054 "gitg-action-support.c" } _state_0: #line 151 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -2120,7 +2084,7 @@ gitg_action_support_stash_if_needed (_data_->self, _data_->_tmp1_, _data_->_tmp2_, gitg_action_support_checkout_conflicts_ready, _data_); #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 2123 "gitg-action-support.c" +#line 2087 "gitg-action-support.c" _state_1: #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp3_ = FALSE; @@ -2138,17 +2102,17 @@ if (_data_->_state_ == 0) { #line 155 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2141 "gitg-action-support.c" +#line 2105 "gitg-action-support.c" } else { #line 155 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2145 "gitg-action-support.c" +#line 2109 "gitg-action-support.c" } #line 155 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 155 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 2151 "gitg-action-support.c" +#line 2115 "gitg-action-support.c" } #line 158 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp4_ = NULL; @@ -2208,7 +2172,7 @@ gitg_ref_action_checkout_checkout (_data_->_tmp14_, gitg_action_support_checkout_conflicts_ready, _data_); #line 163 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 2211 "gitg-action-support.c" +#line 2175 "gitg-action-support.c" _state_2: #line 163 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp15_ = FALSE; @@ -2221,11 +2185,7 @@ #line 165 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp16_ = _data_->notification; #line 165 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp17_ = NULL; -#line 165 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp17_ = _ ("Failed with conflicts"); -#line 165 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - gitg_simple_notification_error (_data_->_tmp16_, _data_->_tmp17_); + gitg_simple_notification_error (_data_->_tmp16_, _ ("Failed with conflicts")); #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->result = FALSE; #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -2238,21 +2198,21 @@ if (_data_->_state_ == 0) { #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2241 "gitg-action-support.c" +#line 2201 "gitg-action-support.c" } else { #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2245 "gitg-action-support.c" +#line 2205 "gitg-action-support.c" } #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 2251 "gitg-action-support.c" +#line 2211 "gitg-action-support.c" } #line 158 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _g_object_unref0 (_data_->checkout); -#line 2255 "gitg-action-support.c" +#line 2215 "gitg-action-support.c" } { #line 173 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -2261,13 +2221,13 @@ gitg_async_thread (____lambda12__gitg_async_thread_func, _data_->_data29_, gitg_action_support_checkout_conflicts_ready, _data_); #line 173 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 2264 "gitg-action-support.c" +#line 2224 "gitg-action-support.c" _state_3: #line 173 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" gitg_async_thread_finish (_data_->_res_, &_data_->_inner_error_); #line 173 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 2270 "gitg-action-support.c" +#line 2230 "gitg-action-support.c" goto __catch43_g_error; } } @@ -2279,33 +2239,29 @@ #line 171 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_inner_error_ = NULL; #line 181 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" + _data_->_tmp17_ = NULL; +#line 181 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" + _data_->_tmp17_ = _data_->notification; +#line 181 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp18_ = NULL; #line 181 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp18_ = _data_->notification; + _data_->_tmp18_ = _data_->err; #line 181 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp19_ = NULL; #line 181 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp19_ = _ ("Failed to checkout conflicts: %s"); + _data_->_tmp19_ = _data_->_tmp18_->message; #line 181 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp20_ = NULL; #line 181 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp20_ = _data_->err; + _data_->_tmp20_ = g_strdup_printf (_ ("Failed to checkout conflicts: %s"), _data_->_tmp19_); #line 181 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp21_ = NULL; #line 181 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp21_ = _data_->_tmp20_->message; -#line 181 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp22_ = NULL; -#line 181 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp22_ = g_strdup_printf (_data_->_tmp19_, _data_->_tmp21_); + _data_->_tmp21_ = _data_->_tmp20_; #line 181 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp23_ = NULL; -#line 181 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp23_ = _data_->_tmp22_; -#line 181 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - gitg_simple_notification_error (_data_->_tmp18_, _data_->_tmp23_); + gitg_simple_notification_error (_data_->_tmp17_, _data_->_tmp21_); #line 181 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _g_free0 (_data_->_tmp23_); + _g_free0 (_data_->_tmp21_); #line 182 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->result = FALSE; #line 182 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -2318,17 +2274,17 @@ if (_data_->_state_ == 0) { #line 182 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2321 "gitg-action-support.c" +#line 2277 "gitg-action-support.c" } else { #line 182 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2325 "gitg-action-support.c" +#line 2281 "gitg-action-support.c" } #line 182 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 182 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 2331 "gitg-action-support.c" +#line 2287 "gitg-action-support.c" } __finally43: #line 171 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -2343,7 +2299,7 @@ g_clear_error (&_data_->_inner_error_); #line 171 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 2346 "gitg-action-support.c" +#line 2302 "gitg-action-support.c" } #line 185 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->result = TRUE; @@ -2355,11 +2311,11 @@ if (_data_->_state_ == 0) { #line 185 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2358 "gitg-action-support.c" +#line 2314 "gitg-action-support.c" } else { #line 185 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2362 "gitg-action-support.c" +#line 2318 "gitg-action-support.c" } #line 185 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); @@ -2373,17 +2329,17 @@ if (_data_->_state_ == 0) { #line 151 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2376 "gitg-action-support.c" +#line 2332 "gitg-action-support.c" } else { #line 151 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2380 "gitg-action-support.c" +#line 2336 "gitg-action-support.c" } #line 151 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 151 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 2386 "gitg-action-support.c" +#line 2342 "gitg-action-support.c" } @@ -2408,7 +2364,7 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_slice_free (GitgActionSupportCommitIndexData, _data_); -#line 2411 "gitg-action-support.c" +#line 2367 "gitg-action-support.c" } @@ -2483,7 +2439,7 @@ _data_->message = _tmp10_; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" gitg_action_support_commit_index_co (_data_); -#line 2486 "gitg-action-support.c" +#line 2442 "gitg-action-support.c" } @@ -2498,7 +2454,7 @@ _data_->result = NULL; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return result; -#line 2501 "gitg-action-support.c" +#line 2457 "gitg-action-support.c" } @@ -2507,7 +2463,7 @@ g_atomic_int_inc (&_data30_->_ref_count_); #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return _data30_; -#line 2510 "gitg-action-support.c" +#line 2466 "gitg-action-support.c" } @@ -2516,7 +2472,7 @@ _data30_ = (Block30Data*) _userdata_; #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" if (g_atomic_int_dec_and_test (&_data30_->_ref_count_)) { -#line 2519 "gitg-action-support.c" +#line 2475 "gitg-action-support.c" GitgActionSupport* self; #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" self = _data30_->self; @@ -2528,7 +2484,7 @@ _g_object_unref0 (self); #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_slice_free (Block30Data, _data30_); -#line 2531 "gitg-action-support.c" +#line 2487 "gitg-action-support.c" } } @@ -2543,7 +2499,7 @@ _data_->_res_ = _res_; #line 229 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" gitg_action_support_commit_index_co (_data_); -#line 2546 "gitg-action-support.c" +#line 2502 "gitg-action-support.c" } @@ -2624,7 +2580,7 @@ _g_object_unref0 (opts); #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return; -#line 2627 "gitg-action-support.c" +#line 2583 "gitg-action-support.c" } #line 270 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _tmp13_ = newcommit; @@ -2666,7 +2622,7 @@ _g_object_unref0 (opts); #line 272 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return; -#line 2669 "gitg-action-support.c" +#line 2625 "gitg-action-support.c" } #line 263 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _g_object_unref0 (newtree); @@ -2674,28 +2630,28 @@ _g_object_unref0 (newcommit); #line 263 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _g_object_unref0 (opts); -#line 2677 "gitg-action-support.c" +#line 2633 "gitg-action-support.c" } static void _____lambda13__gitg_async_thread_func (gpointer self, GError** error) { #line 263 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" ____lambda13_ (self, error); -#line 2684 "gitg-action-support.c" +#line 2640 "gitg-action-support.c" } static GgitOId* _vala_GgitOId_copy (GgitOId* self) { #line 282 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return g_boxed_copy (ggit_oid_get_type (), self); -#line 2691 "gitg-action-support.c" +#line 2647 "gitg-action-support.c" } static gpointer __vala_GgitOId_copy0 (gpointer self) { #line 282 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return self ? _vala_GgitOId_copy (self) : NULL; -#line 2698 "gitg-action-support.c" +#line 2654 "gitg-action-support.c" } @@ -2704,24 +2660,24 @@ switch (_data_->_state_) { #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" case 0: -#line 2707 "gitg-action-support.c" +#line 2663 "gitg-action-support.c" goto _state_0; #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" case 1: -#line 2711 "gitg-action-support.c" +#line 2667 "gitg-action-support.c" goto _state_1; #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" case 2: -#line 2715 "gitg-action-support.c" +#line 2671 "gitg-action-support.c" goto _state_2; #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" case 3: -#line 2719 "gitg-action-support.c" +#line 2675 "gitg-action-support.c" goto _state_3; default: #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_assert_not_reached (); -#line 2724 "gitg-action-support.c" +#line 2680 "gitg-action-support.c" } _state_0: #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -2767,11 +2723,7 @@ #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp6_ = _data_->notification; #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp7_ = NULL; -#line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp7_ = _ ("Failed to obtain author details"); -#line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - gitg_simple_notification_error (_data_->_tmp6_, _data_->_tmp7_); + gitg_simple_notification_error (_data_->_tmp6_, _ ("Failed to obtain author details")); #line 200 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->result = NULL; #line 200 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -2786,42 +2738,46 @@ if (_data_->_state_ == 0) { #line 200 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2789 "gitg-action-support.c" +#line 2741 "gitg-action-support.c" } else { #line 200 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2793 "gitg-action-support.c" +#line 2745 "gitg-action-support.c" } #line 200 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 200 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 2799 "gitg-action-support.c" +#line 2751 "gitg-action-support.c" } #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp8_ = NULL; + _data_->_tmp7_ = NULL; #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp8_ = _data_->author; + _data_->_tmp7_ = _data_->author; #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - if (_data_->_tmp8_ == NULL) { -#line 2807 "gitg-action-support.c" - GgitSignature* _tmp10_ = NULL; + if (_data_->_tmp7_ == NULL) { +#line 2759 "gitg-action-support.c" + GgitSignature* _tmp9_ = NULL; #line 205 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp9_ = NULL; + _data_->_tmp8_ = NULL; #line 205 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp9_ = _data_->committer; + _data_->_tmp8_ = _data_->committer; #line 205 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _tmp10_ = _g_object_ref0 (_data_->_tmp9_); + _tmp9_ = _g_object_ref0 (_data_->_tmp8_); #line 205 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _g_object_unref0 (_data_->author); #line 205 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->author = _tmp10_; -#line 2819 "gitg-action-support.c" + _data_->author = _tmp9_; +#line 2771 "gitg-action-support.c" } #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" + _data_->_tmp10_ = NULL; +#line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" + _data_->_tmp10_ = gitg_action_support_get_application (_data_->self); +#line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp11_ = NULL; #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp11_ = gitg_action_support_get_application (_data_->self); + _data_->_tmp11_ = _data_->_tmp10_; #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp12_ = NULL; #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -2829,11 +2785,11 @@ #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp13_ = NULL; #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp13_ = _data_->_tmp12_; + _data_->_tmp13_ = gitg_ext_application_get_repository (_data_->_tmp12_); #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp14_ = NULL; #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp14_ = gitg_ext_application_get_repository (_data_->_tmp13_); + _data_->_tmp14_ = _data_->_tmp13_; #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp15_ = NULL; #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -2841,83 +2797,79 @@ #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp16_ = NULL; #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp16_ = _data_->_tmp15_; + _data_->_tmp16_ = gitg_repository_get_stage (_data_->_tmp15_); #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp17_ = NULL; #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp17_ = gitg_repository_get_stage (_data_->_tmp16_); + _data_->_tmp17_ = _data_->_tmp16_; #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp18_ = NULL; #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp18_ = _data_->_tmp17_; #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp19_ = NULL; -#line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp19_ = _data_->_tmp18_; + _g_object_unref0 (_data_->_tmp15_); #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _g_object_unref0 (_data_->_tmp16_); + _g_object_unref0 (_data_->_tmp12_); #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _g_object_unref0 (_data_->_tmp13_); -#line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->stage = _data_->_tmp19_; + _data_->stage = _data_->_tmp18_; #line 210 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->head = NULL; #line 211 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp20_ = NULL; + _data_->_tmp19_ = NULL; #line 211 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp20_ = _data_->reference; + _data_->_tmp19_ = _data_->reference; #line 211 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp21_ = FALSE; + _data_->_tmp20_ = FALSE; #line 211 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp21_ = gitg_action_support_reference_is_head (_data_->self, _data_->_tmp20_, &_data_->head); + _data_->_tmp20_ = gitg_action_support_reference_is_head (_data_->self, _data_->_tmp19_, &_data_->head); #line 211 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->ishead = _data_->_tmp21_; + _data_->ishead = _data_->_tmp20_; #line 213 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_data30_->oid = NULL; #line 214 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_data30_->head_tree = NULL; #line 215 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->commit = NULL; -#line 2881 "gitg-action-support.c" +#line 2833 "gitg-action-support.c" { #line 219 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp23_ = NULL; + _data_->_tmp22_ = NULL; #line 219 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp23_ = _data_->reference; + _data_->_tmp22_ = _data_->reference; #line 219 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp24_ = NULL; + _data_->_tmp23_ = NULL; #line 219 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp24_ = ggit_ref_lookup ((GgitRef*) _data_->_tmp23_, &_data_->_inner_error_); + _data_->_tmp23_ = ggit_ref_lookup ((GgitRef*) _data_->_tmp22_, &_data_->_inner_error_); #line 219 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp22_ = _data_->_tmp24_; + _data_->_tmp21_ = _data_->_tmp23_; #line 219 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 2895 "gitg-action-support.c" +#line 2847 "gitg-action-support.c" goto __catch44_g_error; } #line 219 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp25_ = NULL; + _data_->_tmp24_ = NULL; #line 219 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp25_ = _data_->_tmp22_; + _data_->_tmp24_ = _data_->_tmp21_; #line 219 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp22_ = NULL; + _data_->_tmp21_ = NULL; #line 219 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp26_ = NULL; + _data_->_tmp25_ = NULL; #line 219 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp26_ = G_TYPE_CHECK_INSTANCE_TYPE (_data_->_tmp25_, GITG_TYPE_COMMIT) ? ((GitgCommit*) _data_->_tmp25_) : NULL; + _data_->_tmp25_ = G_TYPE_CHECK_INSTANCE_TYPE (_data_->_tmp24_, GITG_TYPE_COMMIT) ? ((GitgCommit*) _data_->_tmp24_) : NULL; #line 219 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - if (_data_->_tmp26_ == NULL) { + if (_data_->_tmp25_ == NULL) { #line 219 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _g_object_unref0 (_data_->_tmp25_); -#line 2912 "gitg-action-support.c" + _g_object_unref0 (_data_->_tmp24_); +#line 2864 "gitg-action-support.c" } #line 219 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _g_object_unref0 (_data_->commit); #line 219 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->commit = _data_->_tmp26_; + _data_->commit = _data_->_tmp25_; #line 217 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _g_object_unref0 (_data_->_tmp22_); -#line 2920 "gitg-action-support.c" + _g_object_unref0 (_data_->_tmp21_); +#line 2872 "gitg-action-support.c" } goto __finally44; __catch44_g_error: @@ -2927,33 +2879,29 @@ #line 217 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_inner_error_ = NULL; #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" + _data_->_tmp26_ = NULL; +#line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" + _data_->_tmp26_ = _data_->notification; +#line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp27_ = NULL; #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp27_ = _data_->notification; + _data_->_tmp27_ = _data_->e; #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp28_ = NULL; #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp28_ = _ ("Failed to lookup commit: %s"); + _data_->_tmp28_ = _data_->_tmp27_->message; #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp29_ = NULL; #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp29_ = _data_->e; + _data_->_tmp29_ = g_strdup_printf (_ ("Failed to lookup commit: %s"), _data_->_tmp28_); #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_tmp30_ = NULL; #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp30_ = _data_->_tmp29_->message; + _data_->_tmp30_ = _data_->_tmp29_; #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp31_ = NULL; + gitg_simple_notification_error (_data_->_tmp26_, _data_->_tmp30_); #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp31_ = g_strdup_printf (_data_->_tmp28_, _data_->_tmp30_); -#line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp32_ = NULL; -#line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp32_ = _data_->_tmp31_; -#line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - gitg_simple_notification_error (_data_->_tmp27_, _data_->_tmp32_); -#line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _g_free0 (_data_->_tmp32_); + _g_free0 (_data_->_tmp30_); #line 224 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->result = NULL; #line 224 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -2976,17 +2924,17 @@ if (_data_->_state_ == 0) { #line 224 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2979 "gitg-action-support.c" +#line 2927 "gitg-action-support.c" } else { #line 224 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2983 "gitg-action-support.c" +#line 2931 "gitg-action-support.c" } #line 224 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 224 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 2989 "gitg-action-support.c" +#line 2937 "gitg-action-support.c" } __finally44: #line 217 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -3011,36 +2959,36 @@ g_clear_error (&_data_->_inner_error_); #line 217 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 3014 "gitg-action-support.c" +#line 2962 "gitg-action-support.c" } #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp33_ = FALSE; + _data_->_tmp31_ = FALSE; #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp33_ = _data_->ishead; + _data_->_tmp31_ = _data_->ishead; #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - if (_data_->_tmp33_) { + if (_data_->_tmp31_) { #line 229 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp34_ = NULL; + _data_->_tmp32_ = NULL; #line 229 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp34_ = _data_->notification; + _data_->_tmp32_ = _data_->notification; #line 229 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp35_ = NULL; + _data_->_tmp33_ = NULL; #line 229 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp35_ = _data_->head; + _data_->_tmp33_ = _data_->head; #line 229 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_state_ = 1; #line 229 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - gitg_action_support_stash_if_needed (_data_->self, _data_->_tmp34_, _data_->_tmp35_, gitg_action_support_commit_index_ready, _data_); + gitg_action_support_stash_if_needed (_data_->self, _data_->_tmp32_, _data_->_tmp33_, gitg_action_support_commit_index_ready, _data_); #line 229 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 3036 "gitg-action-support.c" +#line 2984 "gitg-action-support.c" _state_1: #line 229 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp36_ = FALSE; + _data_->_tmp34_ = FALSE; #line 229 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp36_ = gitg_action_support_stash_if_needed_finish (_data_->self, _data_->_res_); + _data_->_tmp34_ = gitg_action_support_stash_if_needed_finish (_data_->self, _data_->_res_); #line 229 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - if (!_data_->_tmp36_) { + if (!_data_->_tmp34_) { #line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->result = NULL; #line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -3061,147 +3009,147 @@ if (_data_->_state_ == 0) { #line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3064 "gitg-action-support.c" +#line 3012 "gitg-action-support.c" } else { #line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3068 "gitg-action-support.c" +#line 3016 "gitg-action-support.c" } #line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 3074 "gitg-action-support.c" +#line 3022 "gitg-action-support.c" } #line 234 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp37_ = NULL; + _data_->_tmp35_ = NULL; #line 234 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp37_ = _data_->commit; + _data_->_tmp35_ = _data_->commit; #line 234 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp38_ = NULL; + _data_->_tmp36_ = NULL; #line 234 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp38_ = ggit_commit_get_tree ((GgitCommit*) _data_->_tmp37_); + _data_->_tmp36_ = ggit_commit_get_tree ((GgitCommit*) _data_->_tmp35_); #line 234 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _g_object_unref0 (_data_->_data30_->head_tree); #line 234 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_data30_->head_tree = _data_->_tmp38_; -#line 3088 "gitg-action-support.c" + _data_->_data30_->head_tree = _data_->_tmp36_; +#line 3036 "gitg-action-support.c" } #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp39_ = NULL; + _data_->_tmp37_ = NULL; #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp39__length1 = 0; + _data_->_tmp37__length1 = 0; #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp39_ = _data_->parents; + _data_->_tmp37_ = _data_->parents; #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp39__length1 = _data_->parents_length1; + _data_->_tmp37__length1 = _data_->parents_length1; #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - if (_data_->_tmp39_ == NULL) { + if (_data_->_tmp37_ == NULL) { #line 239 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp40_ = NULL; + _data_->_tmp38_ = NULL; #line 239 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp40_ = _data_->commit; + _data_->_tmp38_ = _data_->commit; #line 239 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp41_ = NULL; + _data_->_tmp39_ = NULL; #line 239 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp41_ = ggit_object_get_id ((GgitObject*) _data_->_tmp40_); + _data_->_tmp39_ = ggit_object_get_id ((GgitObject*) _data_->_tmp38_); #line 239 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp42_ = NULL; + _data_->_tmp40_ = NULL; #line 239 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp42_ = g_new0 (GgitOId*, 1 + 1); + _data_->_tmp40_ = g_new0 (GgitOId*, 1 + 1); #line 239 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp42_[0] = _data_->_tmp41_; + _data_->_tmp40_[0] = _data_->_tmp39_; #line 239 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->parents = (_vala_array_free (_data_->parents, _data_->parents_length1, (GDestroyNotify) _vala_GgitOId_free), NULL); #line 239 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->parents = _data_->_tmp42_; + _data_->parents = _data_->_tmp40_; #line 239 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->parents_length1 = 1; -#line 3120 "gitg-action-support.c" +#line 3068 "gitg-action-support.c" } { #line 246 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp44_ = FALSE; + _data_->_tmp42_ = FALSE; #line 246 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp44_ = _data_->ishead; + _data_->_tmp42_ = _data_->ishead; #line 246 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - if (_data_->_tmp44_) { + if (_data_->_tmp42_) { #line 246 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp45_ = NULL; + _data_->_tmp43_ = NULL; #line 246 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp45_ = _data_->head; + _data_->_tmp43_ = _data_->head; #line 246 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp43_ = _data_->_tmp45_; -#line 3135 "gitg-action-support.c" + _data_->_tmp41_ = _data_->_tmp43_; +#line 3083 "gitg-action-support.c" } else { #line 246 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp46_ = NULL; + _data_->_tmp44_ = NULL; #line 246 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp46_ = _data_->reference; + _data_->_tmp44_ = _data_->reference; #line 246 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp43_ = _data_->_tmp46_; -#line 3143 "gitg-action-support.c" + _data_->_tmp41_ = _data_->_tmp44_; +#line 3091 "gitg-action-support.c" } #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp48_ = NULL; + _data_->_tmp46_ = NULL; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp48_ = _data_->stage; + _data_->_tmp46_ = _data_->stage; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp49_ = NULL; + _data_->_tmp47_ = NULL; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp49_ = _data_->index; + _data_->_tmp47_ = _data_->index; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp50_ = NULL; + _data_->_tmp48_ = NULL; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp50_ = _data_->message; + _data_->_tmp48_ = _data_->message; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp51_ = NULL; + _data_->_tmp49_ = NULL; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp51_ = _data_->author; + _data_->_tmp49_ = _data_->author; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp52_ = NULL; + _data_->_tmp50_ = NULL; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp52_ = _data_->committer; + _data_->_tmp50_ = _data_->committer; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp53_ = NULL; + _data_->_tmp51_ = NULL; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp53__length1 = 0; + _data_->_tmp51__length1 = 0; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp53_ = _data_->parents; + _data_->_tmp51_ = _data_->parents; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp53__length1 = _data_->parents_length1; + _data_->_tmp51__length1 = _data_->parents_length1; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_state_ = 2; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - gitg_stage_commit_index (_data_->_tmp48_, _data_->_tmp49_, (GgitRef*) _data_->_tmp43_, _data_->_tmp50_, _data_->_tmp51_, _data_->_tmp52_, _data_->_tmp53_, _data_->_tmp53__length1, GITG_STAGE_COMMIT_OPTIONS_NONE, gitg_action_support_commit_index_ready, _data_); + gitg_stage_commit_index (_data_->_tmp46_, _data_->_tmp47_, (GgitRef*) _data_->_tmp41_, _data_->_tmp48_, _data_->_tmp49_, _data_->_tmp50_, _data_->_tmp51_, _data_->_tmp51__length1, GITG_STAGE_COMMIT_OPTIONS_NONE, gitg_action_support_commit_index_ready, _data_); #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 3179 "gitg-action-support.c" +#line 3127 "gitg-action-support.c" _state_2: #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp54_ = NULL; + _data_->_tmp52_ = NULL; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp54_ = gitg_stage_commit_index_finish (_data_->_tmp48_, _data_->_res_, &_data_->_inner_error_); + _data_->_tmp52_ = gitg_stage_commit_index_finish (_data_->_tmp46_, _data_->_res_, &_data_->_inner_error_); #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp47_ = _data_->_tmp54_; + _data_->_tmp45_ = _data_->_tmp52_; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 3189 "gitg-action-support.c" +#line 3137 "gitg-action-support.c" goto __catch45_g_error; } #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp55_ = NULL; + _data_->_tmp53_ = NULL; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp55_ = _data_->_tmp47_; + _data_->_tmp53_ = _data_->_tmp45_; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp47_ = NULL; + _data_->_tmp45_ = NULL; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" __vala_GgitOId_free0 (_data_->_data30_->oid); #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_data30_->oid = _data_->_tmp55_; + _data_->_data30_->oid = _data_->_tmp53_; #line 242 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - __vala_GgitOId_free0 (_data_->_tmp47_); -#line 3204 "gitg-action-support.c" + __vala_GgitOId_free0 (_data_->_tmp45_); +#line 3152 "gitg-action-support.c" } goto __finally45; __catch45_g_error: @@ -3211,33 +3159,29 @@ #line 242 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_inner_error_ = NULL; #line 255 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp56_ = NULL; -#line 255 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp56_ = _data_->notification; -#line 255 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp57_ = NULL; + _data_->_tmp54_ = NULL; #line 255 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp57_ = _ ("Failed to create commit: %s"); + _data_->_tmp54_ = _data_->notification; #line 255 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp58_ = NULL; + _data_->_tmp55_ = NULL; #line 255 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp58_ = _data_->_vala1_e; + _data_->_tmp55_ = _data_->_vala1_e; #line 255 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp59_ = NULL; + _data_->_tmp56_ = NULL; #line 255 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp59_ = _data_->_tmp58_->message; + _data_->_tmp56_ = _data_->_tmp55_->message; #line 255 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp60_ = NULL; + _data_->_tmp57_ = NULL; #line 255 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp60_ = g_strdup_printf (_data_->_tmp57_, _data_->_tmp59_); + _data_->_tmp57_ = g_strdup_printf (_ ("Failed to create commit: %s"), _data_->_tmp56_); #line 255 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp61_ = NULL; + _data_->_tmp58_ = NULL; #line 255 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp61_ = _data_->_tmp60_; + _data_->_tmp58_ = _data_->_tmp57_; #line 255 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - gitg_simple_notification_error (_data_->_tmp56_, _data_->_tmp61_); + gitg_simple_notification_error (_data_->_tmp54_, _data_->_tmp58_); #line 255 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _g_free0 (_data_->_tmp61_); + _g_free0 (_data_->_tmp58_); #line 256 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->result = NULL; #line 256 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -3260,17 +3204,17 @@ if (_data_->_state_ == 0) { #line 256 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3263 "gitg-action-support.c" +#line 3207 "gitg-action-support.c" } else { #line 256 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3267 "gitg-action-support.c" +#line 3211 "gitg-action-support.c" } #line 256 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 256 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 3273 "gitg-action-support.c" +#line 3217 "gitg-action-support.c" } __finally45: #line 242 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -3295,15 +3239,15 @@ g_clear_error (&_data_->_inner_error_); #line 242 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 3298 "gitg-action-support.c" +#line 3242 "gitg-action-support.c" } #line 259 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp62_ = FALSE; + _data_->_tmp59_ = FALSE; #line 259 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp62_ = _data_->ishead; + _data_->_tmp59_ = _data_->ishead; #line 259 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - if (_data_->_tmp62_) { -#line 3306 "gitg-action-support.c" + if (_data_->_tmp59_) { +#line 3250 "gitg-action-support.c" { #line 263 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_state_ = 3; @@ -3311,13 +3255,13 @@ gitg_async_thread (_____lambda13__gitg_async_thread_func, _data_->_data30_, gitg_action_support_commit_index_ready, _data_); #line 263 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 3314 "gitg-action-support.c" +#line 3258 "gitg-action-support.c" _state_3: #line 263 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" gitg_async_thread_finish (_data_->_res_, &_data_->_inner_error_); #line 263 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 3320 "gitg-action-support.c" +#line 3264 "gitg-action-support.c" goto __catch46_g_error; } } @@ -3329,33 +3273,29 @@ #line 261 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->_inner_error_ = NULL; #line 277 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp63_ = NULL; + _data_->_tmp60_ = NULL; #line 277 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp63_ = _data_->notification; + _data_->_tmp60_ = _data_->notification; #line 277 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp64_ = NULL; + _data_->_tmp61_ = NULL; #line 277 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp64_ = _ ("Failed to checkout index: %s"); + _data_->_tmp61_ = _data_->_vala2_e; #line 277 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp65_ = NULL; + _data_->_tmp62_ = NULL; #line 277 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp65_ = _data_->_vala2_e; + _data_->_tmp62_ = _data_->_tmp61_->message; #line 277 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp66_ = NULL; -#line 277 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp66_ = _data_->_tmp65_->message; -#line 277 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp67_ = NULL; + _data_->_tmp63_ = NULL; #line 277 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp67_ = g_strdup_printf (_data_->_tmp64_, _data_->_tmp66_); + _data_->_tmp63_ = g_strdup_printf (_ ("Failed to checkout index: %s"), _data_->_tmp62_); #line 277 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp68_ = NULL; + _data_->_tmp64_ = NULL; #line 277 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp68_ = _data_->_tmp67_; + _data_->_tmp64_ = _data_->_tmp63_; #line 277 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - gitg_simple_notification_error (_data_->_tmp63_, _data_->_tmp68_); + gitg_simple_notification_error (_data_->_tmp60_, _data_->_tmp64_); #line 277 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _g_free0 (_data_->_tmp68_); + _g_free0 (_data_->_tmp64_); #line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _data_->result = NULL; #line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -3378,17 +3318,17 @@ if (_data_->_state_ == 0) { #line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3381 "gitg-action-support.c" +#line 3321 "gitg-action-support.c" } else { #line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3385 "gitg-action-support.c" +#line 3325 "gitg-action-support.c" } #line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 3391 "gitg-action-support.c" +#line 3331 "gitg-action-support.c" } __finally46: #line 261 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -3413,19 +3353,19 @@ g_clear_error (&_data_->_inner_error_); #line 261 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 3416 "gitg-action-support.c" +#line 3356 "gitg-action-support.c" } } #line 282 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp69_ = NULL; + _data_->_tmp65_ = NULL; #line 282 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp69_ = _data_->_data30_->oid; + _data_->_tmp65_ = _data_->_data30_->oid; #line 282 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp70_ = NULL; + _data_->_tmp66_ = NULL; #line 282 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->_tmp70_ = __vala_GgitOId_copy0 (_data_->_tmp69_); + _data_->_tmp66_ = __vala_GgitOId_copy0 (_data_->_tmp65_); #line 282 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _data_->result = _data_->_tmp70_; + _data_->result = _data_->_tmp66_; #line 282 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" _g_object_unref0 (_data_->commit); #line 282 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" @@ -3444,11 +3384,11 @@ if (_data_->_state_ == 0) { #line 282 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3447 "gitg-action-support.c" +#line 3387 "gitg-action-support.c" } else { #line 282 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3451 "gitg-action-support.c" +#line 3391 "gitg-action-support.c" } #line 282 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); @@ -3472,17 +3412,17 @@ if (_data_->_state_ == 0) { #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3475 "gitg-action-support.c" +#line 3415 "gitg-action-support.c" } else { #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3479 "gitg-action-support.c" +#line 3419 "gitg-action-support.c" } #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_unref (_data_->_async_result); #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return FALSE; -#line 3485 "gitg-action-support.c" +#line 3425 "gitg-action-support.c" } @@ -3500,26 +3440,30 @@ result = _tmp1_; #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return result; -#line 3503 "gitg-action-support.c" +#line 3443 "gitg-action-support.c" } void gitg_action_support_set_application (GitgActionSupport* self, GitgExtApplication* value) { - GitgExtApplication* _tmp0_ = NULL; - GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_return_if_fail (self != NULL); #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _tmp0_ = value; + if (gitg_action_support_get_application (self) != value) { +#line 3452 "gitg-action-support.c" + GitgExtApplication* _tmp0_ = NULL; + GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _g_object_unref0 (self->priv->_application); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" + _g_object_unref0 (self->priv->_application); #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - self->priv->_application = _tmp1_; + self->priv->_application = _tmp1_; #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - g_object_notify ((GObject *) self, "application"); -#line 3522 "gitg-action-support.c" + g_object_notify ((GObject *) self, "application"); +#line 3465 "gitg-action-support.c" + } } @@ -3537,26 +3481,30 @@ result = _tmp1_; #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" return result; -#line 3540 "gitg-action-support.c" +#line 3484 "gitg-action-support.c" } void gitg_action_support_set_action_interface (GitgActionSupport* self, GitgExtRefActionInterface* value) { - GitgExtRefActionInterface* _tmp0_ = NULL; - GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_return_if_fail (self != NULL); #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _tmp0_ = value; + if (gitg_action_support_get_action_interface (self) != value) { +#line 3493 "gitg-action-support.c" + GitgExtRefActionInterface* _tmp0_ = NULL; + GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - _g_object_unref0 (self->priv->_action_interface); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - self->priv->_action_interface = _tmp1_; + _g_object_unref0 (self->priv->_action_interface); #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" - g_object_notify ((GObject *) self, "action-interface"); -#line 3559 "gitg-action-support.c" + self->priv->_action_interface = _tmp1_; +#line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" + g_object_notify ((GObject *) self, "action-interface"); +#line 3506 "gitg-action-support.c" + } } @@ -3575,18 +3523,18 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_ACTION_SUPPORT_APPLICATION, g_param_spec_object ("application", "application", "application", GITG_EXT_TYPE_APPLICATION, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_ACTION_SUPPORT_ACTION_INTERFACE, g_param_spec_object ("action-interface", "action-interface", "action-interface", GITG_EXT_TYPE_REF_ACTION_INTERFACE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); -#line 3578 "gitg-action-support.c" +#line 3526 "gitg-action-support.c" } static void gitg_action_support_instance_init (GitgActionSupport * self) { #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" self->priv = GITG_ACTION_SUPPORT_GET_PRIVATE (self); -#line 3585 "gitg-action-support.c" +#line 3533 "gitg-action-support.c" } -static void gitg_action_support_finalize (GObject* obj) { +static void gitg_action_support_finalize (GObject * obj) { GitgActionSupport * self; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_ACTION_SUPPORT, GitgActionSupport); @@ -3596,7 +3544,7 @@ _g_object_unref0 (self->priv->_action_interface); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" G_OBJECT_CLASS (gitg_action_support_parent_class)->finalize (obj); -#line 3599 "gitg-action-support.c" +#line 3547 "gitg-action-support.c" } @@ -3629,13 +3577,13 @@ g_value_take_object (value, gitg_action_support_get_action_interface (self)); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" break; -#line 3632 "gitg-action-support.c" +#line 3580 "gitg-action-support.c" default: #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" break; -#line 3638 "gitg-action-support.c" +#line 3586 "gitg-action-support.c" } } @@ -3657,13 +3605,13 @@ gitg_action_support_set_action_interface (self, g_value_get_object (value)); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" break; -#line 3660 "gitg-action-support.c" +#line 3608 "gitg-action-support.c" default: #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-action-support.vala" break; -#line 3666 "gitg-action-support.c" +#line 3614 "gitg-action-support.c" } } diff -Nru gitg-3.22.0/tests/gitg/gitg-commit-action-cherry-pick.c gitg-3.23.0/tests/gitg/gitg-commit-action-cherry-pick.c --- gitg-3.22.0/tests/gitg/gitg-commit-action-cherry-pick.c 2016-08-09 09:51:19.000000000 +0000 +++ gitg-3.23.0/tests/gitg/gitg-commit-action-cherry-pick.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-commit-action-cherry-pick.c generated by valac 0.32.1, the Vala compiler +/* gitg-commit-action-cherry-pick.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-commit-action-cherry-pick.vala, do not modify */ /* @@ -131,23 +131,21 @@ GitgSimpleNotification* _tmp12_; const gchar* _tmp13_; const gchar* _tmp14_; - const gchar* _tmp15_; + gchar* _tmp15_; gchar* _tmp16_; - gchar* _tmp17_; - GError* _tmp18_; - const gchar* _tmp19_; + GError* _tmp17_; + const gchar* _tmp18_; + gchar* _tmp19_; gchar* _tmp20_; - gchar* _tmp21_; - GgitMergeOptions* _tmp22_; + GgitMergeOptions* _tmp21_; GError* _vala1_e; - GitgSimpleNotification* _tmp23_; + GitgSimpleNotification* _tmp22_; + GError* _tmp23_; const gchar* _tmp24_; - GError* _tmp25_; - const gchar* _tmp26_; - gchar* _tmp27_; - gchar* _tmp28_; - GgitIndex* _tmp29_; - GgitIndex* _tmp30_; + gchar* _tmp25_; + gchar* _tmp26_; + GgitIndex* _tmp27_; + GgitIndex* _tmp28_; GError * _inner_error_; }; @@ -179,60 +177,52 @@ gchar* _tmp13_; gchar* _tmp14_; GitgSimpleNotification* _tmp15_; - const gchar* _tmp16_; GitgRef* head; gboolean ishead; - GitgActionSupport* _tmp17_; - GitgRef* _tmp18_; - gboolean _tmp19_; + GitgActionSupport* _tmp16_; + GitgRef* _tmp17_; + gboolean _tmp18_; gchar* message; - gboolean _tmp20_; + gboolean _tmp19_; + const gchar* _tmp20_; const gchar* _tmp21_; - const gchar* _tmp22_; - const gchar* _tmp23_; - gchar* _tmp24_; - gchar* _tmp25_; - const gchar* _tmp26_; - const gchar* _tmp27_; - gchar* _tmp28_; - gchar* _tmp29_; - const gchar* _tmp30_; - const gchar* _tmp31_; + gchar* _tmp22_; + gchar* _tmp23_; + const gchar* _tmp24_; + const gchar* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; + const gchar* _tmp28_; + const gchar* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; gchar* _tmp32_; - gchar* _tmp33_; - gchar* _tmp34_; - const gchar* _tmp35_; - const gchar* _tmp36_; + const gchar* _tmp33_; + const gchar* _tmp34_; + gchar* _tmp35_; + gchar* _tmp36_; const gchar* _tmp37_; - gchar* _tmp38_; + const gchar* _tmp38_; gchar* _tmp39_; - const gchar* _tmp40_; - const gchar* _tmp41_; - gchar* _tmp42_; - gchar* _tmp43_; - gchar* _tmp44_; + gchar* _tmp40_; + gchar* _tmp41_; GitgExtUserQuery* q; - const gchar* _tmp45_; - const gchar* _tmp46_; - const gchar* _tmp47_; - const gchar* _tmp48_; - GitgExtUserQuery* _tmp49_; - GitgExtApplication* _tmp50_; - GitgExtApplication* _tmp51_; - GitgExtApplication* _tmp52_; - GitgExtUserQuery* _tmp53_; - GtkResponseType _tmp54_; - gboolean _tmp55_; - GitgSimpleNotification* _tmp56_; - const gchar* _tmp57_; - GitgActionSupport* _tmp58_; - GitgSimpleNotification* _tmp59_; - GitgRef* _tmp60_; - GgitIndex* _tmp61_; - GitgRef* _tmp62_; - gboolean _tmp63_; - GitgSimpleNotification* _tmp64_; - const gchar* _tmp65_; + const gchar* _tmp42_; + GitgExtUserQuery* _tmp43_; + GitgExtApplication* _tmp44_; + GitgExtApplication* _tmp45_; + GitgExtApplication* _tmp46_; + GitgExtUserQuery* _tmp47_; + GtkResponseType _tmp48_; + gboolean _tmp49_; + GitgSimpleNotification* _tmp50_; + GitgActionSupport* _tmp51_; + GitgSimpleNotification* _tmp52_; + GitgRef* _tmp53_; + GgitIndex* _tmp54_; + GitgRef* _tmp55_; + gboolean _tmp56_; + GitgSimpleNotification* _tmp57_; }; struct _GitgCommitActionCherryPickCherryPickData { @@ -263,51 +253,49 @@ GitgSimpleNotification* notification; const gchar* _tmp15_; const gchar* _tmp16_; - const gchar* _tmp17_; + gchar* _tmp17_; gchar* _tmp18_; - gchar* _tmp19_; + const gchar* _tmp19_; const gchar* _tmp20_; - const gchar* _tmp21_; + gchar* _tmp21_; gchar* _tmp22_; gchar* _tmp23_; gchar* _tmp24_; - gchar* _tmp25_; + GitgSimpleNotification* _tmp25_; GitgSimpleNotification* _tmp26_; - GitgSimpleNotification* _tmp27_; + GitgExtApplication* _tmp27_; GitgExtApplication* _tmp28_; GitgExtApplication* _tmp29_; - GitgExtApplication* _tmp30_; + GitgExtNotifications* _tmp30_; GitgExtNotifications* _tmp31_; GitgExtNotifications* _tmp32_; - GitgExtNotifications* _tmp33_; - GitgSimpleNotification* _tmp34_; + GitgSimpleNotification* _tmp33_; GgitIndex* index; - GitgSimpleNotification* _tmp35_; - GitgRef* _tmp36_; + GitgSimpleNotification* _tmp34_; + GitgRef* _tmp35_; + GgitIndex* _tmp36_; GgitIndex* _tmp37_; GgitIndex* _tmp38_; - GgitIndex* _tmp39_; - gboolean _tmp40_; - GitgSimpleNotification* _tmp41_; - GgitIndex* _tmp42_; - GitgRef* _tmp43_; + gboolean _tmp39_; + GitgSimpleNotification* _tmp40_; + GgitIndex* _tmp41_; + GitgRef* _tmp42_; GgitOId* oid; - GitgActionSupport* _tmp44_; - GitgSimpleNotification* _tmp45_; - GitgRef* _tmp46_; - GgitIndex* _tmp47_; + GitgActionSupport* _tmp43_; + GitgSimpleNotification* _tmp44_; + GitgRef* _tmp45_; + GgitIndex* _tmp46_; + GitgCommit* _tmp47_; GitgCommit* _tmp48_; - GitgCommit* _tmp49_; + GgitSignature* _tmp49_; GgitSignature* _tmp50_; - GgitSignature* _tmp51_; + GitgCommit* _tmp51_; GitgCommit* _tmp52_; - GitgCommit* _tmp53_; - const gchar* _tmp54_; + const gchar* _tmp53_; + GgitOId* _tmp54_; GgitOId* _tmp55_; GgitOId* _tmp56_; - GgitOId* _tmp57_; - GitgSimpleNotification* _tmp58_; - const gchar* _tmp59_; + GitgSimpleNotification* _tmp57_; }; struct _Block26Data { @@ -318,9 +306,9 @@ static gpointer gitg_commit_action_cherry_pick_parent_class = NULL; -static GitgExtUIElementIface* gitg_commit_action_cherry_pick_gitg_ext_ui_element_parent_iface = NULL; -static GitgExtActionIface* gitg_commit_action_cherry_pick_gitg_ext_action_parent_iface = NULL; -static GitgExtCommitActionIface* gitg_commit_action_cherry_pick_gitg_ext_commit_action_parent_iface = NULL; +static GitgExtUIElementIface * gitg_commit_action_cherry_pick_gitg_ext_ui_element_parent_iface = NULL; +static GitgExtActionIface * gitg_commit_action_cherry_pick_gitg_ext_action_parent_iface = NULL; +static GitgExtCommitActionIface * gitg_commit_action_cherry_pick_gitg_ext_commit_action_parent_iface = NULL; GType gitg_commit_action_cherry_pick_get_type (void) G_GNUC_CONST; GType gitg_action_support_get_type (void) G_GNUC_CONST; @@ -343,7 +331,7 @@ GitgActionSupport* gitg_action_support_construct (GType object_type, GitgExtApplication* application, GitgExtRefActionInterface* action_interface); static void gitg_commit_action_cherry_pick_ensure_destinations (GitgCommitActionCherryPick* self); static void _vala_GgitOId_free (GgitOId* self); -static void _vala_array_add16 (GitgRef*** array, int* length, int* size, GitgRef* value); +static void _vala_array_add16 (GitgRef** * array, int* length, int* size, GitgRef* value); static void gitg_commit_action_cherry_pick_create_index_data_free (gpointer _data); GType gitg_simple_notification_get_type (void) G_GNUC_CONST; static void gitg_commit_action_cherry_pick_create_index (GitgCommitActionCherryPick* self, GitgSimpleNotification* notification, GitgRef* destination, GAsyncReadyCallback _callback_, gpointer _user_data_); @@ -361,7 +349,7 @@ static gboolean gitg_commit_action_cherry_pick_checkout_conflicts_finish (GitgCommitActionCherryPick* self, GAsyncResult* _res_); static gboolean gitg_commit_action_cherry_pick_checkout_conflicts_co (GitgCommitActionCherryPickCheckoutConflictsData* _data_); void gitg_simple_notification_set_message (GitgSimpleNotification* self, const gchar* value); -gboolean gitg_action_support_reference_is_head (GitgActionSupport* self, GitgRef* reference, GitgRef** head); +gboolean gitg_action_support_reference_is_head (GitgActionSupport* self, GitgRef* reference, GitgRef* * head); static void gitg_commit_action_cherry_pick_checkout_conflicts_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); void gitg_action_support_checkout_conflicts (GitgActionSupport* self, GitgSimpleNotification* notification, GitgRef* reference, GgitIndex* index, GitgRef* head, GAsyncReadyCallback _callback_, gpointer _user_data_); gboolean gitg_action_support_checkout_conflicts_finish (GitgActionSupport* self, GAsyncResult* _res_); @@ -385,7 +373,7 @@ static void ____lambda31_ (Block26Data* _data26_); static void _____lambda31__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); static void gitg_commit_action_cherry_pick_real_activate (GitgExtUIElement* base); -static void gitg_commit_action_cherry_pick_finalize (GObject* obj); +static void gitg_commit_action_cherry_pick_finalize (GObject * obj); static void _vala_gitg_commit_action_cherry_pick_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_commit_action_cherry_pick_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -426,45 +414,45 @@ self->priv->d_support = _tmp5_; #line 35 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return self; -#line 430 "gitg-commit-action-cherry-pick.c" +#line 418 "gitg-commit-action-cherry-pick.c" } GitgCommitActionCherryPick* gitg_commit_action_cherry_pick_new (GitgExtApplication* application, GitgExtRefActionInterface* action_interface, GitgCommit* commit) { #line 35 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return gitg_commit_action_cherry_pick_construct (GITG_TYPE_COMMIT_ACTION_CHERRY_PICK, application, action_interface, commit); -#line 437 "gitg-commit-action-cherry-pick.c" +#line 425 "gitg-commit-action-cherry-pick.c" } static void _vala_GgitOId_free (GgitOId* self) { #line 97 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_boxed_free (ggit_oid_get_type (), self); -#line 444 "gitg-commit-action-cherry-pick.c" +#line 432 "gitg-commit-action-cherry-pick.c" } static gpointer _g_object_ref0 (gpointer self) { #line 99 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return self ? g_object_ref (self) : NULL; -#line 451 "gitg-commit-action-cherry-pick.c" +#line 439 "gitg-commit-action-cherry-pick.c" } -static void _vala_array_add16 (GitgRef*** array, int* length, int* size, GitgRef* value) { +static void _vala_array_add16 (GitgRef** * array, int* length, int* size, GitgRef* value) { #line 99 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" if ((*length) == (*size)) { #line 99 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" *size = (*size) ? (2 * (*size)) : 4; #line 99 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" *array = g_renew (GitgRef*, *array, (*size) + 1); -#line 462 "gitg-commit-action-cherry-pick.c" +#line 450 "gitg-commit-action-cherry-pick.c" } #line 99 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" (*array)[(*length)++] = value; #line 99 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" (*array)[*length] = NULL; -#line 468 "gitg-commit-action-cherry-pick.c" +#line 456 "gitg-commit-action-cherry-pick.c" } @@ -483,7 +471,7 @@ if (_tmp0_ != NULL) { #line 84 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return; -#line 487 "gitg-commit-action-cherry-pick.c" +#line 475 "gitg-commit-action-cherry-pick.c" } #line 87 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _tmp1_ = g_new0 (GitgRef*, 0 + 1); @@ -495,7 +483,7 @@ self->priv->d_destinations_length1 = 0; #line 87 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" self->priv->_d_destinations_size_ = self->priv->d_destinations_length1; -#line 499 "gitg-commit-action-cherry-pick.c" +#line 487 "gitg-commit-action-cherry-pick.c" { GeeList* _r_list = NULL; GitgExtRefActionInterface* _tmp2_ = NULL; @@ -529,7 +517,7 @@ _r_index = -1; #line 89 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" while (TRUE) { -#line 533 "gitg-commit-action-cherry-pick.c" +#line 521 "gitg-commit-action-cherry-pick.c" gint _tmp9_ = 0; gint _tmp10_ = 0; gint _tmp11_ = 0; @@ -551,7 +539,7 @@ if (!(_tmp10_ < _tmp11_)) { #line 89 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" break; -#line 555 "gitg-commit-action-cherry-pick.c" +#line 543 "gitg-commit-action-cherry-pick.c" } #line 89 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _tmp12_ = _r_list; @@ -567,7 +555,7 @@ _tmp16_ = ggit_ref_is_branch ((GgitRef*) _tmp15_); #line 91 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" if (_tmp16_) { -#line 571 "gitg-commit-action-cherry-pick.c" +#line 559 "gitg-commit-action-cherry-pick.c" { GgitObject* _tmp17_ = NULL; GitgRef* _tmp18_ = NULL; @@ -592,7 +580,7 @@ _tmp17_ = _tmp19_; #line 95 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 596 "gitg-commit-action-cherry-pick.c" +#line 584 "gitg-commit-action-cherry-pick.c" goto __catch36_g_error; } #line 95 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" @@ -605,7 +593,7 @@ if (_tmp21_ == NULL) { #line 95 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (_tmp20_); -#line 609 "gitg-commit-action-cherry-pick.c" +#line 597 "gitg-commit-action-cherry-pick.c" } #line 95 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" c = _tmp21_; @@ -633,7 +621,7 @@ __vala_GgitOId_free0 (_tmp24_); #line 97 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" if (_tmp30_) { -#line 637 "gitg-commit-action-cherry-pick.c" +#line 625 "gitg-commit-action-cherry-pick.c" GitgRef** _tmp31_ = NULL; gint _tmp31__length1 = 0; GitgRef* _tmp32_ = NULL; @@ -648,13 +636,13 @@ _tmp33_ = _g_object_ref0 (_tmp32_); #line 99 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _vala_array_add16 (&self->priv->d_destinations, &self->priv->d_destinations_length1, &self->priv->_d_destinations_size_, _tmp33_); -#line 652 "gitg-commit-action-cherry-pick.c" +#line 640 "gitg-commit-action-cherry-pick.c" } #line 93 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (c); #line 93 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (_tmp17_); -#line 658 "gitg-commit-action-cherry-pick.c" +#line 646 "gitg-commit-action-cherry-pick.c" } goto __finally36; __catch36_g_error: @@ -663,7 +651,7 @@ g_clear_error (&_inner_error_); #line 93 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _inner_error_ = NULL; -#line 667 "gitg-commit-action-cherry-pick.c" +#line 655 "gitg-commit-action-cherry-pick.c" } __finally36: #line 93 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" @@ -678,16 +666,16 @@ g_clear_error (&_inner_error_); #line 93 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return; -#line 682 "gitg-commit-action-cherry-pick.c" +#line 670 "gitg-commit-action-cherry-pick.c" } } #line 89 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (r); -#line 687 "gitg-commit-action-cherry-pick.c" +#line 675 "gitg-commit-action-cherry-pick.c" } #line 89 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (_r_list); -#line 691 "gitg-commit-action-cherry-pick.c" +#line 679 "gitg-commit-action-cherry-pick.c" } } @@ -705,7 +693,7 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_slice_free (GitgCommitActionCherryPickCreateIndexData, _data_); -#line 709 "gitg-commit-action-cherry-pick.c" +#line 697 "gitg-commit-action-cherry-pick.c" } @@ -744,7 +732,7 @@ _data_->destination = _tmp4_; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_create_index_co (_data_); -#line 748 "gitg-commit-action-cherry-pick.c" +#line 736 "gitg-commit-action-cherry-pick.c" } @@ -759,7 +747,7 @@ _data_->result = NULL; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return result; -#line 763 "gitg-commit-action-cherry-pick.c" +#line 751 "gitg-commit-action-cherry-pick.c" } @@ -768,14 +756,14 @@ g_atomic_int_inc (&_data25_->_ref_count_); #line 106 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return _data25_; -#line 772 "gitg-commit-action-cherry-pick.c" +#line 760 "gitg-commit-action-cherry-pick.c" } static void _vala_GgitMergeOptions_free (GgitMergeOptions* self) { #line 106 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_boxed_free (ggit_merge_options_get_type (), self); -#line 779 "gitg-commit-action-cherry-pick.c" +#line 767 "gitg-commit-action-cherry-pick.c" } @@ -784,7 +772,7 @@ _data25_ = (Block25Data*) _userdata_; #line 106 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" if (g_atomic_int_dec_and_test (&_data25_->_ref_count_)) { -#line 788 "gitg-commit-action-cherry-pick.c" +#line 776 "gitg-commit-action-cherry-pick.c" GitgCommitActionCherryPick* self; #line 106 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" self = _data25_->self; @@ -798,20 +786,20 @@ _g_object_unref0 (self); #line 106 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_slice_free (Block25Data, _data25_); -#line 802 "gitg-commit-action-cherry-pick.c" +#line 790 "gitg-commit-action-cherry-pick.c" } } static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 815 "gitg-commit-action-cherry-pick.c" +#line 803 "gitg-commit-action-cherry-pick.c" } @@ -870,7 +858,7 @@ g_propagate_error (error, _inner_error_); #line 127 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return; -#line 874 "gitg-commit-action-cherry-pick.c" +#line 862 "gitg-commit-action-cherry-pick.c" } #line 127 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _tmp13_ = _tmp0_; @@ -882,14 +870,14 @@ _data25_->index = _tmp13_; #line 126 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (_tmp0_); -#line 886 "gitg-commit-action-cherry-pick.c" +#line 874 "gitg-commit-action-cherry-pick.c" } static void ____lambda29__gitg_async_thread_func (gpointer self, GError** error) { #line 126 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" ___lambda29_ (self, error); -#line 893 "gitg-commit-action-cherry-pick.c" +#line 881 "gitg-commit-action-cherry-pick.c" } @@ -903,7 +891,7 @@ _data_->_res_ = _res_; #line 126 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_create_index_co (_data_); -#line 907 "gitg-commit-action-cherry-pick.c" +#line 895 "gitg-commit-action-cherry-pick.c" } @@ -912,16 +900,16 @@ switch (_data_->_state_) { #line 106 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" case 0: -#line 916 "gitg-commit-action-cherry-pick.c" +#line 904 "gitg-commit-action-cherry-pick.c" goto _state_0; #line 106 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" case 1: -#line 920 "gitg-commit-action-cherry-pick.c" +#line 908 "gitg-commit-action-cherry-pick.c" goto _state_1; default: #line 106 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_assert_not_reached (); -#line 925 "gitg-commit-action-cherry-pick.c" +#line 913 "gitg-commit-action-cherry-pick.c" } _state_0: #line 106 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" @@ -966,7 +954,7 @@ _g_object_unref0 (_data_->_tmp3_); #line 109 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->theirs_name = _data_->_tmp6_; -#line 970 "gitg-commit-action-cherry-pick.c" +#line 958 "gitg-commit-action-cherry-pick.c" { #line 113 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp8_ = NULL; @@ -980,7 +968,7 @@ _data_->_tmp7_ = _data_->_tmp9_; #line 113 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 984 "gitg-commit-action-cherry-pick.c" +#line 972 "gitg-commit-action-cherry-pick.c" goto __catch37_g_error; } #line 113 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" @@ -997,7 +985,7 @@ if (_data_->_tmp11_ == NULL) { #line 113 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (_data_->_tmp10_); -#line 1001 "gitg-commit-action-cherry-pick.c" +#line 989 "gitg-commit-action-cherry-pick.c" } #line 113 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (_data_->_data25_->theirs); @@ -1005,7 +993,7 @@ _data_->_data25_->theirs = _data_->_tmp11_; #line 111 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (_data_->_tmp7_); -#line 1009 "gitg-commit-action-cherry-pick.c" +#line 997 "gitg-commit-action-cherry-pick.c" } goto __finally37; __catch37_g_error: @@ -1021,45 +1009,41 @@ #line 117 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp13_ = NULL; #line 117 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp13_ = _ ("Failed to lookup the commit for branch %s: %s"); + _data_->_tmp13_ = _data_->theirs_name; #line 117 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp14_ = NULL; #line 117 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp14_ = _data_->theirs_name; + _data_->_tmp14_ = string_to_string (_data_->_tmp13_); #line 117 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp15_ = NULL; #line 117 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp15_ = string_to_string (_data_->_tmp14_); + _data_->_tmp15_ = g_strconcat ("'", _data_->_tmp14_, "'", NULL); #line 117 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp16_ = NULL; #line 117 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp16_ = g_strconcat ("'", _data_->_tmp15_, "'", NULL); + _data_->_tmp16_ = _data_->_tmp15_; #line 117 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp17_ = NULL; #line 117 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp17_ = _data_->_tmp16_; + _data_->_tmp17_ = _data_->e; #line 117 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp18_ = NULL; #line 117 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp18_ = _data_->e; + _data_->_tmp18_ = _data_->_tmp17_->message; #line 117 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp19_ = NULL; #line 117 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp19_ = _data_->_tmp18_->message; + _data_->_tmp19_ = g_strdup_printf (_ ("Failed to lookup the commit for branch %s: %s"), _data_->_tmp16_, _data_->_tmp18_); #line 117 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp20_ = NULL; #line 117 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp20_ = g_strdup_printf (_data_->_tmp13_, _data_->_tmp17_, _data_->_tmp19_); -#line 117 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp21_ = NULL; -#line 117 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp21_ = _data_->_tmp20_; + _data_->_tmp20_ = _data_->_tmp19_; #line 117 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - gitg_simple_notification_error (_data_->_tmp12_, _data_->_tmp21_); + gitg_simple_notification_error (_data_->_tmp12_, _data_->_tmp20_); #line 117 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_data_->_tmp21_); + _g_free0 (_data_->_tmp20_); #line 117 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_data_->_tmp17_); + _g_free0 (_data_->_tmp16_); #line 118 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->result = NULL; #line 118 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" @@ -1074,17 +1058,17 @@ if (_data_->_state_ == 0) { #line 118 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1078 "gitg-commit-action-cherry-pick.c" +#line 1062 "gitg-commit-action-cherry-pick.c" } else { #line 118 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1082 "gitg-commit-action-cherry-pick.c" +#line 1066 "gitg-commit-action-cherry-pick.c" } #line 118 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (_data_->_async_result); #line 118 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 1088 "gitg-commit-action-cherry-pick.c" +#line 1072 "gitg-commit-action-cherry-pick.c" } __finally37: #line 111 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" @@ -1101,17 +1085,17 @@ g_clear_error (&_data_->_inner_error_); #line 111 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 1105 "gitg-commit-action-cherry-pick.c" +#line 1089 "gitg-commit-action-cherry-pick.c" } #line 121 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp22_ = NULL; + _data_->_tmp21_ = NULL; #line 121 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp22_ = ggit_merge_options_new (); + _data_->_tmp21_ = ggit_merge_options_new (); #line 121 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_data25_->merge_options = _data_->_tmp22_; + _data_->_data25_->merge_options = _data_->_tmp21_; #line 122 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_data25_->index = NULL; -#line 1115 "gitg-commit-action-cherry-pick.c" +#line 1099 "gitg-commit-action-cherry-pick.c" { #line 126 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_state_ = 1; @@ -1119,13 +1103,13 @@ gitg_async_thread (____lambda29__gitg_async_thread_func, _data_->_data25_, gitg_commit_action_cherry_pick_create_index_ready, _data_); #line 126 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 1123 "gitg-commit-action-cherry-pick.c" +#line 1107 "gitg-commit-action-cherry-pick.c" _state_1: #line 126 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" gitg_async_thread_finish (_data_->_res_, &_data_->_inner_error_); #line 126 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 1129 "gitg-commit-action-cherry-pick.c" +#line 1113 "gitg-commit-action-cherry-pick.c" goto __catch38_g_error; } } @@ -1137,33 +1121,29 @@ #line 124 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_inner_error_ = NULL; #line 132 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp22_ = NULL; +#line 132 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp22_ = _data_->notification; +#line 132 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp23_ = NULL; #line 132 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp23_ = _data_->notification; + _data_->_tmp23_ = _data_->_vala1_e; #line 132 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp24_ = NULL; #line 132 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp24_ = _ ("Failed to cherry-pick the commit: %s"); + _data_->_tmp24_ = _data_->_tmp23_->message; #line 132 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp25_ = NULL; #line 132 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp25_ = _data_->_vala1_e; + _data_->_tmp25_ = g_strdup_printf (_ ("Failed to cherry-pick the commit: %s"), _data_->_tmp24_); #line 132 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp26_ = NULL; #line 132 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp26_ = _data_->_tmp25_->message; + _data_->_tmp26_ = _data_->_tmp25_; #line 132 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp27_ = NULL; -#line 132 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp27_ = g_strdup_printf (_data_->_tmp24_, _data_->_tmp26_); -#line 132 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp28_ = NULL; -#line 132 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp28_ = _data_->_tmp27_; -#line 132 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - gitg_simple_notification_error (_data_->_tmp23_, _data_->_tmp28_); + gitg_simple_notification_error (_data_->_tmp22_, _data_->_tmp26_); #line 132 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_data_->_tmp28_); + _g_free0 (_data_->_tmp26_); #line 133 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->result = NULL; #line 133 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" @@ -1178,17 +1158,17 @@ if (_data_->_state_ == 0) { #line 133 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1182 "gitg-commit-action-cherry-pick.c" +#line 1162 "gitg-commit-action-cherry-pick.c" } else { #line 133 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1186 "gitg-commit-action-cherry-pick.c" +#line 1166 "gitg-commit-action-cherry-pick.c" } #line 133 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (_data_->_async_result); #line 133 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 1192 "gitg-commit-action-cherry-pick.c" +#line 1172 "gitg-commit-action-cherry-pick.c" } __finally38: #line 124 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" @@ -1205,18 +1185,18 @@ g_clear_error (&_data_->_inner_error_); #line 124 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 1209 "gitg-commit-action-cherry-pick.c" +#line 1189 "gitg-commit-action-cherry-pick.c" } #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp29_ = NULL; + _data_->_tmp27_ = NULL; #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp29_ = _data_->_data25_->index; + _data_->_tmp27_ = _data_->_data25_->index; #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp30_ = NULL; + _data_->_tmp28_ = NULL; #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp30_ = _g_object_ref0 (_data_->_tmp29_); + _data_->_tmp28_ = _g_object_ref0 (_data_->_tmp27_); #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->result = _data_->_tmp30_; + _data_->result = _data_->_tmp28_; #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _g_free0 (_data_->theirs_name); #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" @@ -1227,11 +1207,11 @@ if (_data_->_state_ == 0) { #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1231 "gitg-commit-action-cherry-pick.c" +#line 1211 "gitg-commit-action-cherry-pick.c" } else { #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1235 "gitg-commit-action-cherry-pick.c" +#line 1215 "gitg-commit-action-cherry-pick.c" } #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (_data_->_async_result); @@ -1247,17 +1227,17 @@ if (_data_->_state_ == 0) { #line 106 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1251 "gitg-commit-action-cherry-pick.c" +#line 1231 "gitg-commit-action-cherry-pick.c" } else { #line 106 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1255 "gitg-commit-action-cherry-pick.c" +#line 1235 "gitg-commit-action-cherry-pick.c" } #line 106 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (_data_->_async_result); #line 106 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 1261 "gitg-commit-action-cherry-pick.c" +#line 1241 "gitg-commit-action-cherry-pick.c" } @@ -1274,7 +1254,7 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_slice_free (GitgCommitActionCherryPickCheckoutConflictsData, _data_); -#line 1278 "gitg-commit-action-cherry-pick.c" +#line 1258 "gitg-commit-action-cherry-pick.c" } @@ -1323,7 +1303,7 @@ _data_->destination = _tmp6_; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_checkout_conflicts_co (_data_); -#line 1327 "gitg-commit-action-cherry-pick.c" +#line 1307 "gitg-commit-action-cherry-pick.c" } @@ -1336,7 +1316,7 @@ result = _data_->result; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return result; -#line 1340 "gitg-commit-action-cherry-pick.c" +#line 1320 "gitg-commit-action-cherry-pick.c" } @@ -1357,105 +1337,105 @@ glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1347 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { -#line 1373 "gitg-commit-action-cherry-pick.c" +#line 1353 "gitg-commit-action-cherry-pick.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; -#line 1382 "gitg-commit-action-cherry-pick.c" +#line 1362 "gitg-commit-action-cherry-pick.c" } -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { -#line 1388 "gitg-commit-action-cherry-pick.c" +#line 1368 "gitg-commit-action-cherry-pick.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; -#line 1397 "gitg-commit-action-cherry-pick.c" +#line 1377 "gitg-commit-action-cherry-pick.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { -#line 1403 "gitg-commit-action-cherry-pick.c" +#line 1383 "gitg-commit-action-cherry-pick.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; -#line 1412 "gitg-commit-action-cherry-pick.c" +#line 1392 "gitg-commit-action-cherry-pick.c" } else { -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = FALSE; -#line 1416 "gitg-commit-action-cherry-pick.c" +#line 1396 "gitg-commit-action-cherry-pick.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { -#line 1424 "gitg-commit-action-cherry-pick.c" +#line 1404 "gitg-commit-action-cherry-pick.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; -#line 1433 "gitg-commit-action-cherry-pick.c" +#line 1413 "gitg-commit-action-cherry-pick.c" } else { -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 1437 "gitg-commit-action-cherry-pick.c" +#line 1417 "gitg-commit-action-cherry-pick.c" } -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 1459 "gitg-commit-action-cherry-pick.c" +#line 1439 "gitg-commit-action-cherry-pick.c" } @@ -1469,7 +1449,7 @@ _data_->_res_ = _res_; #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_checkout_conflicts_co (_data_); -#line 1473 "gitg-commit-action-cherry-pick.c" +#line 1453 "gitg-commit-action-cherry-pick.c" } @@ -1478,20 +1458,20 @@ switch (_data_->_state_) { #line 139 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" case 0: -#line 1482 "gitg-commit-action-cherry-pick.c" +#line 1462 "gitg-commit-action-cherry-pick.c" goto _state_0; #line 139 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" case 1: -#line 1486 "gitg-commit-action-cherry-pick.c" +#line 1466 "gitg-commit-action-cherry-pick.c" goto _state_1; #line 139 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" case 2: -#line 1490 "gitg-commit-action-cherry-pick.c" +#line 1470 "gitg-commit-action-cherry-pick.c" goto _state_2; default: #line 139 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_assert_not_reached (); -#line 1495 "gitg-commit-action-cherry-pick.c" +#line 1475 "gitg-commit-action-cherry-pick.c" } _state_0: #line 141 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" @@ -1569,223 +1549,195 @@ #line 144 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp15_ = _data_->notification; #line 144 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp16_ = NULL; -#line 144 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp16_ = _ ("Cherry pick has conflicts"); -#line 144 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - gitg_simple_notification_set_message (_data_->_tmp15_, _data_->_tmp16_); + gitg_simple_notification_set_message (_data_->_tmp15_, _ ("Cherry pick has conflicts")); #line 146 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->head = NULL; #line 147 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp17_ = NULL; + _data_->_tmp16_ = NULL; #line 147 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp17_ = _data_->self->priv->d_support; + _data_->_tmp16_ = _data_->self->priv->d_support; #line 147 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp18_ = NULL; + _data_->_tmp17_ = NULL; #line 147 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp18_ = _data_->destination; + _data_->_tmp17_ = _data_->destination; #line 147 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp19_ = FALSE; + _data_->_tmp18_ = FALSE; #line 147 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp19_ = gitg_action_support_reference_is_head (_data_->_tmp17_, _data_->_tmp18_, &_data_->head); + _data_->_tmp18_ = gitg_action_support_reference_is_head (_data_->_tmp16_, _data_->_tmp17_, &_data_->head); #line 147 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->ishead = _data_->_tmp19_; + _data_->ishead = _data_->_tmp18_; #line 151 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp20_ = FALSE; + _data_->_tmp19_ = FALSE; #line 151 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp20_ = _data_->ishead; + _data_->_tmp19_ = _data_->ishead; #line 151 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - if (_data_->_tmp20_) { + if (_data_->_tmp19_) { +#line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp20_ = NULL; +#line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp20_ = _data_->ours_name; #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp21_ = NULL; #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp21_ = _ ("The cherry pick of %s onto %s has caused conflicts, would you like to " \ -"checkout branch %s with the cherry pick to your working directory to r" \ -"esolve the conflicts?"); + _data_->_tmp21_ = string_to_string (_data_->_tmp20_); #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp22_ = NULL; #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp22_ = _data_->ours_name; + _data_->_tmp22_ = g_strconcat ("'", _data_->_tmp21_, "'", NULL); #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp23_ = NULL; #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp23_ = string_to_string (_data_->_tmp22_); + _data_->_tmp23_ = _data_->_tmp22_; #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp24_ = NULL; #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp24_ = g_strconcat ("'", _data_->_tmp23_, "'", NULL); + _data_->_tmp24_ = _data_->theirs_name; #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp25_ = NULL; #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp25_ = _data_->_tmp24_; + _data_->_tmp25_ = string_to_string (_data_->_tmp24_); #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp26_ = NULL; #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp26_ = _data_->theirs_name; + _data_->_tmp26_ = g_strconcat ("'", _data_->_tmp25_, "'", NULL); #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp27_ = NULL; #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp27_ = string_to_string (_data_->_tmp26_); + _data_->_tmp27_ = _data_->_tmp26_; #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp28_ = NULL; #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp28_ = g_strconcat ("'", _data_->_tmp27_, "'", NULL); + _data_->_tmp28_ = _data_->theirs_name; #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp29_ = NULL; #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp29_ = _data_->_tmp28_; + _data_->_tmp29_ = string_to_string (_data_->_tmp28_); #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp30_ = NULL; #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp30_ = _data_->theirs_name; + _data_->_tmp30_ = g_strconcat ("'", _data_->_tmp29_, "'", NULL); #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp31_ = NULL; #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp31_ = string_to_string (_data_->_tmp30_); + _data_->_tmp31_ = _data_->_tmp30_; #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp32_ = NULL; #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp32_ = g_strconcat ("'", _data_->_tmp31_, "'", NULL); -#line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp33_ = NULL; -#line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp33_ = _data_->_tmp32_; -#line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp34_ = NULL; -#line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp34_ = g_strdup_printf (_data_->_tmp21_, _data_->_tmp25_, _data_->_tmp29_, _data_->_tmp33_); + _data_->_tmp32_ = g_strdup_printf (_ ("The cherry pick of %s onto %s has caused conflicts, would you like to " \ +"checkout branch %s with the cherry pick to your working directory to r" \ +"esolve the conflicts?"), _data_->_tmp23_, _data_->_tmp27_, _data_->_tmp31_); #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _g_free0 (_data_->message); #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->message = _data_->_tmp34_; + _data_->message = _data_->_tmp32_; #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_data_->_tmp33_); + _g_free0 (_data_->_tmp31_); #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_data_->_tmp29_); + _g_free0 (_data_->_tmp27_); #line 153 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_data_->_tmp25_); -#line 1666 "gitg-commit-action-cherry-pick.c" + _g_free0 (_data_->_tmp23_); +#line 1638 "gitg-commit-action-cherry-pick.c" } else { #line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp33_ = NULL; +#line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp33_ = _data_->ours_name; +#line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp34_ = NULL; +#line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp34_ = string_to_string (_data_->_tmp33_); +#line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp35_ = NULL; #line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp35_ = _ ("The cherry-pick of %s onto %s has caused conflicts, would you like to " \ -"checkout the cherry pick to your working directory to resolve the conf" \ -"licts?"); + _data_->_tmp35_ = g_strconcat ("'", _data_->_tmp34_, "'", NULL); #line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp36_ = NULL; #line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp36_ = _data_->ours_name; + _data_->_tmp36_ = _data_->_tmp35_; #line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp37_ = NULL; #line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp37_ = string_to_string (_data_->_tmp36_); + _data_->_tmp37_ = _data_->theirs_name; #line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp38_ = NULL; #line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp38_ = g_strconcat ("'", _data_->_tmp37_, "'", NULL); + _data_->_tmp38_ = string_to_string (_data_->_tmp37_); #line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp39_ = NULL; #line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp39_ = _data_->_tmp38_; + _data_->_tmp39_ = g_strconcat ("'", _data_->_tmp38_, "'", NULL); #line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp40_ = NULL; #line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp40_ = _data_->theirs_name; + _data_->_tmp40_ = _data_->_tmp39_; #line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp41_ = NULL; #line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp41_ = string_to_string (_data_->_tmp40_); -#line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp42_ = NULL; -#line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp42_ = g_strconcat ("'", _data_->_tmp41_, "'", NULL); -#line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp43_ = NULL; -#line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp43_ = _data_->_tmp42_; -#line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp44_ = NULL; -#line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp44_ = g_strdup_printf (_data_->_tmp35_, _data_->_tmp39_, _data_->_tmp43_); + _data_->_tmp41_ = g_strdup_printf (_ ("The cherry-pick of %s onto %s has caused conflicts, would you like to " \ +"checkout the cherry pick to your working directory to resolve the conf" \ +"licts?"), _data_->_tmp36_, _data_->_tmp40_); #line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _g_free0 (_data_->message); #line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->message = _data_->_tmp44_; + _data_->message = _data_->_tmp41_; #line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_data_->_tmp43_); + _g_free0 (_data_->_tmp40_); #line 157 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_data_->_tmp39_); -#line 1716 "gitg-commit-action-cherry-pick.c" + _g_free0 (_data_->_tmp36_); +#line 1684 "gitg-commit-action-cherry-pick.c" } #line 160 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp45_ = NULL; -#line 160 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp45_ = _ ("Cherry pick has conflicts"); -#line 160 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp46_ = NULL; -#line 160 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp46_ = _data_->message; + _data_->_tmp42_ = NULL; #line 160 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp47_ = NULL; -#line 160 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp47_ = _ ("Cancel"); -#line 160 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp48_ = NULL; -#line 160 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp48_ = _ ("Checkout"); + _data_->_tmp42_ = _data_->message; #line 160 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp49_ = NULL; + _data_->_tmp43_ = NULL; #line 160 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp49_ = gitg_ext_user_query_new_full (_data_->_tmp45_, _data_->_tmp46_, GTK_MESSAGE_QUESTION, _data_->_tmp47_, GTK_RESPONSE_CANCEL, _data_->_tmp48_, GTK_RESPONSE_OK, NULL); + _data_->_tmp43_ = gitg_ext_user_query_new_full (_ ("Cherry pick has conflicts"), _data_->_tmp42_, GTK_MESSAGE_QUESTION, _ ("Cancel"), GTK_RESPONSE_CANCEL, _ ("Checkout"), GTK_RESPONSE_OK, NULL); #line 160 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->q = _data_->_tmp49_; + _data_->q = _data_->_tmp43_; #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp50_ = NULL; + _data_->_tmp44_ = NULL; #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp50_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); + _data_->_tmp44_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp51_ = NULL; + _data_->_tmp45_ = NULL; #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp51_ = _data_->_tmp50_; + _data_->_tmp45_ = _data_->_tmp44_; #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp52_ = NULL; + _data_->_tmp46_ = NULL; #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp52_ = _data_->_tmp51_; + _data_->_tmp46_ = _data_->_tmp45_; #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp53_ = NULL; + _data_->_tmp47_ = NULL; #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp53_ = _data_->q; + _data_->_tmp47_ = _data_->q; #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_state_ = 1; #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - gitg_ext_application_user_query_async (_data_->_tmp52_, _data_->_tmp53_, gitg_commit_action_cherry_pick_checkout_conflicts_ready, _data_); + gitg_ext_application_user_query_async (_data_->_tmp46_, _data_->_tmp47_, gitg_commit_action_cherry_pick_checkout_conflicts_ready, _data_); #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 1762 "gitg-commit-action-cherry-pick.c" +#line 1718 "gitg-commit-action-cherry-pick.c" _state_1: #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp54_ = 0; + _data_->_tmp48_ = 0; #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp54_ = gitg_ext_application_user_query_finish (_data_->_tmp52_, _data_->_res_); + _data_->_tmp48_ = gitg_ext_application_user_query_finish (_data_->_tmp46_, _data_->_res_); #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp55_ = FALSE; + _data_->_tmp49_ = FALSE; #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp55_ = _data_->_tmp54_ != GTK_RESPONSE_OK; + _data_->_tmp49_ = _data_->_tmp48_ != GTK_RESPONSE_OK; #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _g_object_unref0 (_data_->_tmp52_); + _g_object_unref0 (_data_->_tmp46_); #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - if (_data_->_tmp55_) { -#line 168 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp56_ = NULL; + if (_data_->_tmp49_) { #line 168 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp56_ = _data_->notification; + _data_->_tmp50_ = NULL; #line 168 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp57_ = NULL; -#line 168 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp57_ = _ ("Cherry pick failed with conflicts"); + _data_->_tmp50_ = _data_->notification; #line 168 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - gitg_simple_notification_error (_data_->_tmp56_, _data_->_tmp57_); + gitg_simple_notification_error (_data_->_tmp50_, _ ("Cherry pick failed with conflicts")); #line 169 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->result = FALSE; #line 169 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" @@ -1802,52 +1754,52 @@ if (_data_->_state_ == 0) { #line 169 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1802 "gitg-commit-action-cherry-pick.c" +#line 1754 "gitg-commit-action-cherry-pick.c" } else { #line 169 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1806 "gitg-commit-action-cherry-pick.c" +#line 1758 "gitg-commit-action-cherry-pick.c" } #line 169 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (_data_->_async_result); #line 169 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 1812 "gitg-commit-action-cherry-pick.c" +#line 1764 "gitg-commit-action-cherry-pick.c" } #line 172 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp58_ = NULL; + _data_->_tmp51_ = NULL; #line 172 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp58_ = _data_->self->priv->d_support; + _data_->_tmp51_ = _data_->self->priv->d_support; #line 172 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp59_ = NULL; + _data_->_tmp52_ = NULL; #line 172 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp59_ = _data_->notification; + _data_->_tmp52_ = _data_->notification; #line 172 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp60_ = NULL; + _data_->_tmp53_ = NULL; #line 172 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp60_ = _data_->destination; + _data_->_tmp53_ = _data_->destination; #line 172 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp61_ = NULL; + _data_->_tmp54_ = NULL; #line 172 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp61_ = _data_->index; + _data_->_tmp54_ = _data_->index; #line 172 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp62_ = NULL; + _data_->_tmp55_ = NULL; #line 172 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp62_ = _data_->head; + _data_->_tmp55_ = _data_->head; #line 172 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_state_ = 2; #line 172 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - gitg_action_support_checkout_conflicts (_data_->_tmp58_, _data_->_tmp59_, _data_->_tmp60_, _data_->_tmp61_, _data_->_tmp62_, gitg_commit_action_cherry_pick_checkout_conflicts_ready, _data_); + gitg_action_support_checkout_conflicts (_data_->_tmp51_, _data_->_tmp52_, _data_->_tmp53_, _data_->_tmp54_, _data_->_tmp55_, gitg_commit_action_cherry_pick_checkout_conflicts_ready, _data_); #line 172 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 1840 "gitg-commit-action-cherry-pick.c" +#line 1792 "gitg-commit-action-cherry-pick.c" _state_2: #line 172 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp63_ = FALSE; + _data_->_tmp56_ = FALSE; #line 172 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp63_ = gitg_action_support_checkout_conflicts_finish (_data_->_tmp58_, _data_->_res_); + _data_->_tmp56_ = gitg_action_support_checkout_conflicts_finish (_data_->_tmp51_, _data_->_res_); #line 172 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - if (!_data_->_tmp63_) { + if (!_data_->_tmp56_) { #line 174 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->result = FALSE; #line 174 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" @@ -1864,30 +1816,26 @@ if (_data_->_state_ == 0) { #line 174 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1864 "gitg-commit-action-cherry-pick.c" +#line 1816 "gitg-commit-action-cherry-pick.c" } else { #line 174 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1868 "gitg-commit-action-cherry-pick.c" +#line 1820 "gitg-commit-action-cherry-pick.c" } #line 174 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (_data_->_async_result); #line 174 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 1874 "gitg-commit-action-cherry-pick.c" +#line 1826 "gitg-commit-action-cherry-pick.c" } #line 177 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_write_cherry_pick_state_files (_data_->self); #line 179 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp64_ = NULL; -#line 179 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp64_ = _data_->notification; -#line 179 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp65_ = NULL; + _data_->_tmp57_ = NULL; #line 179 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp65_ = _ ("Cherry pick finished with conflicts in working directory"); + _data_->_tmp57_ = _data_->notification; #line 179 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - gitg_simple_notification_success (_data_->_tmp64_, _data_->_tmp65_); + gitg_simple_notification_success (_data_->_tmp57_, _ ("Cherry pick finished with conflicts in working directory")); #line 180 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->result = TRUE; #line 180 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" @@ -1904,11 +1852,11 @@ if (_data_->_state_ == 0) { #line 180 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1904 "gitg-commit-action-cherry-pick.c" +#line 1852 "gitg-commit-action-cherry-pick.c" } else { #line 180 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1908 "gitg-commit-action-cherry-pick.c" +#line 1856 "gitg-commit-action-cherry-pick.c" } #line 180 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (_data_->_async_result); @@ -1928,17 +1876,17 @@ if (_data_->_state_ == 0) { #line 139 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1928 "gitg-commit-action-cherry-pick.c" +#line 1876 "gitg-commit-action-cherry-pick.c" } else { #line 139 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1932 "gitg-commit-action-cherry-pick.c" +#line 1880 "gitg-commit-action-cherry-pick.c" } #line 139 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (_data_->_async_result); #line 139 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 1938 "gitg-commit-action-cherry-pick.c" +#line 1886 "gitg-commit-action-cherry-pick.c" } @@ -1985,7 +1933,7 @@ _g_object_unref0 (_tmp2_); #line 185 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" wd = _tmp9_; -#line 1985 "gitg-commit-action-cherry-pick.c" +#line 1933 "gitg-commit-action-cherry-pick.c" { gchar* _tmp10_ = NULL; gchar* _tmp11_ = NULL; @@ -2029,7 +1977,7 @@ _g_free0 (_tmp11_); #line 189 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2029 "gitg-commit-action-cherry-pick.c" +#line 1977 "gitg-commit-action-cherry-pick.c" goto __catch39_g_error; } } @@ -2040,7 +1988,7 @@ g_clear_error (&_inner_error_); #line 187 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _inner_error_ = NULL; -#line 2040 "gitg-commit-action-cherry-pick.c" +#line 1988 "gitg-commit-action-cherry-pick.c" } __finally39: #line 187 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" @@ -2053,11 +2001,11 @@ g_clear_error (&_inner_error_); #line 187 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return; -#line 2053 "gitg-commit-action-cherry-pick.c" +#line 2001 "gitg-commit-action-cherry-pick.c" } #line 183 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _g_free0 (wd); -#line 2057 "gitg-commit-action-cherry-pick.c" +#line 2005 "gitg-commit-action-cherry-pick.c" } @@ -2070,7 +2018,7 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_slice_free (GitgCommitActionCherryPickCherryPickData, _data_); -#line 2070 "gitg-commit-action-cherry-pick.c" +#line 2018 "gitg-commit-action-cherry-pick.c" } @@ -2099,7 +2047,7 @@ _data_->destination = _tmp2_; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_cherry_pick_co (_data_); -#line 2099 "gitg-commit-action-cherry-pick.c" +#line 2047 "gitg-commit-action-cherry-pick.c" } @@ -2107,7 +2055,7 @@ GitgCommitActionCherryPickCherryPickData* _data_; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 2107 "gitg-commit-action-cherry-pick.c" +#line 2055 "gitg-commit-action-cherry-pick.c" } @@ -2121,7 +2069,7 @@ _data_->_res_ = _res_; #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_cherry_pick_co (_data_); -#line 2121 "gitg-commit-action-cherry-pick.c" +#line 2069 "gitg-commit-action-cherry-pick.c" } @@ -2130,24 +2078,24 @@ switch (_data_->_state_) { #line 193 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" case 0: -#line 2130 "gitg-commit-action-cherry-pick.c" +#line 2078 "gitg-commit-action-cherry-pick.c" goto _state_0; #line 193 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" case 1: -#line 2134 "gitg-commit-action-cherry-pick.c" +#line 2082 "gitg-commit-action-cherry-pick.c" goto _state_1; #line 193 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" case 2: -#line 2138 "gitg-commit-action-cherry-pick.c" +#line 2086 "gitg-commit-action-cherry-pick.c" goto _state_2; #line 193 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" case 3: -#line 2142 "gitg-commit-action-cherry-pick.c" +#line 2090 "gitg-commit-action-cherry-pick.c" goto _state_3; default: #line 193 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_assert_not_reached (); -#line 2147 "gitg-commit-action-cherry-pick.c" +#line 2095 "gitg-commit-action-cherry-pick.c" } _state_0: #line 195 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" @@ -2223,67 +2171,67 @@ #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp15_ = NULL; #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp15_ = _ ("Cherry pick %s onto %s"); + _data_->_tmp15_ = _data_->shortid; #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp16_ = NULL; #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp16_ = _data_->shortid; + _data_->_tmp16_ = string_to_string (_data_->_tmp15_); #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp17_ = NULL; #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp17_ = string_to_string (_data_->_tmp16_); + _data_->_tmp17_ = g_strconcat ("'", _data_->_tmp16_, "'", NULL); #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp18_ = NULL; #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp18_ = g_strconcat ("'", _data_->_tmp17_, "'", NULL); + _data_->_tmp18_ = _data_->_tmp17_; #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp19_ = NULL; #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp19_ = _data_->_tmp18_; + _data_->_tmp19_ = _data_->name; #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp20_ = NULL; #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp20_ = _data_->name; + _data_->_tmp20_ = string_to_string (_data_->_tmp19_); #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp21_ = NULL; #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp21_ = string_to_string (_data_->_tmp20_); + _data_->_tmp21_ = g_strconcat ("'", _data_->_tmp20_, "'", NULL); #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp22_ = NULL; #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp22_ = g_strconcat ("'", _data_->_tmp21_, "'", NULL); + _data_->_tmp22_ = _data_->_tmp21_; #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp23_ = NULL; #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp23_ = _data_->_tmp22_; + _data_->_tmp23_ = g_strdup_printf (_ ("Cherry pick %s onto %s"), _data_->_tmp18_, _data_->_tmp22_); #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp24_ = NULL; #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp24_ = g_strdup_printf (_data_->_tmp15_, _data_->_tmp19_, _data_->_tmp23_); + _data_->_tmp24_ = _data_->_tmp23_; #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp25_ = NULL; #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp25_ = _data_->_tmp24_; + _data_->_tmp25_ = gitg_simple_notification_new (_data_->_tmp24_, NULL); #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp26_ = NULL; #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp26_ = gitg_simple_notification_new (_data_->_tmp25_, NULL); -#line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp27_ = NULL; -#line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp27_ = _data_->_tmp26_; + _data_->_tmp26_ = _data_->_tmp25_; #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_data_->_tmp25_); + _g_free0 (_data_->_tmp24_); #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_data_->_tmp23_); + _g_free0 (_data_->_tmp22_); #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_data_->_tmp19_); + _g_free0 (_data_->_tmp18_); #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->notification = _data_->_tmp27_; + _data_->notification = _data_->_tmp26_; +#line 201 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp27_ = NULL; +#line 201 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp27_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); #line 201 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp28_ = NULL; #line 201 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp28_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); + _data_->_tmp28_ = _data_->_tmp27_; #line 201 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp29_ = NULL; #line 201 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" @@ -2291,11 +2239,11 @@ #line 201 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp30_ = NULL; #line 201 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp30_ = _data_->_tmp29_; + _data_->_tmp30_ = gitg_ext_application_get_notifications (_data_->_tmp29_); #line 201 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp31_ = NULL; #line 201 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp31_ = gitg_ext_application_get_notifications (_data_->_tmp30_); + _data_->_tmp31_ = _data_->_tmp30_; #line 201 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp32_ = NULL; #line 201 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" @@ -2303,45 +2251,41 @@ #line 201 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp33_ = NULL; #line 201 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp33_ = _data_->_tmp32_; -#line 201 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp34_ = NULL; -#line 201 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp34_ = _data_->notification; + _data_->_tmp33_ = _data_->notification; #line 201 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - gitg_ext_notifications_add (_data_->_tmp33_, (GitgExtNotification*) _data_->_tmp34_); + gitg_ext_notifications_add (_data_->_tmp32_, (GitgExtNotification*) _data_->_tmp33_); #line 201 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _g_object_unref0 (_data_->_tmp33_); + _g_object_unref0 (_data_->_tmp32_); #line 201 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _g_object_unref0 (_data_->_tmp30_); + _g_object_unref0 (_data_->_tmp29_); #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp35_ = NULL; + _data_->_tmp34_ = NULL; #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp35_ = _data_->notification; + _data_->_tmp34_ = _data_->notification; #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp36_ = NULL; + _data_->_tmp35_ = NULL; #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp36_ = _data_->destination; + _data_->_tmp35_ = _data_->destination; #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_state_ = 1; #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - gitg_commit_action_cherry_pick_create_index (_data_->self, _data_->_tmp35_, _data_->_tmp36_, gitg_commit_action_cherry_pick_cherry_pick_ready, _data_); + gitg_commit_action_cherry_pick_create_index (_data_->self, _data_->_tmp34_, _data_->_tmp35_, gitg_commit_action_cherry_pick_cherry_pick_ready, _data_); #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 2328 "gitg-commit-action-cherry-pick.c" +#line 2272 "gitg-commit-action-cherry-pick.c" _state_1: #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp37_ = NULL; + _data_->_tmp36_ = NULL; #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp37_ = gitg_commit_action_cherry_pick_create_index_finish (_data_->self, _data_->_res_); + _data_->_tmp36_ = gitg_commit_action_cherry_pick_create_index_finish (_data_->self, _data_->_res_); #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->index = _data_->_tmp37_; + _data_->index = _data_->_tmp36_; #line 205 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp38_ = NULL; + _data_->_tmp37_ = NULL; #line 205 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp38_ = _data_->index; + _data_->_tmp37_ = _data_->index; #line 205 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - if (_data_->_tmp38_ == NULL) { + if (_data_->_tmp37_ == NULL) { #line 207 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (_data_->index); #line 207 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" @@ -2356,47 +2300,47 @@ if (_data_->_state_ == 0) { #line 207 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2356 "gitg-commit-action-cherry-pick.c" +#line 2300 "gitg-commit-action-cherry-pick.c" } else { #line 207 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2360 "gitg-commit-action-cherry-pick.c" +#line 2304 "gitg-commit-action-cherry-pick.c" } #line 207 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (_data_->_async_result); #line 207 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 2366 "gitg-commit-action-cherry-pick.c" +#line 2310 "gitg-commit-action-cherry-pick.c" } #line 210 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp39_ = NULL; + _data_->_tmp38_ = NULL; #line 210 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp39_ = _data_->index; + _data_->_tmp38_ = _data_->index; #line 210 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp40_ = FALSE; + _data_->_tmp39_ = FALSE; #line 210 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp40_ = ggit_index_has_conflicts (_data_->_tmp39_); + _data_->_tmp39_ = ggit_index_has_conflicts (_data_->_tmp38_); #line 210 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - if (_data_->_tmp40_) { + if (_data_->_tmp39_) { #line 212 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp41_ = NULL; + _data_->_tmp40_ = NULL; #line 212 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp41_ = _data_->notification; + _data_->_tmp40_ = _data_->notification; #line 212 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp42_ = NULL; + _data_->_tmp41_ = NULL; #line 212 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp42_ = _data_->index; + _data_->_tmp41_ = _data_->index; #line 212 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp43_ = NULL; + _data_->_tmp42_ = NULL; #line 212 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp43_ = _data_->destination; + _data_->_tmp42_ = _data_->destination; #line 212 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_state_ = 2; #line 212 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - gitg_commit_action_cherry_pick_checkout_conflicts (_data_->self, _data_->_tmp41_, _data_->_tmp42_, _data_->_tmp43_, gitg_commit_action_cherry_pick_cherry_pick_ready, _data_); + gitg_commit_action_cherry_pick_checkout_conflicts (_data_->self, _data_->_tmp40_, _data_->_tmp41_, _data_->_tmp42_, gitg_commit_action_cherry_pick_cherry_pick_ready, _data_); #line 212 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 2396 "gitg-commit-action-cherry-pick.c" +#line 2340 "gitg-commit-action-cherry-pick.c" _state_2: #line 212 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_checkout_conflicts_finish (_data_->self, _data_->_res_); @@ -2414,99 +2358,95 @@ if (_data_->_state_ == 0) { #line 213 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2414 "gitg-commit-action-cherry-pick.c" +#line 2358 "gitg-commit-action-cherry-pick.c" } else { #line 213 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2418 "gitg-commit-action-cherry-pick.c" +#line 2362 "gitg-commit-action-cherry-pick.c" } #line 213 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (_data_->_async_result); #line 213 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 2424 "gitg-commit-action-cherry-pick.c" +#line 2368 "gitg-commit-action-cherry-pick.c" } #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp43_ = NULL; +#line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" + _data_->_tmp43_ = _data_->self->priv->d_support; +#line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp44_ = NULL; #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp44_ = _data_->self->priv->d_support; + _data_->_tmp44_ = _data_->notification; #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp45_ = NULL; #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp45_ = _data_->notification; + _data_->_tmp45_ = _data_->destination; #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp46_ = NULL; #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp46_ = _data_->destination; + _data_->_tmp46_ = _data_->index; #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp47_ = NULL; #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp47_ = _data_->index; + _data_->_tmp47_ = gitg_ext_commit_action_get_commit ((GitgExtCommitAction*) _data_->self); #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp48_ = NULL; #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp48_ = gitg_ext_commit_action_get_commit ((GitgExtCommitAction*) _data_->self); + _data_->_tmp48_ = _data_->_tmp47_; #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp49_ = NULL; #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp49_ = _data_->_tmp48_; + _data_->_tmp49_ = ggit_commit_get_author ((GgitCommit*) _data_->_tmp48_); #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp50_ = NULL; #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp50_ = ggit_commit_get_author ((GgitCommit*) _data_->_tmp49_); + _data_->_tmp50_ = _data_->_tmp49_; #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp51_ = NULL; #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp51_ = _data_->_tmp50_; + _data_->_tmp51_ = gitg_ext_commit_action_get_commit ((GitgExtCommitAction*) _data_->self); #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp52_ = NULL; #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp52_ = gitg_ext_commit_action_get_commit ((GitgExtCommitAction*) _data_->self); + _data_->_tmp52_ = _data_->_tmp51_; #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_tmp53_ = NULL; #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp53_ = _data_->_tmp52_; -#line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp54_ = NULL; -#line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp54_ = ggit_commit_get_message ((GgitCommit*) _data_->_tmp53_); + _data_->_tmp53_ = ggit_commit_get_message ((GgitCommit*) _data_->_tmp52_); #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data_->_state_ = 3; #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - gitg_action_support_commit_index (_data_->_tmp44_, _data_->_tmp45_, _data_->_tmp46_, _data_->_tmp47_, NULL, 0, _data_->_tmp51_, _data_->_tmp54_, gitg_commit_action_cherry_pick_cherry_pick_ready, _data_); + gitg_action_support_commit_index (_data_->_tmp43_, _data_->_tmp44_, _data_->_tmp45_, _data_->_tmp46_, NULL, 0, _data_->_tmp50_, _data_->_tmp53_, gitg_commit_action_cherry_pick_cherry_pick_ready, _data_); #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 2476 "gitg-commit-action-cherry-pick.c" +#line 2420 "gitg-commit-action-cherry-pick.c" _state_3: #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp55_ = NULL; + _data_->_tmp54_ = NULL; #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp55_ = gitg_action_support_commit_index_finish (_data_->_tmp44_, _data_->_res_); + _data_->_tmp54_ = gitg_action_support_commit_index_finish (_data_->_tmp43_, _data_->_res_); #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp56_ = NULL; + _data_->_tmp55_ = NULL; #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp56_ = _data_->_tmp55_; + _data_->_tmp55_ = _data_->_tmp54_; #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _g_object_unref0 (_data_->_tmp51_); + _g_object_unref0 (_data_->_tmp50_); #line 216 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->oid = _data_->_tmp56_; + _data_->oid = _data_->_tmp55_; #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp57_ = NULL; + _data_->_tmp56_ = NULL; #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp57_ = _data_->oid; + _data_->_tmp56_ = _data_->oid; #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - if (_data_->_tmp57_ != NULL) { -#line 224 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp58_ = NULL; -#line 224 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp58_ = _data_->notification; + if (_data_->_tmp56_ != NULL) { #line 224 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp59_ = NULL; + _data_->_tmp57_ = NULL; #line 224 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _data_->_tmp59_ = _ ("Successfully cherry picked"); + _data_->_tmp57_ = _data_->notification; #line 224 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - gitg_simple_notification_success (_data_->_tmp58_, _data_->_tmp59_); -#line 2506 "gitg-commit-action-cherry-pick.c" + gitg_simple_notification_success (_data_->_tmp57_, _ ("Successfully cherry picked")); +#line 2446 "gitg-commit-action-cherry-pick.c" } #line 193 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" __vala_GgitOId_free0 (_data_->oid); @@ -2524,17 +2464,17 @@ if (_data_->_state_ == 0) { #line 193 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2524 "gitg-commit-action-cherry-pick.c" +#line 2464 "gitg-commit-action-cherry-pick.c" } else { #line 193 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2528 "gitg-commit-action-cherry-pick.c" +#line 2468 "gitg-commit-action-cherry-pick.c" } #line 193 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (_data_->_async_result); #line 193 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return FALSE; -#line 2534 "gitg-commit-action-cherry-pick.c" +#line 2474 "gitg-commit-action-cherry-pick.c" } @@ -2546,7 +2486,7 @@ _tmp0_ = res; #line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_cherry_pick_finish (self, _tmp0_); -#line 2546 "gitg-commit-action-cherry-pick.c" +#line 2486 "gitg-commit-action-cherry-pick.c" } @@ -2555,7 +2495,7 @@ __lambda30_ ((GitgCommitActionCherryPick*) self, source_object, res); #line 230 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_object_unref (self); -#line 2555 "gitg-commit-action-cherry-pick.c" +#line 2495 "gitg-commit-action-cherry-pick.c" } @@ -2569,7 +2509,7 @@ _tmp0_ = destination; #line 230 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_cherry_pick (self, _tmp0_, ___lambda30__gasync_ready_callback, g_object_ref (self)); -#line 2569 "gitg-commit-action-cherry-pick.c" +#line 2509 "gitg-commit-action-cherry-pick.c" } @@ -2578,7 +2518,7 @@ g_atomic_int_inc (&_data26_->_ref_count_); #line 256 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return _data26_; -#line 2578 "gitg-commit-action-cherry-pick.c" +#line 2518 "gitg-commit-action-cherry-pick.c" } @@ -2587,7 +2527,7 @@ _data26_ = (Block26Data*) _userdata_; #line 256 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" if (g_atomic_int_dec_and_test (&_data26_->_ref_count_)) { -#line 2587 "gitg-commit-action-cherry-pick.c" +#line 2527 "gitg-commit-action-cherry-pick.c" GitgCommitActionCherryPick* self; #line 256 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" self = _data26_->self; @@ -2597,7 +2537,7 @@ _g_object_unref0 (self); #line 256 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_slice_free (Block26Data, _data26_); -#line 2597 "gitg-commit-action-cherry-pick.c" +#line 2537 "gitg-commit-action-cherry-pick.c" } } @@ -2611,14 +2551,14 @@ _tmp0_ = _data26_->dest; #line 265 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_activate_destination (self, _tmp0_); -#line 2611 "gitg-commit-action-cherry-pick.c" +#line 2551 "gitg-commit-action-cherry-pick.c" } static void _____lambda31__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 264 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" ____lambda31_ (self); -#line 2618 "gitg-commit-action-cherry-pick.c" +#line 2558 "gitg-commit-action-cherry-pick.c" } @@ -2644,10 +2584,10 @@ GtkMenu* _tmp15_ = NULL; GitgRef** _tmp16_ = NULL; gint _tmp16__length1 = 0; - GtkMenuItem* _tmp39_ = NULL; + GtkMenuItem* _tmp38_ = NULL; + GtkMenu* _tmp39_ = NULL; GtkMenu* _tmp40_ = NULL; - GtkMenu* _tmp41_ = NULL; - GtkMenuItem* _tmp42_ = NULL; + GtkMenuItem* _tmp41_ = NULL; #line 235 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" self = (GitgCommitActionCherryPick*) base; #line 235 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" @@ -2660,7 +2600,7 @@ if (!_tmp1_) { #line 239 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return; -#line 2660 "gitg-commit-action-cherry-pick.c" +#line 2600 "gitg-commit-action-cherry-pick.c" } #line 242 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_ensure_destinations (self); @@ -2672,7 +2612,7 @@ if (!_tmp3_) { #line 246 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return; -#line 2672 "gitg-commit-action-cherry-pick.c" +#line 2612 "gitg-commit-action-cherry-pick.c" } #line 249 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _tmp4_ = gitg_ext_ui_element_get_display_name ((GitgExtUIElement*) self); @@ -2720,7 +2660,7 @@ _tmp16_ = self->priv->d_destinations; #line 256 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _tmp16__length1 = self->priv->d_destinations_length1; -#line 2720 "gitg-commit-action-cherry-pick.c" +#line 2660 "gitg-commit-action-cherry-pick.c" { GitgRef** dest_collection = NULL; gint dest_collection_length1 = 0; @@ -2732,14 +2672,14 @@ dest_collection_length1 = _tmp16__length1; #line 256 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" for (dest_it = 0; dest_it < _tmp16__length1; dest_it = dest_it + 1) { -#line 2732 "gitg-commit-action-cherry-pick.c" +#line 2672 "gitg-commit-action-cherry-pick.c" GitgRef* _tmp17_ = NULL; GitgRef* dest = NULL; #line 256 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _tmp17_ = _g_object_ref0 (dest_collection[dest_it]); #line 256 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" dest = _tmp17_; -#line 2739 "gitg-commit-action-cherry-pick.c" +#line 2679 "gitg-commit-action-cherry-pick.c" { Block26Data* _data26_; gchar* name = NULL; @@ -2756,15 +2696,14 @@ GtkMenuItem* _tmp27_ = NULL; const gchar* _tmp28_ = NULL; const gchar* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; + gchar* _tmp30_ = NULL; gchar* _tmp31_ = NULL; gchar* _tmp32_ = NULL; gchar* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; + GtkMenuItem* _tmp34_ = NULL; GtkMenuItem* _tmp35_ = NULL; - GtkMenuItem* _tmp36_ = NULL; - GtkMenu* _tmp37_ = NULL; - GtkMenuItem* _tmp38_ = NULL; + GtkMenu* _tmp36_ = NULL; + GtkMenuItem* _tmp37_ = NULL; #line 256 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data26_ = g_slice_new0 (Block26Data); #line 256 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" @@ -2802,39 +2741,37 @@ #line 261 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _tmp27_ = subitem; #line 261 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp28_ = _ ("Cherry pick onto %s"); -#line 261 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp29_ = name; + _tmp28_ = name; #line 261 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp30_ = string_to_string (_tmp29_); + _tmp29_ = string_to_string (_tmp28_); #line 261 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp31_ = g_strconcat ("'", _tmp30_, "'", NULL); + _tmp30_ = g_strconcat ("'", _tmp29_, "'", NULL); #line 261 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp32_ = _tmp31_; + _tmp31_ = _tmp30_; #line 261 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp33_ = g_strdup_printf (_tmp28_, _tmp32_); + _tmp32_ = g_strdup_printf (_ ("Cherry pick onto %s"), _tmp31_); #line 261 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp34_ = _tmp33_; + _tmp33_ = _tmp32_; #line 261 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - gtk_widget_set_tooltip_text ((GtkWidget*) _tmp27_, _tmp34_); + gtk_widget_set_tooltip_text ((GtkWidget*) _tmp27_, _tmp33_); #line 261 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_tmp34_); + _g_free0 (_tmp33_); #line 261 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _g_free0 (_tmp32_); + _g_free0 (_tmp31_); #line 262 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp35_ = subitem; + _tmp34_ = subitem; #line 262 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - gtk_widget_show ((GtkWidget*) _tmp35_); + gtk_widget_show ((GtkWidget*) _tmp34_); #line 264 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp36_ = subitem; + _tmp35_ = subitem; #line 264 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - g_signal_connect_data (_tmp36_, "activate", (GCallback) _____lambda31__gtk_menu_item_activate, block26_data_ref (_data26_), (GClosureNotify) block26_data_unref, 0); + g_signal_connect_data (_tmp35_, "activate", (GCallback) _____lambda31__gtk_menu_item_activate, block26_data_ref (_data26_), (GClosureNotify) block26_data_unref, 0); #line 268 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp37_ = submenu; + _tmp36_ = submenu; #line 268 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp38_ = subitem; + _tmp37_ = subitem; #line 268 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - gtk_menu_shell_append ((GtkMenuShell*) _tmp37_, (GtkWidget*) _tmp38_); + gtk_menu_shell_append ((GtkMenuShell*) _tmp36_, (GtkWidget*) _tmp37_); #line 256 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (subitem); #line 256 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" @@ -2843,27 +2780,27 @@ block26_data_unref (_data26_); #line 256 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _data26_ = NULL; -#line 2843 "gitg-commit-action-cherry-pick.c" +#line 2780 "gitg-commit-action-cherry-pick.c" } } } #line 271 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp39_ = item; + _tmp38_ = item; #line 271 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp40_ = submenu; + _tmp39_ = submenu; #line 271 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - gtk_menu_item_set_submenu (_tmp39_, _tmp40_); + gtk_menu_item_set_submenu (_tmp38_, _tmp39_); #line 272 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp41_ = menu; + _tmp40_ = menu; #line 272 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp42_ = item; + _tmp41_ = item; #line 272 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - gtk_menu_shell_append ((GtkMenuShell*) _tmp41_, (GtkWidget*) _tmp42_); + gtk_menu_shell_append ((GtkMenuShell*) _tmp40_, (GtkWidget*) _tmp41_); #line 235 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (submenu); #line 235 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" _g_object_unref0 (item); -#line 2863 "gitg-commit-action-cherry-pick.c" +#line 2800 "gitg-commit-action-cherry-pick.c" } @@ -2871,7 +2808,7 @@ GitgCommitActionCherryPick * self; #line 275 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" self = (GitgCommitActionCherryPick*) base; -#line 2871 "gitg-commit-action-cherry-pick.c" +#line 2808 "gitg-commit-action-cherry-pick.c" } @@ -2890,27 +2827,31 @@ result = _tmp1_; #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return result; -#line 2890 "gitg-commit-action-cherry-pick.c" +#line 2827 "gitg-commit-action-cherry-pick.c" } static void gitg_commit_action_cherry_pick_real_set_application (GitgExtUIElement* base, GitgExtApplication* value) { GitgCommitActionCherryPick* self; - GitgExtApplication* _tmp0_ = NULL; - GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" self = (GitgCommitActionCherryPick*) base; #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp0_ = value; + if (gitg_commit_action_cherry_pick_real_get_application (self) != value) { +#line 2837 "gitg-commit-action-cherry-pick.c" + GitgExtApplication* _tmp0_ = NULL; + GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _g_object_unref0 (self->priv->_application); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" + _g_object_unref0 (self->priv->_application); #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - self->priv->_application = _tmp1_; + self->priv->_application = _tmp1_; #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - g_object_notify ((GObject *) self, "application"); -#line 2910 "gitg-commit-action-cherry-pick.c" + g_object_notify ((GObject *) self, "application"); +#line 2850 "gitg-commit-action-cherry-pick.c" + } } @@ -2926,27 +2867,31 @@ result = _tmp0_; #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return result; -#line 2926 "gitg-commit-action-cherry-pick.c" +#line 2867 "gitg-commit-action-cherry-pick.c" } static void gitg_commit_action_cherry_pick_real_set_action_interface (GitgExtCommitAction* base, GitgExtRefActionInterface* value) { GitgCommitActionCherryPick* self; - GitgExtRefActionInterface* _tmp0_ = NULL; - GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" self = (GitgCommitActionCherryPick*) base; #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp0_ = value; + if (gitg_commit_action_cherry_pick_real_get_action_interface (self) != value) { +#line 2877 "gitg-commit-action-cherry-pick.c" + GitgExtRefActionInterface* _tmp0_ = NULL; + GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _g_object_unref0 (self->priv->_action_interface); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" + _g_object_unref0 (self->priv->_action_interface); #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - self->priv->_action_interface = _tmp1_; + self->priv->_action_interface = _tmp1_; #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - g_object_notify ((GObject *) self, "action-interface"); -#line 2946 "gitg-commit-action-cherry-pick.c" + g_object_notify ((GObject *) self, "action-interface"); +#line 2890 "gitg-commit-action-cherry-pick.c" + } } @@ -2962,27 +2907,31 @@ result = _tmp0_; #line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return result; -#line 2962 "gitg-commit-action-cherry-pick.c" +#line 2907 "gitg-commit-action-cherry-pick.c" } static void gitg_commit_action_cherry_pick_real_set_commit (GitgExtCommitAction* base, GitgCommit* value) { GitgCommitActionCherryPick* self; - GitgCommit* _tmp0_ = NULL; - GitgCommit* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" self = (GitgCommitActionCherryPick*) base; #line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp0_ = value; + if (gitg_commit_action_cherry_pick_real_get_commit (self) != value) { +#line 2917 "gitg-commit-action-cherry-pick.c" + GitgCommit* _tmp0_ = NULL; + GitgCommit* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _g_object_unref0 (self->priv->_commit); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" + _g_object_unref0 (self->priv->_commit); #line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - self->priv->_commit = _tmp1_; + self->priv->_commit = _tmp1_; #line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - g_object_notify ((GObject *) self, "commit"); -#line 2982 "gitg-commit-action-cherry-pick.c" + g_object_notify ((GObject *) self, "commit"); +#line 2930 "gitg-commit-action-cherry-pick.c" + } } @@ -2998,45 +2947,39 @@ result = _tmp0_; #line 48 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return result; -#line 2998 "gitg-commit-action-cherry-pick.c" +#line 2947 "gitg-commit-action-cherry-pick.c" } static gchar* gitg_commit_action_cherry_pick_real_get_display_name (GitgExtUIElement* base) { gchar* result; GitgCommitActionCherryPick* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 53 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" self = (GitgCommitActionCherryPick*) base; #line 53 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp0_ = _ ("Cherry pick onto"); -#line 53 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (_ ("Cherry pick onto")); #line 53 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - result = _tmp1_; + result = _tmp0_; #line 53 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return result; -#line 3017 "gitg-commit-action-cherry-pick.c" +#line 2963 "gitg-commit-action-cherry-pick.c" } static gchar* gitg_commit_action_cherry_pick_real_get_description (GitgExtUIElement* base) { gchar* result; GitgCommitActionCherryPick* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 58 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" self = (GitgCommitActionCherryPick*) base; #line 58 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp0_ = _ ("Cherry pick this commit onto a branch"); + _tmp0_ = g_strdup (_ ("Cherry pick this commit onto a branch")); #line 58 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 58 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - result = _tmp1_; + result = _tmp0_; #line 58 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return result; -#line 3036 "gitg-commit-action-cherry-pick.c" +#line 2979 "gitg-commit-action-cherry-pick.c" } @@ -3049,7 +2992,7 @@ result = TRUE; #line 63 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return result; -#line 3049 "gitg-commit-action-cherry-pick.c" +#line 2992 "gitg-commit-action-cherry-pick.c" } @@ -3086,7 +3029,7 @@ result = FALSE; #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return result; -#line 3086 "gitg-commit-action-cherry-pick.c" +#line 3029 "gitg-commit-action-cherry-pick.c" } #line 75 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_ensure_destinations (self); @@ -3098,7 +3041,7 @@ result = _tmp6__length1 != 0; #line 76 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" return result; -#line 3098 "gitg-commit-action-cherry-pick.c" +#line 3041 "gitg-commit-action-cherry-pick.c" } @@ -3129,7 +3072,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_COMMIT_ACTION_CHERRY_PICK_AVAILABLE, g_param_spec_boolean ("available", "available", "available", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_COMMIT_ACTION_CHERRY_PICK_ENABLED, g_param_spec_boolean ("enabled", "enabled", "enabled", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 3129 "gitg-commit-action-cherry-pick.c" +#line 3072 "gitg-commit-action-cherry-pick.c" } @@ -3137,7 +3080,7 @@ #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_gitg_ext_ui_element_parent_iface = g_type_interface_peek_parent (iface); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - iface->activate = (void (*)(GitgExtUIElement*)) gitg_commit_action_cherry_pick_real_activate; + iface->activate = (void (*) (GitgExtUIElement *)) gitg_commit_action_cherry_pick_real_activate; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" iface->get_application = gitg_commit_action_cherry_pick_real_get_application; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" @@ -3152,7 +3095,7 @@ iface->get_available = gitg_commit_action_cherry_pick_real_get_available; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" iface->get_enabled = gitg_commit_action_cherry_pick_real_get_enabled; -#line 3152 "gitg-commit-action-cherry-pick.c" +#line 3095 "gitg-commit-action-cherry-pick.c" } @@ -3160,8 +3103,8 @@ #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" gitg_commit_action_cherry_pick_gitg_ext_action_parent_iface = g_type_interface_peek_parent (iface); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" - iface->populate_menu = (void (*)(GitgExtAction*, GtkMenu*)) gitg_commit_action_cherry_pick_real_populate_menu; -#line 3161 "gitg-commit-action-cherry-pick.c" + iface->populate_menu = (void (*) (GitgExtAction *, GtkMenu*)) gitg_commit_action_cherry_pick_real_populate_menu; +#line 3104 "gitg-commit-action-cherry-pick.c" } @@ -3176,18 +3119,18 @@ iface->get_commit = gitg_commit_action_cherry_pick_real_get_commit; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" iface->set_commit = gitg_commit_action_cherry_pick_real_set_commit; -#line 3176 "gitg-commit-action-cherry-pick.c" +#line 3119 "gitg-commit-action-cherry-pick.c" } static void gitg_commit_action_cherry_pick_instance_init (GitgCommitActionCherryPick * self) { #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" self->priv = GITG_COMMIT_ACTION_CHERRY_PICK_GET_PRIVATE (self); -#line 3183 "gitg-commit-action-cherry-pick.c" +#line 3126 "gitg-commit-action-cherry-pick.c" } -static void gitg_commit_action_cherry_pick_finalize (GObject* obj) { +static void gitg_commit_action_cherry_pick_finalize (GObject * obj) { GitgCommitActionCherryPick * self; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_COMMIT_ACTION_CHERRY_PICK, GitgCommitActionCherryPick); @@ -3203,7 +3146,7 @@ _g_object_unref0 (self->priv->d_support); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" G_OBJECT_CLASS (gitg_commit_action_cherry_pick_parent_class)->finalize (obj); -#line 3203 "gitg-commit-action-cherry-pick.c" +#line 3146 "gitg-commit-action-cherry-pick.c" } @@ -3278,13 +3221,13 @@ g_value_set_boolean (value, gitg_ext_ui_element_get_enabled ((GitgExtUIElement*) self)); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" break; -#line 3278 "gitg-commit-action-cherry-pick.c" +#line 3221 "gitg-commit-action-cherry-pick.c" default: #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" break; -#line 3284 "gitg-commit-action-cherry-pick.c" +#line 3227 "gitg-commit-action-cherry-pick.c" } } @@ -3312,13 +3255,13 @@ gitg_ext_commit_action_set_commit ((GitgExtCommitAction*) self, g_value_get_object (value)); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" break; -#line 3312 "gitg-commit-action-cherry-pick.c" +#line 3255 "gitg-commit-action-cherry-pick.c" default: #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-commit-action-cherry-pick.vala" break; -#line 3318 "gitg-commit-action-cherry-pick.c" +#line 3261 "gitg-commit-action-cherry-pick.c" } } diff -Nru gitg-3.22.0/tests/gitg/gitg-ref-action-checkout.c gitg-3.23.0/tests/gitg/gitg-ref-action-checkout.c --- gitg-3.22.0/tests/gitg/gitg-ref-action-checkout.c 2016-08-09 09:51:19.000000000 +0000 +++ gitg-3.23.0/tests/gitg/gitg-ref-action-checkout.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ref-action-checkout.c generated by valac 0.32.1, the Vala compiler +/* gitg-ref-action-checkout.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ref-action-checkout.vala, do not modify */ /* @@ -96,39 +96,37 @@ GitgRepository* _tmp3_; GitgRepository* _tmp4_; GitgRepository* _tmp5_; - const gchar* _tmp6_; + GitgRef* _tmp6_; GitgRef* _tmp7_; - GitgRef* _tmp8_; + GitgParsedRefName* _tmp8_; GitgParsedRefName* _tmp9_; GitgParsedRefName* _tmp10_; - GitgParsedRefName* _tmp11_; + gchar* _tmp11_; gchar* _tmp12_; gchar* _tmp13_; - gchar* _tmp14_; - const gchar* _tmp15_; + const gchar* _tmp14_; + gchar* _tmp15_; gchar* _tmp16_; gchar* _tmp17_; gchar* _tmp18_; - gchar* _tmp19_; + GitgSimpleNotification* _tmp19_; GitgSimpleNotification* _tmp20_; - GitgSimpleNotification* _tmp21_; + GitgExtApplication* _tmp21_; GitgExtApplication* _tmp22_; GitgExtApplication* _tmp23_; - GitgExtApplication* _tmp24_; + GitgExtNotifications* _tmp24_; GitgExtNotifications* _tmp25_; GitgExtNotifications* _tmp26_; - GitgExtNotifications* _tmp27_; - const gchar* _tmp28_; - GitgExtRefActionInterface* _tmp29_; - GitgExtRefActionInterface* _tmp30_; + GitgExtRefActionInterface* _tmp27_; + GitgExtRefActionInterface* _tmp28_; GError * _inner_error_; }; static gpointer gitg_ref_action_checkout_parent_class = NULL; -static GitgExtUIElementIface* gitg_ref_action_checkout_gitg_ext_ui_element_parent_iface = NULL; -static GitgExtActionIface* gitg_ref_action_checkout_gitg_ext_action_parent_iface = NULL; -static GitgExtRefActionIface* gitg_ref_action_checkout_gitg_ext_ref_action_parent_iface = NULL; +static GitgExtUIElementIface * gitg_ref_action_checkout_gitg_ext_ui_element_parent_iface = NULL; +static GitgExtActionIface * gitg_ref_action_checkout_gitg_ext_action_parent_iface = NULL; +static GitgExtRefActionIface * gitg_ref_action_checkout_gitg_ext_ref_action_parent_iface = NULL; GType gitg_ref_action_checkout_get_type (void) G_GNUC_CONST; #define GITG_REF_ACTION_CHECKOUT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TYPE_REF_ACTION_CHECKOUT, GitgRefActionCheckoutPrivate)) @@ -162,7 +160,7 @@ static void gitg_ref_action_checkout_real_activate (GitgExtUIElement* base); static void __lambda5_ (GitgRefActionCheckout* self, GObject* obj, GAsyncResult* res); static void ___lambda5__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); -static void gitg_ref_action_checkout_finalize (GObject* obj); +static void gitg_ref_action_checkout_finalize (GObject * obj); static void _vala_gitg_ref_action_checkout_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_ref_action_checkout_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -188,14 +186,14 @@ self = (GitgRefActionCheckout*) g_object_new (object_type, "application", _tmp0_, "action-interface", _tmp1_, "reference", _tmp2_, NULL); #line 32 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return self; -#line 192 "gitg-ref-action-checkout.c" +#line 190 "gitg-ref-action-checkout.c" } GitgRefActionCheckout* gitg_ref_action_checkout_new (GitgExtApplication* application, GitgExtRefActionInterface* action_interface, GitgRef* reference) { #line 32 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return gitg_ref_action_checkout_construct (GITG_TYPE_REF_ACTION_CHECKOUT, application, action_interface, reference); -#line 199 "gitg-ref-action-checkout.c" +#line 197 "gitg-ref-action-checkout.c" } @@ -206,14 +204,14 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" g_slice_free (GitgRefActionCheckoutCheckoutData, _data_); -#line 210 "gitg-ref-action-checkout.c" +#line 208 "gitg-ref-action-checkout.c" } static gpointer _g_object_ref0 (gpointer self) { #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return self ? g_object_ref (self) : NULL; -#line 217 "gitg-ref-action-checkout.c" +#line 215 "gitg-ref-action-checkout.c" } @@ -232,7 +230,7 @@ _data_->self = _tmp0_; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" gitg_ref_action_checkout_checkout_co (_data_); -#line 236 "gitg-ref-action-checkout.c" +#line 234 "gitg-ref-action-checkout.c" } @@ -245,7 +243,7 @@ result = _data_->result; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return result; -#line 249 "gitg-ref-action-checkout.c" +#line 247 "gitg-ref-action-checkout.c" } @@ -254,7 +252,7 @@ g_atomic_int_inc (&_data22_->_ref_count_); #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return _data22_; -#line 258 "gitg-ref-action-checkout.c" +#line 256 "gitg-ref-action-checkout.c" } @@ -263,7 +261,7 @@ _data22_ = (Block22Data*) _userdata_; #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" if (g_atomic_int_dec_and_test (&_data22_->_ref_count_)) { -#line 267 "gitg-ref-action-checkout.c" +#line 265 "gitg-ref-action-checkout.c" GitgRefActionCheckout* self; #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" self = _data22_->self; @@ -275,20 +273,20 @@ _g_object_unref0 (self); #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" g_slice_free (Block22Data, _data22_); -#line 279 "gitg-ref-action-checkout.c" +#line 277 "gitg-ref-action-checkout.c" } } static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 292 "gitg-ref-action-checkout.c" +#line 290 "gitg-ref-action-checkout.c" } @@ -298,7 +296,7 @@ GError * _inner_error_ = NULL; #line 79 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" self = _data22_->self; -#line 302 "gitg-ref-action-checkout.c" +#line 300 "gitg-ref-action-checkout.c" { GgitRef* _tmp0_ = NULL; GitgRef* _tmp1_ = NULL; @@ -321,7 +319,7 @@ _tmp0_ = _tmp3_; #line 84 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 325 "gitg-ref-action-checkout.c" +#line 323 "gitg-ref-action-checkout.c" goto __catch22_g_error; } #line 84 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" @@ -342,7 +340,7 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 84 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _g_object_unref0 (_tmp0_); -#line 346 "gitg-ref-action-checkout.c" +#line 344 "gitg-ref-action-checkout.c" goto __catch22_g_error; } #line 84 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" @@ -355,7 +353,7 @@ if (_tmp10_ == NULL) { #line 84 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _g_object_unref0 (_tmp9_); -#line 359 "gitg-ref-action-checkout.c" +#line 357 "gitg-ref-action-checkout.c" } #line 84 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _g_object_unref0 (commit); @@ -365,42 +363,39 @@ _g_object_unref0 (_tmp4_); #line 82 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _g_object_unref0 (_tmp0_); -#line 369 "gitg-ref-action-checkout.c" +#line 367 "gitg-ref-action-checkout.c" } goto __finally22; __catch22_g_error: { GError* e = NULL; - const gchar* _tmp11_ = NULL; - GError* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; + GError* _tmp11_ = NULL; + const gchar* _tmp12_ = NULL; + gchar* _tmp13_ = NULL; gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; #line 82 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" e = _inner_error_; #line 82 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _inner_error_ = NULL; #line 88 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp11_ = _ ("Failed to lookup commit: %s"); + _tmp11_ = e; #line 88 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp12_ = e; + _tmp12_ = _tmp11_->message; #line 88 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp13_ = _tmp12_->message; + _tmp13_ = g_strdup_printf (_ ("Failed to lookup commit: %s"), _tmp12_); #line 88 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp14_ = g_strdup_printf (_tmp11_, _tmp13_); + _tmp14_ = _tmp13_; #line 88 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp15_ = _tmp14_; + gitg_simple_notification_error (_data22_->notification, _tmp14_); #line 88 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - gitg_simple_notification_error (_data22_->notification, _tmp15_); -#line 88 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp14_); #line 89 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _g_error_free0 (e); #line 89 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _g_object_unref0 (commit); #line 89 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return; -#line 404 "gitg-ref-action-checkout.c" +#line 399 "gitg-ref-action-checkout.c" } __finally22: #line 82 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" @@ -411,81 +406,78 @@ _g_object_unref0 (commit); #line 82 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return; -#line 415 "gitg-ref-action-checkout.c" +#line 410 "gitg-ref-action-checkout.c" } { GgitCheckoutOptions* opts = NULL; + GgitCheckoutOptions* _tmp15_ = NULL; GgitCheckoutOptions* _tmp16_ = NULL; - GgitCheckoutOptions* _tmp17_ = NULL; - GitgCommit* _tmp18_ = NULL; + GitgCommit* _tmp17_ = NULL; + GgitTree* _tmp18_ = NULL; GgitTree* _tmp19_ = NULL; - GgitTree* _tmp20_ = NULL; - GgitCheckoutOptions* _tmp21_ = NULL; + GgitCheckoutOptions* _tmp20_ = NULL; #line 94 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp16_ = ggit_checkout_options_new (); + _tmp15_ = ggit_checkout_options_new (); #line 94 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - opts = _tmp16_; + opts = _tmp15_; #line 95 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp17_ = opts; + _tmp16_ = opts; #line 95 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - ggit_checkout_options_set_strategy (_tmp17_, GGIT_CHECKOUT_SAFE); + ggit_checkout_options_set_strategy (_tmp16_, GGIT_CHECKOUT_SAFE); #line 97 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp18_ = commit; + _tmp17_ = commit; #line 97 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp19_ = ggit_commit_get_tree ((GgitCommit*) _tmp18_); + _tmp18_ = ggit_commit_get_tree ((GgitCommit*) _tmp17_); #line 97 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 97 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp21_ = opts; + _tmp20_ = opts; #line 97 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - ggit_repository_checkout_tree ((GgitRepository*) _data22_->repo, (GgitObject*) _tmp20_, _tmp21_, &_inner_error_); + ggit_repository_checkout_tree ((GgitRepository*) _data22_->repo, (GgitObject*) _tmp19_, _tmp20_, &_inner_error_); #line 97 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp19_); #line 97 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 97 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _g_object_unref0 (opts); -#line 449 "gitg-ref-action-checkout.c" +#line 444 "gitg-ref-action-checkout.c" goto __catch23_g_error; } #line 92 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _g_object_unref0 (opts); -#line 454 "gitg-ref-action-checkout.c" +#line 449 "gitg-ref-action-checkout.c" } goto __finally23; __catch23_g_error: { GError* e = NULL; + GError* _tmp21_ = NULL; const gchar* _tmp22_ = NULL; - GError* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; + gchar* _tmp23_ = NULL; + gchar* _tmp24_ = NULL; #line 92 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" e = _inner_error_; #line 92 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _inner_error_ = NULL; #line 101 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp22_ = _ ("Failed to checkout branch: %s"); + _tmp21_ = e; #line 101 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp23_ = e; + _tmp22_ = _tmp21_->message; #line 101 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp24_ = _tmp23_->message; + _tmp23_ = g_strdup_printf (_ ("Failed to checkout branch: %s"), _tmp22_); #line 101 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp25_ = g_strdup_printf (_tmp22_, _tmp24_); + _tmp24_ = _tmp23_; #line 101 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp26_ = _tmp25_; + gitg_simple_notification_error (_data22_->notification, _tmp24_); #line 101 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - gitg_simple_notification_error (_data22_->notification, _tmp26_); -#line 101 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _g_free0 (_tmp26_); + _g_free0 (_tmp24_); #line 102 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _g_error_free0 (e); #line 102 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _g_object_unref0 (commit); #line 102 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return; -#line 489 "gitg-ref-action-checkout.c" +#line 481 "gitg-ref-action-checkout.c" } __finally23: #line 92 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" @@ -496,23 +488,23 @@ _g_object_unref0 (commit); #line 92 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return; -#line 500 "gitg-ref-action-checkout.c" +#line 492 "gitg-ref-action-checkout.c" } { - GitgRef* _tmp27_ = NULL; - GitgRef* _tmp28_ = NULL; - const gchar* _tmp29_ = NULL; + GitgRef* _tmp25_ = NULL; + GitgRef* _tmp26_ = NULL; + const gchar* _tmp27_ = NULL; #line 107 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp27_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); + _tmp25_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); #line 107 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp28_ = _tmp27_; + _tmp26_ = _tmp25_; #line 107 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp29_ = ggit_ref_get_name ((GgitRef*) _tmp28_); + _tmp27_ = ggit_ref_get_name ((GgitRef*) _tmp26_); #line 107 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - ggit_repository_set_head ((GgitRepository*) _data22_->repo, _tmp29_, &_inner_error_); + ggit_repository_set_head ((GgitRepository*) _data22_->repo, _tmp27_, &_inner_error_); #line 107 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 516 "gitg-ref-action-checkout.c" +#line 508 "gitg-ref-action-checkout.c" goto __catch24_g_error; } } @@ -520,36 +512,33 @@ __catch24_g_error: { GError* e = NULL; - const gchar* _tmp30_ = NULL; - GError* _tmp31_ = NULL; - const gchar* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; + GError* _tmp28_ = NULL; + const gchar* _tmp29_ = NULL; + gchar* _tmp30_ = NULL; + gchar* _tmp31_ = NULL; #line 105 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" e = _inner_error_; #line 105 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _inner_error_ = NULL; #line 111 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp30_ = _ ("Failed to update HEAD: %s"); -#line 111 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp31_ = e; + _tmp28_ = e; #line 111 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp32_ = _tmp31_->message; + _tmp29_ = _tmp28_->message; #line 111 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp33_ = g_strdup_printf (_tmp30_, _tmp32_); + _tmp30_ = g_strdup_printf (_ ("Failed to update HEAD: %s"), _tmp29_); #line 111 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp34_ = _tmp33_; + _tmp31_ = _tmp30_; #line 111 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - gitg_simple_notification_error (_data22_->notification, _tmp34_); + gitg_simple_notification_error (_data22_->notification, _tmp31_); #line 111 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _g_free0 (_tmp34_); + _g_free0 (_tmp31_); #line 112 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _g_error_free0 (e); #line 112 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _g_object_unref0 (commit); #line 112 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return; -#line 553 "gitg-ref-action-checkout.c" +#line 542 "gitg-ref-action-checkout.c" } __finally24: #line 105 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" @@ -560,20 +549,20 @@ _g_object_unref0 (commit); #line 105 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return; -#line 564 "gitg-ref-action-checkout.c" +#line 553 "gitg-ref-action-checkout.c" } #line 115 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data22_->retval = TRUE; #line 79 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _g_object_unref0 (commit); -#line 570 "gitg-ref-action-checkout.c" +#line 559 "gitg-ref-action-checkout.c" } static void ____lambda4__gitg_async_thread_func (gpointer self, GError** error) { #line 79 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" ___lambda4_ (self, error); -#line 577 "gitg-ref-action-checkout.c" +#line 566 "gitg-ref-action-checkout.c" } @@ -587,7 +576,7 @@ _data_->_res_ = _res_; #line 79 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" gitg_ref_action_checkout_checkout_co (_data_); -#line 591 "gitg-ref-action-checkout.c" +#line 580 "gitg-ref-action-checkout.c" } @@ -596,16 +585,16 @@ switch (_data_->_state_) { #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" case 0: -#line 600 "gitg-ref-action-checkout.c" +#line 589 "gitg-ref-action-checkout.c" goto _state_0; #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" case 1: -#line 604 "gitg-ref-action-checkout.c" +#line 593 "gitg-ref-action-checkout.c" goto _state_1; default: #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" g_assert_not_reached (); -#line 609 "gitg-ref-action-checkout.c" +#line 598 "gitg-ref-action-checkout.c" } _state_0: #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" @@ -647,19 +636,19 @@ #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_tmp6_ = NULL; #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp6_ = _ ("Checkout %s"); + _data_->_tmp6_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) _data_->self); #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_tmp7_ = NULL; #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp7_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) _data_->self); + _data_->_tmp7_ = _data_->_tmp6_; #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_tmp8_ = NULL; #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp8_ = _data_->_tmp7_; + _data_->_tmp8_ = gitg_ref_get_parsed_name (_data_->_tmp7_); #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_tmp9_ = NULL; #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp9_ = gitg_ref_get_parsed_name (_data_->_tmp8_); + _data_->_tmp9_ = _data_->_tmp8_; #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_tmp10_ = NULL; #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" @@ -667,11 +656,11 @@ #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_tmp11_ = NULL; #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp11_ = _data_->_tmp10_; + _data_->_tmp11_ = gitg_parsed_ref_name_get_shortname (_data_->_tmp10_); #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_tmp12_ = NULL; #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp12_ = gitg_parsed_ref_name_get_shortname (_data_->_tmp11_); + _data_->_tmp12_ = _data_->_tmp11_; #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_tmp13_ = NULL; #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" @@ -679,51 +668,51 @@ #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_tmp14_ = NULL; #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp14_ = _data_->_tmp13_; + _data_->_tmp14_ = string_to_string (_data_->_tmp13_); #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_tmp15_ = NULL; #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp15_ = string_to_string (_data_->_tmp14_); + _data_->_tmp15_ = g_strconcat ("'", _data_->_tmp14_, "'", NULL); #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_tmp16_ = NULL; #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp16_ = g_strconcat ("'", _data_->_tmp15_, "'", NULL); + _data_->_tmp16_ = _data_->_tmp15_; #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_tmp17_ = NULL; #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp17_ = _data_->_tmp16_; + _data_->_tmp17_ = g_strdup_printf (_ ("Checkout %s"), _data_->_tmp16_); #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_tmp18_ = NULL; #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp18_ = g_strdup_printf (_data_->_tmp6_, _data_->_tmp17_); + _data_->_tmp18_ = _data_->_tmp17_; #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_tmp19_ = NULL; #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp19_ = _data_->_tmp18_; + _data_->_tmp19_ = gitg_simple_notification_new (_data_->_tmp18_, NULL); #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_tmp20_ = NULL; #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp20_ = gitg_simple_notification_new (_data_->_tmp19_, NULL); -#line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp21_ = NULL; -#line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp21_ = _data_->_tmp20_; + _data_->_tmp20_ = _data_->_tmp19_; #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _g_free0 (_data_->_tmp19_); + _g_free0 (_data_->_tmp18_); #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _g_free0 (_data_->_tmp17_); + _g_free0 (_data_->_tmp16_); #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _g_free0 (_data_->_tmp14_); + _g_free0 (_data_->_tmp13_); #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _g_object_unref0 (_data_->_tmp11_); + _g_object_unref0 (_data_->_tmp10_); #line 72 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_data22_->notification = _data_->_tmp21_; + _data_->_data22_->notification = _data_->_tmp20_; #line 73 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_data22_->retval = FALSE; #line 75 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" + _data_->_tmp21_ = NULL; +#line 75 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" + _data_->_tmp21_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); +#line 75 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_tmp22_ = NULL; #line 75 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp22_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); + _data_->_tmp22_ = _data_->_tmp21_; #line 75 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_tmp23_ = NULL; #line 75 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" @@ -731,26 +720,22 @@ #line 75 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_tmp24_ = NULL; #line 75 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp24_ = _data_->_tmp23_; + _data_->_tmp24_ = gitg_ext_application_get_notifications (_data_->_tmp23_); #line 75 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_tmp25_ = NULL; #line 75 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp25_ = gitg_ext_application_get_notifications (_data_->_tmp24_); + _data_->_tmp25_ = _data_->_tmp24_; #line 75 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_tmp26_ = NULL; #line 75 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_tmp26_ = _data_->_tmp25_; #line 75 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp27_ = NULL; -#line 75 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp27_ = _data_->_tmp26_; + gitg_ext_notifications_add (_data_->_tmp26_, (GitgExtNotification*) _data_->_data22_->notification); #line 75 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - gitg_ext_notifications_add (_data_->_tmp27_, (GitgExtNotification*) _data_->_data22_->notification); + _g_object_unref0 (_data_->_tmp26_); #line 75 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _g_object_unref0 (_data_->_tmp27_); -#line 75 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _g_object_unref0 (_data_->_tmp24_); -#line 754 "gitg-ref-action-checkout.c" + _g_object_unref0 (_data_->_tmp23_); +#line 739 "gitg-ref-action-checkout.c" { #line 79 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_state_ = 1; @@ -758,13 +743,13 @@ gitg_async_thread (____lambda4__gitg_async_thread_func, _data_->_data22_, gitg_ref_action_checkout_checkout_ready, _data_); #line 79 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return FALSE; -#line 762 "gitg-ref-action-checkout.c" +#line 747 "gitg-ref-action-checkout.c" _state_1: #line 79 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" gitg_async_thread_finish (_data_->_res_, &_data_->_inner_error_); #line 79 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 768 "gitg-ref-action-checkout.c" +#line 753 "gitg-ref-action-checkout.c" goto __catch21_g_error; } } @@ -775,7 +760,7 @@ g_clear_error (&_data_->_inner_error_); #line 77 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->_inner_error_ = NULL; -#line 779 "gitg-ref-action-checkout.c" +#line 764 "gitg-ref-action-checkout.c" } __finally21: #line 77 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" @@ -790,27 +775,23 @@ g_clear_error (&_data_->_inner_error_); #line 77 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return FALSE; -#line 794 "gitg-ref-action-checkout.c" +#line 779 "gitg-ref-action-checkout.c" } #line 119 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" if (_data_->_data22_->retval) { #line 121 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp28_ = NULL; -#line 121 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp28_ = _ ("Successfully checked out branch to working directory"); -#line 121 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - gitg_simple_notification_success (_data_->_data22_->notification, _data_->_tmp28_); + gitg_simple_notification_success (_data_->_data22_->notification, _ ("Successfully checked out branch to working directory")); #line 122 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp29_ = NULL; + _data_->_tmp27_ = NULL; #line 122 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp29_ = gitg_ext_ref_action_get_action_interface ((GitgExtRefAction*) _data_->self); + _data_->_tmp27_ = gitg_ext_ref_action_get_action_interface ((GitgExtRefAction*) _data_->self); #line 122 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp30_ = NULL; + _data_->_tmp28_ = NULL; #line 122 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _data_->_tmp30_ = _data_->_tmp29_; + _data_->_tmp28_ = _data_->_tmp27_; #line 122 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - gitg_ext_ref_action_interface_refresh (_data_->_tmp30_); -#line 814 "gitg-ref-action-checkout.c" + gitg_ext_ref_action_interface_refresh (_data_->_tmp28_); +#line 795 "gitg-ref-action-checkout.c" } #line 125 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _data_->result = _data_->_data22_->retval; @@ -822,11 +803,11 @@ if (_data_->_state_ == 0) { #line 125 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 826 "gitg-ref-action-checkout.c" +#line 807 "gitg-ref-action-checkout.c" } else { #line 125 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" g_simple_async_result_complete (_data_->_async_result); -#line 830 "gitg-ref-action-checkout.c" +#line 811 "gitg-ref-action-checkout.c" } #line 125 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" g_object_unref (_data_->_async_result); @@ -840,17 +821,17 @@ if (_data_->_state_ == 0) { #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 844 "gitg-ref-action-checkout.c" +#line 825 "gitg-ref-action-checkout.c" } else { #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" g_simple_async_result_complete (_data_->_async_result); -#line 848 "gitg-ref-action-checkout.c" +#line 829 "gitg-ref-action-checkout.c" } #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" g_object_unref (_data_->_async_result); #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return FALSE; -#line 854 "gitg-ref-action-checkout.c" +#line 835 "gitg-ref-action-checkout.c" } @@ -862,7 +843,7 @@ _tmp0_ = res; #line 131 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" gitg_ref_action_checkout_checkout_finish (self, _tmp0_); -#line 866 "gitg-ref-action-checkout.c" +#line 847 "gitg-ref-action-checkout.c" } @@ -871,7 +852,7 @@ __lambda5_ ((GitgRefActionCheckout*) self, source_object, res); #line 130 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" g_object_unref (self); -#line 875 "gitg-ref-action-checkout.c" +#line 856 "gitg-ref-action-checkout.c" } @@ -881,7 +862,7 @@ self = (GitgRefActionCheckout*) base; #line 130 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" gitg_ref_action_checkout_checkout (self, ___lambda5__gasync_ready_callback, g_object_ref (self)); -#line 885 "gitg-ref-action-checkout.c" +#line 866 "gitg-ref-action-checkout.c" } @@ -900,27 +881,31 @@ result = _tmp1_; #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return result; -#line 904 "gitg-ref-action-checkout.c" +#line 885 "gitg-ref-action-checkout.c" } static void gitg_ref_action_checkout_real_set_application (GitgExtUIElement* base, GitgExtApplication* value) { GitgRefActionCheckout* self; - GitgExtApplication* _tmp0_ = NULL; - GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" self = (GitgRefActionCheckout*) base; #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp0_ = value; + if (gitg_ref_action_checkout_real_get_application (self) != value) { +#line 895 "gitg-ref-action-checkout.c" + GitgExtApplication* _tmp0_ = NULL; + GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _g_object_unref0 (self->priv->_application); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" + _g_object_unref0 (self->priv->_application); #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - self->priv->_application = _tmp1_; + self->priv->_application = _tmp1_; #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - g_object_notify ((GObject *) self, "application"); -#line 924 "gitg-ref-action-checkout.c" + g_object_notify ((GObject *) self, "application"); +#line 908 "gitg-ref-action-checkout.c" + } } @@ -936,27 +921,31 @@ result = _tmp0_; #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return result; -#line 940 "gitg-ref-action-checkout.c" +#line 925 "gitg-ref-action-checkout.c" } static void gitg_ref_action_checkout_real_set_action_interface (GitgExtRefAction* base, GitgExtRefActionInterface* value) { GitgRefActionCheckout* self; - GitgExtRefActionInterface* _tmp0_ = NULL; - GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" self = (GitgRefActionCheckout*) base; #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp0_ = value; + if (gitg_ref_action_checkout_real_get_action_interface (self) != value) { +#line 935 "gitg-ref-action-checkout.c" + GitgExtRefActionInterface* _tmp0_ = NULL; + GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _g_object_unref0 (self->priv->_action_interface); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - self->priv->_action_interface = _tmp1_; + _g_object_unref0 (self->priv->_action_interface); #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - g_object_notify ((GObject *) self, "action-interface"); -#line 960 "gitg-ref-action-checkout.c" + self->priv->_action_interface = _tmp1_; +#line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" + g_object_notify ((GObject *) self, "action-interface"); +#line 948 "gitg-ref-action-checkout.c" + } } @@ -972,27 +961,31 @@ result = _tmp0_; #line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return result; -#line 976 "gitg-ref-action-checkout.c" +#line 965 "gitg-ref-action-checkout.c" } static void gitg_ref_action_checkout_real_set_reference (GitgExtRefAction* base, GitgRef* value) { GitgRefActionCheckout* self; - GitgRef* _tmp0_ = NULL; - GitgRef* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" self = (GitgRefActionCheckout*) base; #line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp0_ = value; + if (gitg_ref_action_checkout_real_get_reference (self) != value) { +#line 975 "gitg-ref-action-checkout.c" + GitgRef* _tmp0_ = NULL; + GitgRef* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _g_object_unref0 (self->priv->_reference); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" + _g_object_unref0 (self->priv->_reference); #line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - self->priv->_reference = _tmp1_; + self->priv->_reference = _tmp1_; #line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - g_object_notify ((GObject *) self, "reference"); -#line 996 "gitg-ref-action-checkout.c" + g_object_notify ((GObject *) self, "reference"); +#line 988 "gitg-ref-action-checkout.c" + } } @@ -1008,45 +1001,39 @@ result = _tmp0_; #line 43 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return result; -#line 1012 "gitg-ref-action-checkout.c" +#line 1005 "gitg-ref-action-checkout.c" } static gchar* gitg_ref_action_checkout_real_get_display_name (GitgExtUIElement* base) { gchar* result; GitgRefActionCheckout* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 48 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" self = (GitgRefActionCheckout*) base; #line 48 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp0_ = _ ("Checkout"); -#line 48 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (_ ("Checkout")); #line 48 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - result = _tmp1_; + result = _tmp0_; #line 48 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return result; -#line 1031 "gitg-ref-action-checkout.c" +#line 1021 "gitg-ref-action-checkout.c" } static gchar* gitg_ref_action_checkout_real_get_description (GitgExtUIElement* base) { gchar* result; GitgRefActionCheckout* self; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_ = NULL; #line 53 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" self = (GitgRefActionCheckout*) base; #line 53 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp0_ = _ ("Checkout the selected reference"); + _tmp0_ = g_strdup (_ ("Checkout the selected reference")); #line 53 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 53 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - result = _tmp1_; + result = _tmp0_; #line 53 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return result; -#line 1050 "gitg-ref-action-checkout.c" +#line 1037 "gitg-ref-action-checkout.c" } @@ -1056,7 +1043,7 @@ GError * _inner_error_ = NULL; #line 58 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" self = (GitgRefActionCheckout*) base; -#line 1060 "gitg-ref-action-checkout.c" +#line 1047 "gitg-ref-action-checkout.c" { gboolean _tmp0_ = FALSE; GitgRef* _tmp1_ = NULL; @@ -1070,7 +1057,7 @@ _tmp3_ = ggit_ref_is_branch ((GgitRef*) _tmp2_); #line 62 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" if (_tmp3_) { -#line 1074 "gitg-ref-action-checkout.c" +#line 1061 "gitg-ref-action-checkout.c" gboolean _tmp4_ = FALSE; GitgRef* _tmp5_ = NULL; GitgRef* _tmp6_ = NULL; @@ -1085,22 +1072,22 @@ _tmp4_ = _tmp7_; #line 62 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1089 "gitg-ref-action-checkout.c" +#line 1076 "gitg-ref-action-checkout.c" goto __catch25_g_error; } #line 62 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _tmp0_ = !_tmp4_; -#line 1094 "gitg-ref-action-checkout.c" +#line 1081 "gitg-ref-action-checkout.c" } else { #line 62 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _tmp0_ = FALSE; -#line 1098 "gitg-ref-action-checkout.c" +#line 1085 "gitg-ref-action-checkout.c" } #line 62 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" result = _tmp0_; #line 62 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return result; -#line 1104 "gitg-ref-action-checkout.c" +#line 1091 "gitg-ref-action-checkout.c" } goto __finally25; __catch25_g_error: @@ -1109,7 +1096,7 @@ g_clear_error (&_inner_error_); #line 60 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" _inner_error_ = NULL; -#line 1113 "gitg-ref-action-checkout.c" +#line 1100 "gitg-ref-action-checkout.c" } __finally25: #line 60 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" @@ -1120,13 +1107,13 @@ g_clear_error (&_inner_error_); #line 60 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return FALSE; -#line 1124 "gitg-ref-action-checkout.c" +#line 1111 "gitg-ref-action-checkout.c" } #line 65 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" result = FALSE; #line 65 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" return result; -#line 1130 "gitg-ref-action-checkout.c" +#line 1117 "gitg-ref-action-checkout.c" } @@ -1155,7 +1142,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REF_ACTION_CHECKOUT_DESCRIPTION, g_param_spec_string ("description", "description", "description", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REF_ACTION_CHECKOUT_ENABLED, g_param_spec_boolean ("enabled", "enabled", "enabled", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1159 "gitg-ref-action-checkout.c" +#line 1146 "gitg-ref-action-checkout.c" } @@ -1163,7 +1150,7 @@ #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" gitg_ref_action_checkout_gitg_ext_ui_element_parent_iface = g_type_interface_peek_parent (iface); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" - iface->activate = (void (*)(GitgExtUIElement*)) gitg_ref_action_checkout_real_activate; + iface->activate = (void (*) (GitgExtUIElement *)) gitg_ref_action_checkout_real_activate; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" iface->get_application = gitg_ref_action_checkout_real_get_application; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" @@ -1176,14 +1163,14 @@ iface->get_description = gitg_ref_action_checkout_real_get_description; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" iface->get_enabled = gitg_ref_action_checkout_real_get_enabled; -#line 1180 "gitg-ref-action-checkout.c" +#line 1167 "gitg-ref-action-checkout.c" } static void gitg_ref_action_checkout_gitg_ext_action_interface_init (GitgExtActionIface * iface) { #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" gitg_ref_action_checkout_gitg_ext_action_parent_iface = g_type_interface_peek_parent (iface); -#line 1187 "gitg-ref-action-checkout.c" +#line 1174 "gitg-ref-action-checkout.c" } @@ -1198,18 +1185,18 @@ iface->get_reference = gitg_ref_action_checkout_real_get_reference; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" iface->set_reference = gitg_ref_action_checkout_real_set_reference; -#line 1202 "gitg-ref-action-checkout.c" +#line 1189 "gitg-ref-action-checkout.c" } static void gitg_ref_action_checkout_instance_init (GitgRefActionCheckout * self) { #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" self->priv = GITG_REF_ACTION_CHECKOUT_GET_PRIVATE (self); -#line 1209 "gitg-ref-action-checkout.c" +#line 1196 "gitg-ref-action-checkout.c" } -static void gitg_ref_action_checkout_finalize (GObject* obj) { +static void gitg_ref_action_checkout_finalize (GObject * obj) { GitgRefActionCheckout * self; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_REF_ACTION_CHECKOUT, GitgRefActionCheckout); @@ -1221,7 +1208,7 @@ _g_object_unref0 (self->priv->_reference); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" G_OBJECT_CLASS (gitg_ref_action_checkout_parent_class)->finalize (obj); -#line 1225 "gitg-ref-action-checkout.c" +#line 1212 "gitg-ref-action-checkout.c" } @@ -1290,13 +1277,13 @@ g_value_set_boolean (value, gitg_ext_ui_element_get_enabled ((GitgExtUIElement*) self)); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" break; -#line 1294 "gitg-ref-action-checkout.c" +#line 1281 "gitg-ref-action-checkout.c" default: #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" break; -#line 1300 "gitg-ref-action-checkout.c" +#line 1287 "gitg-ref-action-checkout.c" } } @@ -1324,13 +1311,13 @@ gitg_ext_ref_action_set_reference ((GitgExtRefAction*) self, g_value_get_object (value)); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" break; -#line 1328 "gitg-ref-action-checkout.c" +#line 1315 "gitg-ref-action-checkout.c" default: #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-checkout.vala" break; -#line 1334 "gitg-ref-action-checkout.c" +#line 1321 "gitg-ref-action-checkout.c" } } diff -Nru gitg-3.22.0/tests/gitg/gitg-ref-action-merge.c gitg-3.23.0/tests/gitg/gitg-ref-action-merge.c --- gitg-3.22.0/tests/gitg/gitg-ref-action-merge.c 2016-08-09 09:51:19.000000000 +0000 +++ gitg-3.23.0/tests/gitg/gitg-ref-action-merge.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* gitg-ref-action-merge.c generated by valac 0.32.1, the Vala compiler +/* gitg-ref-action-merge.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from gitg-ref-action-merge.vala, do not modify */ /* @@ -170,64 +170,56 @@ gchar* _tmp13_; gchar* _tmp14_; GitgSimpleNotification* _tmp15_; - const gchar* _tmp16_; GitgRef* head; gboolean ishead; - GitgActionSupport* _tmp17_; + GitgActionSupport* _tmp16_; + GitgRef* _tmp17_; GitgRef* _tmp18_; - GitgRef* _tmp19_; - gboolean _tmp20_; + gboolean _tmp19_; gchar* message; - gboolean _tmp21_; + gboolean _tmp20_; + const gchar* _tmp21_; const gchar* _tmp22_; - const gchar* _tmp23_; - const gchar* _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; - const gchar* _tmp27_; - const gchar* _tmp28_; - gchar* _tmp29_; - gchar* _tmp30_; - const gchar* _tmp31_; - const gchar* _tmp32_; + gchar* _tmp23_; + gchar* _tmp24_; + const gchar* _tmp25_; + const gchar* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + const gchar* _tmp29_; + const gchar* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; gchar* _tmp33_; - gchar* _tmp34_; - gchar* _tmp35_; - const gchar* _tmp36_; - const gchar* _tmp37_; + const gchar* _tmp34_; + const gchar* _tmp35_; + gchar* _tmp36_; + gchar* _tmp37_; const gchar* _tmp38_; - gchar* _tmp39_; + const gchar* _tmp39_; gchar* _tmp40_; - const gchar* _tmp41_; - const gchar* _tmp42_; - gchar* _tmp43_; - gchar* _tmp44_; - gchar* _tmp45_; + gchar* _tmp41_; + gchar* _tmp42_; GitgExtUserQuery* q; - const gchar* _tmp46_; - const gchar* _tmp47_; - const gchar* _tmp48_; - const gchar* _tmp49_; - GitgExtUserQuery* _tmp50_; - GitgExtApplication* _tmp51_; - GitgExtApplication* _tmp52_; - GitgExtApplication* _tmp53_; - GitgExtUserQuery* _tmp54_; - GtkResponseType _tmp55_; - gboolean _tmp56_; - GitgSimpleNotification* _tmp57_; - const gchar* _tmp58_; - GitgActionSupport* _tmp59_; - GitgSimpleNotification* _tmp60_; - GitgRef* _tmp61_; - GitgRef* _tmp62_; - GgitIndex* _tmp63_; - GitgRef* _tmp64_; - gboolean _tmp65_; - GgitIndex* _tmp66_; - GitgRef* _tmp67_; - GitgSimpleNotification* _tmp68_; - const gchar* _tmp69_; + const gchar* _tmp43_; + GitgExtUserQuery* _tmp44_; + GitgExtApplication* _tmp45_; + GitgExtApplication* _tmp46_; + GitgExtApplication* _tmp47_; + GitgExtUserQuery* _tmp48_; + GtkResponseType _tmp49_; + gboolean _tmp50_; + GitgSimpleNotification* _tmp51_; + GitgActionSupport* _tmp52_; + GitgSimpleNotification* _tmp53_; + GitgRef* _tmp54_; + GitgRef* _tmp55_; + GgitIndex* _tmp56_; + GitgRef* _tmp57_; + gboolean _tmp58_; + GgitIndex* _tmp59_; + GitgRef* _tmp60_; + GitgSimpleNotification* _tmp61_; }; struct _GitgRefActionMergeMergeData { @@ -260,110 +252,106 @@ GitgSimpleNotification* notification; const gchar* _tmp15_; const gchar* _tmp16_; - const gchar* _tmp17_; + gchar* _tmp17_; gchar* _tmp18_; - gchar* _tmp19_; + const gchar* _tmp19_; const gchar* _tmp20_; - const gchar* _tmp21_; + gchar* _tmp21_; gchar* _tmp22_; gchar* _tmp23_; gchar* _tmp24_; - gchar* _tmp25_; + GitgSimpleNotification* _tmp25_; GitgSimpleNotification* _tmp26_; - GitgSimpleNotification* _tmp27_; + GitgExtApplication* _tmp27_; GitgExtApplication* _tmp28_; GitgExtApplication* _tmp29_; - GitgExtApplication* _tmp30_; + GitgExtNotifications* _tmp30_; GitgExtNotifications* _tmp31_; GitgExtNotifications* _tmp32_; - GitgExtNotifications* _tmp33_; - GitgSimpleNotification* _tmp34_; - GgitRef* _tmp35_; + GitgSimpleNotification* _tmp33_; + GgitRef* _tmp34_; + GitgRef* _tmp35_; GitgRef* _tmp36_; - GitgRef* _tmp37_; - GgitRef* _tmp38_; - GgitObject* _tmp39_; + GgitRef* _tmp37_; + GgitObject* _tmp38_; + GgitRef* _tmp39_; GgitRef* _tmp40_; - GgitRef* _tmp41_; + GgitObject* _tmp41_; GgitObject* _tmp42_; GgitObject* _tmp43_; - GgitObject* _tmp44_; - GgitCommit* _tmp45_; + GgitCommit* _tmp44_; GError* e; - GitgSimpleNotification* _tmp46_; + GitgSimpleNotification* _tmp45_; + GError* _tmp46_; const gchar* _tmp47_; - GError* _tmp48_; - const gchar* _tmp49_; - gchar* _tmp50_; - gchar* _tmp51_; + gchar* _tmp48_; + gchar* _tmp49_; + GgitRef* _tmp50_; + GitgRef* _tmp51_; GgitRef* _tmp52_; - GitgRef* _tmp53_; + GgitObject* _tmp53_; GgitRef* _tmp54_; - GgitObject* _tmp55_; - GgitRef* _tmp56_; - GgitRef* _tmp57_; + GgitRef* _tmp55_; + GgitObject* _tmp56_; + GgitObject* _tmp57_; GgitObject* _tmp58_; - GgitObject* _tmp59_; - GgitObject* _tmp60_; - GgitCommit* _tmp61_; + GgitCommit* _tmp59_; GError* _vala1_e; - GitgSimpleNotification* _tmp62_; - const gchar* _tmp63_; - GError* _tmp64_; - const gchar* _tmp65_; - gchar* _tmp66_; - gchar* _tmp67_; + GitgSimpleNotification* _tmp60_; + GError* _tmp61_; + const gchar* _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; GgitIndex* index; - GitgSimpleNotification* _tmp68_; - GgitCommit* _tmp69_; - GgitCommit* _tmp70_; - GgitIndex* _tmp71_; - GgitIndex* _tmp72_; + GitgSimpleNotification* _tmp65_; + GgitCommit* _tmp66_; + GgitCommit* _tmp67_; + GgitIndex* _tmp68_; + GgitIndex* _tmp69_; + GgitIndex* _tmp70_; + gboolean _tmp71_; + GitgSimpleNotification* _tmp72_; GgitIndex* _tmp73_; - gboolean _tmp74_; - GitgSimpleNotification* _tmp75_; - GgitIndex* _tmp76_; - GitgRef* _tmp77_; + GitgRef* _tmp74_; gchar* msg; - GitgRef* _tmp78_; - GitgParsedRefName* _tmp79_; - GitgParsedRefName* _tmp80_; - GitgParsedRefName* _tmp81_; - GitgRefType _tmp82_; - GitgRefType _tmp83_; - gboolean _tmp84_; + GitgRef* _tmp75_; + GitgParsedRefName* _tmp76_; + GitgParsedRefName* _tmp77_; + GitgParsedRefName* _tmp78_; + GitgRefType _tmp79_; + GitgRefType _tmp80_; + gboolean _tmp81_; + const gchar* _tmp82_; + const gchar* _tmp83_; + gchar* _tmp84_; const gchar* _tmp85_; const gchar* _tmp86_; gchar* _tmp87_; - const gchar* _tmp88_; - const gchar* _tmp89_; - gchar* _tmp90_; GgitOId* oid; - GitgActionSupport* _tmp91_; - GitgSimpleNotification* _tmp92_; - GitgRef* _tmp93_; - GitgRef* _tmp94_; - GgitIndex* _tmp95_; - GgitCommit* _tmp96_; - GgitOId* _tmp97_; - GgitCommit* _tmp98_; + GitgActionSupport* _tmp88_; + GitgSimpleNotification* _tmp89_; + GitgRef* _tmp90_; + GitgRef* _tmp91_; + GgitIndex* _tmp92_; + GgitCommit* _tmp93_; + GgitOId* _tmp94_; + GgitCommit* _tmp95_; + GgitOId* _tmp96_; + GgitOId** _tmp97_; + const gchar* _tmp98_; GgitOId* _tmp99_; - GgitOId** _tmp100_; - const gchar* _tmp101_; - GgitOId* _tmp102_; - GgitOId* _tmp103_; - GitgSimpleNotification* _tmp104_; - const gchar* _tmp105_; + GgitOId* _tmp100_; + GitgSimpleNotification* _tmp101_; + const gchar* _tmp102_; + const gchar* _tmp103_; + gchar* _tmp104_; + gchar* _tmp105_; const gchar* _tmp106_; const gchar* _tmp107_; gchar* _tmp108_; gchar* _tmp109_; - const gchar* _tmp110_; - const gchar* _tmp111_; - gchar* _tmp112_; - gchar* _tmp113_; - gchar* _tmp114_; - gchar* _tmp115_; + gchar* _tmp110_; + gchar* _tmp111_; GError * _inner_error_; }; @@ -375,9 +363,9 @@ static gpointer gitg_ref_action_merge_parent_class = NULL; -static GitgExtUIElementIface* gitg_ref_action_merge_gitg_ext_ui_element_parent_iface = NULL; -static GitgExtActionIface* gitg_ref_action_merge_gitg_ext_action_parent_iface = NULL; -static GitgExtRefActionIface* gitg_ref_action_merge_gitg_ext_ref_action_parent_iface = NULL; +static GitgExtUIElementIface * gitg_ref_action_merge_gitg_ext_ui_element_parent_iface = NULL; +static GitgExtActionIface * gitg_ref_action_merge_gitg_ext_action_parent_iface = NULL; +static GitgExtRefActionIface * gitg_ref_action_merge_gitg_ext_ref_action_parent_iface = NULL; GType gitg_ref_action_merge_get_type (void) G_GNUC_CONST; static GType gitg_ref_action_merge_remote_source_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; @@ -398,7 +386,7 @@ GITG_REF_ACTION_MERGE_AVAILABLE, GITG_REF_ACTION_MERGE_ENABLED }; -static void _vala_GitgRefActionMergeRemoteSource_array_free (GitgRefActionMergeRemoteSource* array, gint array_length); +static void _vala_GitgRefActionMergeRemoteSource_array_free (GitgRefActionMergeRemoteSource * array, gint array_length); #define GITG_REF_ACTION_MERGE_version VERSION GitgRefActionMerge* gitg_ref_action_merge_new (GitgExtApplication* application, GitgExtRefActionInterface* action_interface, GitgRef* reference); GitgRefActionMerge* gitg_ref_action_merge_construct (GType object_type, GitgExtApplication* application, GitgExtRefActionInterface* action_interface, GitgRef* reference); @@ -423,7 +411,7 @@ static gboolean gitg_ref_action_merge_checkout_conflicts_finish (GitgRefActionMerge* self, GAsyncResult* _res_); static gboolean gitg_ref_action_merge_checkout_conflicts_co (GitgRefActionMergeCheckoutConflictsData* _data_); void gitg_simple_notification_set_message (GitgSimpleNotification* self, const gchar* value); -gboolean gitg_action_support_reference_is_head (GitgActionSupport* self, GitgRef* reference, GitgRef** head); +gboolean gitg_action_support_reference_is_head (GitgActionSupport* self, GitgRef* reference, GitgRef* * head); static void gitg_ref_action_merge_checkout_conflicts_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); void gitg_action_support_checkout_conflicts (GitgActionSupport* self, GitgSimpleNotification* notification, GitgRef* reference, GgitIndex* index, GitgRef* head, GAsyncReadyCallback _callback_, gpointer _user_data_); gboolean gitg_action_support_checkout_conflicts_finish (GitgActionSupport* self, GAsyncResult* _res_); @@ -447,34 +435,34 @@ static void __lambda16_ (Block24Data* _data24_); static void ___lambda16__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); static void gitg_ref_action_merge_ensure_sources (GitgRefActionMerge* self); -static void _vala_array_add12 (GitgRef*** array, int* length, int* size, GitgRef* value); -static void _vala_array_add13 (GitgRef*** array, int* length, int* size, GitgRef* value); -static void _vala_array_add14 (GitgRefActionMergeRemoteSource** array, int* length, int* size, const GitgRefActionMergeRemoteSource* value); -static void _vala_array_add15 (GitgRef*** array, int* length, int* size, GitgRef* value); +static void _vala_array_add12 (GitgRef** * array, int* length, int* size, GitgRef* value); +static void _vala_array_add13 (GitgRef** * array, int* length, int* size, GitgRef* value); +static void _vala_array_add14 (GitgRefActionMergeRemoteSource* * array, int* length, int* size, const GitgRefActionMergeRemoteSource* value); +static void _vala_array_add15 (GitgRef** * array, int* length, int* size, GitgRef* value); static void gitg_ref_action_merge_real_populate_menu (GitgExtAction* base, GtkMenu* menu); static GitgRef** _vala_array_dup1 (GitgRef** self, int length); -static void gitg_ref_action_merge_finalize (GObject* obj); +static void gitg_ref_action_merge_finalize (GObject * obj); static void _vala_gitg_ref_action_merge_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_ref_action_merge_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_GitgRefActionMergeRemoteSource_array_free (GitgRefActionMergeRemoteSource* array, gint array_length) { +static void _vala_GitgRefActionMergeRemoteSource_array_free (GitgRefActionMergeRemoteSource * array, gint array_length) { #line 41 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (array != NULL) { -#line 467 "gitg-ref-action-merge.c" +#line 455 "gitg-ref-action-merge.c" int i; #line 41 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" for (i = 0; i < array_length; i = i + 1) { #line 41 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_remote_source_destroy (&array[i]); -#line 473 "gitg-ref-action-merge.c" +#line 461 "gitg-ref-action-merge.c" } } #line 41 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_free (array); -#line 478 "gitg-ref-action-merge.c" +#line 466 "gitg-ref-action-merge.c" } @@ -512,14 +500,14 @@ self->priv->d_support = _tmp5_; #line 45 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return self; -#line 516 "gitg-ref-action-merge.c" +#line 504 "gitg-ref-action-merge.c" } GitgRefActionMerge* gitg_ref_action_merge_new (GitgExtApplication* application, GitgExtRefActionInterface* action_interface, GitgRef* reference) { #line 45 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return gitg_ref_action_merge_construct (GITG_TYPE_REF_ACTION_MERGE, application, action_interface, reference); -#line 523 "gitg-ref-action-merge.c" +#line 511 "gitg-ref-action-merge.c" } @@ -532,14 +520,14 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_slice_free (GitgRefActionMergeCreateMergeIndexData, _data_); -#line 536 "gitg-ref-action-merge.c" +#line 524 "gitg-ref-action-merge.c" } static gpointer _g_object_ref0 (gpointer self) { #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return self ? g_object_ref (self) : NULL; -#line 543 "gitg-ref-action-merge.c" +#line 531 "gitg-ref-action-merge.c" } @@ -588,7 +576,7 @@ _data_->theirs = _tmp6_; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_create_merge_index_co (_data_); -#line 592 "gitg-ref-action-merge.c" +#line 580 "gitg-ref-action-merge.c" } @@ -603,7 +591,7 @@ _data_->result = NULL; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return result; -#line 607 "gitg-ref-action-merge.c" +#line 595 "gitg-ref-action-merge.c" } @@ -612,7 +600,7 @@ g_atomic_int_inc (&_data23_->_ref_count_); #line 93 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return _data23_; -#line 616 "gitg-ref-action-merge.c" +#line 604 "gitg-ref-action-merge.c" } @@ -621,7 +609,7 @@ _data23_ = (Block23Data*) _userdata_; #line 93 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (g_atomic_int_dec_and_test (&_data23_->_ref_count_)) { -#line 625 "gitg-ref-action-merge.c" +#line 613 "gitg-ref-action-merge.c" GitgRefActionMerge* self; #line 93 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" self = _data23_->self; @@ -637,7 +625,7 @@ _g_object_unref0 (self); #line 93 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_slice_free (Block23Data, _data23_); -#line 641 "gitg-ref-action-merge.c" +#line 629 "gitg-ref-action-merge.c" } } @@ -645,7 +633,7 @@ static void _vala_GgitMergeOptions_free (GgitMergeOptions* self) { #line 107 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_boxed_free (ggit_merge_options_get_type (), self); -#line 649 "gitg-ref-action-merge.c" +#line 637 "gitg-ref-action-merge.c" } @@ -660,7 +648,7 @@ _tmp0_ = ggit_merge_options_new (); #line 98 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" options = _tmp0_; -#line 664 "gitg-ref-action-merge.c" +#line 652 "gitg-ref-action-merge.c" { GgitIndex* _tmp1_ = NULL; GitgExtApplication* _tmp2_ = NULL; @@ -705,7 +693,7 @@ _tmp1_ = _tmp12_; #line 102 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 709 "gitg-ref-action-merge.c" +#line 697 "gitg-ref-action-merge.c" goto __catch26_g_error; } #line 102 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -718,18 +706,17 @@ _data23_->index = _tmp13_; #line 100 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (_tmp1_); -#line 722 "gitg-ref-action-merge.c" +#line 710 "gitg-ref-action-merge.c" } goto __finally26; __catch26_g_error: { GError* e = NULL; GitgSimpleNotification* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - GError* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; + GError* _tmp15_ = NULL; + const gchar* _tmp16_ = NULL; + gchar* _tmp17_ = NULL; gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; #line 100 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" e = _inner_error_; #line 100 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -737,26 +724,24 @@ #line 106 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp14_ = _data23_->notification; #line 106 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp15_ = _ ("Failed to merge commits: %s"); + _tmp15_ = e; #line 106 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp16_ = e; + _tmp16_ = _tmp15_->message; #line 106 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp17_ = _tmp16_->message; + _tmp17_ = g_strdup_printf (_ ("Failed to merge commits: %s"), _tmp16_); #line 106 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp18_ = g_strdup_printf (_tmp15_, _tmp17_); + _tmp18_ = _tmp17_; #line 106 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp19_ = _tmp18_; -#line 106 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gitg_simple_notification_error (_tmp14_, _tmp19_); + gitg_simple_notification_error (_tmp14_, _tmp18_); #line 106 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_free0 (_tmp19_); + _g_free0 (_tmp18_); #line 107 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_error_free0 (e); #line 107 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" __vala_GgitMergeOptions_free0 (options); #line 107 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return; -#line 760 "gitg-ref-action-merge.c" +#line 745 "gitg-ref-action-merge.c" } __finally26: #line 100 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -767,18 +752,18 @@ __vala_GgitMergeOptions_free0 (options); #line 100 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return; -#line 771 "gitg-ref-action-merge.c" +#line 756 "gitg-ref-action-merge.c" } #line 97 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" __vala_GgitMergeOptions_free0 (options); -#line 775 "gitg-ref-action-merge.c" +#line 760 "gitg-ref-action-merge.c" } static void ___lambda14__gitg_async_thread_func (gpointer self, GError** error) { #line 97 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" __lambda14_ (self, error); -#line 782 "gitg-ref-action-merge.c" +#line 767 "gitg-ref-action-merge.c" } @@ -792,7 +777,7 @@ _data_->_res_ = _res_; #line 97 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_create_merge_index_co (_data_); -#line 796 "gitg-ref-action-merge.c" +#line 781 "gitg-ref-action-merge.c" } @@ -801,16 +786,16 @@ switch (_data_->_state_) { #line 93 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" case 0: -#line 805 "gitg-ref-action-merge.c" +#line 790 "gitg-ref-action-merge.c" goto _state_0; #line 93 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" case 1: -#line 809 "gitg-ref-action-merge.c" +#line 794 "gitg-ref-action-merge.c" goto _state_1; default: #line 93 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_assert_not_reached (); -#line 814 "gitg-ref-action-merge.c" +#line 799 "gitg-ref-action-merge.c" } _state_0: #line 93 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -853,7 +838,7 @@ gitg_async_thread_try (___lambda14__gitg_async_thread_func, _data_->_data23_, gitg_ref_action_merge_create_merge_index_ready, _data_); #line 97 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 857 "gitg-ref-action-merge.c" +#line 842 "gitg-ref-action-merge.c" _state_1: #line 97 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" gitg_async_thread_try_finish (_data_->_res_); @@ -871,11 +856,11 @@ if (_data_->_state_ == 0) { #line 111 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 875 "gitg-ref-action-merge.c" +#line 860 "gitg-ref-action-merge.c" } else { #line 111 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 879 "gitg-ref-action-merge.c" +#line 864 "gitg-ref-action-merge.c" } #line 111 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); @@ -889,36 +874,36 @@ if (_data_->_state_ == 0) { #line 93 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 893 "gitg-ref-action-merge.c" +#line 878 "gitg-ref-action-merge.c" } else { #line 93 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 897 "gitg-ref-action-merge.c" +#line 882 "gitg-ref-action-merge.c" } #line 93 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); #line 93 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 903 "gitg-ref-action-merge.c" +#line 888 "gitg-ref-action-merge.c" } static void _vala_GgitOId_free (GgitOId* self) { #line 122 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_boxed_free (ggit_oid_get_type (), self); -#line 910 "gitg-ref-action-merge.c" +#line 895 "gitg-ref-action-merge.c" } static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1434 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1435 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 922 "gitg-ref-action-merge.c" +#line 907 "gitg-ref-action-merge.c" } @@ -995,7 +980,7 @@ _g_object_unref0 (_tmp13_); #line 117 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" theirs_name = _tmp16_; -#line 999 "gitg-ref-action-merge.c" +#line 984 "gitg-ref-action-merge.c" { GgitRef* _tmp17_ = NULL; GitgRef* _tmp18_ = NULL; @@ -1024,7 +1009,7 @@ _tmp17_ = _tmp20_; #line 121 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1028 "gitg-ref-action-merge.c" +#line 1013 "gitg-ref-action-merge.c" goto __catch27_g_error; } #line 121 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -1071,14 +1056,14 @@ __vala_GgitOId_free0 (dest_oid); #line 122 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (_tmp17_); -#line 1075 "gitg-ref-action-merge.c" +#line 1060 "gitg-ref-action-merge.c" goto __catch27_g_error; } #line 119 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" __vala_GgitOId_free0 (dest_oid); #line 119 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (_tmp17_); -#line 1082 "gitg-ref-action-merge.c" +#line 1067 "gitg-ref-action-merge.c" } goto __finally27; __catch27_g_error: @@ -1087,7 +1072,7 @@ g_clear_error (&_inner_error_); #line 119 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _inner_error_ = NULL; -#line 1091 "gitg-ref-action-merge.c" +#line 1076 "gitg-ref-action-merge.c" } __finally27: #line 119 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -1102,7 +1087,7 @@ g_clear_error (&_inner_error_); #line 119 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return; -#line 1106 "gitg-ref-action-merge.c" +#line 1091 "gitg-ref-action-merge.c" } { GgitRef* _tmp33_ = NULL; @@ -1129,7 +1114,7 @@ _tmp33_ = _tmp35_; #line 127 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1133 "gitg-ref-action-merge.c" +#line 1118 "gitg-ref-action-merge.c" goto __catch28_g_error; } #line 127 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -1176,14 +1161,14 @@ __vala_GgitOId_free0 (source_oid); #line 128 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (_tmp33_); -#line 1180 "gitg-ref-action-merge.c" +#line 1165 "gitg-ref-action-merge.c" goto __catch28_g_error; } #line 125 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" __vala_GgitOId_free0 (source_oid); #line 125 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (_tmp33_); -#line 1187 "gitg-ref-action-merge.c" +#line 1172 "gitg-ref-action-merge.c" } goto __finally28; __catch28_g_error: @@ -1192,7 +1177,7 @@ g_clear_error (&_inner_error_); #line 125 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _inner_error_ = NULL; -#line 1196 "gitg-ref-action-merge.c" +#line 1181 "gitg-ref-action-merge.c" } __finally28: #line 125 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -1207,7 +1192,7 @@ g_clear_error (&_inner_error_); #line 125 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return; -#line 1211 "gitg-ref-action-merge.c" +#line 1196 "gitg-ref-action-merge.c" } { const gchar* _tmp48_ = NULL; @@ -1225,7 +1210,7 @@ _g_free0 (_tmp50_); #line 133 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1229 "gitg-ref-action-merge.c" +#line 1214 "gitg-ref-action-merge.c" goto __catch29_g_error; } } @@ -1236,7 +1221,7 @@ g_clear_error (&_inner_error_); #line 131 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _inner_error_ = NULL; -#line 1240 "gitg-ref-action-merge.c" +#line 1225 "gitg-ref-action-merge.c" } __finally29: #line 131 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -1251,7 +1236,7 @@ g_clear_error (&_inner_error_); #line 131 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return; -#line 1255 "gitg-ref-action-merge.c" +#line 1240 "gitg-ref-action-merge.c" } { gchar* msg = NULL; @@ -1291,7 +1276,7 @@ _g_object_unref0 (_tmp54_); #line 140 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp57_) { -#line 1295 "gitg-ref-action-merge.c" +#line 1280 "gitg-ref-action-merge.c" const gchar* _tmp58_ = NULL; const gchar* _tmp59_ = NULL; gchar* _tmp60_ = NULL; @@ -1305,7 +1290,7 @@ _g_free0 (msg); #line 142 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" msg = _tmp60_; -#line 1309 "gitg-ref-action-merge.c" +#line 1294 "gitg-ref-action-merge.c" } else { const gchar* _tmp61_ = NULL; const gchar* _tmp62_ = NULL; @@ -1320,7 +1305,7 @@ _g_free0 (msg); #line 146 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" msg = _tmp63_; -#line 1324 "gitg-ref-action-merge.c" +#line 1309 "gitg-ref-action-merge.c" } #line 149 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp64_ = msg; @@ -1340,19 +1325,19 @@ _tmp68_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 152 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" seen = _tmp68_; -#line 1344 "gitg-ref-action-merge.c" +#line 1329 "gitg-ref-action-merge.c" { gint i = 0; #line 154 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" i = 0; -#line 1349 "gitg-ref-action-merge.c" +#line 1334 "gitg-ref-action-merge.c" { gboolean _tmp69_ = FALSE; #line 154 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp69_ = TRUE; #line 154 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" while (TRUE) { -#line 1356 "gitg-ref-action-merge.c" +#line 1341 "gitg-ref-action-merge.c" gint _tmp71_ = 0; GgitIndexEntries* _tmp72_ = NULL; guint _tmp73_ = 0U; @@ -1369,13 +1354,13 @@ gboolean _tmp82_ = FALSE; #line 154 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (!_tmp69_) { -#line 1373 "gitg-ref-action-merge.c" +#line 1358 "gitg-ref-action-merge.c" gint _tmp70_ = 0; #line 154 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp70_ = i; #line 154 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" i = _tmp70_ + 1; -#line 1379 "gitg-ref-action-merge.c" +#line 1364 "gitg-ref-action-merge.c" } #line 154 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp69_ = FALSE; @@ -1389,7 +1374,7 @@ if (!(((guint) _tmp71_) < _tmp73_)) { #line 154 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" break; -#line 1393 "gitg-ref-action-merge.c" +#line 1378 "gitg-ref-action-merge.c" } #line 156 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp74_ = entries; @@ -1413,7 +1398,7 @@ _tmp82_ = ggit_index_entry_is_conflict (_tmp81_); #line 159 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp82_) { -#line 1417 "gitg-ref-action-merge.c" +#line 1402 "gitg-ref-action-merge.c" GeeHashSet* _tmp83_ = NULL; const gchar* _tmp84_ = NULL; gboolean _tmp85_ = FALSE; @@ -1425,15 +1410,15 @@ _tmp85_ = gee_abstract_collection_contains ((GeeAbstractCollection*) _tmp83_, _tmp84_); #line 159 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp80_ = !_tmp85_; -#line 1429 "gitg-ref-action-merge.c" +#line 1414 "gitg-ref-action-merge.c" } else { #line 159 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp80_ = FALSE; -#line 1433 "gitg-ref-action-merge.c" +#line 1418 "gitg-ref-action-merge.c" } #line 159 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp80_) { -#line 1437 "gitg-ref-action-merge.c" +#line 1422 "gitg-ref-action-merge.c" const gchar* _tmp86_ = NULL; const gchar* _tmp87_ = NULL; gchar* _tmp88_ = NULL; @@ -1463,13 +1448,13 @@ _tmp92_ = p; #line 162 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _tmp91_, _tmp92_); -#line 1467 "gitg-ref-action-merge.c" +#line 1452 "gitg-ref-action-merge.c" } #line 154 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_free0 (p); #line 154 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _ggit_index_entry_unref0 (entry); -#line 1473 "gitg-ref-action-merge.c" +#line 1458 "gitg-ref-action-merge.c" } } } @@ -1493,7 +1478,7 @@ _ggit_index_entries_unref0 (entries); #line 166 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_free0 (msg); -#line 1497 "gitg-ref-action-merge.c" +#line 1482 "gitg-ref-action-merge.c" goto __catch30_g_error; } #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -1502,7 +1487,7 @@ _ggit_index_entries_unref0 (entries); #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_free0 (msg); -#line 1506 "gitg-ref-action-merge.c" +#line 1491 "gitg-ref-action-merge.c" } goto __finally30; __catch30_g_error: @@ -1511,7 +1496,7 @@ g_clear_error (&_inner_error_); #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _inner_error_ = NULL; -#line 1515 "gitg-ref-action-merge.c" +#line 1500 "gitg-ref-action-merge.c" } __finally30: #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -1526,13 +1511,13 @@ g_clear_error (&_inner_error_); #line 136 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return; -#line 1530 "gitg-ref-action-merge.c" +#line 1515 "gitg-ref-action-merge.c" } #line 114 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_free0 (theirs_name); #line 114 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_free0 (wd); -#line 1536 "gitg-ref-action-merge.c" +#line 1521 "gitg-ref-action-merge.c" } @@ -1549,7 +1534,7 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_slice_free (GitgRefActionMergeCheckoutConflictsData, _data_); -#line 1553 "gitg-ref-action-merge.c" +#line 1538 "gitg-ref-action-merge.c" } @@ -1598,7 +1583,7 @@ _data_->source = _tmp6_; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_checkout_conflicts_co (_data_); -#line 1602 "gitg-ref-action-merge.c" +#line 1587 "gitg-ref-action-merge.c" } @@ -1611,7 +1596,7 @@ result = _data_->result; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return result; -#line 1615 "gitg-ref-action-merge.c" +#line 1600 "gitg-ref-action-merge.c" } @@ -1625,7 +1610,7 @@ _data_->_res_ = _res_; #line 197 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_checkout_conflicts_co (_data_); -#line 1629 "gitg-ref-action-merge.c" +#line 1614 "gitg-ref-action-merge.c" } @@ -1634,20 +1619,20 @@ switch (_data_->_state_) { #line 170 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" case 0: -#line 1638 "gitg-ref-action-merge.c" +#line 1623 "gitg-ref-action-merge.c" goto _state_0; #line 170 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" case 1: -#line 1642 "gitg-ref-action-merge.c" +#line 1627 "gitg-ref-action-merge.c" goto _state_1; #line 170 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" case 2: -#line 1646 "gitg-ref-action-merge.c" +#line 1631 "gitg-ref-action-merge.c" goto _state_2; default: #line 170 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_assert_not_reached (); -#line 1651 "gitg-ref-action-merge.c" +#line 1636 "gitg-ref-action-merge.c" } _state_0: #line 172 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -1723,226 +1708,198 @@ #line 175 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp15_ = _data_->notification; #line 175 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp16_ = NULL; -#line 175 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp16_ = _ ("Merge has conflicts"); -#line 175 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gitg_simple_notification_set_message (_data_->_tmp15_, _data_->_tmp16_); + gitg_simple_notification_set_message (_data_->_tmp15_, _ ("Merge has conflicts")); #line 177 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->head = NULL; #line 178 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp17_ = NULL; + _data_->_tmp16_ = NULL; #line 178 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp17_ = _data_->self->priv->d_support; + _data_->_tmp16_ = _data_->self->priv->d_support; #line 178 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp18_ = NULL; + _data_->_tmp17_ = NULL; #line 178 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp18_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) _data_->self); + _data_->_tmp17_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) _data_->self); #line 178 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp19_ = NULL; + _data_->_tmp18_ = NULL; #line 178 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp19_ = _data_->_tmp18_; + _data_->_tmp18_ = _data_->_tmp17_; #line 178 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp20_ = FALSE; + _data_->_tmp19_ = FALSE; #line 178 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp20_ = gitg_action_support_reference_is_head (_data_->_tmp17_, _data_->_tmp19_, &_data_->head); + _data_->_tmp19_ = gitg_action_support_reference_is_head (_data_->_tmp16_, _data_->_tmp18_, &_data_->head); #line 178 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->ishead = _data_->_tmp20_; + _data_->ishead = _data_->_tmp19_; #line 182 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp21_ = FALSE; + _data_->_tmp20_ = FALSE; #line 182 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp21_ = _data_->ishead; + _data_->_tmp20_ = _data_->ishead; #line 182 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - if (_data_->_tmp21_) { + if (_data_->_tmp20_) { +#line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _data_->_tmp21_ = NULL; +#line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _data_->_tmp21_ = _data_->theirs_name; #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp22_ = NULL; #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp22_ = _ ("The merge of %s into %s has caused conflicts, would you like to checko" \ -"ut branch %s with the merge to your working directory to resolve the c" \ -"onflicts?"); + _data_->_tmp22_ = string_to_string (_data_->_tmp21_); #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp23_ = NULL; #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp23_ = _data_->theirs_name; + _data_->_tmp23_ = g_strconcat ("'", _data_->_tmp22_, "'", NULL); #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp24_ = NULL; #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp24_ = string_to_string (_data_->_tmp23_); + _data_->_tmp24_ = _data_->_tmp23_; #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp25_ = NULL; #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp25_ = g_strconcat ("'", _data_->_tmp24_, "'", NULL); + _data_->_tmp25_ = _data_->ours_name; #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp26_ = NULL; #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp26_ = _data_->_tmp25_; + _data_->_tmp26_ = string_to_string (_data_->_tmp25_); #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp27_ = NULL; #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp27_ = _data_->ours_name; + _data_->_tmp27_ = g_strconcat ("'", _data_->_tmp26_, "'", NULL); #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp28_ = NULL; #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp28_ = string_to_string (_data_->_tmp27_); + _data_->_tmp28_ = _data_->_tmp27_; #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp29_ = NULL; #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp29_ = g_strconcat ("'", _data_->_tmp28_, "'", NULL); + _data_->_tmp29_ = _data_->ours_name; #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp30_ = NULL; #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp30_ = _data_->_tmp29_; + _data_->_tmp30_ = string_to_string (_data_->_tmp29_); #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp31_ = NULL; #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp31_ = _data_->ours_name; + _data_->_tmp31_ = g_strconcat ("'", _data_->_tmp30_, "'", NULL); #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp32_ = NULL; #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp32_ = string_to_string (_data_->_tmp31_); + _data_->_tmp32_ = _data_->_tmp31_; #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp33_ = NULL; #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp33_ = g_strconcat ("'", _data_->_tmp32_, "'", NULL); -#line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp34_ = NULL; -#line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp34_ = _data_->_tmp33_; -#line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp35_ = NULL; -#line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp35_ = g_strdup_printf (_data_->_tmp22_, _data_->_tmp26_, _data_->_tmp30_, _data_->_tmp34_); + _data_->_tmp33_ = g_strdup_printf (_ ("The merge of %s into %s has caused conflicts, would you like to checko" \ +"ut branch %s with the merge to your working directory to resolve the c" \ +"onflicts?"), _data_->_tmp24_, _data_->_tmp28_, _data_->_tmp32_); #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_free0 (_data_->message); #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->message = _data_->_tmp35_; + _data_->message = _data_->_tmp33_; #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp34_); + _g_free0 (_data_->_tmp32_); #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp30_); + _g_free0 (_data_->_tmp28_); #line 184 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp26_); -#line 1824 "gitg-ref-action-merge.c" + _g_free0 (_data_->_tmp24_); +#line 1801 "gitg-ref-action-merge.c" } else { #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _data_->_tmp34_ = NULL; +#line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _data_->_tmp34_ = _data_->theirs_name; +#line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _data_->_tmp35_ = NULL; +#line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _data_->_tmp35_ = string_to_string (_data_->_tmp34_); +#line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp36_ = NULL; #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp36_ = _ ("The merge of %s into %s has caused conflicts, would you like to checko" \ -"ut the merge to your working directory to resolve the conflicts?"); + _data_->_tmp36_ = g_strconcat ("'", _data_->_tmp35_, "'", NULL); #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp37_ = NULL; #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp37_ = _data_->theirs_name; + _data_->_tmp37_ = _data_->_tmp36_; #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp38_ = NULL; #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp38_ = string_to_string (_data_->_tmp37_); + _data_->_tmp38_ = _data_->ours_name; #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp39_ = NULL; #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp39_ = g_strconcat ("'", _data_->_tmp38_, "'", NULL); + _data_->_tmp39_ = string_to_string (_data_->_tmp38_); #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp40_ = NULL; #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp40_ = _data_->_tmp39_; + _data_->_tmp40_ = g_strconcat ("'", _data_->_tmp39_, "'", NULL); #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp41_ = NULL; #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp41_ = _data_->ours_name; + _data_->_tmp41_ = _data_->_tmp40_; #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp42_ = NULL; #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp42_ = string_to_string (_data_->_tmp41_); -#line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp43_ = NULL; -#line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp43_ = g_strconcat ("'", _data_->_tmp42_, "'", NULL); -#line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp44_ = NULL; -#line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp44_ = _data_->_tmp43_; -#line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp45_ = NULL; -#line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp45_ = g_strdup_printf (_data_->_tmp36_, _data_->_tmp40_, _data_->_tmp44_); + _data_->_tmp42_ = g_strdup_printf (_ ("The merge of %s into %s has caused conflicts, would you like to checko" \ +"ut the merge to your working directory to resolve the conflicts?"), _data_->_tmp37_, _data_->_tmp41_); #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_free0 (_data_->message); #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->message = _data_->_tmp45_; + _data_->message = _data_->_tmp42_; #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp44_); + _g_free0 (_data_->_tmp41_); #line 188 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp40_); -#line 1874 "gitg-ref-action-merge.c" + _g_free0 (_data_->_tmp37_); +#line 1847 "gitg-ref-action-merge.c" } #line 191 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp46_ = NULL; -#line 191 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp46_ = _ ("Merge has conflicts"); -#line 191 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp47_ = NULL; -#line 191 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp47_ = _data_->message; -#line 191 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp48_ = NULL; + _data_->_tmp43_ = NULL; #line 191 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp48_ = _ ("Cancel"); + _data_->_tmp43_ = _data_->message; #line 191 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp49_ = NULL; + _data_->_tmp44_ = NULL; #line 191 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp49_ = _ ("Checkout"); + _data_->_tmp44_ = gitg_ext_user_query_new_full (_ ("Merge has conflicts"), _data_->_tmp43_, GTK_MESSAGE_QUESTION, _ ("Cancel"), GTK_RESPONSE_CANCEL, _ ("Checkout"), GTK_RESPONSE_OK, NULL); #line 191 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp50_ = NULL; -#line 191 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp50_ = gitg_ext_user_query_new_full (_data_->_tmp46_, _data_->_tmp47_, GTK_MESSAGE_QUESTION, _data_->_tmp48_, GTK_RESPONSE_CANCEL, _data_->_tmp49_, GTK_RESPONSE_OK, NULL); -#line 191 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->q = _data_->_tmp50_; + _data_->q = _data_->_tmp44_; #line 197 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp51_ = NULL; + _data_->_tmp45_ = NULL; #line 197 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp51_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); + _data_->_tmp45_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); #line 197 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp52_ = NULL; + _data_->_tmp46_ = NULL; #line 197 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp52_ = _data_->_tmp51_; + _data_->_tmp46_ = _data_->_tmp45_; #line 197 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp53_ = NULL; + _data_->_tmp47_ = NULL; #line 197 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp53_ = _data_->_tmp52_; + _data_->_tmp47_ = _data_->_tmp46_; #line 197 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp54_ = NULL; + _data_->_tmp48_ = NULL; #line 197 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp54_ = _data_->q; + _data_->_tmp48_ = _data_->q; #line 197 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_state_ = 1; #line 197 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gitg_ext_application_user_query_async (_data_->_tmp53_, _data_->_tmp54_, gitg_ref_action_merge_checkout_conflicts_ready, _data_); + gitg_ext_application_user_query_async (_data_->_tmp47_, _data_->_tmp48_, gitg_ref_action_merge_checkout_conflicts_ready, _data_); #line 197 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 1920 "gitg-ref-action-merge.c" +#line 1881 "gitg-ref-action-merge.c" _state_1: #line 197 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp55_ = 0; + _data_->_tmp49_ = 0; #line 197 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp55_ = gitg_ext_application_user_query_finish (_data_->_tmp53_, _data_->_res_); + _data_->_tmp49_ = gitg_ext_application_user_query_finish (_data_->_tmp47_, _data_->_res_); #line 197 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp56_ = FALSE; + _data_->_tmp50_ = FALSE; #line 197 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp56_ = _data_->_tmp55_ != GTK_RESPONSE_OK; + _data_->_tmp50_ = _data_->_tmp49_ != GTK_RESPONSE_OK; #line 197 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp53_); + _g_object_unref0 (_data_->_tmp47_); #line 197 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - if (_data_->_tmp56_) { + if (_data_->_tmp50_) { #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp57_ = NULL; -#line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp57_ = _data_->notification; -#line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp58_ = NULL; + _data_->_tmp51_ = NULL; #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp58_ = _ ("Merge failed with conflicts"); + _data_->_tmp51_ = _data_->notification; #line 199 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gitg_simple_notification_error (_data_->_tmp57_, _data_->_tmp58_); + gitg_simple_notification_error (_data_->_tmp51_, _ ("Merge failed with conflicts")); #line 200 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->result = FALSE; #line 200 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -1959,56 +1916,56 @@ if (_data_->_state_ == 0) { #line 200 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1960 "gitg-ref-action-merge.c" +#line 1917 "gitg-ref-action-merge.c" } else { #line 200 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1964 "gitg-ref-action-merge.c" +#line 1921 "gitg-ref-action-merge.c" } #line 200 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); #line 200 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 1970 "gitg-ref-action-merge.c" +#line 1927 "gitg-ref-action-merge.c" } #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp59_ = NULL; + _data_->_tmp52_ = NULL; #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp59_ = _data_->self->priv->d_support; + _data_->_tmp52_ = _data_->self->priv->d_support; #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp60_ = NULL; + _data_->_tmp53_ = NULL; #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp60_ = _data_->notification; + _data_->_tmp53_ = _data_->notification; #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp61_ = NULL; + _data_->_tmp54_ = NULL; #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp61_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) _data_->self); + _data_->_tmp54_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) _data_->self); #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp62_ = NULL; + _data_->_tmp55_ = NULL; #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp62_ = _data_->_tmp61_; + _data_->_tmp55_ = _data_->_tmp54_; #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp63_ = NULL; + _data_->_tmp56_ = NULL; #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp63_ = _data_->index; + _data_->_tmp56_ = _data_->index; #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp64_ = NULL; + _data_->_tmp57_ = NULL; #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp64_ = _data_->head; + _data_->_tmp57_ = _data_->head; #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_state_ = 2; #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gitg_action_support_checkout_conflicts (_data_->_tmp59_, _data_->_tmp60_, _data_->_tmp62_, _data_->_tmp63_, _data_->_tmp64_, gitg_ref_action_merge_checkout_conflicts_ready, _data_); + gitg_action_support_checkout_conflicts (_data_->_tmp52_, _data_->_tmp53_, _data_->_tmp55_, _data_->_tmp56_, _data_->_tmp57_, gitg_ref_action_merge_checkout_conflicts_ready, _data_); #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2002 "gitg-ref-action-merge.c" +#line 1959 "gitg-ref-action-merge.c" _state_2: #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp65_ = FALSE; + _data_->_tmp58_ = FALSE; #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp65_ = gitg_action_support_checkout_conflicts_finish (_data_->_tmp59_, _data_->_res_); + _data_->_tmp58_ = gitg_action_support_checkout_conflicts_finish (_data_->_tmp52_, _data_->_res_); #line 203 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - if (!_data_->_tmp65_) { + if (!_data_->_tmp58_) { #line 205 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->result = FALSE; #line 205 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -2025,38 +1982,34 @@ if (_data_->_state_ == 0) { #line 205 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2026 "gitg-ref-action-merge.c" +#line 1983 "gitg-ref-action-merge.c" } else { #line 205 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2030 "gitg-ref-action-merge.c" +#line 1987 "gitg-ref-action-merge.c" } #line 205 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); #line 205 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2036 "gitg-ref-action-merge.c" +#line 1993 "gitg-ref-action-merge.c" } #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp66_ = NULL; + _data_->_tmp59_ = NULL; #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp66_ = _data_->index; + _data_->_tmp59_ = _data_->index; #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp67_ = NULL; + _data_->_tmp60_ = NULL; #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp67_ = _data_->source; + _data_->_tmp60_ = _data_->source; #line 208 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gitg_ref_action_merge_write_merge_state_files (_data_->self, _data_->_tmp66_, _data_->_tmp67_); -#line 210 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp68_ = NULL; -#line 210 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp68_ = _data_->notification; + gitg_ref_action_merge_write_merge_state_files (_data_->self, _data_->_tmp59_, _data_->_tmp60_); #line 210 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp69_ = NULL; + _data_->_tmp61_ = NULL; #line 210 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp69_ = _ ("Finished merge with conflicts in working directory"); + _data_->_tmp61_ = _data_->notification; #line 210 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gitg_simple_notification_success (_data_->_tmp68_, _data_->_tmp69_); + gitg_simple_notification_success (_data_->_tmp61_, _ ("Finished merge with conflicts in working directory")); #line 211 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->result = TRUE; #line 211 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -2073,11 +2026,11 @@ if (_data_->_state_ == 0) { #line 211 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2074 "gitg-ref-action-merge.c" +#line 2027 "gitg-ref-action-merge.c" } else { #line 211 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2078 "gitg-ref-action-merge.c" +#line 2031 "gitg-ref-action-merge.c" } #line 211 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); @@ -2097,17 +2050,17 @@ if (_data_->_state_ == 0) { #line 170 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2098 "gitg-ref-action-merge.c" +#line 2051 "gitg-ref-action-merge.c" } else { #line 170 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2102 "gitg-ref-action-merge.c" +#line 2055 "gitg-ref-action-merge.c" } #line 170 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); #line 170 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2108 "gitg-ref-action-merge.c" +#line 2061 "gitg-ref-action-merge.c" } @@ -2122,7 +2075,7 @@ _g_object_unref0 (_data_->self); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_slice_free (GitgRefActionMergeMergeData, _data_); -#line 2123 "gitg-ref-action-merge.c" +#line 2076 "gitg-ref-action-merge.c" } @@ -2151,7 +2104,7 @@ _data_->source = _tmp2_; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_merge_co (_data_); -#line 2152 "gitg-ref-action-merge.c" +#line 2105 "gitg-ref-action-merge.c" } @@ -2166,7 +2119,7 @@ _data_->result = NULL; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return result; -#line 2167 "gitg-ref-action-merge.c" +#line 2120 "gitg-ref-action-merge.c" } @@ -2180,7 +2133,7 @@ _data_->_res_ = _res_; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_merge_co (_data_); -#line 2181 "gitg-ref-action-merge.c" +#line 2134 "gitg-ref-action-merge.c" } @@ -2189,24 +2142,24 @@ switch (_data_->_state_) { #line 214 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" case 0: -#line 2190 "gitg-ref-action-merge.c" +#line 2143 "gitg-ref-action-merge.c" goto _state_0; #line 214 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" case 1: -#line 2194 "gitg-ref-action-merge.c" +#line 2147 "gitg-ref-action-merge.c" goto _state_1; #line 214 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" case 2: -#line 2198 "gitg-ref-action-merge.c" +#line 2151 "gitg-ref-action-merge.c" goto _state_2; #line 214 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" case 3: -#line 2202 "gitg-ref-action-merge.c" +#line 2155 "gitg-ref-action-merge.c" goto _state_3; default: #line 214 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_assert_not_reached (); -#line 2207 "gitg-ref-action-merge.c" +#line 2160 "gitg-ref-action-merge.c" } _state_0: #line 219 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -2280,67 +2233,67 @@ #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp15_ = NULL; #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp15_ = _ ("Merge %s into %s"); + _data_->_tmp15_ = _data_->theirs_name; #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp16_ = NULL; #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp16_ = _data_->theirs_name; + _data_->_tmp16_ = string_to_string (_data_->_tmp15_); #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp17_ = NULL; #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp17_ = string_to_string (_data_->_tmp16_); + _data_->_tmp17_ = g_strconcat ("'", _data_->_tmp16_, "'", NULL); #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp18_ = NULL; #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp18_ = g_strconcat ("'", _data_->_tmp17_, "'", NULL); + _data_->_tmp18_ = _data_->_tmp17_; #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp19_ = NULL; #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp19_ = _data_->_tmp18_; + _data_->_tmp19_ = _data_->ours_name; #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp20_ = NULL; #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp20_ = _data_->ours_name; + _data_->_tmp20_ = string_to_string (_data_->_tmp19_); #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp21_ = NULL; #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp21_ = string_to_string (_data_->_tmp20_); + _data_->_tmp21_ = g_strconcat ("'", _data_->_tmp20_, "'", NULL); #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp22_ = NULL; #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp22_ = g_strconcat ("'", _data_->_tmp21_, "'", NULL); + _data_->_tmp22_ = _data_->_tmp21_; #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp23_ = NULL; #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp23_ = _data_->_tmp22_; + _data_->_tmp23_ = g_strdup_printf (_ ("Merge %s into %s"), _data_->_tmp18_, _data_->_tmp22_); #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp24_ = NULL; #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp24_ = g_strdup_printf (_data_->_tmp15_, _data_->_tmp19_, _data_->_tmp23_); + _data_->_tmp24_ = _data_->_tmp23_; #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp25_ = NULL; #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp25_ = _data_->_tmp24_; + _data_->_tmp25_ = gitg_simple_notification_new (_data_->_tmp24_, NULL); #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp26_ = NULL; #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp26_ = gitg_simple_notification_new (_data_->_tmp25_, NULL); + _data_->_tmp26_ = _data_->_tmp25_; #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp27_ = NULL; + _g_free0 (_data_->_tmp24_); #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp27_ = _data_->_tmp26_; + _g_free0 (_data_->_tmp22_); #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp25_); + _g_free0 (_data_->_tmp18_); #line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp23_); -#line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp19_); -#line 222 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->notification = _data_->_tmp27_; + _data_->notification = _data_->_tmp26_; +#line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _data_->_tmp27_ = NULL; +#line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _data_->_tmp27_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp28_ = NULL; #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp28_ = gitg_ext_ui_element_get_application ((GitgExtUIElement*) _data_->self); + _data_->_tmp28_ = _data_->_tmp27_; #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp29_ = NULL; #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -2348,11 +2301,11 @@ #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp30_ = NULL; #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp30_ = _data_->_tmp29_; + _data_->_tmp30_ = gitg_ext_application_get_notifications (_data_->_tmp29_); #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp31_ = NULL; #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp31_ = gitg_ext_application_get_notifications (_data_->_tmp30_); + _data_->_tmp31_ = _data_->_tmp30_; #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp32_ = NULL; #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -2360,92 +2313,88 @@ #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp33_ = NULL; #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp33_ = _data_->_tmp32_; + _data_->_tmp33_ = _data_->notification; #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp34_ = NULL; + gitg_ext_notifications_add (_data_->_tmp32_, (GitgExtNotification*) _data_->_tmp33_); #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp34_ = _data_->notification; + _g_object_unref0 (_data_->_tmp32_); #line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gitg_ext_notifications_add (_data_->_tmp33_, (GitgExtNotification*) _data_->_tmp34_); -#line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp33_); -#line 223 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp30_); -#line 2372 "gitg-ref-action-merge.c" + _g_object_unref0 (_data_->_tmp29_); +#line 2321 "gitg-ref-action-merge.c" { #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp36_ = NULL; + _data_->_tmp35_ = NULL; #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp36_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) _data_->self); + _data_->_tmp35_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) _data_->self); #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp37_ = NULL; + _data_->_tmp36_ = NULL; #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp37_ = _data_->_tmp36_; + _data_->_tmp36_ = _data_->_tmp35_; #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp38_ = NULL; + _data_->_tmp37_ = NULL; #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp38_ = ggit_ref_resolve ((GgitRef*) _data_->_tmp37_, &_data_->_inner_error_); + _data_->_tmp37_ = ggit_ref_resolve ((GgitRef*) _data_->_tmp36_, &_data_->_inner_error_); #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp35_ = _data_->_tmp38_; + _data_->_tmp34_ = _data_->_tmp37_; #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 2390 "gitg-ref-action-merge.c" +#line 2339 "gitg-ref-action-merge.c" goto __catch31_g_error; } #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp40_ = NULL; + _data_->_tmp39_ = NULL; #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp40_ = _data_->_tmp35_; + _data_->_tmp39_ = _data_->_tmp34_; #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp35_ = NULL; + _data_->_tmp34_ = NULL; #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp41_ = NULL; + _data_->_tmp40_ = NULL; #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp41_ = _data_->_tmp40_; + _data_->_tmp40_ = _data_->_tmp39_; #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp42_ = NULL; + _data_->_tmp41_ = NULL; #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp42_ = ggit_ref_lookup (_data_->_tmp41_, &_data_->_inner_error_); + _data_->_tmp41_ = ggit_ref_lookup (_data_->_tmp40_, &_data_->_inner_error_); #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp43_ = NULL; + _data_->_tmp42_ = NULL; #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp43_ = _data_->_tmp42_; + _data_->_tmp42_ = _data_->_tmp41_; #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp41_); + _g_object_unref0 (_data_->_tmp40_); #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp39_ = _data_->_tmp43_; + _data_->_tmp38_ = _data_->_tmp42_; #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp35_); -#line 2419 "gitg-ref-action-merge.c" + _g_object_unref0 (_data_->_tmp34_); +#line 2368 "gitg-ref-action-merge.c" goto __catch31_g_error; } #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp44_ = NULL; + _data_->_tmp43_ = NULL; #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp44_ = _data_->_tmp39_; + _data_->_tmp43_ = _data_->_tmp38_; #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp39_ = NULL; + _data_->_tmp38_ = NULL; #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp45_ = NULL; + _data_->_tmp44_ = NULL; #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp45_ = G_TYPE_CHECK_INSTANCE_TYPE (_data_->_tmp44_, ggit_commit_get_type ()) ? ((GgitCommit*) _data_->_tmp44_) : NULL; + _data_->_tmp44_ = G_TYPE_CHECK_INSTANCE_TYPE (_data_->_tmp43_, ggit_commit_get_type ()) ? ((GgitCommit*) _data_->_tmp43_) : NULL; #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - if (_data_->_tmp45_ == NULL) { + if (_data_->_tmp44_ == NULL) { #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp44_); -#line 2436 "gitg-ref-action-merge.c" + _g_object_unref0 (_data_->_tmp43_); +#line 2385 "gitg-ref-action-merge.c" } #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (_data_->ours); #line 227 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->ours = _data_->_tmp45_; + _data_->ours = _data_->_tmp44_; #line 225 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp39_); + _g_object_unref0 (_data_->_tmp38_); #line 225 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp35_); -#line 2446 "gitg-ref-action-merge.c" + _g_object_unref0 (_data_->_tmp34_); +#line 2395 "gitg-ref-action-merge.c" } goto __finally31; __catch31_g_error: @@ -2455,33 +2404,29 @@ #line 225 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_inner_error_ = NULL; #line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _data_->_tmp45_ = NULL; +#line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _data_->_tmp45_ = _data_->notification; +#line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp46_ = NULL; #line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp46_ = _data_->notification; + _data_->_tmp46_ = _data_->e; #line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp47_ = NULL; #line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp47_ = _ ("Failed to lookup our commit: %s"); + _data_->_tmp47_ = _data_->_tmp46_->message; #line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp48_ = NULL; #line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp48_ = _data_->e; + _data_->_tmp48_ = g_strdup_printf (_ ("Failed to lookup our commit: %s"), _data_->_tmp47_); #line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp49_ = NULL; #line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp49_ = _data_->_tmp48_->message; + _data_->_tmp49_ = _data_->_tmp48_; #line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp50_ = NULL; + gitg_simple_notification_error (_data_->_tmp45_, _data_->_tmp49_); #line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp50_ = g_strdup_printf (_data_->_tmp47_, _data_->_tmp49_); -#line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp51_ = NULL; -#line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp51_ = _data_->_tmp50_; -#line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gitg_simple_notification_error (_data_->_tmp46_, _data_->_tmp51_); -#line 231 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp51_); + _g_free0 (_data_->_tmp49_); #line 232 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->result = NULL; #line 232 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -2500,17 +2445,17 @@ if (_data_->_state_ == 0) { #line 232 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2501 "gitg-ref-action-merge.c" +#line 2446 "gitg-ref-action-merge.c" } else { #line 232 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2505 "gitg-ref-action-merge.c" +#line 2450 "gitg-ref-action-merge.c" } #line 232 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); #line 232 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2511 "gitg-ref-action-merge.c" +#line 2456 "gitg-ref-action-merge.c" } __finally31: #line 225 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -2531,78 +2476,78 @@ g_clear_error (&_data_->_inner_error_); #line 225 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2532 "gitg-ref-action-merge.c" +#line 2477 "gitg-ref-action-merge.c" } { #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp53_ = NULL; + _data_->_tmp51_ = NULL; #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp53_ = _data_->source; + _data_->_tmp51_ = _data_->source; #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp54_ = NULL; + _data_->_tmp52_ = NULL; #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp54_ = ggit_ref_resolve ((GgitRef*) _data_->_tmp53_, &_data_->_inner_error_); + _data_->_tmp52_ = ggit_ref_resolve ((GgitRef*) _data_->_tmp51_, &_data_->_inner_error_); #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp52_ = _data_->_tmp54_; + _data_->_tmp50_ = _data_->_tmp52_; #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { -#line 2547 "gitg-ref-action-merge.c" +#line 2492 "gitg-ref-action-merge.c" goto __catch32_g_error; } #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp56_ = NULL; + _data_->_tmp54_ = NULL; #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp56_ = _data_->_tmp52_; + _data_->_tmp54_ = _data_->_tmp50_; #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp52_ = NULL; + _data_->_tmp50_ = NULL; #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp57_ = NULL; + _data_->_tmp55_ = NULL; #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp57_ = _data_->_tmp56_; + _data_->_tmp55_ = _data_->_tmp54_; #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp58_ = NULL; + _data_->_tmp56_ = NULL; #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp58_ = ggit_ref_lookup (_data_->_tmp57_, &_data_->_inner_error_); + _data_->_tmp56_ = ggit_ref_lookup (_data_->_tmp55_, &_data_->_inner_error_); #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp59_ = NULL; + _data_->_tmp57_ = NULL; #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp59_ = _data_->_tmp58_; + _data_->_tmp57_ = _data_->_tmp56_; #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp57_); + _g_object_unref0 (_data_->_tmp55_); #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp55_ = _data_->_tmp59_; + _data_->_tmp53_ = _data_->_tmp57_; #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (G_UNLIKELY (_data_->_inner_error_ != NULL)) { #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp52_); -#line 2576 "gitg-ref-action-merge.c" + _g_object_unref0 (_data_->_tmp50_); +#line 2521 "gitg-ref-action-merge.c" goto __catch32_g_error; } #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp60_ = NULL; + _data_->_tmp58_ = NULL; #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp60_ = _data_->_tmp55_; + _data_->_tmp58_ = _data_->_tmp53_; #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp55_ = NULL; + _data_->_tmp53_ = NULL; #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp61_ = NULL; + _data_->_tmp59_ = NULL; #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp61_ = G_TYPE_CHECK_INSTANCE_TYPE (_data_->_tmp60_, ggit_commit_get_type ()) ? ((GgitCommit*) _data_->_tmp60_) : NULL; + _data_->_tmp59_ = G_TYPE_CHECK_INSTANCE_TYPE (_data_->_tmp58_, ggit_commit_get_type ()) ? ((GgitCommit*) _data_->_tmp58_) : NULL; #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - if (_data_->_tmp61_ == NULL) { + if (_data_->_tmp59_ == NULL) { #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp60_); -#line 2593 "gitg-ref-action-merge.c" + _g_object_unref0 (_data_->_tmp58_); +#line 2538 "gitg-ref-action-merge.c" } #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (_data_->theirs); #line 237 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->theirs = _data_->_tmp61_; + _data_->theirs = _data_->_tmp59_; #line 235 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp55_); + _g_object_unref0 (_data_->_tmp53_); #line 235 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp52_); -#line 2603 "gitg-ref-action-merge.c" + _g_object_unref0 (_data_->_tmp50_); +#line 2548 "gitg-ref-action-merge.c" } goto __finally32; __catch32_g_error: @@ -2612,33 +2557,29 @@ #line 235 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_inner_error_ = NULL; #line 241 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp62_ = NULL; -#line 241 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp62_ = _data_->notification; -#line 241 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp63_ = NULL; + _data_->_tmp60_ = NULL; #line 241 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp63_ = _ ("Failed to lookup their commit: %s"); + _data_->_tmp60_ = _data_->notification; #line 241 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp64_ = NULL; + _data_->_tmp61_ = NULL; #line 241 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp64_ = _data_->_vala1_e; + _data_->_tmp61_ = _data_->_vala1_e; #line 241 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp65_ = NULL; + _data_->_tmp62_ = NULL; #line 241 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp65_ = _data_->_tmp64_->message; + _data_->_tmp62_ = _data_->_tmp61_->message; #line 241 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp66_ = NULL; + _data_->_tmp63_ = NULL; #line 241 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp66_ = g_strdup_printf (_data_->_tmp63_, _data_->_tmp65_); + _data_->_tmp63_ = g_strdup_printf (_ ("Failed to lookup their commit: %s"), _data_->_tmp62_); #line 241 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp67_ = NULL; + _data_->_tmp64_ = NULL; #line 241 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp67_ = _data_->_tmp66_; + _data_->_tmp64_ = _data_->_tmp63_; #line 241 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gitg_simple_notification_error (_data_->_tmp62_, _data_->_tmp67_); + gitg_simple_notification_error (_data_->_tmp60_, _data_->_tmp64_); #line 241 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp67_); + _g_free0 (_data_->_tmp64_); #line 242 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->result = NULL; #line 242 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -2657,17 +2598,17 @@ if (_data_->_state_ == 0) { #line 242 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2658 "gitg-ref-action-merge.c" +#line 2599 "gitg-ref-action-merge.c" } else { #line 242 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2662 "gitg-ref-action-merge.c" +#line 2603 "gitg-ref-action-merge.c" } #line 242 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); #line 242 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2668 "gitg-ref-action-merge.c" +#line 2609 "gitg-ref-action-merge.c" } __finally32: #line 235 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -2688,40 +2629,40 @@ g_clear_error (&_data_->_inner_error_); #line 235 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2689 "gitg-ref-action-merge.c" +#line 2630 "gitg-ref-action-merge.c" } #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp68_ = NULL; + _data_->_tmp65_ = NULL; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp68_ = _data_->notification; + _data_->_tmp65_ = _data_->notification; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp69_ = NULL; + _data_->_tmp66_ = NULL; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp69_ = _data_->ours; + _data_->_tmp66_ = _data_->ours; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp70_ = NULL; + _data_->_tmp67_ = NULL; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp70_ = _data_->theirs; + _data_->_tmp67_ = _data_->theirs; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_state_ = 1; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gitg_ref_action_merge_create_merge_index (_data_->self, _data_->_tmp68_, _data_->_tmp69_, _data_->_tmp70_, gitg_ref_action_merge_merge_ready, _data_); + gitg_ref_action_merge_create_merge_index (_data_->self, _data_->_tmp65_, _data_->_tmp66_, _data_->_tmp67_, gitg_ref_action_merge_merge_ready, _data_); #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2709 "gitg-ref-action-merge.c" +#line 2650 "gitg-ref-action-merge.c" _state_1: #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp71_ = NULL; + _data_->_tmp68_ = NULL; #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp71_ = gitg_ref_action_merge_create_merge_index_finish (_data_->self, _data_->_res_); + _data_->_tmp68_ = gitg_ref_action_merge_create_merge_index_finish (_data_->self, _data_->_res_); #line 245 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->index = _data_->_tmp71_; + _data_->index = _data_->_tmp68_; #line 247 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp72_ = NULL; + _data_->_tmp69_ = NULL; #line 247 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp72_ = _data_->index; + _data_->_tmp69_ = _data_->index; #line 247 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - if (_data_->_tmp72_ == NULL) { + if (_data_->_tmp69_ == NULL) { #line 249 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->result = NULL; #line 249 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -2740,47 +2681,47 @@ if (_data_->_state_ == 0) { #line 249 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2741 "gitg-ref-action-merge.c" +#line 2682 "gitg-ref-action-merge.c" } else { #line 249 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2745 "gitg-ref-action-merge.c" +#line 2686 "gitg-ref-action-merge.c" } #line 249 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); #line 249 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2751 "gitg-ref-action-merge.c" +#line 2692 "gitg-ref-action-merge.c" } #line 252 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp73_ = NULL; + _data_->_tmp70_ = NULL; #line 252 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp73_ = _data_->index; + _data_->_tmp70_ = _data_->index; #line 252 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp74_ = FALSE; + _data_->_tmp71_ = FALSE; #line 252 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp74_ = ggit_index_has_conflicts (_data_->_tmp73_); + _data_->_tmp71_ = ggit_index_has_conflicts (_data_->_tmp70_); #line 252 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - if (_data_->_tmp74_) { + if (_data_->_tmp71_) { #line 254 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp75_ = NULL; + _data_->_tmp72_ = NULL; #line 254 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp75_ = _data_->notification; + _data_->_tmp72_ = _data_->notification; #line 254 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp76_ = NULL; + _data_->_tmp73_ = NULL; #line 254 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp76_ = _data_->index; + _data_->_tmp73_ = _data_->index; #line 254 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp77_ = NULL; + _data_->_tmp74_ = NULL; #line 254 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp77_ = _data_->source; + _data_->_tmp74_ = _data_->source; #line 254 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_state_ = 2; #line 254 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gitg_ref_action_merge_checkout_conflicts (_data_->self, _data_->_tmp75_, _data_->_tmp76_, _data_->_tmp77_, gitg_ref_action_merge_merge_ready, _data_); + gitg_ref_action_merge_checkout_conflicts (_data_->self, _data_->_tmp72_, _data_->_tmp73_, _data_->_tmp74_, gitg_ref_action_merge_merge_ready, _data_); #line 254 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2781 "gitg-ref-action-merge.c" +#line 2722 "gitg-ref-action-merge.c" _state_2: #line 254 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_checkout_conflicts_finish (_data_->self, _data_->_res_); @@ -2802,166 +2743,178 @@ if (_data_->_state_ == 0) { #line 255 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2803 "gitg-ref-action-merge.c" +#line 2744 "gitg-ref-action-merge.c" } else { #line 255 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2807 "gitg-ref-action-merge.c" +#line 2748 "gitg-ref-action-merge.c" } #line 255 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); #line 255 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2813 "gitg-ref-action-merge.c" +#line 2754 "gitg-ref-action-merge.c" } #line 260 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp78_ = NULL; + _data_->_tmp75_ = NULL; #line 260 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp78_ = _data_->source; + _data_->_tmp75_ = _data_->source; #line 260 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp79_ = NULL; + _data_->_tmp76_ = NULL; #line 260 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp79_ = gitg_ref_get_parsed_name (_data_->_tmp78_); + _data_->_tmp76_ = gitg_ref_get_parsed_name (_data_->_tmp75_); #line 260 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp80_ = NULL; + _data_->_tmp77_ = NULL; #line 260 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp80_ = _data_->_tmp79_; + _data_->_tmp77_ = _data_->_tmp76_; #line 260 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp81_ = NULL; + _data_->_tmp78_ = NULL; #line 260 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp81_ = _data_->_tmp80_; + _data_->_tmp78_ = _data_->_tmp77_; #line 260 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp82_ = 0; + _data_->_tmp79_ = 0; #line 260 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp82_ = gitg_parsed_ref_name_get_rtype (_data_->_tmp81_); + _data_->_tmp79_ = gitg_parsed_ref_name_get_rtype (_data_->_tmp78_); #line 260 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp83_ = 0; + _data_->_tmp80_ = 0; #line 260 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp83_ = _data_->_tmp82_; + _data_->_tmp80_ = _data_->_tmp79_; #line 260 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp84_ = FALSE; + _data_->_tmp81_ = FALSE; #line 260 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp84_ = _data_->_tmp83_ == GITG_REF_TYPE_REMOTE; + _data_->_tmp81_ = _data_->_tmp80_ == GITG_REF_TYPE_REMOTE; #line 260 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_data_->_tmp81_); + _g_object_unref0 (_data_->_tmp78_); #line 260 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - if (_data_->_tmp84_) { + if (_data_->_tmp81_) { #line 262 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp85_ = NULL; + _data_->_tmp82_ = NULL; #line 262 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp85_ = _data_->theirs_name; + _data_->_tmp82_ = _data_->theirs_name; #line 262 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp86_ = NULL; + _data_->_tmp83_ = NULL; #line 262 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp86_ = string_to_string (_data_->_tmp85_); + _data_->_tmp83_ = string_to_string (_data_->_tmp82_); #line 262 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp87_ = NULL; + _data_->_tmp84_ = NULL; #line 262 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp87_ = g_strconcat ("Merge remote branch '", _data_->_tmp86_, "'", NULL); + _data_->_tmp84_ = g_strconcat ("Merge remote branch '", _data_->_tmp83_, "'", NULL); #line 262 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_free0 (_data_->msg); #line 262 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->msg = _data_->_tmp87_; -#line 2863 "gitg-ref-action-merge.c" + _data_->msg = _data_->_tmp84_; +#line 2804 "gitg-ref-action-merge.c" } else { #line 266 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp88_ = NULL; + _data_->_tmp85_ = NULL; #line 266 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp88_ = _data_->theirs_name; + _data_->_tmp85_ = _data_->theirs_name; #line 266 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp89_ = NULL; + _data_->_tmp86_ = NULL; #line 266 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp89_ = string_to_string (_data_->_tmp88_); + _data_->_tmp86_ = string_to_string (_data_->_tmp85_); #line 266 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp90_ = NULL; + _data_->_tmp87_ = NULL; #line 266 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp90_ = g_strconcat ("Merge branch '", _data_->_tmp89_, "'", NULL); + _data_->_tmp87_ = g_strconcat ("Merge branch '", _data_->_tmp86_, "'", NULL); #line 266 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_free0 (_data_->msg); #line 266 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->msg = _data_->_tmp90_; -#line 2881 "gitg-ref-action-merge.c" + _data_->msg = _data_->_tmp87_; +#line 2822 "gitg-ref-action-merge.c" } #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _data_->_tmp88_ = NULL; +#line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _data_->_tmp88_ = _data_->self->priv->d_support; +#line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _data_->_tmp89_ = NULL; +#line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _data_->_tmp89_ = _data_->notification; +#line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _data_->_tmp90_ = NULL; +#line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _data_->_tmp90_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) _data_->self); +#line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp91_ = NULL; #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp91_ = _data_->self->priv->d_support; + _data_->_tmp91_ = _data_->_tmp90_; #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp92_ = NULL; #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp92_ = _data_->notification; + _data_->_tmp92_ = _data_->index; #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp93_ = NULL; #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp93_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) _data_->self); + _data_->_tmp93_ = _data_->ours; #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp94_ = NULL; #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp94_ = _data_->_tmp93_; + _data_->_tmp94_ = ggit_object_get_id ((GgitObject*) _data_->_tmp93_); #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp95_ = NULL; #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp95_ = _data_->index; + _data_->_tmp95_ = _data_->theirs; #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp96_ = NULL; #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp96_ = _data_->ours; + _data_->_tmp96_ = ggit_object_get_id ((GgitObject*) _data_->_tmp95_); #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp97_ = NULL; #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp97_ = ggit_object_get_id ((GgitObject*) _data_->_tmp96_); -#line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp98_ = NULL; -#line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp98_ = _data_->theirs; -#line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp99_ = NULL; -#line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp99_ = ggit_object_get_id ((GgitObject*) _data_->_tmp98_); -#line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp100_ = NULL; -#line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp100_ = g_new0 (GgitOId*, 2 + 1); + _data_->_tmp97_ = g_new0 (GgitOId*, 2 + 1); #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp100_[0] = _data_->_tmp97_; + _data_->_tmp97_[0] = _data_->_tmp94_; #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp100_[1] = _data_->_tmp99_; + _data_->_tmp97_[1] = _data_->_tmp96_; #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp101_ = NULL; + _data_->_tmp98_ = NULL; #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp101_ = _data_->msg; + _data_->_tmp98_ = _data_->msg; #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_state_ = 3; #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gitg_action_support_commit_index (_data_->_tmp91_, _data_->_tmp92_, _data_->_tmp94_, _data_->_tmp95_, _data_->_tmp100_, 2, NULL, _data_->_tmp101_, gitg_ref_action_merge_merge_ready, _data_); + gitg_action_support_commit_index (_data_->_tmp88_, _data_->_tmp89_, _data_->_tmp91_, _data_->_tmp92_, _data_->_tmp97_, 2, NULL, _data_->_tmp98_, gitg_ref_action_merge_merge_ready, _data_); #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 2937 "gitg-ref-action-merge.c" +#line 2878 "gitg-ref-action-merge.c" _state_3: #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp102_ = NULL; + _data_->_tmp99_ = NULL; #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp102_ = gitg_action_support_commit_index_finish (_data_->_tmp91_, _data_->_res_); + _data_->_tmp99_ = gitg_action_support_commit_index_finish (_data_->_tmp88_, _data_->_res_); #line 269 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->oid = _data_->_tmp102_; + _data_->oid = _data_->_tmp99_; #line 276 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp103_ = NULL; + _data_->_tmp100_ = NULL; #line 276 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp103_ = _data_->oid; + _data_->_tmp100_ = _data_->oid; #line 276 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - if (_data_->_tmp103_ != NULL) { + if (_data_->_tmp100_ != NULL) { +#line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _data_->_tmp101_ = NULL; +#line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _data_->_tmp101_ = _data_->notification; +#line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _data_->_tmp102_ = NULL; +#line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _data_->_tmp102_ = _data_->theirs_name; +#line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _data_->_tmp103_ = NULL; +#line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _data_->_tmp103_ = string_to_string (_data_->_tmp102_); #line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp104_ = NULL; #line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp104_ = _data_->notification; + _data_->_tmp104_ = g_strconcat ("'", _data_->_tmp103_, "'", NULL); #line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp105_ = NULL; #line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp105_ = _ ("Successfully merged %s into %s"); + _data_->_tmp105_ = _data_->_tmp104_; #line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp106_ = NULL; #line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp106_ = _data_->theirs_name; + _data_->_tmp106_ = _data_->ours_name; #line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp107_ = NULL; #line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -2977,36 +2930,20 @@ #line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp110_ = NULL; #line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp110_ = _data_->ours_name; + _data_->_tmp110_ = g_strdup_printf (_ ("Successfully merged %s into %s"), _data_->_tmp105_, _data_->_tmp109_); #line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->_tmp111_ = NULL; #line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp111_ = string_to_string (_data_->_tmp110_); -#line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp112_ = NULL; + _data_->_tmp111_ = _data_->_tmp110_; #line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp112_ = g_strconcat ("'", _data_->_tmp111_, "'", NULL); + gitg_simple_notification_success (_data_->_tmp101_, _data_->_tmp111_); #line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp113_ = NULL; -#line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp113_ = _data_->_tmp112_; -#line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp114_ = NULL; -#line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp114_ = g_strdup_printf (_data_->_tmp105_, _data_->_tmp109_, _data_->_tmp113_); -#line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp115_ = NULL; -#line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _data_->_tmp115_ = _data_->_tmp114_; -#line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gitg_simple_notification_success (_data_->_tmp104_, _data_->_tmp115_); -#line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp115_); -#line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_free0 (_data_->_tmp113_); + _g_free0 (_data_->_tmp111_); #line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_free0 (_data_->_tmp109_); -#line 3007 "gitg-ref-action-merge.c" +#line 278 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + _g_free0 (_data_->_tmp105_); +#line 2944 "gitg-ref-action-merge.c" } #line 281 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data_->result = _data_->oid; @@ -3028,11 +2965,11 @@ if (_data_->_state_ == 0) { #line 281 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3029 "gitg-ref-action-merge.c" +#line 2966 "gitg-ref-action-merge.c" } else { #line 281 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3033 "gitg-ref-action-merge.c" +#line 2970 "gitg-ref-action-merge.c" } #line 281 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); @@ -3058,17 +2995,17 @@ if (_data_->_state_ == 0) { #line 214 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3059 "gitg-ref-action-merge.c" +#line 2996 "gitg-ref-action-merge.c" } else { #line 214 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3063 "gitg-ref-action-merge.c" +#line 3000 "gitg-ref-action-merge.c" } #line 214 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_object_unref (_data_->_async_result); #line 214 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return FALSE; -#line 3069 "gitg-ref-action-merge.c" +#line 3006 "gitg-ref-action-merge.c" } @@ -3086,7 +3023,7 @@ _tmp2_ = _tmp1_; #line 287 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" __vala_GgitOId_free0 (_tmp2_); -#line 3087 "gitg-ref-action-merge.c" +#line 3024 "gitg-ref-action-merge.c" } @@ -3095,7 +3032,7 @@ __lambda15_ ((GitgRefActionMerge*) self, source_object, res); #line 286 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_object_unref (self); -#line 3096 "gitg-ref-action-merge.c" +#line 3033 "gitg-ref-action-merge.c" } @@ -3109,7 +3046,7 @@ _tmp0_ = source; #line 286 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_merge (self, _tmp0_, ___lambda15__gasync_ready_callback, g_object_ref (self)); -#line 3110 "gitg-ref-action-merge.c" +#line 3047 "gitg-ref-action-merge.c" } @@ -3135,7 +3072,7 @@ _tmp3_ = branch; #line 295 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp3_ != NULL) { -#line 3136 "gitg-ref-action-merge.c" +#line 3073 "gitg-ref-action-merge.c" { GgitRef* _tmp4_ = NULL; GgitBranch* _tmp5_ = NULL; @@ -3150,7 +3087,7 @@ _tmp4_ = _tmp6_; #line 299 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3151 "gitg-ref-action-merge.c" +#line 3088 "gitg-ref-action-merge.c" goto __catch33_g_error; } #line 299 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -3163,7 +3100,7 @@ if (_tmp8_ == NULL) { #line 299 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (_tmp7_); -#line 3164 "gitg-ref-action-merge.c" +#line 3101 "gitg-ref-action-merge.c" } #line 299 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" result = _tmp8_; @@ -3173,7 +3110,7 @@ _g_object_unref0 (branch); #line 299 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return result; -#line 3174 "gitg-ref-action-merge.c" +#line 3111 "gitg-ref-action-merge.c" } goto __finally33; __catch33_g_error: @@ -3182,7 +3119,7 @@ g_clear_error (&_inner_error_); #line 297 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _inner_error_ = NULL; -#line 3183 "gitg-ref-action-merge.c" +#line 3120 "gitg-ref-action-merge.c" } __finally33: #line 297 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -3195,7 +3132,7 @@ g_clear_error (&_inner_error_); #line 297 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return NULL; -#line 3196 "gitg-ref-action-merge.c" +#line 3133 "gitg-ref-action-merge.c" } } #line 303 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -3204,7 +3141,7 @@ _g_object_unref0 (branch); #line 303 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return result; -#line 3205 "gitg-ref-action-merge.c" +#line 3142 "gitg-ref-action-merge.c" } @@ -3213,7 +3150,7 @@ g_atomic_int_inc (&_data24_->_ref_count_); #line 306 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return _data24_; -#line 3214 "gitg-ref-action-merge.c" +#line 3151 "gitg-ref-action-merge.c" } @@ -3222,7 +3159,7 @@ _data24_ = (Block24Data*) _userdata_; #line 306 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (g_atomic_int_dec_and_test (&_data24_->_ref_count_)) { -#line 3223 "gitg-ref-action-merge.c" +#line 3160 "gitg-ref-action-merge.c" GitgRefActionMerge* self; #line 306 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" self = _data24_->self; @@ -3232,7 +3169,7 @@ _g_object_unref0 (self); #line 306 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_slice_free (Block24Data, _data24_); -#line 3233 "gitg-ref-action-merge.c" +#line 3170 "gitg-ref-action-merge.c" } } @@ -3246,14 +3183,14 @@ _tmp0_ = _data24_->source; #line 323 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_activate_source (self, _tmp0_); -#line 3247 "gitg-ref-action-merge.c" +#line 3184 "gitg-ref-action-merge.c" } static void ___lambda16__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { #line 322 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" __lambda16_ (self); -#line 3254 "gitg-ref-action-merge.c" +#line 3191 "gitg-ref-action-merge.c" } @@ -3277,25 +3214,24 @@ GtkMenuItem* _tmp17_ = NULL; const gchar* _tmp18_ = NULL; const gchar* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; + gchar* _tmp20_ = NULL; gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; + GitgRef* _tmp22_ = NULL; GitgRef* _tmp23_ = NULL; - GitgRef* _tmp24_ = NULL; + GitgParsedRefName* _tmp24_ = NULL; GitgParsedRefName* _tmp25_ = NULL; GitgParsedRefName* _tmp26_ = NULL; - GitgParsedRefName* _tmp27_ = NULL; + gchar* _tmp27_ = NULL; gchar* _tmp28_ = NULL; gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - const gchar* _tmp31_ = NULL; + const gchar* _tmp30_ = NULL; + gchar* _tmp31_ = NULL; gchar* _tmp32_ = NULL; gchar* _tmp33_ = NULL; gchar* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; - GtkMenuItem* _tmp36_ = NULL; - GtkMenu* _tmp37_ = NULL; - GtkMenuItem* _tmp38_ = NULL; + GtkMenuItem* _tmp35_ = NULL; + GtkMenu* _tmp36_ = NULL; + GtkMenuItem* _tmp37_ = NULL; #line 306 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_return_if_fail (self != NULL); #line 306 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -3318,7 +3254,7 @@ _tmp2_ = _data24_->source; #line 308 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp2_ == NULL) { -#line 3319 "gitg-ref-action-merge.c" +#line 3255 "gitg-ref-action-merge.c" GtkSeparatorMenuItem* sep = NULL; GtkSeparatorMenuItem* _tmp3_ = NULL; GtkSeparatorMenuItem* _tmp4_ = NULL; @@ -3348,7 +3284,7 @@ _data24_ = NULL; #line 313 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return; -#line 3349 "gitg-ref-action-merge.c" +#line 3285 "gitg-ref-action-merge.c" } #line 316 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp7_ = _data24_->source; @@ -3383,63 +3319,61 @@ #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp17_ = item; #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp18_ = _ ("Merge %s into branch %s"); + _tmp18_ = name; #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp19_ = name; + _tmp19_ = string_to_string (_tmp18_); #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp20_ = string_to_string (_tmp19_); + _tmp20_ = g_strconcat ("'", _tmp19_, "'", NULL); #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp21_ = g_strconcat ("'", _tmp20_, "'", NULL); + _tmp21_ = _tmp20_; #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp22_ = _tmp21_; + _tmp22_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp23_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); + _tmp23_ = _tmp22_; #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp24_ = _tmp23_; + _tmp24_ = gitg_ref_get_parsed_name (_tmp23_); #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp25_ = gitg_ref_get_parsed_name (_tmp24_); + _tmp25_ = _tmp24_; #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp26_ = _tmp25_; #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp27_ = _tmp26_; + _tmp27_ = gitg_parsed_ref_name_get_shortname (_tmp26_); #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp28_ = gitg_parsed_ref_name_get_shortname (_tmp27_); + _tmp28_ = _tmp27_; #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp29_ = _tmp28_; #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp30_ = _tmp29_; -#line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp31_ = string_to_string (_tmp30_); + _tmp30_ = string_to_string (_tmp29_); #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp32_ = g_strconcat ("'", _tmp31_, "'", NULL); + _tmp31_ = g_strconcat ("'", _tmp30_, "'", NULL); #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp33_ = _tmp32_; + _tmp32_ = _tmp31_; #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp34_ = g_strdup_printf (_tmp18_, _tmp22_, _tmp33_); + _tmp33_ = g_strdup_printf (_ ("Merge %s into branch %s"), _tmp21_, _tmp32_); #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp35_ = _tmp34_; + _tmp34_ = _tmp33_; #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gtk_widget_set_tooltip_text ((GtkWidget*) _tmp17_, _tmp35_); + gtk_widget_set_tooltip_text ((GtkWidget*) _tmp17_, _tmp34_); #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_free0 (_tmp35_); + _g_free0 (_tmp34_); #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_free0 (_tmp33_); + _g_free0 (_tmp32_); #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_free0 (_tmp30_); + _g_free0 (_tmp29_); #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_tmp27_); + _g_object_unref0 (_tmp26_); #line 320 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp21_); #line 322 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp36_ = item; + _tmp35_ = item; #line 322 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - g_signal_connect_data (_tmp36_, "activate", (GCallback) ___lambda16__gtk_menu_item_activate, block24_data_ref (_data24_), (GClosureNotify) block24_data_unref, 0); + g_signal_connect_data (_tmp35_, "activate", (GCallback) ___lambda16__gtk_menu_item_activate, block24_data_ref (_data24_), (GClosureNotify) block24_data_unref, 0); #line 326 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp37_ = submenu; + _tmp36_ = submenu; #line 326 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp38_ = item; + _tmp37_ = item; #line 326 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gtk_menu_shell_append ((GtkMenuShell*) _tmp37_, (GtkWidget*) _tmp38_); + gtk_menu_shell_append ((GtkMenuShell*) _tmp36_, (GtkWidget*) _tmp37_); #line 306 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (item); #line 306 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -3448,73 +3382,73 @@ block24_data_unref (_data24_); #line 306 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _data24_ = NULL; -#line 3449 "gitg-ref-action-merge.c" +#line 3383 "gitg-ref-action-merge.c" } -static void _vala_array_add12 (GitgRef*** array, int* length, int* size, GitgRef* value) { +static void _vala_array_add12 (GitgRef** * array, int* length, int* size, GitgRef* value) { #line 385 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if ((*length) == (*size)) { #line 385 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" *size = (*size) ? (2 * (*size)) : 4; #line 385 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" *array = g_renew (GitgRef*, *array, (*size) + 1); -#line 3460 "gitg-ref-action-merge.c" +#line 3394 "gitg-ref-action-merge.c" } #line 385 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" (*array)[(*length)++] = value; #line 385 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" (*array)[*length] = NULL; -#line 3466 "gitg-ref-action-merge.c" +#line 3400 "gitg-ref-action-merge.c" } -static void _vala_array_add13 (GitgRef*** array, int* length, int* size, GitgRef* value) { +static void _vala_array_add13 (GitgRef** * array, int* length, int* size, GitgRef* value) { #line 389 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if ((*length) == (*size)) { #line 389 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" *size = (*size) ? (2 * (*size)) : 4; #line 389 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" *array = g_renew (GitgRef*, *array, (*size) + 1); -#line 3477 "gitg-ref-action-merge.c" +#line 3411 "gitg-ref-action-merge.c" } #line 389 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" (*array)[(*length)++] = value; #line 389 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" (*array)[*length] = NULL; -#line 3483 "gitg-ref-action-merge.c" +#line 3417 "gitg-ref-action-merge.c" } -static void _vala_array_add14 (GitgRefActionMergeRemoteSource** array, int* length, int* size, const GitgRefActionMergeRemoteSource* value) { +static void _vala_array_add14 (GitgRefActionMergeRemoteSource* * array, int* length, int* size, const GitgRefActionMergeRemoteSource* value) { #line 402 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if ((*length) == (*size)) { #line 402 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" *size = (*size) ? (2 * (*size)) : 4; #line 402 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" *array = g_renew (GitgRefActionMergeRemoteSource, *array, *size); -#line 3494 "gitg-ref-action-merge.c" +#line 3428 "gitg-ref-action-merge.c" } #line 402 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" (*array)[(*length)++] = *value; -#line 3498 "gitg-ref-action-merge.c" +#line 3432 "gitg-ref-action-merge.c" } -static void _vala_array_add15 (GitgRef*** array, int* length, int* size, GitgRef* value) { +static void _vala_array_add15 (GitgRef** * array, int* length, int* size, GitgRef* value) { #line 406 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if ((*length) == (*size)) { #line 406 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" *size = (*size) ? (2 * (*size)) : 4; #line 406 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" *array = g_renew (GitgRef*, *array, (*size) + 1); -#line 3509 "gitg-ref-action-merge.c" +#line 3443 "gitg-ref-action-merge.c" } #line 406 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" (*array)[(*length)++] = value; #line 406 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" (*array)[*length] = NULL; -#line 3515 "gitg-ref-action-merge.c" +#line 3449 "gitg-ref-action-merge.c" } @@ -3537,7 +3471,7 @@ if (_tmp0_) { #line 333 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return; -#line 3538 "gitg-ref-action-merge.c" +#line 3472 "gitg-ref-action-merge.c" } #line 336 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" self->priv->d_has_sourced = TRUE; @@ -3549,7 +3483,7 @@ if (!_tmp2_) { #line 340 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return; -#line 3550 "gitg-ref-action-merge.c" +#line 3484 "gitg-ref-action-merge.c" } #line 345 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp3_ = gitg_ref_action_merge_upstream_reference (self); @@ -3589,7 +3523,7 @@ self->priv->_d_tag_sources_size_ = self->priv->d_tag_sources_length1; #line 351 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" target_oid = NULL; -#line 3590 "gitg-ref-action-merge.c" +#line 3524 "gitg-ref-action-merge.c" { GgitRef* _tmp7_ = NULL; GitgRef* _tmp8_ = NULL; @@ -3608,7 +3542,7 @@ _tmp7_ = _tmp10_; #line 355 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3609 "gitg-ref-action-merge.c" +#line 3543 "gitg-ref-action-merge.c" goto __catch34_g_error; } #line 355 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -3627,7 +3561,7 @@ _g_object_unref0 (_tmp12_); #line 353 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (_tmp7_); -#line 3628 "gitg-ref-action-merge.c" +#line 3562 "gitg-ref-action-merge.c" } goto __finally34; __catch34_g_error: @@ -3636,7 +3570,7 @@ g_clear_error (&_inner_error_); #line 353 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _inner_error_ = NULL; -#line 3637 "gitg-ref-action-merge.c" +#line 3571 "gitg-ref-action-merge.c" } __finally34: #line 353 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -3649,11 +3583,11 @@ g_clear_error (&_inner_error_); #line 353 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return; -#line 3650 "gitg-ref-action-merge.c" +#line 3584 "gitg-ref-action-merge.c" } #line 358 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" last_remote = NULL; -#line 3654 "gitg-ref-action-merge.c" +#line 3588 "gitg-ref-action-merge.c" { GeeList* _r_list = NULL; GitgExtRefActionInterface* _tmp14_ = NULL; @@ -3687,7 +3621,7 @@ _r_index = -1; #line 360 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" while (TRUE) { -#line 3688 "gitg-ref-action-merge.c" +#line 3622 "gitg-ref-action-merge.c" gint _tmp21_ = 0; gint _tmp22_ = 0; gint _tmp23_ = 0; @@ -3712,7 +3646,7 @@ if (!(_tmp22_ < _tmp23_)) { #line 360 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" break; -#line 3713 "gitg-ref-action-merge.c" +#line 3647 "gitg-ref-action-merge.c" } #line 360 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp24_ = _r_list; @@ -3726,7 +3660,7 @@ _tmp28_ = self->priv->d_upstream; #line 362 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp28_ != NULL) { -#line 3727 "gitg-ref-action-merge.c" +#line 3661 "gitg-ref-action-merge.c" GitgRef* _tmp29_ = NULL; const gchar* _tmp30_ = NULL; GitgRef* _tmp31_ = NULL; @@ -3741,11 +3675,11 @@ _tmp32_ = ggit_ref_get_name ((GgitRef*) _tmp31_); #line 362 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp27_ = g_strcmp0 (_tmp30_, _tmp32_) == 0; -#line 3742 "gitg-ref-action-merge.c" +#line 3676 "gitg-ref-action-merge.c" } else { #line 362 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp27_ = FALSE; -#line 3746 "gitg-ref-action-merge.c" +#line 3680 "gitg-ref-action-merge.c" } #line 362 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp27_) { @@ -3753,19 +3687,19 @@ _g_object_unref0 (r); #line 364 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" continue; -#line 3754 "gitg-ref-action-merge.c" +#line 3688 "gitg-ref-action-merge.c" } #line 368 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp33_ = target_oid; #line 368 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp33_ != NULL) { -#line 3760 "gitg-ref-action-merge.c" +#line 3694 "gitg-ref-action-merge.c" GgitOId* oid = NULL; gboolean _tmp40_ = FALSE; GgitOId* _tmp41_ = NULL; #line 370 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" oid = NULL; -#line 3766 "gitg-ref-action-merge.c" +#line 3700 "gitg-ref-action-merge.c" { GgitRef* _tmp34_ = NULL; GitgRef* _tmp35_ = NULL; @@ -3781,7 +3715,7 @@ _tmp34_ = _tmp36_; #line 374 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3782 "gitg-ref-action-merge.c" +#line 3716 "gitg-ref-action-merge.c" goto __catch35_g_error; } #line 374 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -3800,7 +3734,7 @@ _g_object_unref0 (_tmp38_); #line 372 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (_tmp34_); -#line 3801 "gitg-ref-action-merge.c" +#line 3735 "gitg-ref-action-merge.c" } goto __finally35; __catch35_g_error: @@ -3809,7 +3743,7 @@ g_clear_error (&_inner_error_); #line 372 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _inner_error_ = NULL; -#line 3810 "gitg-ref-action-merge.c" +#line 3744 "gitg-ref-action-merge.c" } __finally35: #line 372 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -3830,13 +3764,13 @@ g_clear_error (&_inner_error_); #line 372 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return; -#line 3831 "gitg-ref-action-merge.c" +#line 3765 "gitg-ref-action-merge.c" } #line 377 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp41_ = oid; #line 377 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp41_ != NULL) { -#line 3837 "gitg-ref-action-merge.c" +#line 3771 "gitg-ref-action-merge.c" GgitOId* _tmp42_ = NULL; GgitOId* _tmp43_ = NULL; gboolean _tmp44_ = FALSE; @@ -3848,11 +3782,11 @@ _tmp44_ = ggit_oid_equal (_tmp42_, _tmp43_); #line 377 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp40_ = _tmp44_; -#line 3849 "gitg-ref-action-merge.c" +#line 3783 "gitg-ref-action-merge.c" } else { #line 377 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp40_ = FALSE; -#line 3853 "gitg-ref-action-merge.c" +#line 3787 "gitg-ref-action-merge.c" } #line 377 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp40_) { @@ -3862,11 +3796,11 @@ _g_object_unref0 (r); #line 379 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" continue; -#line 3863 "gitg-ref-action-merge.c" +#line 3797 "gitg-ref-action-merge.c" } #line 368 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" __vala_GgitOId_free0 (oid); -#line 3867 "gitg-ref-action-merge.c" +#line 3801 "gitg-ref-action-merge.c" } #line 383 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp45_ = r; @@ -3874,7 +3808,7 @@ _tmp46_ = ggit_ref_is_branch ((GgitRef*) _tmp45_); #line 383 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp46_) { -#line 3875 "gitg-ref-action-merge.c" +#line 3809 "gitg-ref-action-merge.c" GitgRef** _tmp47_ = NULL; gint _tmp47__length1 = 0; GitgRef* _tmp48_ = NULL; @@ -3889,7 +3823,7 @@ _tmp49_ = _g_object_ref0 (_tmp48_); #line 385 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _vala_array_add12 (&self->priv->d_local_sources, &self->priv->d_local_sources_length1, &self->priv->_d_local_sources_size_, _tmp49_); -#line 3890 "gitg-ref-action-merge.c" +#line 3824 "gitg-ref-action-merge.c" } else { GitgRef* _tmp50_ = NULL; gboolean _tmp51_ = FALSE; @@ -3899,7 +3833,7 @@ _tmp51_ = ggit_ref_is_tag ((GgitRef*) _tmp50_); #line 387 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp51_) { -#line 3900 "gitg-ref-action-merge.c" +#line 3834 "gitg-ref-action-merge.c" GitgRef** _tmp52_ = NULL; gint _tmp52__length1 = 0; GitgRef* _tmp53_ = NULL; @@ -3914,7 +3848,7 @@ _tmp54_ = _g_object_ref0 (_tmp53_); #line 389 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _vala_array_add13 (&self->priv->d_tag_sources, &self->priv->d_tag_sources_length1, &self->priv->_d_tag_sources_size_, _tmp54_); -#line 3915 "gitg-ref-action-merge.c" +#line 3849 "gitg-ref-action-merge.c" } else { GitgRef* _tmp55_ = NULL; GitgParsedRefName* _tmp56_ = NULL; @@ -3941,7 +3875,7 @@ _g_object_unref0 (_tmp58_); #line 391 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp61_) { -#line 3942 "gitg-ref-action-merge.c" +#line 3876 "gitg-ref-action-merge.c" gchar* remote_name = NULL; GitgRef* _tmp62_ = NULL; GitgParsedRefName* _tmp63_ = NULL; @@ -3978,7 +3912,7 @@ _tmp70_ = last_remote; #line 395 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (g_strcmp0 (_tmp69_, _tmp70_) != 0) { -#line 3979 "gitg-ref-action-merge.c" +#line 3913 "gitg-ref-action-merge.c" GitgRefActionMergeRemoteSource source = {0}; const gchar* _tmp71_ = NULL; gchar* _tmp72_ = NULL; @@ -4030,7 +3964,7 @@ _vala_array_add14 (&self->priv->d_remote_sources, &self->priv->d_remote_sources_length1, &self->priv->_d_remote_sources_size_, &_tmp79_); #line 395 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_remote_source_destroy (&source); -#line 4031 "gitg-ref-action-merge.c" +#line 3965 "gitg-ref-action-merge.c" } else { GitgRefActionMergeRemoteSource* _tmp80_ = NULL; gint _tmp80__length1 = 0; @@ -4070,7 +4004,7 @@ _tmp86_ = _g_object_ref0 (_tmp85_); #line 406 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _vala_array_add15 (&_tmp80_[_tmp81__length1 - 1].sources, &_tmp80_[_tmp81__length1 - 1].sources_length1, &_tmp80_[_tmp81__length1 - 1]._sources_size_, _tmp86_); -#line 4071 "gitg-ref-action-merge.c" +#line 4005 "gitg-ref-action-merge.c" } #line 409 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp87_ = remote_name; @@ -4082,23 +4016,23 @@ last_remote = _tmp88_; #line 391 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_free0 (remote_name); -#line 4083 "gitg-ref-action-merge.c" +#line 4017 "gitg-ref-action-merge.c" } } } #line 360 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (r); -#line 4089 "gitg-ref-action-merge.c" +#line 4023 "gitg-ref-action-merge.c" } #line 360 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (_r_list); -#line 4093 "gitg-ref-action-merge.c" +#line 4027 "gitg-ref-action-merge.c" } #line 329 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_free0 (last_remote); #line 329 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" __vala_GgitOId_free0 (target_oid); -#line 4099 "gitg-ref-action-merge.c" +#line 4033 "gitg-ref-action-merge.c" } @@ -4118,9 +4052,9 @@ gchar* _tmp10_ = NULL; gboolean _tmp11_ = FALSE; gboolean _tmp12_ = FALSE; - GtkMenuItem* _tmp70_ = NULL; - GtkMenu* _tmp71_ = NULL; - GtkMenuItem* _tmp72_ = NULL; + GtkMenuItem* _tmp69_ = NULL; + GtkMenu* _tmp70_ = NULL; + GtkMenuItem* _tmp71_ = NULL; #line 414 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" self = (GitgRefActionMerge*) base; #line 414 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -4133,7 +4067,7 @@ if (!_tmp1_) { #line 418 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return; -#line 4134 "gitg-ref-action-merge.c" +#line 4068 "gitg-ref-action-merge.c" } #line 421 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp2_ = gitg_ext_ui_element_get_display_name ((GitgExtUIElement*) self); @@ -4169,7 +4103,7 @@ _tmp12_ = _tmp11_; #line 424 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp12_) { -#line 4170 "gitg-ref-action-merge.c" +#line 4104 "gitg-ref-action-merge.c" GtkMenu* submenu = NULL; GtkMenu* _tmp13_ = NULL; GtkMenu* _tmp14_ = NULL; @@ -4180,8 +4114,8 @@ gint _tmp25__length1 = 0; GitgRef** _tmp47_ = NULL; gint _tmp47__length1 = 0; - GtkMenuItem* _tmp67_ = NULL; - GtkMenu* _tmp68_ = NULL; + GtkMenuItem* _tmp66_ = NULL; + GtkMenu* _tmp67_ = NULL; #line 426 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp13_ = (GtkMenu*) gtk_menu_new (); #line 426 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -4196,7 +4130,7 @@ _tmp15_ = self->priv->d_upstream; #line 429 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp15_ != NULL) { -#line 4197 "gitg-ref-action-merge.c" +#line 4131 "gitg-ref-action-merge.c" GtkMenu* _tmp16_ = NULL; GitgRef* _tmp17_ = NULL; #line 431 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -4205,7 +4139,7 @@ _tmp17_ = self->priv->d_upstream; #line 431 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_add_merge_source (self, _tmp16_, _tmp17_); -#line 4206 "gitg-ref-action-merge.c" +#line 4140 "gitg-ref-action-merge.c" } #line 434 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp18_ = self->priv->d_local_sources; @@ -4213,7 +4147,7 @@ _tmp18__length1 = self->priv->d_local_sources_length1; #line 434 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp18__length1 != 0) { -#line 4214 "gitg-ref-action-merge.c" +#line 4148 "gitg-ref-action-merge.c" GitgRef* _tmp19_ = NULL; GitgRef** _tmp21_ = NULL; gint _tmp21__length1 = 0; @@ -4221,19 +4155,19 @@ _tmp19_ = self->priv->d_upstream; #line 436 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp19_ != NULL) { -#line 4222 "gitg-ref-action-merge.c" +#line 4156 "gitg-ref-action-merge.c" GtkMenu* _tmp20_ = NULL; #line 439 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp20_ = submenu; #line 439 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_add_merge_source (self, _tmp20_, NULL); -#line 4228 "gitg-ref-action-merge.c" +#line 4162 "gitg-ref-action-merge.c" } #line 442 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp21_ = self->priv->d_local_sources; #line 442 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp21__length1 = self->priv->d_local_sources_length1; -#line 4234 "gitg-ref-action-merge.c" +#line 4168 "gitg-ref-action-merge.c" { GitgRef** source_collection = NULL; gint source_collection_length1 = 0; @@ -4245,14 +4179,14 @@ source_collection_length1 = _tmp21__length1; #line 442 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" for (source_it = 0; source_it < _tmp21__length1; source_it = source_it + 1) { -#line 4246 "gitg-ref-action-merge.c" +#line 4180 "gitg-ref-action-merge.c" GitgRef* _tmp22_ = NULL; GitgRef* source = NULL; #line 442 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp22_ = _g_object_ref0 (source_collection[source_it]); #line 442 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" source = _tmp22_; -#line 4253 "gitg-ref-action-merge.c" +#line 4187 "gitg-ref-action-merge.c" { GtkMenu* _tmp23_ = NULL; GitgRef* _tmp24_ = NULL; @@ -4264,7 +4198,7 @@ gitg_ref_action_merge_add_merge_source (self, _tmp23_, _tmp24_); #line 442 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (source); -#line 4265 "gitg-ref-action-merge.c" +#line 4199 "gitg-ref-action-merge.c" } } } @@ -4275,7 +4209,7 @@ _tmp25__length1 = self->priv->d_remote_sources_length1; #line 448 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp25__length1 != 0) { -#line 4276 "gitg-ref-action-merge.c" +#line 4210 "gitg-ref-action-merge.c" gboolean _tmp26_ = FALSE; GitgRef** _tmp27_ = NULL; gint _tmp27__length1 = 0; @@ -4289,30 +4223,30 @@ if (_tmp27__length1 != 0) { #line 450 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp26_ = TRUE; -#line 4290 "gitg-ref-action-merge.c" +#line 4224 "gitg-ref-action-merge.c" } else { GitgRef* _tmp28_ = NULL; #line 450 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp28_ = self->priv->d_upstream; #line 450 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp26_ = _tmp28_ != NULL; -#line 4297 "gitg-ref-action-merge.c" +#line 4231 "gitg-ref-action-merge.c" } #line 450 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp26_) { -#line 4301 "gitg-ref-action-merge.c" +#line 4235 "gitg-ref-action-merge.c" GtkMenu* _tmp29_ = NULL; #line 453 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp29_ = submenu; #line 453 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_add_merge_source (self, _tmp29_, NULL); -#line 4307 "gitg-ref-action-merge.c" +#line 4241 "gitg-ref-action-merge.c" } #line 456 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp30_ = self->priv->d_remote_sources; #line 456 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp30__length1 = self->priv->d_remote_sources_length1; -#line 4313 "gitg-ref-action-merge.c" +#line 4247 "gitg-ref-action-merge.c" { GitgRefActionMergeRemoteSource* remote_collection = NULL; gint remote_collection_length1 = 0; @@ -4324,14 +4258,14 @@ remote_collection_length1 = _tmp30__length1; #line 456 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" for (remote_it = 0; remote_it < _tmp30__length1; remote_it = remote_it + 1) { -#line 4325 "gitg-ref-action-merge.c" +#line 4259 "gitg-ref-action-merge.c" GitgRefActionMergeRemoteSource _tmp31_ = {0}; GitgRefActionMergeRemoteSource remote = {0}; #line 456 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_remote_source_copy (&remote_collection[remote_it], &_tmp31_); #line 456 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" remote = _tmp31_; -#line 4332 "gitg-ref-action-merge.c" +#line 4266 "gitg-ref-action-merge.c" { GtkMenuItem* subitem = NULL; GitgRefActionMergeRemoteSource _tmp32_ = {0}; @@ -4378,7 +4312,7 @@ _tmp39_ = _tmp38_.sources; #line 464 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp39__length1 = _tmp38_.sources_length1; -#line 4379 "gitg-ref-action-merge.c" +#line 4313 "gitg-ref-action-merge.c" { GitgRef** source_collection = NULL; gint source_collection_length1 = 0; @@ -4390,14 +4324,14 @@ source_collection_length1 = _tmp39__length1; #line 464 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" for (source_it = 0; source_it < _tmp39__length1; source_it = source_it + 1) { -#line 4391 "gitg-ref-action-merge.c" +#line 4325 "gitg-ref-action-merge.c" GitgRef* _tmp40_ = NULL; GitgRef* source = NULL; #line 464 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp40_ = _g_object_ref0 (source_collection[source_it]); #line 464 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" source = _tmp40_; -#line 4398 "gitg-ref-action-merge.c" +#line 4332 "gitg-ref-action-merge.c" { GtkMenu* _tmp41_ = NULL; GitgRef* _tmp42_ = NULL; @@ -4409,7 +4343,7 @@ gitg_ref_action_merge_add_merge_source (self, _tmp41_, _tmp42_); #line 464 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (source); -#line 4410 "gitg-ref-action-merge.c" +#line 4344 "gitg-ref-action-merge.c" } } } @@ -4431,7 +4365,7 @@ _g_object_unref0 (subitem); #line 456 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_remote_source_destroy (&remote); -#line 4432 "gitg-ref-action-merge.c" +#line 4366 "gitg-ref-action-merge.c" } } } @@ -4442,24 +4376,23 @@ _tmp47__length1 = self->priv->d_tag_sources_length1; #line 474 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp47__length1 != 0) { -#line 4443 "gitg-ref-action-merge.c" +#line 4377 "gitg-ref-action-merge.c" gboolean _tmp48_ = FALSE; gboolean _tmp49_ = FALSE; GitgRefActionMergeRemoteSource* _tmp50_ = NULL; gint _tmp50__length1 = 0; GtkMenuItem* subitem = NULL; - const gchar* _tmp54_ = NULL; + GtkMenuItem* _tmp54_ = NULL; GtkMenuItem* _tmp55_ = NULL; - GtkMenuItem* _tmp56_ = NULL; GtkMenu* subsubmenu = NULL; + GtkMenu* _tmp56_ = NULL; GtkMenu* _tmp57_ = NULL; - GtkMenu* _tmp58_ = NULL; - GitgRef** _tmp59_ = NULL; - gint _tmp59__length1 = 0; - GtkMenuItem* _tmp63_ = NULL; + GitgRef** _tmp58_ = NULL; + gint _tmp58__length1 = 0; + GtkMenuItem* _tmp62_ = NULL; + GtkMenu* _tmp63_ = NULL; GtkMenu* _tmp64_ = NULL; - GtkMenu* _tmp65_ = NULL; - GtkMenuItem* _tmp66_ = NULL; + GtkMenuItem* _tmp65_ = NULL; #line 476 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp50_ = self->priv->d_remote_sources; #line 476 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" @@ -4468,7 +4401,7 @@ if (_tmp50__length1 != 0) { #line 476 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp49_ = TRUE; -#line 4469 "gitg-ref-action-merge.c" +#line 4402 "gitg-ref-action-merge.c" } else { GitgRef** _tmp51_ = NULL; gint _tmp51__length1 = 0; @@ -4478,140 +4411,138 @@ _tmp51__length1 = self->priv->d_local_sources_length1; #line 476 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp49_ = _tmp51__length1 != 0; -#line 4479 "gitg-ref-action-merge.c" +#line 4412 "gitg-ref-action-merge.c" } #line 476 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp49_) { #line 476 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp48_ = TRUE; -#line 4485 "gitg-ref-action-merge.c" +#line 4418 "gitg-ref-action-merge.c" } else { GitgRef* _tmp52_ = NULL; #line 476 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp52_ = self->priv->d_upstream; #line 476 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp48_ = _tmp52_ != NULL; -#line 4492 "gitg-ref-action-merge.c" +#line 4425 "gitg-ref-action-merge.c" } #line 476 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp48_) { -#line 4496 "gitg-ref-action-merge.c" +#line 4429 "gitg-ref-action-merge.c" GtkMenu* _tmp53_ = NULL; #line 479 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp53_ = submenu; #line 479 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_add_merge_source (self, _tmp53_, NULL); -#line 4502 "gitg-ref-action-merge.c" +#line 4435 "gitg-ref-action-merge.c" } #line 482 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp54_ = _ ("Tags"); + _tmp54_ = (GtkMenuItem*) gtk_menu_item_new_with_label (_ ("Tags")); #line 482 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp55_ = (GtkMenuItem*) gtk_menu_item_new_with_label (_tmp54_); + g_object_ref_sink (_tmp54_); #line 482 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - g_object_ref_sink (_tmp55_); -#line 482 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - subitem = _tmp55_; + subitem = _tmp54_; #line 483 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp56_ = subitem; + _tmp55_ = subitem; #line 483 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gtk_widget_show ((GtkWidget*) _tmp56_); + gtk_widget_show ((GtkWidget*) _tmp55_); #line 485 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp57_ = (GtkMenu*) gtk_menu_new (); + _tmp56_ = (GtkMenu*) gtk_menu_new (); #line 485 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - g_object_ref_sink (_tmp57_); + g_object_ref_sink (_tmp56_); #line 485 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - subsubmenu = _tmp57_; + subsubmenu = _tmp56_; #line 486 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp58_ = subsubmenu; + _tmp57_ = subsubmenu; #line 486 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gtk_widget_show ((GtkWidget*) _tmp58_); + gtk_widget_show ((GtkWidget*) _tmp57_); #line 488 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp59_ = self->priv->d_tag_sources; + _tmp58_ = self->priv->d_tag_sources; #line 488 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp59__length1 = self->priv->d_tag_sources_length1; -#line 4530 "gitg-ref-action-merge.c" + _tmp58__length1 = self->priv->d_tag_sources_length1; +#line 4461 "gitg-ref-action-merge.c" { GitgRef** source_collection = NULL; gint source_collection_length1 = 0; gint _source_collection_size_ = 0; gint source_it = 0; #line 488 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - source_collection = _tmp59_; + source_collection = _tmp58_; #line 488 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - source_collection_length1 = _tmp59__length1; + source_collection_length1 = _tmp58__length1; #line 488 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - for (source_it = 0; source_it < _tmp59__length1; source_it = source_it + 1) { -#line 4542 "gitg-ref-action-merge.c" - GitgRef* _tmp60_ = NULL; + for (source_it = 0; source_it < _tmp58__length1; source_it = source_it + 1) { +#line 4473 "gitg-ref-action-merge.c" + GitgRef* _tmp59_ = NULL; GitgRef* source = NULL; #line 488 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp60_ = _g_object_ref0 (source_collection[source_it]); + _tmp59_ = _g_object_ref0 (source_collection[source_it]); #line 488 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - source = _tmp60_; -#line 4549 "gitg-ref-action-merge.c" + source = _tmp59_; +#line 4480 "gitg-ref-action-merge.c" { - GtkMenu* _tmp61_ = NULL; - GitgRef* _tmp62_ = NULL; + GtkMenu* _tmp60_ = NULL; + GitgRef* _tmp61_ = NULL; #line 490 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp61_ = subsubmenu; + _tmp60_ = subsubmenu; #line 490 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp62_ = source; + _tmp61_ = source; #line 490 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gitg_ref_action_merge_add_merge_source (self, _tmp61_, _tmp62_); + gitg_ref_action_merge_add_merge_source (self, _tmp60_, _tmp61_); #line 488 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (source); -#line 4561 "gitg-ref-action-merge.c" +#line 4492 "gitg-ref-action-merge.c" } } } #line 493 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp63_ = subitem; + _tmp62_ = subitem; #line 493 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp64_ = subsubmenu; + _tmp63_ = subsubmenu; #line 493 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gtk_menu_item_set_submenu (_tmp63_, _tmp64_); + gtk_menu_item_set_submenu (_tmp62_, _tmp63_); #line 494 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp65_ = submenu; + _tmp64_ = submenu; #line 494 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp66_ = subitem; + _tmp65_ = subitem; #line 494 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gtk_menu_shell_append ((GtkMenuShell*) _tmp65_, (GtkWidget*) _tmp66_); + gtk_menu_shell_append ((GtkMenuShell*) _tmp64_, (GtkWidget*) _tmp65_); #line 474 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (subsubmenu); #line 474 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (subitem); -#line 4581 "gitg-ref-action-merge.c" +#line 4512 "gitg-ref-action-merge.c" } #line 497 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp67_ = item; + _tmp66_ = item; #line 497 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp68_ = submenu; + _tmp67_ = submenu; #line 497 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gtk_menu_item_set_submenu (_tmp67_, _tmp68_); + gtk_menu_item_set_submenu (_tmp66_, _tmp67_); #line 424 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (submenu); -#line 4591 "gitg-ref-action-merge.c" +#line 4522 "gitg-ref-action-merge.c" } else { - GtkMenuItem* _tmp69_ = NULL; + GtkMenuItem* _tmp68_ = NULL; #line 501 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp69_ = item; + _tmp68_ = item; #line 501 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gtk_widget_set_sensitive ((GtkWidget*) _tmp69_, FALSE); -#line 4598 "gitg-ref-action-merge.c" + gtk_widget_set_sensitive ((GtkWidget*) _tmp68_, FALSE); +#line 4529 "gitg-ref-action-merge.c" } #line 504 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp70_ = item; + _tmp69_ = item; #line 504 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gtk_widget_show ((GtkWidget*) _tmp70_); + gtk_widget_show ((GtkWidget*) _tmp69_); #line 505 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp71_ = menu; + _tmp70_ = menu; #line 505 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp72_ = item; + _tmp71_ = item; #line 505 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - gtk_menu_shell_append ((GtkMenuShell*) _tmp71_, (GtkWidget*) _tmp72_); + gtk_menu_shell_append ((GtkMenuShell*) _tmp70_, (GtkWidget*) _tmp71_); #line 414 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _g_object_unref0 (item); -#line 4612 "gitg-ref-action-merge.c" +#line 4543 "gitg-ref-action-merge.c" } @@ -4630,27 +4561,31 @@ result = _tmp1_; #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return result; -#line 4631 "gitg-ref-action-merge.c" +#line 4562 "gitg-ref-action-merge.c" } static void gitg_ref_action_merge_real_set_application (GitgExtUIElement* base, GitgExtApplication* value) { GitgRefActionMerge* self; - GitgExtApplication* _tmp0_ = NULL; - GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" self = (GitgRefActionMerge*) base; #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp0_ = value; + if (gitg_ref_action_merge_real_get_application (self) != value) { +#line 4572 "gitg-ref-action-merge.c" + GitgExtApplication* _tmp0_ = NULL; + GitgExtApplication* _tmp1_ = NULL; #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (self->priv->_application); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - self->priv->_application = _tmp1_; + _g_object_unref0 (self->priv->_application); #line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - g_object_notify ((GObject *) self, "application"); -#line 4651 "gitg-ref-action-merge.c" + self->priv->_application = _tmp1_; +#line 28 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + g_object_notify ((GObject *) self, "application"); +#line 4585 "gitg-ref-action-merge.c" + } } @@ -4666,27 +4601,31 @@ result = _tmp0_; #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return result; -#line 4667 "gitg-ref-action-merge.c" +#line 4602 "gitg-ref-action-merge.c" } static void gitg_ref_action_merge_real_set_action_interface (GitgExtRefAction* base, GitgExtRefActionInterface* value) { GitgRefActionMerge* self; - GitgExtRefActionInterface* _tmp0_ = NULL; - GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" self = (GitgRefActionMerge*) base; #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp0_ = value; + if (gitg_ref_action_merge_real_get_action_interface (self) != value) { +#line 4612 "gitg-ref-action-merge.c" + GitgExtRefActionInterface* _tmp0_ = NULL; + GitgExtRefActionInterface* _tmp1_ = NULL; #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (self->priv->_action_interface); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - self->priv->_action_interface = _tmp1_; + _g_object_unref0 (self->priv->_action_interface); #line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - g_object_notify ((GObject *) self, "action-interface"); -#line 4687 "gitg-ref-action-merge.c" + self->priv->_action_interface = _tmp1_; +#line 29 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + g_object_notify ((GObject *) self, "action-interface"); +#line 4625 "gitg-ref-action-merge.c" + } } @@ -4702,27 +4641,31 @@ result = _tmp0_; #line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return result; -#line 4703 "gitg-ref-action-merge.c" +#line 4642 "gitg-ref-action-merge.c" } static void gitg_ref_action_merge_real_set_reference (GitgExtRefAction* base, GitgRef* value) { GitgRefActionMerge* self; - GitgRef* _tmp0_ = NULL; - GitgRef* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" self = (GitgRefActionMerge*) base; #line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp0_ = value; + if (gitg_ref_action_merge_real_get_reference (self) != value) { +#line 4652 "gitg-ref-action-merge.c" + GitgRef* _tmp0_ = NULL; + GitgRef* _tmp1_ = NULL; #line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (self->priv->_reference); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - self->priv->_reference = _tmp1_; + _g_object_unref0 (self->priv->_reference); #line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - g_object_notify ((GObject *) self, "reference"); -#line 4723 "gitg-ref-action-merge.c" + self->priv->_reference = _tmp1_; +#line 30 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" + g_object_notify ((GObject *) self, "reference"); +#line 4665 "gitg-ref-action-merge.c" + } } @@ -4738,107 +4681,101 @@ result = _tmp0_; #line 58 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return result; -#line 4739 "gitg-ref-action-merge.c" +#line 4682 "gitg-ref-action-merge.c" } static gchar* gitg_ref_action_merge_real_get_display_name (GitgExtUIElement* base) { gchar* result; GitgRefActionMerge* self; - const gchar* _tmp0_ = NULL; + GitgRef* _tmp0_ = NULL; GitgRef* _tmp1_ = NULL; - GitgRef* _tmp2_ = NULL; + GitgParsedRefName* _tmp2_ = NULL; GitgParsedRefName* _tmp3_ = NULL; GitgParsedRefName* _tmp4_ = NULL; - GitgParsedRefName* _tmp5_ = NULL; + gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; #line 63 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" self = (GitgRefActionMerge*) base; #line 63 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp0_ = _ ("Merge into %s"); + _tmp0_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); #line 63 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp1_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); + _tmp1_ = _tmp0_; #line 63 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp2_ = _tmp1_; + _tmp2_ = gitg_ref_get_parsed_name (_tmp1_); #line 63 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp3_ = gitg_ref_get_parsed_name (_tmp2_); + _tmp3_ = _tmp2_; #line 63 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp4_ = _tmp3_; #line 63 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp5_ = _tmp4_; + _tmp5_ = gitg_parsed_ref_name_get_shortname (_tmp4_); #line 63 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp6_ = gitg_parsed_ref_name_get_shortname (_tmp5_); + _tmp6_ = _tmp5_; #line 63 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp7_ = _tmp6_; #line 63 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp8_ = _tmp7_; + _tmp8_ = g_strdup_printf (_ ("Merge into %s"), _tmp7_); #line 63 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp9_ = g_strdup_printf (_tmp0_, _tmp8_); + _tmp9_ = _tmp8_; #line 63 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp10_ = _tmp9_; + _g_free0 (_tmp7_); #line 63 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_free0 (_tmp8_); + _g_object_unref0 (_tmp4_); #line 63 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_tmp5_); -#line 63 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - result = _tmp10_; + result = _tmp9_; #line 63 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return result; -#line 4789 "gitg-ref-action-merge.c" +#line 4729 "gitg-ref-action-merge.c" } static gchar* gitg_ref_action_merge_real_get_description (GitgExtUIElement* base) { gchar* result; GitgRefActionMerge* self; - const gchar* _tmp0_ = NULL; + GitgRef* _tmp0_ = NULL; GitgRef* _tmp1_ = NULL; - GitgRef* _tmp2_ = NULL; + GitgParsedRefName* _tmp2_ = NULL; GitgParsedRefName* _tmp3_ = NULL; GitgParsedRefName* _tmp4_ = NULL; - GitgParsedRefName* _tmp5_ = NULL; + gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" self = (GitgRefActionMerge*) base; #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp0_ = _ ("Merge another branch into branch %s"); + _tmp0_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp1_ = gitg_ext_ref_action_get_reference ((GitgExtRefAction*) self); + _tmp1_ = _tmp0_; #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp2_ = _tmp1_; + _tmp2_ = gitg_ref_get_parsed_name (_tmp1_); #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp3_ = gitg_ref_get_parsed_name (_tmp2_); + _tmp3_ = _tmp2_; #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp4_ = _tmp3_; #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp5_ = _tmp4_; + _tmp5_ = gitg_parsed_ref_name_get_shortname (_tmp4_); #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp6_ = gitg_parsed_ref_name_get_shortname (_tmp5_); + _tmp6_ = _tmp5_; #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp7_ = _tmp6_; #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp8_ = _tmp7_; -#line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp9_ = g_strdup_printf (_tmp0_, _tmp8_); + _tmp8_ = g_strdup_printf (_ ("Merge another branch into branch %s"), _tmp7_); #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp7_); #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp4_); #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - result = _tmp10_; + result = _tmp9_; #line 69 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return result; -#line 4839 "gitg-ref-action-merge.c" +#line 4776 "gitg-ref-action-merge.c" } @@ -4860,7 +4797,7 @@ result = _tmp2_; #line 76 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return result; -#line 4861 "gitg-ref-action-merge.c" +#line 4798 "gitg-ref-action-merge.c" } @@ -4881,7 +4818,7 @@ if (_tmp3_ != NULL) { #line 86 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp2_ = TRUE; -#line 4882 "gitg-ref-action-merge.c" +#line 4819 "gitg-ref-action-merge.c" } else { GitgRef** _tmp4_ = NULL; gint _tmp4__length1 = 0; @@ -4891,13 +4828,13 @@ _tmp4__length1 = self->priv->d_local_sources_length1; #line 87 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp2_ = _tmp4__length1 != 0; -#line 4892 "gitg-ref-action-merge.c" +#line 4829 "gitg-ref-action-merge.c" } #line 86 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp2_) { #line 86 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp1_ = TRUE; -#line 4898 "gitg-ref-action-merge.c" +#line 4835 "gitg-ref-action-merge.c" } else { GitgRefActionMergeRemoteSource* _tmp5_ = NULL; gint _tmp5__length1 = 0; @@ -4907,13 +4844,13 @@ _tmp5__length1 = self->priv->d_remote_sources_length1; #line 88 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp1_ = _tmp5__length1 != 0; -#line 4908 "gitg-ref-action-merge.c" +#line 4845 "gitg-ref-action-merge.c" } #line 86 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" if (_tmp1_) { #line 86 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp0_ = TRUE; -#line 4914 "gitg-ref-action-merge.c" +#line 4851 "gitg-ref-action-merge.c" } else { GitgRef** _tmp6_ = NULL; gint _tmp6__length1 = 0; @@ -4923,13 +4860,13 @@ _tmp6__length1 = self->priv->d_tag_sources_length1; #line 89 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp0_ = _tmp6__length1 != 0; -#line 4924 "gitg-ref-action-merge.c" +#line 4861 "gitg-ref-action-merge.c" } #line 86 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" result = _tmp0_; #line 86 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return result; -#line 4930 "gitg-ref-action-merge.c" +#line 4867 "gitg-ref-action-merge.c" } @@ -4940,17 +4877,17 @@ result = g_new0 (GitgRef*, length + 1); #line 32 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" for (i = 0; i < length; i++) { -#line 4941 "gitg-ref-action-merge.c" +#line 4878 "gitg-ref-action-merge.c" GitgRef* _tmp0_ = NULL; #line 32 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 32 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" result[i] = _tmp0_; -#line 4947 "gitg-ref-action-merge.c" +#line 4884 "gitg-ref-action-merge.c" } #line 32 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return result; -#line 4951 "gitg-ref-action-merge.c" +#line 4888 "gitg-ref-action-merge.c" } @@ -4985,7 +4922,7 @@ (*dest).sources_length1 = _tmp3__length1; #line 32 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" (*dest)._sources_size_ = (*dest).sources_length1; -#line 4986 "gitg-ref-action-merge.c" +#line 4923 "gitg-ref-action-merge.c" } @@ -4994,7 +4931,7 @@ _g_free0 ((*self).name); #line 35 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" (*self).sources = (_vala_array_free ((*self).sources, (*self).sources_length1, (GDestroyNotify) g_object_unref), NULL); -#line 4995 "gitg-ref-action-merge.c" +#line 4932 "gitg-ref-action-merge.c" } @@ -5006,7 +4943,7 @@ gitg_ref_action_merge_remote_source_copy (self, dup); #line 32 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" return dup; -#line 5007 "gitg-ref-action-merge.c" +#line 4944 "gitg-ref-action-merge.c" } @@ -5015,7 +4952,7 @@ gitg_ref_action_merge_remote_source_destroy (self); #line 32 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_free (self); -#line 5016 "gitg-ref-action-merge.c" +#line 4953 "gitg-ref-action-merge.c" } @@ -5057,7 +4994,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REF_ACTION_MERGE_AVAILABLE, g_param_spec_boolean ("available", "available", "available", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_REF_ACTION_MERGE_ENABLED, g_param_spec_boolean ("enabled", "enabled", "enabled", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 5058 "gitg-ref-action-merge.c" +#line 4995 "gitg-ref-action-merge.c" } @@ -5078,7 +5015,7 @@ iface->get_available = gitg_ref_action_merge_real_get_available; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" iface->get_enabled = gitg_ref_action_merge_real_get_enabled; -#line 5079 "gitg-ref-action-merge.c" +#line 5016 "gitg-ref-action-merge.c" } @@ -5086,8 +5023,8 @@ #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" gitg_ref_action_merge_gitg_ext_action_parent_iface = g_type_interface_peek_parent (iface); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" - iface->populate_menu = (void (*)(GitgExtAction*, GtkMenu*)) gitg_ref_action_merge_real_populate_menu; -#line 5088 "gitg-ref-action-merge.c" + iface->populate_menu = (void (*) (GitgExtAction *, GtkMenu*)) gitg_ref_action_merge_real_populate_menu; +#line 5025 "gitg-ref-action-merge.c" } @@ -5102,18 +5039,18 @@ iface->get_reference = gitg_ref_action_merge_real_get_reference; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" iface->set_reference = gitg_ref_action_merge_real_set_reference; -#line 5103 "gitg-ref-action-merge.c" +#line 5040 "gitg-ref-action-merge.c" } static void gitg_ref_action_merge_instance_init (GitgRefActionMerge * self) { #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" self->priv = GITG_REF_ACTION_MERGE_GET_PRIVATE (self); -#line 5110 "gitg-ref-action-merge.c" +#line 5047 "gitg-ref-action-merge.c" } -static void gitg_ref_action_merge_finalize (GObject* obj) { +static void gitg_ref_action_merge_finalize (GObject * obj) { GitgRefActionMerge * self; #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_REF_ACTION_MERGE, GitgRefActionMerge); @@ -5135,7 +5072,7 @@ _g_object_unref0 (self->priv->d_support); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" G_OBJECT_CLASS (gitg_ref_action_merge_parent_class)->finalize (obj); -#line 5136 "gitg-ref-action-merge.c" +#line 5073 "gitg-ref-action-merge.c" } @@ -5210,13 +5147,13 @@ g_value_set_boolean (value, gitg_ext_ui_element_get_enabled ((GitgExtUIElement*) self)); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" break; -#line 5211 "gitg-ref-action-merge.c" +#line 5148 "gitg-ref-action-merge.c" default: #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" break; -#line 5217 "gitg-ref-action-merge.c" +#line 5154 "gitg-ref-action-merge.c" } } @@ -5244,13 +5181,13 @@ gitg_ext_ref_action_set_reference ((GitgExtRefAction*) self, g_value_get_object (value)); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" break; -#line 5245 "gitg-ref-action-merge.c" +#line 5182 "gitg-ref-action-merge.c" default: #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/tests/gitg/gitg-ref-action-merge.vala" break; -#line 5251 "gitg-ref-action-merge.c" +#line 5188 "gitg-ref-action-merge.c" } } diff -Nru gitg-3.22.0/tests/gitg/main.c gitg-3.23.0/tests/gitg/main.c --- gitg-3.22.0/tests/gitg/main.c 2016-08-09 09:51:19.000000000 +0000 +++ gitg-3.23.0/tests/gitg/main.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* main.c generated by valac 0.32.1, the Vala compiler +/* main.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from main.vala, do not modify */ /* @@ -165,7 +165,7 @@ void gitg_test_main_run (GitgTestMain* self); GitgTestRunner* gitg_test_runner_new (void); GitgTestRunner* gitg_test_runner_construct (GType object_type); -static void gitg_test_runner_finalize (GitgTestRunner* obj); +static void gitg_test_runner_finalize (GitgTestRunner * obj); void gitg_test_runner_main (gchar** args, int args_length1) { @@ -286,7 +286,7 @@ #line 20 "/home/jesse/dev/gitg/tests/gitg/main.vala" if (collect_values[0].v_pointer) { #line 289 "main.c" - GitgTestRunner* object; + GitgTestRunner * object; object = collect_values[0].v_pointer; #line 20 "/home/jesse/dev/gitg/tests/gitg/main.vala" if (object->parent_instance.g_class == NULL) { @@ -313,7 +313,7 @@ static gchar* gitg_test_value_runner_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GitgTestRunner** object_p; + GitgTestRunner ** object_p; object_p = collect_values[0].v_pointer; #line 20 "/home/jesse/dev/gitg/tests/gitg/main.vala" if (!object_p) { @@ -365,7 +365,7 @@ void gitg_test_value_set_runner (GValue* value, gpointer v_object) { - GitgTestRunner* old; + GitgTestRunner * old; #line 20 "/home/jesse/dev/gitg/tests/gitg/main.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TEST_TYPE_RUNNER)); #line 20 "/home/jesse/dev/gitg/tests/gitg/main.vala" @@ -396,7 +396,7 @@ void gitg_test_value_take_runner (GValue* value, gpointer v_object) { - GitgTestRunner* old; + GitgTestRunner * old; #line 20 "/home/jesse/dev/gitg/tests/gitg/main.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TEST_TYPE_RUNNER)); #line 20 "/home/jesse/dev/gitg/tests/gitg/main.vala" @@ -440,7 +440,7 @@ } -static void gitg_test_runner_finalize (GitgTestRunner* obj) { +static void gitg_test_runner_finalize (GitgTestRunner * obj) { GitgTestRunner * self; #line 20 "/home/jesse/dev/gitg/tests/gitg/main.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TEST_TYPE_RUNNER, GitgTestRunner); @@ -465,7 +465,7 @@ gpointer gitg_test_runner_ref (gpointer instance) { - GitgTestRunner* self; + GitgTestRunner * self; self = instance; #line 20 "/home/jesse/dev/gitg/tests/gitg/main.vala" g_atomic_int_inc (&self->ref_count); @@ -476,7 +476,7 @@ void gitg_test_runner_unref (gpointer instance) { - GitgTestRunner* self; + GitgTestRunner * self; self = instance; #line 20 "/home/jesse/dev/gitg/tests/gitg/main.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { diff -Nru gitg-3.22.0/tests/gitg/notifications-mock.c gitg-3.23.0/tests/gitg/notifications-mock.c --- gitg-3.22.0/tests/gitg/notifications-mock.c 2016-08-09 09:51:19.000000000 +0000 +++ gitg-3.23.0/tests/gitg/notifications-mock.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* notifications-mock.c generated by valac 0.32.1, the Vala compiler +/* notifications-mock.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from notifications-mock.vala, do not modify */ /* @@ -37,6 +37,12 @@ typedef struct _GitgTestNotificationsClass GitgTestNotificationsClass; typedef struct _GitgTestNotificationsPrivate GitgTestNotificationsPrivate; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) +enum { + GITG_TEST_NOTIFICATIONS_ADDED_SIGNAL, + GITG_TEST_NOTIFICATIONS_REMOVED_SIGNAL, + GITG_TEST_NOTIFICATIONS_LAST_SIGNAL +}; +static guint gitg_test_notifications_signals[GITG_TEST_NOTIFICATIONS_LAST_SIGNAL] = {0}; struct _GitgTestNotifications { GObject parent_instance; @@ -50,7 +56,7 @@ static gpointer gitg_test_notifications_parent_class = NULL; -static GitgExtNotificationsIface* gitg_test_notifications_gitg_ext_notifications_parent_iface = NULL; +static GitgExtNotificationsIface * gitg_test_notifications_gitg_ext_notifications_parent_iface = NULL; GType gitg_test_notifications_get_type (void) G_GNUC_CONST; enum { @@ -60,7 +66,7 @@ GitgTestNotifications* gitg_test_notifications_construct (GType object_type); static void gitg_test_notifications_real_add (GitgExtNotifications* base, GitgExtNotification* notification); static void gitg_test_notifications_real_remove (GitgExtNotifications* base, GitgExtNotification* notification, guint delay); -static void gitg_test_notifications_finalize (GObject* obj); +static void gitg_test_notifications_finalize (GObject * obj); GitgTestNotifications* gitg_test_notifications_construct (GType object_type) { @@ -76,14 +82,14 @@ self->notifications = _tmp0_; #line 29 "/home/jesse/dev/gitg/tests/gitg/notifications-mock.vala" return self; -#line 80 "notifications-mock.c" +#line 86 "notifications-mock.c" } GitgTestNotifications* gitg_test_notifications_new (void) { #line 29 "/home/jesse/dev/gitg/tests/gitg/notifications-mock.vala" return gitg_test_notifications_construct (GITG_TEST_TYPE_NOTIFICATIONS); -#line 87 "notifications-mock.c" +#line 93 "notifications-mock.c" } @@ -99,14 +105,14 @@ #line 36 "/home/jesse/dev/gitg/tests/gitg/notifications-mock.vala" _tmp0_ = notification; #line 36 "/home/jesse/dev/gitg/tests/gitg/notifications-mock.vala" - g_signal_emit_by_name (self, "added", _tmp0_); + g_signal_emit (self, gitg_test_notifications_signals[GITG_TEST_NOTIFICATIONS_ADDED_SIGNAL], 0, _tmp0_); #line 37 "/home/jesse/dev/gitg/tests/gitg/notifications-mock.vala" _tmp1_ = self->notifications; #line 37 "/home/jesse/dev/gitg/tests/gitg/notifications-mock.vala" _tmp2_ = notification; #line 37 "/home/jesse/dev/gitg/tests/gitg/notifications-mock.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _tmp1_, _tmp2_); -#line 110 "notifications-mock.c" +#line 116 "notifications-mock.c" } @@ -122,14 +128,14 @@ #line 42 "/home/jesse/dev/gitg/tests/gitg/notifications-mock.vala" _tmp0_ = notification; #line 42 "/home/jesse/dev/gitg/tests/gitg/notifications-mock.vala" - g_signal_emit_by_name (self, "removed", _tmp0_); + g_signal_emit (self, gitg_test_notifications_signals[GITG_TEST_NOTIFICATIONS_REMOVED_SIGNAL], 0, _tmp0_); #line 43 "/home/jesse/dev/gitg/tests/gitg/notifications-mock.vala" _tmp1_ = self->notifications; #line 43 "/home/jesse/dev/gitg/tests/gitg/notifications-mock.vala" _tmp2_ = notification; #line 43 "/home/jesse/dev/gitg/tests/gitg/notifications-mock.vala" gee_abstract_collection_remove ((GeeAbstractCollection*) _tmp1_, _tmp2_); -#line 133 "notifications-mock.c" +#line 139 "notifications-mock.c" } @@ -139,10 +145,10 @@ #line 22 "/home/jesse/dev/gitg/tests/gitg/notifications-mock.vala" G_OBJECT_CLASS (klass)->finalize = gitg_test_notifications_finalize; #line 22 "/home/jesse/dev/gitg/tests/gitg/notifications-mock.vala" - g_signal_new ("added", GITG_TEST_TYPE_NOTIFICATIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GITG_EXT_TYPE_NOTIFICATION); + gitg_test_notifications_signals[GITG_TEST_NOTIFICATIONS_ADDED_SIGNAL] = g_signal_new ("added", GITG_TEST_TYPE_NOTIFICATIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GITG_EXT_TYPE_NOTIFICATION); #line 22 "/home/jesse/dev/gitg/tests/gitg/notifications-mock.vala" - g_signal_new ("removed", GITG_TEST_TYPE_NOTIFICATIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GITG_EXT_TYPE_NOTIFICATION); -#line 146 "notifications-mock.c" + gitg_test_notifications_signals[GITG_TEST_NOTIFICATIONS_REMOVED_SIGNAL] = g_signal_new ("removed", GITG_TEST_TYPE_NOTIFICATIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GITG_EXT_TYPE_NOTIFICATION); +#line 152 "notifications-mock.c" } @@ -150,10 +156,10 @@ #line 22 "/home/jesse/dev/gitg/tests/gitg/notifications-mock.vala" gitg_test_notifications_gitg_ext_notifications_parent_iface = g_type_interface_peek_parent (iface); #line 22 "/home/jesse/dev/gitg/tests/gitg/notifications-mock.vala" - iface->add = (void (*)(GitgExtNotifications*, GitgExtNotification*)) gitg_test_notifications_real_add; + iface->add = (void (*) (GitgExtNotifications *, GitgExtNotification*)) gitg_test_notifications_real_add; #line 22 "/home/jesse/dev/gitg/tests/gitg/notifications-mock.vala" - iface->remove = (void (*)(GitgExtNotifications*, GitgExtNotification*, guint)) gitg_test_notifications_real_remove; -#line 157 "notifications-mock.c" + iface->remove = (void (*) (GitgExtNotifications *, GitgExtNotification*, guint)) gitg_test_notifications_real_remove; +#line 163 "notifications-mock.c" } @@ -161,7 +167,7 @@ } -static void gitg_test_notifications_finalize (GObject* obj) { +static void gitg_test_notifications_finalize (GObject * obj) { GitgTestNotifications * self; #line 22 "/home/jesse/dev/gitg/tests/gitg/notifications-mock.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TEST_TYPE_NOTIFICATIONS, GitgTestNotifications); @@ -169,7 +175,7 @@ _g_object_unref0 (self->notifications); #line 22 "/home/jesse/dev/gitg/tests/gitg/notifications-mock.vala" G_OBJECT_CLASS (gitg_test_notifications_parent_class)->finalize (obj); -#line 173 "notifications-mock.c" +#line 179 "notifications-mock.c" } diff -Nru gitg-3.22.0/tests/gitg/ref-action-interface-mock.c gitg-3.23.0/tests/gitg/ref-action-interface-mock.c --- gitg-3.22.0/tests/gitg/ref-action-interface-mock.c 2016-08-09 09:51:19.000000000 +0000 +++ gitg-3.23.0/tests/gitg/ref-action-interface-mock.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* ref-action-interface-mock.c generated by valac 0.32.1, the Vala compiler +/* ref-action-interface-mock.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from ref-action-interface-mock.vala, do not modify */ /* @@ -54,7 +54,7 @@ static gpointer gitg_test_ref_action_interface_parent_class = NULL; -static GitgExtRefActionInterfaceIface* gitg_test_ref_action_interface_gitg_ext_ref_action_interface_parent_iface = NULL; +static GitgExtRefActionInterfaceIface * gitg_test_ref_action_interface_gitg_ext_ref_action_interface_parent_iface = NULL; GType gitg_test_ref_action_interface_get_type (void) G_GNUC_CONST; #define GITG_TEST_REF_ACTION_INTERFACE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GITG_TEST_TYPE_REF_ACTION_INTERFACE, GitgTestRefActionInterfacePrivate)) @@ -71,7 +71,7 @@ static void gitg_test_ref_action_interface_real_set_busy (GitgExtRefActionInterface* base, GitgRef* reference, gboolean busy); static void gitg_test_ref_action_interface_real_edit_ref_name (GitgExtRefActionInterface* base, GitgRef* reference, GitgExtRefNameEditingDone callback, void* callback_target, GDestroyNotify callback_target_destroy_notify); static void gitg_test_ref_action_interface_real_refresh (GitgExtRefActionInterface* base); -static void gitg_test_ref_action_interface_finalize (GObject* obj); +static void gitg_test_ref_action_interface_finalize (GObject * obj); static void _vala_gitg_test_ref_action_interface_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_test_ref_action_interface_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -194,21 +194,25 @@ static void gitg_test_ref_action_interface_real_set_application (GitgExtRefActionInterface* base, GitgExtApplication* value) { GitgTestRefActionInterface* self; - GitgExtApplication* _tmp0_ = NULL; - GitgExtApplication* _tmp1_ = NULL; #line 24 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" self = (GitgTestRefActionInterface*) base; #line 24 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" - _tmp0_ = value; + if (gitg_test_ref_action_interface_real_get_application (self) != value) { +#line 202 "ref-action-interface-mock.c" + GitgExtApplication* _tmp0_ = NULL; + GitgExtApplication* _tmp1_ = NULL; #line 24 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 24 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" - _g_object_unref0 (self->priv->_application); + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 24 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" + _g_object_unref0 (self->priv->_application); #line 24 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" - self->priv->_application = _tmp1_; + self->priv->_application = _tmp1_; #line 24 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" - g_object_notify ((GObject *) self, "application"); -#line 212 "ref-action-interface-mock.c" + g_object_notify ((GObject *) self, "application"); +#line 215 "ref-action-interface-mock.c" + } } @@ -224,7 +228,7 @@ result = (GeeList*) _tmp0_; #line 33 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" return result; -#line 228 "ref-action-interface-mock.c" +#line 232 "ref-action-interface-mock.c" } @@ -243,7 +247,7 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_TEST_REF_ACTION_INTERFACE_APPLICATION, g_param_spec_object ("application", "application", "application", GITG_EXT_TYPE_APPLICATION, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); #line 22 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_TEST_REF_ACTION_INTERFACE_REFERENCES, g_param_spec_object ("references", "references", "references", GEE_TYPE_LIST, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 247 "ref-action-interface-mock.c" +#line 251 "ref-action-interface-mock.c" } @@ -251,35 +255,35 @@ #line 22 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" gitg_test_ref_action_interface_gitg_ext_ref_action_interface_parent_iface = g_type_interface_peek_parent (iface); #line 22 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" - iface->add_ref = (void (*)(GitgExtRefActionInterface*, GitgRef*)) gitg_test_ref_action_interface_real_add_ref; + iface->add_ref = (void (*) (GitgExtRefActionInterface *, GitgRef*)) gitg_test_ref_action_interface_real_add_ref; #line 22 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" - iface->remove_ref = (void (*)(GitgExtRefActionInterface*, GitgRef*)) gitg_test_ref_action_interface_real_remove_ref; + iface->remove_ref = (void (*) (GitgExtRefActionInterface *, GitgRef*)) gitg_test_ref_action_interface_real_remove_ref; #line 22 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" - iface->replace_ref = (void (*)(GitgExtRefActionInterface*, GitgRef*, GitgRef*)) gitg_test_ref_action_interface_real_replace_ref; + iface->replace_ref = (void (*) (GitgExtRefActionInterface *, GitgRef*, GitgRef*)) gitg_test_ref_action_interface_real_replace_ref; #line 22 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" - iface->set_busy = (void (*)(GitgExtRefActionInterface*, GitgRef*, gboolean)) gitg_test_ref_action_interface_real_set_busy; + iface->set_busy = (void (*) (GitgExtRefActionInterface *, GitgRef*, gboolean)) gitg_test_ref_action_interface_real_set_busy; #line 22 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" - iface->edit_ref_name = (void (*)(GitgExtRefActionInterface*, GitgRef*, GitgExtRefNameEditingDone, void*, GDestroyNotify)) gitg_test_ref_action_interface_real_edit_ref_name; + iface->edit_ref_name = (void (*) (GitgExtRefActionInterface *, GitgRef*, GitgExtRefNameEditingDone, void*, GDestroyNotify)) gitg_test_ref_action_interface_real_edit_ref_name; #line 22 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" - iface->refresh = (void (*)(GitgExtRefActionInterface*)) gitg_test_ref_action_interface_real_refresh; + iface->refresh = (void (*) (GitgExtRefActionInterface *)) gitg_test_ref_action_interface_real_refresh; #line 22 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" iface->get_application = gitg_test_ref_action_interface_real_get_application; #line 22 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" iface->set_application = gitg_test_ref_action_interface_real_set_application; #line 22 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" iface->get_references = gitg_test_ref_action_interface_real_get_references; -#line 272 "ref-action-interface-mock.c" +#line 276 "ref-action-interface-mock.c" } static void gitg_test_ref_action_interface_instance_init (GitgTestRefActionInterface * self) { #line 22 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" self->priv = GITG_TEST_REF_ACTION_INTERFACE_GET_PRIVATE (self); -#line 279 "ref-action-interface-mock.c" +#line 283 "ref-action-interface-mock.c" } -static void gitg_test_ref_action_interface_finalize (GObject* obj) { +static void gitg_test_ref_action_interface_finalize (GObject * obj) { GitgTestRefActionInterface * self; #line 22 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TEST_TYPE_REF_ACTION_INTERFACE, GitgTestRefActionInterface); @@ -287,7 +291,7 @@ _g_object_unref0 (self->priv->_application); #line 22 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" G_OBJECT_CLASS (gitg_test_ref_action_interface_parent_class)->finalize (obj); -#line 291 "ref-action-interface-mock.c" +#line 295 "ref-action-interface-mock.c" } @@ -322,13 +326,13 @@ g_value_take_object (value, gitg_ext_ref_action_interface_get_references ((GitgExtRefActionInterface*) self)); #line 22 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" break; -#line 326 "ref-action-interface-mock.c" +#line 330 "ref-action-interface-mock.c" default: #line 22 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 22 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" break; -#line 332 "ref-action-interface-mock.c" +#line 336 "ref-action-interface-mock.c" } } @@ -344,13 +348,13 @@ gitg_ext_ref_action_interface_set_application ((GitgExtRefActionInterface*) self, g_value_get_object (value)); #line 22 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" break; -#line 348 "ref-action-interface-mock.c" +#line 352 "ref-action-interface-mock.c" default: #line 22 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 22 "/home/jesse/dev/gitg/tests/gitg/ref-action-interface-mock.vala" break; -#line 354 "ref-action-interface-mock.c" +#line 358 "ref-action-interface-mock.c" } } diff -Nru gitg-3.22.0/tests/gitg/simple-notification-mock.c gitg-3.23.0/tests/gitg/simple-notification-mock.c --- gitg-3.22.0/tests/gitg/simple-notification-mock.c 2016-08-09 09:51:19.000000000 +0000 +++ gitg-3.23.0/tests/gitg/simple-notification-mock.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* simple-notification-mock.c generated by valac 0.32.1, the Vala compiler +/* simple-notification-mock.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from simple-notification-mock.vala, do not modify */ /* @@ -40,6 +40,11 @@ #define GITG_SIMPLE_NOTIFICATION_TYPE_STATUS (gitg_simple_notification_status_get_type ()) #define _g_free0(var) (var = (g_free (var), NULL)) +enum { + GITG_SIMPLE_NOTIFICATION_CANCEL_SIGNAL, + GITG_SIMPLE_NOTIFICATION_LAST_SIGNAL +}; +static guint gitg_simple_notification_signals[GITG_SIMPLE_NOTIFICATION_LAST_SIGNAL] = {0}; struct _GitgSimpleNotification { GObject parent_instance; @@ -64,7 +69,7 @@ static gpointer gitg_simple_notification_parent_class = NULL; -static GitgExtNotificationIface* gitg_simple_notification_gitg_ext_notification_parent_iface = NULL; +static GitgExtNotificationIface * gitg_simple_notification_gitg_ext_notification_parent_iface = NULL; GType gitg_simple_notification_get_type (void) G_GNUC_CONST; GType gitg_simple_notification_status_get_type (void) G_GNUC_CONST; @@ -86,7 +91,7 @@ const gchar* gitg_simple_notification_get_title (GitgSimpleNotification* self); void gitg_simple_notification_set_title (GitgSimpleNotification* self, const gchar* value); const gchar* gitg_simple_notification_get_message (GitgSimpleNotification* self); -static void gitg_simple_notification_finalize (GObject* obj); +static void gitg_simple_notification_finalize (GObject * obj); static void _vala_gitg_simple_notification_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gitg_simple_notification_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -115,14 +120,14 @@ self = (GitgSimpleNotification*) g_object_new (object_type, "title", _tmp0_, "message", _tmp1_, NULL); #line 38 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" return self; -#line 119 "simple-notification-mock.c" +#line 124 "simple-notification-mock.c" } GitgSimpleNotification* gitg_simple_notification_new (const gchar* title, const gchar* message) { #line 38 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" return gitg_simple_notification_construct (GITG_TYPE_SIMPLE_NOTIFICATION, title, message); -#line 126 "simple-notification-mock.c" +#line 131 "simple-notification-mock.c" } @@ -138,7 +143,7 @@ gitg_simple_notification_set_message (self, _tmp0_); #line 51 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" gitg_simple_notification_set_status (self, GITG_SIMPLE_NOTIFICATION_STATUS_SUCCESS); -#line 142 "simple-notification-mock.c" +#line 147 "simple-notification-mock.c" } @@ -154,7 +159,7 @@ gitg_simple_notification_set_message (self, _tmp0_); #line 57 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" gitg_simple_notification_set_status (self, GITG_SIMPLE_NOTIFICATION_STATUS_ERROR); -#line 158 "simple-notification-mock.c" +#line 163 "simple-notification-mock.c" } @@ -169,21 +174,25 @@ result = _tmp0_; #line 33 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" return result; -#line 173 "simple-notification-mock.c" +#line 178 "simple-notification-mock.c" } void gitg_simple_notification_set_status (GitgSimpleNotification* self, GitgSimpleNotificationStatus value) { - GitgSimpleNotificationStatus _tmp0_ = 0; #line 33 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" g_return_if_fail (self != NULL); #line 33 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" - _tmp0_ = value; + if (gitg_simple_notification_get_status (self) != value) { +#line 187 "simple-notification-mock.c" + GitgSimpleNotificationStatus _tmp0_ = 0; +#line 33 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" + _tmp0_ = value; #line 33 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" - self->priv->_status = _tmp0_; + self->priv->_status = _tmp0_; #line 33 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" - g_object_notify ((GObject *) self, "status"); -#line 187 "simple-notification-mock.c" + g_object_notify ((GObject *) self, "status"); +#line 195 "simple-notification-mock.c" + } } @@ -198,26 +207,30 @@ result = _tmp0_; #line 35 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" return result; -#line 202 "simple-notification-mock.c" +#line 211 "simple-notification-mock.c" } void gitg_simple_notification_set_title (GitgSimpleNotification* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; #line 35 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" g_return_if_fail (self != NULL); #line 35 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" - _tmp0_ = value; + if (g_strcmp0 (value, gitg_simple_notification_get_title (self)) != 0) { +#line 220 "simple-notification-mock.c" + const gchar* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; #line 35 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = value; #line 35 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" - _g_free0 (self->priv->_title); + _tmp1_ = g_strdup (_tmp0_); +#line 35 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" + _g_free0 (self->priv->_title); #line 35 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" - self->priv->_title = _tmp1_; + self->priv->_title = _tmp1_; #line 35 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" - g_object_notify ((GObject *) self, "title"); -#line 221 "simple-notification-mock.c" + g_object_notify ((GObject *) self, "title"); +#line 233 "simple-notification-mock.c" + } } @@ -232,26 +245,30 @@ result = _tmp0_; #line 36 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" return result; -#line 236 "simple-notification-mock.c" +#line 249 "simple-notification-mock.c" } void gitg_simple_notification_set_message (GitgSimpleNotification* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; #line 36 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" g_return_if_fail (self != NULL); #line 36 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" - _tmp0_ = value; + if (g_strcmp0 (value, gitg_simple_notification_get_message (self)) != 0) { +#line 258 "simple-notification-mock.c" + const gchar* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; #line 36 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = value; #line 36 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" - _g_free0 (self->priv->_message); + _tmp1_ = g_strdup (_tmp0_); +#line 36 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" + _g_free0 (self->priv->_message); #line 36 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" - self->priv->_message = _tmp1_; + self->priv->_message = _tmp1_; #line 36 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" - g_object_notify ((GObject *) self, "message"); -#line 255 "simple-notification-mock.c" + g_object_notify ((GObject *) self, "message"); +#line 271 "simple-notification-mock.c" + } } @@ -264,7 +281,7 @@ result = NULL; #line 45 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" return result; -#line 268 "simple-notification-mock.c" +#line 285 "simple-notification-mock.c" } @@ -288,8 +305,8 @@ #line 23 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), GITG_SIMPLE_NOTIFICATION_WIDGET, g_param_spec_object ("widget", "widget", "widget", gtk_widget_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 23 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" - g_signal_new ("cancel", GITG_TYPE_SIMPLE_NOTIFICATION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 293 "simple-notification-mock.c" + gitg_simple_notification_signals[GITG_SIMPLE_NOTIFICATION_CANCEL_SIGNAL] = g_signal_new ("cancel", GITG_TYPE_SIMPLE_NOTIFICATION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 310 "simple-notification-mock.c" } @@ -298,18 +315,18 @@ gitg_simple_notification_gitg_ext_notification_parent_iface = g_type_interface_peek_parent (iface); #line 23 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" iface->get_widget = gitg_simple_notification_real_get_widget; -#line 302 "simple-notification-mock.c" +#line 319 "simple-notification-mock.c" } static void gitg_simple_notification_instance_init (GitgSimpleNotification * self) { #line 23 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" self->priv = GITG_SIMPLE_NOTIFICATION_GET_PRIVATE (self); -#line 309 "simple-notification-mock.c" +#line 326 "simple-notification-mock.c" } -static void gitg_simple_notification_finalize (GObject* obj) { +static void gitg_simple_notification_finalize (GObject * obj) { GitgSimpleNotification * self; #line 23 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TYPE_SIMPLE_NOTIFICATION, GitgSimpleNotification); @@ -319,7 +336,7 @@ _g_free0 (self->priv->_message); #line 23 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" G_OBJECT_CLASS (gitg_simple_notification_parent_class)->finalize (obj); -#line 323 "simple-notification-mock.c" +#line 340 "simple-notification-mock.c" } @@ -366,13 +383,13 @@ g_value_take_object (value, gitg_ext_notification_get_widget ((GitgExtNotification*) self)); #line 23 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" break; -#line 370 "simple-notification-mock.c" +#line 387 "simple-notification-mock.c" default: #line 23 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" break; -#line 376 "simple-notification-mock.c" +#line 393 "simple-notification-mock.c" } } @@ -400,13 +417,13 @@ gitg_simple_notification_set_message (self, g_value_get_string (value)); #line 23 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" break; -#line 404 "simple-notification-mock.c" +#line 421 "simple-notification-mock.c" default: #line 23 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 23 "/home/jesse/dev/gitg/tests/gitg/simple-notification-mock.vala" break; -#line 410 "simple-notification-mock.c" +#line 427 "simple-notification-mock.c" } } diff -Nru gitg-3.22.0/tests/gitg/support-main.c gitg-3.23.0/tests/gitg/support-main.c --- gitg-3.22.0/tests/gitg/support-main.c 2016-08-09 09:51:19.000000000 +0000 +++ gitg-3.23.0/tests/gitg/support-main.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* support-main.c generated by valac 0.32.1, the Vala compiler +/* support-main.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from support-main.vala, do not modify */ /* @@ -125,7 +125,7 @@ GTestSuite* gitg_test_test_get_suite (GitgTestTest* self); static GitgTestMainTestCase* gitg_test_main_test_case_new (GitgTestTest* test, const gchar* name, guint signal_id); static GitgTestMainTestCase* gitg_test_main_test_case_construct (GType object_type, GitgTestTest* test, const gchar* name, guint signal_id); -static void _vala_array_add9 (GitgTestMainTestCase*** array, int* length, int* size, GitgTestMainTestCase* value); +static void _vala_array_add9 (GitgTestMainTestCase** * array, int* length, int* size, GitgTestMainTestCase* value); static const gchar* gitg_test_main_test_case_get_name (GitgTestMainTestCase* self); static void gitg_test_main_test_case_set_up (GitgTestMainTestCase* self); static void _gitg_test_main_test_case_set_up_gtest_fixture_func (void* fixture, gpointer self); @@ -140,9 +140,9 @@ }; void gitg_test_test_set_up (GitgTestTest* self); void gitg_test_test_tear_down (GitgTestTest* self); -static void gitg_test_main_test_case_finalize (GObject* obj); +static void gitg_test_main_test_case_finalize (GObject * obj); static void _vala_gitg_test_main_test_case_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); -static void gitg_test_main_finalize (GitgTestMain* obj); +static void gitg_test_main_finalize (GitgTestMain * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -256,109 +256,109 @@ glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1347 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { #line 272 "support-main.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; #line 281 "support-main.c" } -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { #line 287 "support-main.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; #line 296 "support-main.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { #line 302 "support-main.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; #line 311 "support-main.c" } else { -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = FALSE; #line 315 "support-main.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { #line 323 "support-main.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; #line 332 "support-main.c" } else { -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 336 "support-main.c" } -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 358 "support-main.c" } -static void _vala_array_add9 (GitgTestMainTestCase*** array, int* length, int* size, GitgTestMainTestCase* value) { +static void _vala_array_add9 (GitgTestMainTestCase** * array, int* length, int* size, GitgTestMainTestCase* value) { #line 103 "/home/jesse/dev/gitg/tests/gitg/support-main.vala" if ((*length) == (*size)) { #line 103 "/home/jesse/dev/gitg/tests/gitg/support-main.vala" @@ -729,7 +729,7 @@ } -static void gitg_test_main_test_case_finalize (GObject* obj) { +static void gitg_test_main_test_case_finalize (GObject * obj) { GitgTestMainTestCase * self; #line 35 "/home/jesse/dev/gitg/tests/gitg/support-main.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TEST_MAIN_TYPE_TEST_CASE, GitgTestMainTestCase); @@ -819,7 +819,7 @@ #line 20 "/home/jesse/dev/gitg/tests/gitg/support-main.vala" if (collect_values[0].v_pointer) { #line 822 "support-main.c" - GitgTestMain* object; + GitgTestMain * object; object = collect_values[0].v_pointer; #line 20 "/home/jesse/dev/gitg/tests/gitg/support-main.vala" if (object->parent_instance.g_class == NULL) { @@ -846,7 +846,7 @@ static gchar* gitg_test_value_main_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GitgTestMain** object_p; + GitgTestMain ** object_p; object_p = collect_values[0].v_pointer; #line 20 "/home/jesse/dev/gitg/tests/gitg/support-main.vala" if (!object_p) { @@ -898,7 +898,7 @@ void gitg_test_value_set_main (GValue* value, gpointer v_object) { - GitgTestMain* old; + GitgTestMain * old; #line 20 "/home/jesse/dev/gitg/tests/gitg/support-main.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TEST_TYPE_MAIN)); #line 20 "/home/jesse/dev/gitg/tests/gitg/support-main.vala" @@ -929,7 +929,7 @@ void gitg_test_value_take_main (GValue* value, gpointer v_object) { - GitgTestMain* old; + GitgTestMain * old; #line 20 "/home/jesse/dev/gitg/tests/gitg/support-main.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TEST_TYPE_MAIN)); #line 20 "/home/jesse/dev/gitg/tests/gitg/support-main.vala" @@ -977,7 +977,7 @@ } -static void gitg_test_main_finalize (GitgTestMain* obj) { +static void gitg_test_main_finalize (GitgTestMain * obj) { GitgTestMain * self; #line 20 "/home/jesse/dev/gitg/tests/gitg/support-main.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TEST_TYPE_MAIN, GitgTestMain); @@ -1004,7 +1004,7 @@ gpointer gitg_test_main_ref (gpointer instance) { - GitgTestMain* self; + GitgTestMain * self; self = instance; #line 20 "/home/jesse/dev/gitg/tests/gitg/support-main.vala" g_atomic_int_inc (&self->ref_count); @@ -1015,7 +1015,7 @@ void gitg_test_main_unref (gpointer instance) { - GitgTestMain* self; + GitgTestMain * self; self = instance; #line 20 "/home/jesse/dev/gitg/tests/gitg/support-main.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { diff -Nru gitg-3.22.0/tests/gitg/support-repository.c gitg-3.23.0/tests/gitg/support-repository.c --- gitg-3.22.0/tests/gitg/support-repository.c 2016-08-09 09:51:19.000000000 +0000 +++ gitg-3.23.0/tests/gitg/support-repository.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* support-repository.c generated by valac 0.32.1, the Vala compiler +/* support-repository.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from support-repository.vala, do not modify */ /* @@ -113,10 +113,10 @@ static void gitg_test_repository_file_copy (const GitgTestRepositoryFile* self, GitgTestRepositoryFile* dest); static void gitg_test_repository_file_destroy (GitgTestRepositoryFile* self); static GitgTestRepositoryFile* gitg_test_repository_files_from_varargs (GitgTestRepository* self, const gchar* filename, va_list l, int* result_length1); -static void _vala_array_add10 (GitgTestRepositoryFile** array, int* length, int* size, const GitgTestRepositoryFile* value); -static void _vala_GitgTestRepositoryFile_array_free (GitgTestRepositoryFile* array, gint array_length); +static void _vala_array_add10 (GitgTestRepositoryFile* * array, int* length, int* size, const GitgTestRepositoryFile* value); +static void _vala_GitgTestRepositoryFile_array_free (GitgTestRepositoryFile * array, gint array_length); static GitgTestRepositoryFile* gitg_test_repository_filenames_from_varargs (GitgTestRepository* self, const gchar* filename, va_list l, int* result_length1); -static void _vala_array_add11 (GitgTestRepositoryFile** array, int* length, int* size, const GitgTestRepositoryFile* value); +static void _vala_array_add11 (GitgTestRepositoryFile* * array, int* length, int* size, const GitgTestRepositoryFile* value); void gitg_test_repository_assert_file_contents (GitgTestRepository* self, const gchar* filename, const gchar* expected_contents); void gitg_test_assert_assert_file_contents (const gchar* filename, const gchar* expected_contents); gboolean gitg_test_repository_file_exists (GitgTestRepository* self, const gchar* filename); @@ -139,12 +139,12 @@ GitgTestRepository* gitg_test_repository_construct (GType object_type); GitgTestTest* gitg_test_test_new (void); GitgTestTest* gitg_test_test_construct (GType object_type); -static void gitg_test_repository_finalize (GObject* obj); +static void gitg_test_repository_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_add10 (GitgTestRepositoryFile** array, int* length, int* size, const GitgTestRepositoryFile* value) { +static void _vala_array_add10 (GitgTestRepositoryFile* * array, int* length, int* size, const GitgTestRepositoryFile* value) { #line 41 "/home/jesse/dev/gitg/tests/gitg/support-repository.vala" if ((*length) == (*size)) { #line 41 "/home/jesse/dev/gitg/tests/gitg/support-repository.vala" @@ -159,7 +159,7 @@ } -static void _vala_GitgTestRepositoryFile_array_free (GitgTestRepositoryFile* array, gint array_length) { +static void _vala_GitgTestRepositoryFile_array_free (GitgTestRepositoryFile * array, gint array_length) { #line 33 "/home/jesse/dev/gitg/tests/gitg/support-repository.vala" if (array != NULL) { #line 166 "support-repository.c" @@ -274,7 +274,7 @@ } -static void _vala_array_add11 (GitgTestRepositoryFile** array, int* length, int* size, const GitgTestRepositoryFile* value) { +static void _vala_array_add11 (GitgTestRepositoryFile* * array, int* length, int* size, const GitgTestRepositoryFile* value) { #line 58 "/home/jesse/dev/gitg/tests/gitg/support-repository.vala" if ((*length) == (*size)) { #line 58 "/home/jesse/dev/gitg/tests/gitg/support-repository.vala" @@ -469,39 +469,39 @@ gint _tmp3__length1 = 0; guint8* _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 1398 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1420 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1421 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" res = (guint8*) self; -#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1421 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" res_length1 = -1; -#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1421 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _res_size_ = res_length1; -#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1422 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1422 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1422 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" res_length1 = (gint) _tmp1_; -#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1422 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = res_length1; -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = res; -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = res_length1; -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = _tmp3__length1; -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (result_length1) { -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" *result_length1 = _tmp4__length1; #line 501 "support-repository.c" } -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 507 "support-repository.c" } @@ -3084,7 +3084,7 @@ } -static void gitg_test_repository_finalize (GObject* obj) { +static void gitg_test_repository_finalize (GObject * obj) { GitgTestRepository * self; #line 22 "/home/jesse/dev/gitg/tests/gitg/support-repository.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TEST_TYPE_REPOSITORY, GitgTestRepository); diff -Nru gitg-3.22.0/tests/gitg/support-test.c gitg-3.23.0/tests/gitg/support-test.c --- gitg-3.22.0/tests/gitg/support-test.c 2016-08-09 09:51:19.000000000 +0000 +++ gitg-3.23.0/tests/gitg/support-test.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* support-test.c generated by valac 0.32.1, the Vala compiler +/* support-test.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from support-test.vala, do not modify */ /* @@ -73,7 +73,7 @@ GitgTestTest* gitg_test_test_construct (GType object_type); GTestSuite* gitg_test_test_get_suite (GitgTestTest* self); static GObject * gitg_test_test_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); -static void gitg_test_test_finalize (GObject* obj); +static void gitg_test_test_finalize (GObject * obj); static void _vala_gitg_test_test_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); void gitg_test_assert_assert_file_contents (const gchar* filename, const gchar* expected_contents); @@ -191,7 +191,7 @@ } -static void gitg_test_test_finalize (GObject* obj) { +static void gitg_test_test_finalize (GObject * obj) { GitgTestTest * self; #line 20 "/home/jesse/dev/gitg/tests/gitg/support-test.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TEST_TYPE_TEST, GitgTestTest); diff -Nru gitg-3.22.0/tests/gitg/test-checkout-ref.c gitg-3.23.0/tests/gitg/test-checkout-ref.c --- gitg-3.22.0/tests/gitg/test-checkout-ref.c 2016-08-09 09:51:19.000000000 +0000 +++ gitg-3.23.0/tests/gitg/test-checkout-ref.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* test-checkout-ref.c generated by valac 0.32.1, the Vala compiler +/* test-checkout-ref.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from test-checkout-ref.vala, do not modify */ /* @@ -111,6 +111,13 @@ #define GITG_SIMPLE_NOTIFICATION_TYPE_STATUS (gitg_simple_notification_status_get_type ()) typedef struct _Block2Data Block2Data; typedef struct _Block3Data Block3Data; +enum { + GITG_TEST_CHECKOUT_REF_TEST_CHECKOUT_BRANCH_SIGNAL, + GITG_TEST_CHECKOUT_REF_TEST_CHECKOUT_BRANCH_SAFE_SIGNAL, + GITG_TEST_CHECKOUT_REF_TEST_CHECKOUT_BRANCH_CONFLICT_SIGNAL, + GITG_TEST_CHECKOUT_REF_LAST_SIGNAL +}; +static guint gitg_test_checkout_ref_signals[GITG_TEST_CHECKOUT_REF_LAST_SIGNAL] = {0}; struct _GitgTestTest { GObject parent_instance; @@ -234,7 +241,7 @@ static void block3_data_unref (void * _userdata_); static void __lambda8_ (Block3Data* _data3_, GObject* obj, GAsyncResult* res); static void ___lambda8__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); -static void gitg_test_checkout_ref_finalize (GObject* obj); +static void gitg_test_checkout_ref_finalize (GObject * obj); static void gitg_test_checkout_ref_real_set_up (GitgTestTest* base) { @@ -276,7 +283,7 @@ _g_object_unref0 (self->priv->action); #line 40 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" self->priv->action = _tmp4_; -#line 280 "test-checkout-ref.c" +#line 287 "test-checkout-ref.c" } @@ -286,14 +293,14 @@ self = (GitgTestCheckoutRef*) gitg_test_application_construct (object_type); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" return self; -#line 290 "test-checkout-ref.c" +#line 297 "test-checkout-ref.c" } GitgTestCheckoutRef* gitg_test_checkout_ref_new (void) { #line 22 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" return gitg_test_checkout_ref_construct (GITG_TEST_TYPE_CHECKOUT_REF); -#line 297 "test-checkout-ref.c" +#line 304 "test-checkout-ref.c" } @@ -302,7 +309,7 @@ g_atomic_int_inc (&_data1_->_ref_count_); #line 46 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" return _data1_; -#line 306 "test-checkout-ref.c" +#line 313 "test-checkout-ref.c" } @@ -311,7 +318,7 @@ _data1_ = (Block1Data*) _userdata_; #line 46 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { -#line 315 "test-checkout-ref.c" +#line 322 "test-checkout-ref.c" GitgTestCheckoutRef* self; #line 46 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" self = _data1_->self; @@ -321,7 +328,7 @@ _g_object_unref0 (self); #line 46 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" g_slice_free (Block1Data, _data1_); -#line 325 "test-checkout-ref.c" +#line 332 "test-checkout-ref.c" } } @@ -342,7 +349,7 @@ gitg_ref_action_checkout_checkout_finish (_tmp0_, _tmp1_); #line 52 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" g_main_loop_quit (_data1_->loop); -#line 346 "test-checkout-ref.c" +#line 353 "test-checkout-ref.c" } @@ -351,7 +358,7 @@ __lambda6_ (self, source_object, res); #line 50 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" block1_data_unref (self); -#line 355 "test-checkout-ref.c" +#line 362 "test-checkout-ref.c" } @@ -481,7 +488,7 @@ block1_data_unref (_data1_); #line 46 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" _data1_ = NULL; -#line 485 "test-checkout-ref.c" +#line 492 "test-checkout-ref.c" } @@ -490,7 +497,7 @@ g_atomic_int_inc (&_data2_->_ref_count_); #line 64 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" return _data2_; -#line 494 "test-checkout-ref.c" +#line 501 "test-checkout-ref.c" } @@ -499,7 +506,7 @@ _data2_ = (Block2Data*) _userdata_; #line 64 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { -#line 503 "test-checkout-ref.c" +#line 510 "test-checkout-ref.c" GitgTestCheckoutRef* self; #line 64 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" self = _data2_->self; @@ -509,7 +516,7 @@ _g_object_unref0 (self); #line 64 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" g_slice_free (Block2Data, _data2_); -#line 513 "test-checkout-ref.c" +#line 520 "test-checkout-ref.c" } } @@ -530,7 +537,7 @@ gitg_ref_action_checkout_checkout_finish (_tmp0_, _tmp1_); #line 72 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" g_main_loop_quit (_data2_->loop); -#line 534 "test-checkout-ref.c" +#line 541 "test-checkout-ref.c" } @@ -539,7 +546,7 @@ __lambda7_ (self, source_object, res); #line 70 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" block2_data_unref (self); -#line 543 "test-checkout-ref.c" +#line 550 "test-checkout-ref.c" } @@ -671,7 +678,7 @@ block2_data_unref (_data2_); #line 64 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" _data2_ = NULL; -#line 675 "test-checkout-ref.c" +#line 682 "test-checkout-ref.c" } @@ -680,7 +687,7 @@ g_atomic_int_inc (&_data3_->_ref_count_); #line 84 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" return _data3_; -#line 684 "test-checkout-ref.c" +#line 691 "test-checkout-ref.c" } @@ -689,7 +696,7 @@ _data3_ = (Block3Data*) _userdata_; #line 84 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) { -#line 693 "test-checkout-ref.c" +#line 700 "test-checkout-ref.c" GitgTestCheckoutRef* self; #line 84 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" self = _data3_->self; @@ -699,7 +706,7 @@ _g_object_unref0 (self); #line 84 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" g_slice_free (Block3Data, _data3_); -#line 703 "test-checkout-ref.c" +#line 710 "test-checkout-ref.c" } } @@ -720,7 +727,7 @@ gitg_ref_action_checkout_checkout_finish (_tmp0_, _tmp1_); #line 92 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" g_main_loop_quit (_data3_->loop); -#line 724 "test-checkout-ref.c" +#line 731 "test-checkout-ref.c" } @@ -729,7 +736,7 @@ __lambda8_ (self, source_object, res); #line 90 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" block3_data_unref (self); -#line 733 "test-checkout-ref.c" +#line 740 "test-checkout-ref.c" } @@ -861,7 +868,7 @@ block3_data_unref (_data3_); #line 84 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" _data3_ = NULL; -#line 865 "test-checkout-ref.c" +#line 872 "test-checkout-ref.c" } @@ -880,28 +887,28 @@ ((GitgTestCheckoutRefClass *) klass)->test_checkout_branch_conflict = gitg_test_checkout_ref_real_test_checkout_branch_conflict; #line 22 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" G_OBJECT_CLASS (klass)->finalize = gitg_test_checkout_ref_finalize; -#line 884 "test-checkout-ref.c" +#line 891 "test-checkout-ref.c" /** * test basic branch checkout. */ #line 22 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" - g_signal_new ("test_checkout_branch", GITG_TEST_TYPE_CHECKOUT_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCheckoutRefClass, test_checkout_branch), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_test_checkout_ref_signals[GITG_TEST_CHECKOUT_REF_TEST_CHECKOUT_BRANCH_SIGNAL] = g_signal_new ("test_checkout_branch", GITG_TEST_TYPE_CHECKOUT_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCheckoutRefClass, test_checkout_branch), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" - g_signal_new ("test_checkout_branch_safe", GITG_TEST_TYPE_CHECKOUT_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCheckoutRefClass, test_checkout_branch_safe), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_test_checkout_ref_signals[GITG_TEST_CHECKOUT_REF_TEST_CHECKOUT_BRANCH_SAFE_SIGNAL] = g_signal_new ("test_checkout_branch_safe", GITG_TEST_TYPE_CHECKOUT_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCheckoutRefClass, test_checkout_branch_safe), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" - g_signal_new ("test_checkout_branch_conflict", GITG_TEST_TYPE_CHECKOUT_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCheckoutRefClass, test_checkout_branch_conflict), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 894 "test-checkout-ref.c" + gitg_test_checkout_ref_signals[GITG_TEST_CHECKOUT_REF_TEST_CHECKOUT_BRANCH_CONFLICT_SIGNAL] = g_signal_new ("test_checkout_branch_conflict", GITG_TEST_TYPE_CHECKOUT_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCheckoutRefClass, test_checkout_branch_conflict), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 901 "test-checkout-ref.c" } static void gitg_test_checkout_ref_instance_init (GitgTestCheckoutRef * self) { #line 22 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" self->priv = GITG_TEST_CHECKOUT_REF_GET_PRIVATE (self); -#line 901 "test-checkout-ref.c" +#line 908 "test-checkout-ref.c" } -static void gitg_test_checkout_ref_finalize (GObject* obj) { +static void gitg_test_checkout_ref_finalize (GObject * obj) { GitgTestCheckoutRef * self; #line 22 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TEST_TYPE_CHECKOUT_REF, GitgTestCheckoutRef); @@ -913,7 +920,7 @@ _g_object_unref0 (self->priv->action); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-checkout-ref.vala" G_OBJECT_CLASS (gitg_test_checkout_ref_parent_class)->finalize (obj); -#line 917 "test-checkout-ref.c" +#line 924 "test-checkout-ref.c" } diff -Nru gitg-3.22.0/tests/gitg/test-cherry-pick-commit.c gitg-3.23.0/tests/gitg/test-cherry-pick-commit.c --- gitg-3.22.0/tests/gitg/test-cherry-pick-commit.c 2016-08-09 09:51:19.000000000 +0000 +++ gitg-3.23.0/tests/gitg/test-cherry-pick-commit.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* test-cherry-pick-commit.c generated by valac 0.32.1, the Vala compiler +/* test-cherry-pick-commit.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from test-cherry-pick-commit.vala, do not modify */ /* @@ -122,6 +122,19 @@ typedef struct _Block19Data Block19Data; typedef struct _Block20Data Block20Data; typedef struct _Block21Data Block21Data; +enum { + GITG_TEST_CHERRY_PICK_COMMIT_TEST_CHERRY_PICK_SIMPLE_SIGNAL, + GITG_TEST_CHERRY_PICK_COMMIT_TEST_CHERRY_PICK_NOT_HEAD_SIGNAL, + GITG_TEST_CHERRY_PICK_COMMIT_TEST_CHERRY_PICK_NOT_HEAD_WOULD_HAVE_CONFLICTED_SIGNAL, + GITG_TEST_CHERRY_PICK_COMMIT_TEST_CHERRY_PICK_THEIRS_CONFLICTS_NO_CHECKOUT_SIGNAL, + GITG_TEST_CHERRY_PICK_COMMIT_TEST_MERGE_THEIRS_CONFLICTS_CHECKOUT_SIGNAL, + GITG_TEST_CHERRY_PICK_COMMIT_TEST_CHERRY_PICK_THEIRS_DIRTY_STASH_SIGNAL, + GITG_TEST_CHERRY_PICK_COMMIT_TEST_CHERRY_PICK_THEIRS_NOT_MASTER_CONFLICTS_CHECKOUT_SIGNAL, + GITG_TEST_CHERRY_PICK_COMMIT_TEST_CHERRY_PICK_THEIRS_NOT_MASTER_CONFLICTS_CHECKOUT_DIRTY_SIGNAL, + GITG_TEST_CHERRY_PICK_COMMIT_TEST_CHERRY_PICK_THEIRS_NOT_MASTER_CONFLICTS_CHECKOUT_DIRTY_NO_STASH_SIGNAL, + GITG_TEST_CHERRY_PICK_COMMIT_LAST_SIGNAL +}; +static guint gitg_test_cherry_pick_commit_signals[GITG_TEST_CHERRY_PICK_COMMIT_LAST_SIGNAL] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -338,9 +351,9 @@ static void __lambda37_ (Block18Data* _data18_, GObject* obj, GAsyncResult* res); static void ___lambda37__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); static gint __lambda38_ (Block18Data* _data18_, gsize index, const gchar* message, GgitOId* oid); -static void _vala_array_add5 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add5 (gchar** * array, int* length, int* size, gchar* value); static GgitOId* _vala_GgitOId_copy (GgitOId* self); -static void _vala_array_add6 (GgitOId*** array, int* length, int* size, GgitOId* value); +static void _vala_array_add6 (GgitOId** * array, int* length, int* size, GgitOId* value); static gint ___lambda38__ggit_stash_callback (gsize index, const gchar* message, GgitOId* stash_oid, gpointer self); static void gitg_test_cherry_pick_commit_real_test_cherry_pick_theirs_not_master_conflicts_checkout (GitgTestCherryPickCommit* self); static Block19Data* block19_data_ref (Block19Data* _data19_); @@ -353,8 +366,8 @@ static void __lambda40_ (Block20Data* _data20_, GObject* obj, GAsyncResult* res); static void ___lambda40__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); static gint __lambda41_ (Block20Data* _data20_, gsize index, const gchar* message, GgitOId* oid); -static void _vala_array_add7 (gchar*** array, int* length, int* size, gchar* value); -static void _vala_array_add8 (GgitOId*** array, int* length, int* size, GgitOId* value); +static void _vala_array_add7 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add8 (GgitOId** * array, int* length, int* size, GgitOId* value); static gint ___lambda41__ggit_stash_callback (gsize index, const gchar* message, GgitOId* stash_oid, gpointer self); static void gitg_test_cherry_pick_commit_real_test_cherry_pick_theirs_not_master_conflicts_checkout_dirty_no_stash (GitgTestCherryPickCommit* self); static Block21Data* block21_data_ref (Block21Data* _data21_); @@ -363,7 +376,7 @@ static void ___lambda42__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); static gint __lambda43_ (GitgTestCherryPickCommit* self, gsize index, const gchar* message, GgitOId* oid); static gint ___lambda43__ggit_stash_callback (gsize index, const gchar* message, GgitOId* stash_oid, gpointer self); -static void gitg_test_cherry_pick_commit_finalize (GObject* obj); +static void gitg_test_cherry_pick_commit_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -425,7 +438,7 @@ g_clear_error (&_inner_error_); #line 49 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return; -#line 429 "test-cherry-pick-commit.c" +#line 442 "test-cherry-pick-commit.c" } #line 49 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" _tmp6_ = _tmp3_; @@ -437,7 +450,7 @@ if (_tmp7_ == NULL) { #line 49 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" _g_object_unref0 (_tmp6_); -#line 441 "test-cherry-pick-commit.c" +#line 454 "test-cherry-pick-commit.c" } #line 49 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" _g_object_unref0 (self->priv->theirs_commit); @@ -473,7 +486,7 @@ g_clear_error (&_inner_error_); #line 55 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return; -#line 477 "test-cherry-pick-commit.c" +#line 490 "test-cherry-pick-commit.c" } #line 55 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" _tmp13_ = _tmp10_; @@ -485,7 +498,7 @@ if (_tmp14_ == NULL) { #line 55 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" _g_object_unref0 (_tmp13_); -#line 489 "test-cherry-pick-commit.c" +#line 502 "test-cherry-pick-commit.c" } #line 55 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" _g_object_unref0 (self->priv->master_commit); @@ -501,7 +514,7 @@ _g_object_unref0 (_tmp10_); #line 36 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" _g_object_unref0 (_tmp3_); -#line 505 "test-cherry-pick-commit.c" +#line 518 "test-cherry-pick-commit.c" } @@ -511,14 +524,14 @@ self = (GitgTestCherryPickCommit*) gitg_test_application_construct (object_type); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return self; -#line 515 "test-cherry-pick-commit.c" +#line 528 "test-cherry-pick-commit.c" } GitgTestCherryPickCommit* gitg_test_cherry_pick_commit_new (void) { #line 22 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return gitg_test_cherry_pick_commit_construct (GITG_TEST_TYPE_CHERRY_PICK_COMMIT); -#line 522 "test-cherry-pick-commit.c" +#line 535 "test-cherry-pick-commit.c" } @@ -527,7 +540,7 @@ g_atomic_int_inc (&_data13_->_ref_count_); #line 60 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return _data13_; -#line 531 "test-cherry-pick-commit.c" +#line 544 "test-cherry-pick-commit.c" } @@ -536,7 +549,7 @@ _data13_ = (Block13Data*) _userdata_; #line 60 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" if (g_atomic_int_dec_and_test (&_data13_->_ref_count_)) { -#line 540 "test-cherry-pick-commit.c" +#line 553 "test-cherry-pick-commit.c" GitgTestCherryPickCommit* self; #line 60 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" self = _data13_->self; @@ -548,7 +561,7 @@ _g_object_unref0 (self); #line 60 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" g_slice_free (Block13Data, _data13_); -#line 552 "test-cherry-pick-commit.c" +#line 565 "test-cherry-pick-commit.c" } } @@ -566,7 +579,7 @@ gitg_commit_action_cherry_pick_cherry_pick_finish (_data13_->action, _tmp0_); #line 67 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" g_main_loop_quit (_data13_->loop); -#line 570 "test-cherry-pick-commit.c" +#line 583 "test-cherry-pick-commit.c" } @@ -575,14 +588,14 @@ __lambda32_ (self, source_object, res); #line 65 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" block13_data_unref (self); -#line 579 "test-cherry-pick-commit.c" +#line 592 "test-cherry-pick-commit.c" } static void _vala_GgitOId_free (GgitOId* self) { #line 84 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" g_boxed_free (ggit_oid_get_type (), self); -#line 586 "test-cherry-pick-commit.c" +#line 599 "test-cherry-pick-commit.c" } @@ -800,7 +813,7 @@ block13_data_unref (_data13_); #line 60 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" _data13_ = NULL; -#line 804 "test-cherry-pick-commit.c" +#line 817 "test-cherry-pick-commit.c" } @@ -809,7 +822,7 @@ g_atomic_int_inc (&_data14_->_ref_count_); #line 89 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return _data14_; -#line 813 "test-cherry-pick-commit.c" +#line 826 "test-cherry-pick-commit.c" } @@ -818,7 +831,7 @@ _data14_ = (Block14Data*) _userdata_; #line 89 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" if (g_atomic_int_dec_and_test (&_data14_->_ref_count_)) { -#line 822 "test-cherry-pick-commit.c" +#line 835 "test-cherry-pick-commit.c" GitgTestCherryPickCommit* self; #line 89 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" self = _data14_->self; @@ -830,7 +843,7 @@ _g_object_unref0 (self); #line 89 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" g_slice_free (Block14Data, _data14_); -#line 834 "test-cherry-pick-commit.c" +#line 847 "test-cherry-pick-commit.c" } } @@ -848,7 +861,7 @@ gitg_commit_action_cherry_pick_cherry_pick_finish (_data14_->action, _tmp0_); #line 97 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" g_main_loop_quit (_data14_->loop); -#line 852 "test-cherry-pick-commit.c" +#line 865 "test-cherry-pick-commit.c" } @@ -857,7 +870,7 @@ __lambda33_ (self, source_object, res); #line 95 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" block14_data_unref (self); -#line 861 "test-cherry-pick-commit.c" +#line 874 "test-cherry-pick-commit.c" } @@ -1078,7 +1091,7 @@ block14_data_unref (_data14_); #line 89 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" _data14_ = NULL; -#line 1082 "test-cherry-pick-commit.c" +#line 1095 "test-cherry-pick-commit.c" } @@ -1087,7 +1100,7 @@ g_atomic_int_inc (&_data15_->_ref_count_); #line 119 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return _data15_; -#line 1091 "test-cherry-pick-commit.c" +#line 1104 "test-cherry-pick-commit.c" } @@ -1096,7 +1109,7 @@ _data15_ = (Block15Data*) _userdata_; #line 119 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" if (g_atomic_int_dec_and_test (&_data15_->_ref_count_)) { -#line 1100 "test-cherry-pick-commit.c" +#line 1113 "test-cherry-pick-commit.c" GitgTestCherryPickCommit* self; #line 119 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" self = _data15_->self; @@ -1108,7 +1121,7 @@ _g_object_unref0 (self); #line 119 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" g_slice_free (Block15Data, _data15_); -#line 1112 "test-cherry-pick-commit.c" +#line 1125 "test-cherry-pick-commit.c" } } @@ -1126,7 +1139,7 @@ gitg_commit_action_cherry_pick_cherry_pick_finish (_data15_->action, _tmp0_); #line 129 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" g_main_loop_quit (_data15_->loop); -#line 1130 "test-cherry-pick-commit.c" +#line 1143 "test-cherry-pick-commit.c" } @@ -1135,7 +1148,7 @@ __lambda34_ (self, source_object, res); #line 127 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" block15_data_unref (self); -#line 1139 "test-cherry-pick-commit.c" +#line 1152 "test-cherry-pick-commit.c" } @@ -1355,7 +1368,7 @@ block15_data_unref (_data15_); #line 119 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" _data15_ = NULL; -#line 1359 "test-cherry-pick-commit.c" +#line 1372 "test-cherry-pick-commit.c" } @@ -1364,7 +1377,7 @@ g_atomic_int_inc (&_data16_->_ref_count_); #line 151 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return _data16_; -#line 1368 "test-cherry-pick-commit.c" +#line 1381 "test-cherry-pick-commit.c" } @@ -1373,7 +1386,7 @@ _data16_ = (Block16Data*) _userdata_; #line 151 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" if (g_atomic_int_dec_and_test (&_data16_->_ref_count_)) { -#line 1377 "test-cherry-pick-commit.c" +#line 1390 "test-cherry-pick-commit.c" GitgTestCherryPickCommit* self; #line 151 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" self = _data16_->self; @@ -1385,7 +1398,7 @@ _g_object_unref0 (self); #line 151 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" g_slice_free (Block16Data, _data16_); -#line 1389 "test-cherry-pick-commit.c" +#line 1402 "test-cherry-pick-commit.c" } } @@ -1403,7 +1416,7 @@ gitg_commit_action_cherry_pick_cherry_pick_finish (_data16_->action, _tmp0_); #line 171 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" g_main_loop_quit (_data16_->loop); -#line 1407 "test-cherry-pick-commit.c" +#line 1420 "test-cherry-pick-commit.c" } @@ -1412,7 +1425,7 @@ __lambda35_ (self, source_object, res); #line 169 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" block16_data_unref (self); -#line 1416 "test-cherry-pick-commit.c" +#line 1429 "test-cherry-pick-commit.c" } @@ -1657,7 +1670,7 @@ block16_data_unref (_data16_); #line 151 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" _data16_ = NULL; -#line 1659 "test-cherry-pick-commit.c" +#line 1672 "test-cherry-pick-commit.c" } @@ -1666,7 +1679,7 @@ g_atomic_int_inc (&_data17_->_ref_count_); #line 193 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return _data17_; -#line 1668 "test-cherry-pick-commit.c" +#line 1681 "test-cherry-pick-commit.c" } @@ -1675,7 +1688,7 @@ _data17_ = (Block17Data*) _userdata_; #line 193 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" if (g_atomic_int_dec_and_test (&_data17_->_ref_count_)) { -#line 1677 "test-cherry-pick-commit.c" +#line 1690 "test-cherry-pick-commit.c" GitgTestCherryPickCommit* self; #line 193 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" self = _data17_->self; @@ -1687,7 +1700,7 @@ _g_object_unref0 (self); #line 193 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" g_slice_free (Block17Data, _data17_); -#line 1689 "test-cherry-pick-commit.c" +#line 1702 "test-cherry-pick-commit.c" } } @@ -1705,7 +1718,7 @@ gitg_commit_action_cherry_pick_cherry_pick_finish (_data17_->action, _tmp0_); #line 213 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" g_main_loop_quit (_data17_->loop); -#line 1707 "test-cherry-pick-commit.c" +#line 1720 "test-cherry-pick-commit.c" } @@ -1714,7 +1727,7 @@ __lambda36_ (self, source_object, res); #line 211 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" block17_data_unref (self); -#line 1716 "test-cherry-pick-commit.c" +#line 1729 "test-cherry-pick-commit.c" } @@ -1892,7 +1905,7 @@ block17_data_unref (_data17_); #line 193 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" _data17_ = NULL; -#line 1888 "test-cherry-pick-commit.c" +#line 1901 "test-cherry-pick-commit.c" } @@ -1901,7 +1914,7 @@ g_atomic_int_inc (&_data18_->_ref_count_); #line 230 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return _data18_; -#line 1897 "test-cherry-pick-commit.c" +#line 1910 "test-cherry-pick-commit.c" } @@ -1910,7 +1923,7 @@ _data18_ = (Block18Data*) _userdata_; #line 230 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" if (g_atomic_int_dec_and_test (&_data18_->_ref_count_)) { -#line 1906 "test-cherry-pick-commit.c" +#line 1919 "test-cherry-pick-commit.c" GitgTestCherryPickCommit* self; #line 230 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" self = _data18_->self; @@ -1926,7 +1939,7 @@ _g_object_unref0 (self); #line 230 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" g_slice_free (Block18Data, _data18_); -#line 1922 "test-cherry-pick-commit.c" +#line 1935 "test-cherry-pick-commit.c" } } @@ -1944,7 +1957,7 @@ gitg_commit_action_cherry_pick_cherry_pick_finish (_data18_->action, _tmp0_); #line 249 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" g_main_loop_quit (_data18_->loop); -#line 1940 "test-cherry-pick-commit.c" +#line 1953 "test-cherry-pick-commit.c" } @@ -1953,55 +1966,55 @@ __lambda37_ (self, source_object, res); #line 247 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" block18_data_unref (self); -#line 1949 "test-cherry-pick-commit.c" +#line 1962 "test-cherry-pick-commit.c" } -static void _vala_array_add5 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add5 (gchar** * array, int* length, int* size, gchar* value) { #line 267 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" if ((*length) == (*size)) { #line 267 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" *size = (*size) ? (2 * (*size)) : 4; #line 267 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 1960 "test-cherry-pick-commit.c" +#line 1973 "test-cherry-pick-commit.c" } #line 267 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" (*array)[(*length)++] = value; #line 267 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" (*array)[*length] = NULL; -#line 1966 "test-cherry-pick-commit.c" +#line 1979 "test-cherry-pick-commit.c" } static GgitOId* _vala_GgitOId_copy (GgitOId* self) { #line 268 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return g_boxed_copy (ggit_oid_get_type (), self); -#line 1973 "test-cherry-pick-commit.c" +#line 1986 "test-cherry-pick-commit.c" } static gpointer __vala_GgitOId_copy0 (gpointer self) { #line 268 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return self ? _vala_GgitOId_copy (self) : NULL; -#line 1980 "test-cherry-pick-commit.c" +#line 1993 "test-cherry-pick-commit.c" } -static void _vala_array_add6 (GgitOId*** array, int* length, int* size, GgitOId* value) { +static void _vala_array_add6 (GgitOId** * array, int* length, int* size, GgitOId* value) { #line 268 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" if ((*length) == (*size)) { #line 268 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" *size = (*size) ? (2 * (*size)) : 4; #line 268 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" *array = g_renew (GgitOId*, *array, (*size) + 1); -#line 1991 "test-cherry-pick-commit.c" +#line 2004 "test-cherry-pick-commit.c" } #line 268 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" (*array)[(*length)++] = value; #line 268 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" (*array)[*length] = NULL; -#line 1997 "test-cherry-pick-commit.c" +#line 2010 "test-cherry-pick-commit.c" } @@ -2034,7 +2047,7 @@ result = 0; #line 270 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return result; -#line 2030 "test-cherry-pick-commit.c" +#line 2043 "test-cherry-pick-commit.c" } @@ -2043,7 +2056,7 @@ result = __lambda38_ (self, index, message, stash_oid); #line 266 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return result; -#line 2039 "test-cherry-pick-commit.c" +#line 2052 "test-cherry-pick-commit.c" } @@ -2264,7 +2277,7 @@ g_clear_error (&_inner_error_); #line 266 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return; -#line 2259 "test-cherry-pick-commit.c" +#line 2272 "test-cherry-pick-commit.c" } #line 273 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" gitg_test_assert_assert_inteq (_data18_->messages_length1, 1); @@ -2350,7 +2363,7 @@ block18_data_unref (_data18_); #line 230 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" _data18_ = NULL; -#line 2345 "test-cherry-pick-commit.c" +#line 2358 "test-cherry-pick-commit.c" } @@ -2359,7 +2372,7 @@ g_atomic_int_inc (&_data19_->_ref_count_); #line 285 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return _data19_; -#line 2354 "test-cherry-pick-commit.c" +#line 2367 "test-cherry-pick-commit.c" } @@ -2368,7 +2381,7 @@ _data19_ = (Block19Data*) _userdata_; #line 285 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" if (g_atomic_int_dec_and_test (&_data19_->_ref_count_)) { -#line 2363 "test-cherry-pick-commit.c" +#line 2376 "test-cherry-pick-commit.c" GitgTestCherryPickCommit* self; #line 285 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" self = _data19_->self; @@ -2380,7 +2393,7 @@ _g_object_unref0 (self); #line 285 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" g_slice_free (Block19Data, _data19_); -#line 2375 "test-cherry-pick-commit.c" +#line 2388 "test-cherry-pick-commit.c" } } @@ -2398,7 +2411,7 @@ gitg_commit_action_cherry_pick_cherry_pick_finish (_data19_->action, _tmp0_); #line 317 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" g_main_loop_quit (_data19_->loop); -#line 2393 "test-cherry-pick-commit.c" +#line 2406 "test-cherry-pick-commit.c" } @@ -2407,7 +2420,7 @@ __lambda39_ (self, source_object, res); #line 315 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" block19_data_unref (self); -#line 2402 "test-cherry-pick-commit.c" +#line 2415 "test-cherry-pick-commit.c" } @@ -2700,7 +2713,7 @@ block19_data_unref (_data19_); #line 285 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" _data19_ = NULL; -#line 2688 "test-cherry-pick-commit.c" +#line 2701 "test-cherry-pick-commit.c" } @@ -2709,7 +2722,7 @@ g_atomic_int_inc (&_data20_->_ref_count_); #line 341 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return _data20_; -#line 2697 "test-cherry-pick-commit.c" +#line 2710 "test-cherry-pick-commit.c" } @@ -2718,7 +2731,7 @@ _data20_ = (Block20Data*) _userdata_; #line 341 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" if (g_atomic_int_dec_and_test (&_data20_->_ref_count_)) { -#line 2706 "test-cherry-pick-commit.c" +#line 2719 "test-cherry-pick-commit.c" GitgTestCherryPickCommit* self; #line 341 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" self = _data20_->self; @@ -2734,7 +2747,7 @@ _g_object_unref0 (self); #line 341 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" g_slice_free (Block20Data, _data20_); -#line 2722 "test-cherry-pick-commit.c" +#line 2735 "test-cherry-pick-commit.c" } } @@ -2752,7 +2765,7 @@ gitg_commit_action_cherry_pick_cherry_pick_finish (_data20_->action, _tmp0_); #line 375 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" g_main_loop_quit (_data20_->loop); -#line 2740 "test-cherry-pick-commit.c" +#line 2753 "test-cherry-pick-commit.c" } @@ -2761,41 +2774,41 @@ __lambda40_ (self, source_object, res); #line 373 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" block20_data_unref (self); -#line 2749 "test-cherry-pick-commit.c" +#line 2762 "test-cherry-pick-commit.c" } -static void _vala_array_add7 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add7 (gchar** * array, int* length, int* size, gchar* value) { #line 402 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" if ((*length) == (*size)) { #line 402 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" *size = (*size) ? (2 * (*size)) : 4; #line 402 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 2760 "test-cherry-pick-commit.c" +#line 2773 "test-cherry-pick-commit.c" } #line 402 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" (*array)[(*length)++] = value; #line 402 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" (*array)[*length] = NULL; -#line 2766 "test-cherry-pick-commit.c" +#line 2779 "test-cherry-pick-commit.c" } -static void _vala_array_add8 (GgitOId*** array, int* length, int* size, GgitOId* value) { +static void _vala_array_add8 (GgitOId** * array, int* length, int* size, GgitOId* value) { #line 403 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" if ((*length) == (*size)) { #line 403 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" *size = (*size) ? (2 * (*size)) : 4; #line 403 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" *array = g_renew (GgitOId*, *array, (*size) + 1); -#line 2777 "test-cherry-pick-commit.c" +#line 2790 "test-cherry-pick-commit.c" } #line 403 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" (*array)[(*length)++] = value; #line 403 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" (*array)[*length] = NULL; -#line 2783 "test-cherry-pick-commit.c" +#line 2796 "test-cherry-pick-commit.c" } @@ -2828,7 +2841,7 @@ result = 0; #line 405 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return result; -#line 2816 "test-cherry-pick-commit.c" +#line 2829 "test-cherry-pick-commit.c" } @@ -2837,7 +2850,7 @@ result = __lambda41_ (self, index, message, stash_oid); #line 401 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return result; -#line 2825 "test-cherry-pick-commit.c" +#line 2838 "test-cherry-pick-commit.c" } @@ -3168,7 +3181,7 @@ g_clear_error (&_inner_error_); #line 401 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return; -#line 3149 "test-cherry-pick-commit.c" +#line 3162 "test-cherry-pick-commit.c" } #line 408 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" gitg_test_assert_assert_inteq (_data20_->messages_length1, 1); @@ -3190,7 +3203,7 @@ block20_data_unref (_data20_); #line 341 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" _data20_ = NULL; -#line 3171 "test-cherry-pick-commit.c" +#line 3184 "test-cherry-pick-commit.c" } @@ -3199,7 +3212,7 @@ g_atomic_int_inc (&_data21_->_ref_count_); #line 413 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return _data21_; -#line 3180 "test-cherry-pick-commit.c" +#line 3193 "test-cherry-pick-commit.c" } @@ -3208,7 +3221,7 @@ _data21_ = (Block21Data*) _userdata_; #line 413 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" if (g_atomic_int_dec_and_test (&_data21_->_ref_count_)) { -#line 3189 "test-cherry-pick-commit.c" +#line 3202 "test-cherry-pick-commit.c" GitgTestCherryPickCommit* self; #line 413 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" self = _data21_->self; @@ -3220,7 +3233,7 @@ _g_object_unref0 (self); #line 413 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" g_slice_free (Block21Data, _data21_); -#line 3201 "test-cherry-pick-commit.c" +#line 3214 "test-cherry-pick-commit.c" } } @@ -3238,7 +3251,7 @@ gitg_commit_action_cherry_pick_cherry_pick_finish (_data21_->action, _tmp0_); #line 447 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" g_main_loop_quit (_data21_->loop); -#line 3219 "test-cherry-pick-commit.c" +#line 3232 "test-cherry-pick-commit.c" } @@ -3247,7 +3260,7 @@ __lambda42_ (self, source_object, res); #line 445 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" block21_data_unref (self); -#line 3228 "test-cherry-pick-commit.c" +#line 3241 "test-cherry-pick-commit.c" } @@ -3263,7 +3276,7 @@ result = 0; #line 471 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return result; -#line 3244 "test-cherry-pick-commit.c" +#line 3257 "test-cherry-pick-commit.c" } @@ -3272,7 +3285,7 @@ result = __lambda43_ ((GitgTestCherryPickCommit*) self, index, message, stash_oid); #line 469 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return result; -#line 3253 "test-cherry-pick-commit.c" +#line 3266 "test-cherry-pick-commit.c" } @@ -3517,13 +3530,13 @@ g_clear_error (&_inner_error_); #line 469 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" return; -#line 3495 "test-cherry-pick-commit.c" +#line 3508 "test-cherry-pick-commit.c" } #line 413 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" block21_data_unref (_data21_); #line 413 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" _data21_ = NULL; -#line 3501 "test-cherry-pick-commit.c" +#line 3514 "test-cherry-pick-commit.c" } @@ -3555,35 +3568,35 @@ #line 22 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" G_OBJECT_CLASS (klass)->finalize = gitg_test_cherry_pick_commit_finalize; #line 22 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" - g_signal_new ("test_cherry_pick_simple", GITG_TEST_TYPE_CHERRY_PICK_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCherryPickCommitClass, test_cherry_pick_simple), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_test_cherry_pick_commit_signals[GITG_TEST_CHERRY_PICK_COMMIT_TEST_CHERRY_PICK_SIMPLE_SIGNAL] = g_signal_new ("test_cherry_pick_simple", GITG_TEST_TYPE_CHERRY_PICK_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCherryPickCommitClass, test_cherry_pick_simple), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" - g_signal_new ("test_cherry_pick_not_head", GITG_TEST_TYPE_CHERRY_PICK_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCherryPickCommitClass, test_cherry_pick_not_head), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_test_cherry_pick_commit_signals[GITG_TEST_CHERRY_PICK_COMMIT_TEST_CHERRY_PICK_NOT_HEAD_SIGNAL] = g_signal_new ("test_cherry_pick_not_head", GITG_TEST_TYPE_CHERRY_PICK_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCherryPickCommitClass, test_cherry_pick_not_head), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" - g_signal_new ("test_cherry_pick_not_head_would_have_conflicted", GITG_TEST_TYPE_CHERRY_PICK_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCherryPickCommitClass, test_cherry_pick_not_head_would_have_conflicted), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_test_cherry_pick_commit_signals[GITG_TEST_CHERRY_PICK_COMMIT_TEST_CHERRY_PICK_NOT_HEAD_WOULD_HAVE_CONFLICTED_SIGNAL] = g_signal_new ("test_cherry_pick_not_head_would_have_conflicted", GITG_TEST_TYPE_CHERRY_PICK_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCherryPickCommitClass, test_cherry_pick_not_head_would_have_conflicted), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" - g_signal_new ("test_cherry_pick_theirs_conflicts_no_checkout", GITG_TEST_TYPE_CHERRY_PICK_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCherryPickCommitClass, test_cherry_pick_theirs_conflicts_no_checkout), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_test_cherry_pick_commit_signals[GITG_TEST_CHERRY_PICK_COMMIT_TEST_CHERRY_PICK_THEIRS_CONFLICTS_NO_CHECKOUT_SIGNAL] = g_signal_new ("test_cherry_pick_theirs_conflicts_no_checkout", GITG_TEST_TYPE_CHERRY_PICK_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCherryPickCommitClass, test_cherry_pick_theirs_conflicts_no_checkout), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" - g_signal_new ("test_merge_theirs_conflicts_checkout", GITG_TEST_TYPE_CHERRY_PICK_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCherryPickCommitClass, test_merge_theirs_conflicts_checkout), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_test_cherry_pick_commit_signals[GITG_TEST_CHERRY_PICK_COMMIT_TEST_MERGE_THEIRS_CONFLICTS_CHECKOUT_SIGNAL] = g_signal_new ("test_merge_theirs_conflicts_checkout", GITG_TEST_TYPE_CHERRY_PICK_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCherryPickCommitClass, test_merge_theirs_conflicts_checkout), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" - g_signal_new ("test_cherry_pick_theirs_dirty_stash", GITG_TEST_TYPE_CHERRY_PICK_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCherryPickCommitClass, test_cherry_pick_theirs_dirty_stash), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_test_cherry_pick_commit_signals[GITG_TEST_CHERRY_PICK_COMMIT_TEST_CHERRY_PICK_THEIRS_DIRTY_STASH_SIGNAL] = g_signal_new ("test_cherry_pick_theirs_dirty_stash", GITG_TEST_TYPE_CHERRY_PICK_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCherryPickCommitClass, test_cherry_pick_theirs_dirty_stash), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" - g_signal_new ("test_cherry_pick_theirs_not_master_conflicts_checkout", GITG_TEST_TYPE_CHERRY_PICK_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCherryPickCommitClass, test_cherry_pick_theirs_not_master_conflicts_checkout), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_test_cherry_pick_commit_signals[GITG_TEST_CHERRY_PICK_COMMIT_TEST_CHERRY_PICK_THEIRS_NOT_MASTER_CONFLICTS_CHECKOUT_SIGNAL] = g_signal_new ("test_cherry_pick_theirs_not_master_conflicts_checkout", GITG_TEST_TYPE_CHERRY_PICK_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCherryPickCommitClass, test_cherry_pick_theirs_not_master_conflicts_checkout), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" - g_signal_new ("test_cherry_pick_theirs_not_master_conflicts_checkout_dirty", GITG_TEST_TYPE_CHERRY_PICK_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCherryPickCommitClass, test_cherry_pick_theirs_not_master_conflicts_checkout_dirty), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_test_cherry_pick_commit_signals[GITG_TEST_CHERRY_PICK_COMMIT_TEST_CHERRY_PICK_THEIRS_NOT_MASTER_CONFLICTS_CHECKOUT_DIRTY_SIGNAL] = g_signal_new ("test_cherry_pick_theirs_not_master_conflicts_checkout_dirty", GITG_TEST_TYPE_CHERRY_PICK_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCherryPickCommitClass, test_cherry_pick_theirs_not_master_conflicts_checkout_dirty), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" - g_signal_new ("test_cherry_pick_theirs_not_master_conflicts_checkout_dirty_no_stash", GITG_TEST_TYPE_CHERRY_PICK_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCherryPickCommitClass, test_cherry_pick_theirs_not_master_conflicts_checkout_dirty_no_stash), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 3550 "test-cherry-pick-commit.c" + gitg_test_cherry_pick_commit_signals[GITG_TEST_CHERRY_PICK_COMMIT_TEST_CHERRY_PICK_THEIRS_NOT_MASTER_CONFLICTS_CHECKOUT_DIRTY_NO_STASH_SIGNAL] = g_signal_new ("test_cherry_pick_theirs_not_master_conflicts_checkout_dirty_no_stash", GITG_TEST_TYPE_CHERRY_PICK_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestCherryPickCommitClass, test_cherry_pick_theirs_not_master_conflicts_checkout_dirty_no_stash), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 3563 "test-cherry-pick-commit.c" } static void gitg_test_cherry_pick_commit_instance_init (GitgTestCherryPickCommit * self) { #line 22 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" self->priv = GITG_TEST_CHERRY_PICK_COMMIT_GET_PRIVATE (self); -#line 3557 "test-cherry-pick-commit.c" +#line 3570 "test-cherry-pick-commit.c" } -static void gitg_test_cherry_pick_commit_finalize (GObject* obj) { +static void gitg_test_cherry_pick_commit_finalize (GObject * obj) { GitgTestCherryPickCommit * self; #line 22 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TEST_TYPE_CHERRY_PICK_COMMIT, GitgTestCherryPickCommit); @@ -3603,7 +3616,7 @@ _g_object_unref0 (self->priv->action_interface); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-cherry-pick-commit.vala" G_OBJECT_CLASS (gitg_test_cherry_pick_commit_parent_class)->finalize (obj); -#line 3581 "test-cherry-pick-commit.c" +#line 3594 "test-cherry-pick-commit.c" } diff -Nru gitg-3.22.0/tests/gitg/test-merge-ref.c gitg-3.23.0/tests/gitg/test-merge-ref.c --- gitg-3.22.0/tests/gitg/test-merge-ref.c 2016-08-09 09:51:19.000000000 +0000 +++ gitg-3.23.0/tests/gitg/test-merge-ref.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* test-merge-ref.c generated by valac 0.32.1, the Vala compiler +/* test-merge-ref.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from test-merge-ref.vala, do not modify */ /* @@ -131,6 +131,19 @@ typedef struct _Block10Data Block10Data; typedef struct _Block11Data Block11Data; typedef struct _Block12Data Block12Data; +enum { + GITG_TEST_MERGE_REF_TEST_MERGE_SIMPLE_SIGNAL, + GITG_TEST_MERGE_REF_TEST_MERGE_NOT_HEAD_SIGNAL, + GITG_TEST_MERGE_REF_TEST_MERGE_NOT_HEAD_WOULD_HAVE_CONFLICTED_SIGNAL, + GITG_TEST_MERGE_REF_TEST_MERGE_THEIRS_CONFLICTS_NO_CHECKOUT_SIGNAL, + GITG_TEST_MERGE_REF_TEST_MERGE_THEIRS_CONFLICTS_CHECKOUT_SIGNAL, + GITG_TEST_MERGE_REF_TEST_MERGE_THEIRS_DIRTY_STASH_SIGNAL, + GITG_TEST_MERGE_REF_TEST_MERGE_THEIRS_NOT_MASTER_CONFLICTS_CHECKOUT_SIGNAL, + GITG_TEST_MERGE_REF_TEST_MERGE_THEIRS_NOT_MASTER_CONFLICTS_CHECKOUT_DIRTY_SIGNAL, + GITG_TEST_MERGE_REF_TEST_MERGE_THEIRS_NOT_MASTER_CONFLICTS_CHECKOUT_DIRTY_NO_STASH_SIGNAL, + GITG_TEST_MERGE_REF_LAST_SIGNAL +}; +static guint gitg_test_merge_ref_signals[GITG_TEST_MERGE_REF_LAST_SIGNAL] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -349,9 +362,9 @@ static void __lambda22_ (Block9Data* _data9_, GObject* obj, GAsyncResult* res); static void ___lambda22__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); static gint __lambda23_ (Block9Data* _data9_, gsize index, const gchar* message, GgitOId* oid); -static void _vala_array_add1 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add1 (gchar** * array, int* length, int* size, gchar* value); static GgitOId* _vala_GgitOId_copy (GgitOId* self); -static void _vala_array_add2 (GgitOId*** array, int* length, int* size, GgitOId* value); +static void _vala_array_add2 (GgitOId** * array, int* length, int* size, GgitOId* value); static gint ___lambda23__ggit_stash_callback (gsize index, const gchar* message, GgitOId* stash_oid, gpointer self); static void gitg_test_merge_ref_real_test_merge_theirs_not_master_conflicts_checkout (GitgTestMergeRef* self); static Block10Data* block10_data_ref (Block10Data* _data10_); @@ -364,8 +377,8 @@ static void __lambda25_ (Block11Data* _data11_, GObject* obj, GAsyncResult* res); static void ___lambda25__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); static gint __lambda26_ (Block11Data* _data11_, gsize index, const gchar* message, GgitOId* oid); -static void _vala_array_add3 (gchar*** array, int* length, int* size, gchar* value); -static void _vala_array_add4 (GgitOId*** array, int* length, int* size, GgitOId* value); +static void _vala_array_add3 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add4 (GgitOId** * array, int* length, int* size, GgitOId* value); static gint ___lambda26__ggit_stash_callback (gsize index, const gchar* message, GgitOId* stash_oid, gpointer self); static void gitg_test_merge_ref_real_test_merge_theirs_not_master_conflicts_checkout_dirty_no_stash (GitgTestMergeRef* self); static Block12Data* block12_data_ref (Block12Data* _data12_); @@ -374,7 +387,7 @@ static void ___lambda27__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); static gint __lambda28_ (GitgTestMergeRef* self, gsize index, const gchar* message, GgitOId* oid); static gint ___lambda28__ggit_stash_callback (gsize index, const gchar* message, GgitOId* stash_oid, gpointer self); -static void gitg_test_merge_ref_finalize (GObject* obj); +static void gitg_test_merge_ref_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -431,14 +444,14 @@ _g_object_unref0 (self->priv->action_interface); #line 51 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" self->priv->action_interface = _tmp5_; -#line 435 "test-merge-ref.c" +#line 448 "test-merge-ref.c" } static void _vala_GgitOId_free (GgitOId* self) { #line 61 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" g_boxed_free (ggit_oid_get_type (), self); -#line 442 "test-merge-ref.c" +#line 455 "test-merge-ref.c" } @@ -552,7 +565,7 @@ _g_object_unref0 (parents); #line 54 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" _g_object_unref0 (now_commit); -#line 556 "test-merge-ref.c" +#line 569 "test-merge-ref.c" } @@ -562,14 +575,14 @@ self = (GitgTestMergeRef*) gitg_test_application_construct (object_type); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" return self; -#line 566 "test-merge-ref.c" +#line 579 "test-merge-ref.c" } GitgTestMergeRef* gitg_test_merge_ref_new (void) { #line 22 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" return gitg_test_merge_ref_construct (GITG_TEST_TYPE_MERGE_REF); -#line 573 "test-merge-ref.c" +#line 586 "test-merge-ref.c" } @@ -578,7 +591,7 @@ g_atomic_int_inc (&_data4_->_ref_count_); #line 65 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" return _data4_; -#line 582 "test-merge-ref.c" +#line 595 "test-merge-ref.c" } @@ -587,7 +600,7 @@ _data4_ = (Block4Data*) _userdata_; #line 65 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) { -#line 591 "test-merge-ref.c" +#line 604 "test-merge-ref.c" GitgTestMergeRef* self; #line 65 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" self = _data4_->self; @@ -599,7 +612,7 @@ _g_object_unref0 (self); #line 65 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" g_slice_free (Block4Data, _data4_); -#line 603 "test-merge-ref.c" +#line 616 "test-merge-ref.c" } } @@ -623,7 +636,7 @@ __vala_GgitOId_free0 (_tmp2_); #line 75 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" g_main_loop_quit (_data4_->loop); -#line 627 "test-merge-ref.c" +#line 640 "test-merge-ref.c" } @@ -632,7 +645,7 @@ __lambda17_ (self, source_object, res); #line 73 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" block4_data_unref (self); -#line 636 "test-merge-ref.c" +#line 649 "test-merge-ref.c" } @@ -809,7 +822,7 @@ block4_data_unref (_data4_); #line 65 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" _data4_ = NULL; -#line 813 "test-merge-ref.c" +#line 826 "test-merge-ref.c" } @@ -818,7 +831,7 @@ g_atomic_int_inc (&_data5_->_ref_count_); #line 92 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" return _data5_; -#line 822 "test-merge-ref.c" +#line 835 "test-merge-ref.c" } @@ -827,7 +840,7 @@ _data5_ = (Block5Data*) _userdata_; #line 92 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" if (g_atomic_int_dec_and_test (&_data5_->_ref_count_)) { -#line 831 "test-merge-ref.c" +#line 844 "test-merge-ref.c" GitgTestMergeRef* self; #line 92 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" self = _data5_->self; @@ -839,7 +852,7 @@ _g_object_unref0 (self); #line 92 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" g_slice_free (Block5Data, _data5_); -#line 843 "test-merge-ref.c" +#line 856 "test-merge-ref.c" } } @@ -863,7 +876,7 @@ __vala_GgitOId_free0 (_tmp2_); #line 102 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" g_main_loop_quit (_data5_->loop); -#line 867 "test-merge-ref.c" +#line 880 "test-merge-ref.c" } @@ -872,7 +885,7 @@ __lambda18_ (self, source_object, res); #line 100 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" block5_data_unref (self); -#line 876 "test-merge-ref.c" +#line 889 "test-merge-ref.c" } @@ -1044,7 +1057,7 @@ block5_data_unref (_data5_); #line 92 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" _data5_ = NULL; -#line 1048 "test-merge-ref.c" +#line 1061 "test-merge-ref.c" } @@ -1053,7 +1066,7 @@ g_atomic_int_inc (&_data6_->_ref_count_); #line 119 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" return _data6_; -#line 1057 "test-merge-ref.c" +#line 1070 "test-merge-ref.c" } @@ -1062,7 +1075,7 @@ _data6_ = (Block6Data*) _userdata_; #line 119 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) { -#line 1066 "test-merge-ref.c" +#line 1079 "test-merge-ref.c" GitgTestMergeRef* self; #line 119 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" self = _data6_->self; @@ -1074,7 +1087,7 @@ _g_object_unref0 (self); #line 119 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" g_slice_free (Block6Data, _data6_); -#line 1078 "test-merge-ref.c" +#line 1091 "test-merge-ref.c" } } @@ -1098,7 +1111,7 @@ __vala_GgitOId_free0 (_tmp2_); #line 132 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" g_main_loop_quit (_data6_->loop); -#line 1102 "test-merge-ref.c" +#line 1115 "test-merge-ref.c" } @@ -1107,7 +1120,7 @@ __lambda19_ (self, source_object, res); #line 130 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" block6_data_unref (self); -#line 1111 "test-merge-ref.c" +#line 1124 "test-merge-ref.c" } @@ -1278,7 +1291,7 @@ block6_data_unref (_data6_); #line 119 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" _data6_ = NULL; -#line 1282 "test-merge-ref.c" +#line 1295 "test-merge-ref.c" } @@ -1287,7 +1300,7 @@ g_atomic_int_inc (&_data7_->_ref_count_); #line 149 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" return _data7_; -#line 1291 "test-merge-ref.c" +#line 1304 "test-merge-ref.c" } @@ -1296,7 +1309,7 @@ _data7_ = (Block7Data*) _userdata_; #line 149 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" if (g_atomic_int_dec_and_test (&_data7_->_ref_count_)) { -#line 1300 "test-merge-ref.c" +#line 1313 "test-merge-ref.c" GitgTestMergeRef* self; #line 149 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" self = _data7_->self; @@ -1308,7 +1321,7 @@ _g_object_unref0 (self); #line 149 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" g_slice_free (Block7Data, _data7_); -#line 1312 "test-merge-ref.c" +#line 1325 "test-merge-ref.c" } } @@ -1332,7 +1345,7 @@ __vala_GgitOId_free0 (_tmp2_); #line 171 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" g_main_loop_quit (_data7_->loop); -#line 1336 "test-merge-ref.c" +#line 1349 "test-merge-ref.c" } @@ -1341,7 +1354,7 @@ __lambda20_ (self, source_object, res); #line 169 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" block7_data_unref (self); -#line 1345 "test-merge-ref.c" +#line 1358 "test-merge-ref.c" } @@ -1536,7 +1549,7 @@ block7_data_unref (_data7_); #line 149 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" _data7_ = NULL; -#line 1538 "test-merge-ref.c" +#line 1551 "test-merge-ref.c" } @@ -1545,7 +1558,7 @@ g_atomic_int_inc (&_data8_->_ref_count_); #line 186 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" return _data8_; -#line 1547 "test-merge-ref.c" +#line 1560 "test-merge-ref.c" } @@ -1554,7 +1567,7 @@ _data8_ = (Block8Data*) _userdata_; #line 186 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" if (g_atomic_int_dec_and_test (&_data8_->_ref_count_)) { -#line 1556 "test-merge-ref.c" +#line 1569 "test-merge-ref.c" GitgTestMergeRef* self; #line 186 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" self = _data8_->self; @@ -1566,7 +1579,7 @@ _g_object_unref0 (self); #line 186 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" g_slice_free (Block8Data, _data8_); -#line 1568 "test-merge-ref.c" +#line 1581 "test-merge-ref.c" } } @@ -1590,7 +1603,7 @@ __vala_GgitOId_free0 (_tmp2_); #line 208 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" g_main_loop_quit (_data8_->loop); -#line 1592 "test-merge-ref.c" +#line 1605 "test-merge-ref.c" } @@ -1599,7 +1612,7 @@ __lambda21_ (self, source_object, res); #line 206 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" block8_data_unref (self); -#line 1601 "test-merge-ref.c" +#line 1614 "test-merge-ref.c" } @@ -1806,7 +1819,7 @@ block8_data_unref (_data8_); #line 186 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" _data8_ = NULL; -#line 1802 "test-merge-ref.c" +#line 1815 "test-merge-ref.c" } @@ -1815,7 +1828,7 @@ g_atomic_int_inc (&_data9_->_ref_count_); #line 228 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" return _data9_; -#line 1811 "test-merge-ref.c" +#line 1824 "test-merge-ref.c" } @@ -1824,7 +1837,7 @@ _data9_ = (Block9Data*) _userdata_; #line 228 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" if (g_atomic_int_dec_and_test (&_data9_->_ref_count_)) { -#line 1820 "test-merge-ref.c" +#line 1833 "test-merge-ref.c" GitgTestMergeRef* self; #line 228 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" self = _data9_->self; @@ -1840,7 +1853,7 @@ _g_object_unref0 (self); #line 228 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" g_slice_free (Block9Data, _data9_); -#line 1836 "test-merge-ref.c" +#line 1849 "test-merge-ref.c" } } @@ -1864,7 +1877,7 @@ __vala_GgitOId_free0 (_tmp2_); #line 250 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" g_main_loop_quit (_data9_->loop); -#line 1860 "test-merge-ref.c" +#line 1873 "test-merge-ref.c" } @@ -1873,55 +1886,55 @@ __lambda22_ (self, source_object, res); #line 248 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" block9_data_unref (self); -#line 1869 "test-merge-ref.c" +#line 1882 "test-merge-ref.c" } -static void _vala_array_add1 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add1 (gchar** * array, int* length, int* size, gchar* value) { #line 268 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" if ((*length) == (*size)) { #line 268 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" *size = (*size) ? (2 * (*size)) : 4; #line 268 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 1880 "test-merge-ref.c" +#line 1893 "test-merge-ref.c" } #line 268 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" (*array)[(*length)++] = value; #line 268 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" (*array)[*length] = NULL; -#line 1886 "test-merge-ref.c" +#line 1899 "test-merge-ref.c" } static GgitOId* _vala_GgitOId_copy (GgitOId* self) { #line 269 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" return g_boxed_copy (ggit_oid_get_type (), self); -#line 1893 "test-merge-ref.c" +#line 1906 "test-merge-ref.c" } static gpointer __vala_GgitOId_copy0 (gpointer self) { #line 269 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" return self ? _vala_GgitOId_copy (self) : NULL; -#line 1900 "test-merge-ref.c" +#line 1913 "test-merge-ref.c" } -static void _vala_array_add2 (GgitOId*** array, int* length, int* size, GgitOId* value) { +static void _vala_array_add2 (GgitOId** * array, int* length, int* size, GgitOId* value) { #line 269 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" if ((*length) == (*size)) { #line 269 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" *size = (*size) ? (2 * (*size)) : 4; #line 269 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" *array = g_renew (GgitOId*, *array, (*size) + 1); -#line 1911 "test-merge-ref.c" +#line 1924 "test-merge-ref.c" } #line 269 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" (*array)[(*length)++] = value; #line 269 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" (*array)[*length] = NULL; -#line 1917 "test-merge-ref.c" +#line 1930 "test-merge-ref.c" } @@ -1954,7 +1967,7 @@ result = 0; #line 271 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" return result; -#line 1950 "test-merge-ref.c" +#line 1963 "test-merge-ref.c" } @@ -1963,7 +1976,7 @@ result = __lambda23_ (self, index, message, stash_oid); #line 267 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" return result; -#line 1959 "test-merge-ref.c" +#line 1972 "test-merge-ref.c" } @@ -2193,7 +2206,7 @@ g_clear_error (&_inner_error_); #line 267 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" return; -#line 2188 "test-merge-ref.c" +#line 2201 "test-merge-ref.c" } #line 274 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" gitg_test_merge_ref_assert_merged (self, ours_oid, theirs_oid, "master"); @@ -2221,7 +2234,7 @@ block9_data_unref (_data9_); #line 228 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" _data9_ = NULL; -#line 2216 "test-merge-ref.c" +#line 2229 "test-merge-ref.c" } @@ -2230,7 +2243,7 @@ g_atomic_int_inc (&_data10_->_ref_count_); #line 281 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" return _data10_; -#line 2225 "test-merge-ref.c" +#line 2238 "test-merge-ref.c" } @@ -2239,7 +2252,7 @@ _data10_ = (Block10Data*) _userdata_; #line 281 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" if (g_atomic_int_dec_and_test (&_data10_->_ref_count_)) { -#line 2234 "test-merge-ref.c" +#line 2247 "test-merge-ref.c" GitgTestMergeRef* self; #line 281 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" self = _data10_->self; @@ -2251,7 +2264,7 @@ _g_object_unref0 (self); #line 281 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" g_slice_free (Block10Data, _data10_); -#line 2246 "test-merge-ref.c" +#line 2259 "test-merge-ref.c" } } @@ -2275,7 +2288,7 @@ __vala_GgitOId_free0 (_tmp2_); #line 315 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" g_main_loop_quit (_data10_->loop); -#line 2270 "test-merge-ref.c" +#line 2283 "test-merge-ref.c" } @@ -2284,7 +2297,7 @@ __lambda24_ (self, source_object, res); #line 313 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" block10_data_unref (self); -#line 2279 "test-merge-ref.c" +#line 2292 "test-merge-ref.c" } @@ -2605,7 +2618,7 @@ block10_data_unref (_data10_); #line 281 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" _data10_ = NULL; -#line 2593 "test-merge-ref.c" +#line 2606 "test-merge-ref.c" } @@ -2614,7 +2627,7 @@ g_atomic_int_inc (&_data11_->_ref_count_); #line 342 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" return _data11_; -#line 2602 "test-merge-ref.c" +#line 2615 "test-merge-ref.c" } @@ -2623,7 +2636,7 @@ _data11_ = (Block11Data*) _userdata_; #line 342 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" if (g_atomic_int_dec_and_test (&_data11_->_ref_count_)) { -#line 2611 "test-merge-ref.c" +#line 2624 "test-merge-ref.c" GitgTestMergeRef* self; #line 342 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" self = _data11_->self; @@ -2639,7 +2652,7 @@ _g_object_unref0 (self); #line 342 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" g_slice_free (Block11Data, _data11_); -#line 2627 "test-merge-ref.c" +#line 2640 "test-merge-ref.c" } } @@ -2663,7 +2676,7 @@ __vala_GgitOId_free0 (_tmp2_); #line 378 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" g_main_loop_quit (_data11_->loop); -#line 2651 "test-merge-ref.c" +#line 2664 "test-merge-ref.c" } @@ -2672,41 +2685,41 @@ __lambda25_ (self, source_object, res); #line 376 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" block11_data_unref (self); -#line 2660 "test-merge-ref.c" +#line 2673 "test-merge-ref.c" } -static void _vala_array_add3 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add3 (gchar** * array, int* length, int* size, gchar* value) { #line 408 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" if ((*length) == (*size)) { #line 408 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" *size = (*size) ? (2 * (*size)) : 4; #line 408 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 2671 "test-merge-ref.c" +#line 2684 "test-merge-ref.c" } #line 408 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" (*array)[(*length)++] = value; #line 408 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" (*array)[*length] = NULL; -#line 2677 "test-merge-ref.c" +#line 2690 "test-merge-ref.c" } -static void _vala_array_add4 (GgitOId*** array, int* length, int* size, GgitOId* value) { +static void _vala_array_add4 (GgitOId** * array, int* length, int* size, GgitOId* value) { #line 409 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" if ((*length) == (*size)) { #line 409 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" *size = (*size) ? (2 * (*size)) : 4; #line 409 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" *array = g_renew (GgitOId*, *array, (*size) + 1); -#line 2688 "test-merge-ref.c" +#line 2701 "test-merge-ref.c" } #line 409 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" (*array)[(*length)++] = value; #line 409 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" (*array)[*length] = NULL; -#line 2694 "test-merge-ref.c" +#line 2707 "test-merge-ref.c" } @@ -2739,7 +2752,7 @@ result = 0; #line 411 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" return result; -#line 2727 "test-merge-ref.c" +#line 2740 "test-merge-ref.c" } @@ -2748,7 +2761,7 @@ result = __lambda26_ (self, index, message, stash_oid); #line 407 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" return result; -#line 2736 "test-merge-ref.c" +#line 2749 "test-merge-ref.c" } @@ -3107,7 +3120,7 @@ g_clear_error (&_inner_error_); #line 407 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" return; -#line 3088 "test-merge-ref.c" +#line 3101 "test-merge-ref.c" } #line 414 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" gitg_test_assert_assert_inteq (_data11_->messages_length1, 1); @@ -3133,7 +3146,7 @@ block11_data_unref (_data11_); #line 342 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" _data11_ = NULL; -#line 3114 "test-merge-ref.c" +#line 3127 "test-merge-ref.c" } @@ -3142,7 +3155,7 @@ g_atomic_int_inc (&_data12_->_ref_count_); #line 419 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" return _data12_; -#line 3123 "test-merge-ref.c" +#line 3136 "test-merge-ref.c" } @@ -3151,7 +3164,7 @@ _data12_ = (Block12Data*) _userdata_; #line 419 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" if (g_atomic_int_dec_and_test (&_data12_->_ref_count_)) { -#line 3132 "test-merge-ref.c" +#line 3145 "test-merge-ref.c" GitgTestMergeRef* self; #line 419 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" self = _data12_->self; @@ -3163,7 +3176,7 @@ _g_object_unref0 (self); #line 419 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" g_slice_free (Block12Data, _data12_); -#line 3144 "test-merge-ref.c" +#line 3157 "test-merge-ref.c" } } @@ -3187,7 +3200,7 @@ __vala_GgitOId_free0 (_tmp2_); #line 455 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" g_main_loop_quit (_data12_->loop); -#line 3168 "test-merge-ref.c" +#line 3181 "test-merge-ref.c" } @@ -3196,7 +3209,7 @@ __lambda27_ (self, source_object, res); #line 453 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" block12_data_unref (self); -#line 3177 "test-merge-ref.c" +#line 3190 "test-merge-ref.c" } @@ -3212,7 +3225,7 @@ result = 0; #line 479 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" return result; -#line 3193 "test-merge-ref.c" +#line 3206 "test-merge-ref.c" } @@ -3221,7 +3234,7 @@ result = __lambda28_ ((GitgTestMergeRef*) self, index, message, stash_oid); #line 477 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" return result; -#line 3202 "test-merge-ref.c" +#line 3215 "test-merge-ref.c" } @@ -3488,7 +3501,7 @@ g_clear_error (&_inner_error_); #line 477 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" return; -#line 3466 "test-merge-ref.c" +#line 3479 "test-merge-ref.c" } #line 419 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" __vala_GgitOId_free0 (theirs_oid); @@ -3498,7 +3511,7 @@ block12_data_unref (_data12_); #line 419 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" _data12_ = NULL; -#line 3476 "test-merge-ref.c" +#line 3489 "test-merge-ref.c" } @@ -3530,35 +3543,35 @@ #line 22 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" G_OBJECT_CLASS (klass)->finalize = gitg_test_merge_ref_finalize; #line 22 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" - g_signal_new ("test_merge_simple", GITG_TEST_TYPE_MERGE_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestMergeRefClass, test_merge_simple), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_test_merge_ref_signals[GITG_TEST_MERGE_REF_TEST_MERGE_SIMPLE_SIGNAL] = g_signal_new ("test_merge_simple", GITG_TEST_TYPE_MERGE_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestMergeRefClass, test_merge_simple), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" - g_signal_new ("test_merge_not_head", GITG_TEST_TYPE_MERGE_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestMergeRefClass, test_merge_not_head), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_test_merge_ref_signals[GITG_TEST_MERGE_REF_TEST_MERGE_NOT_HEAD_SIGNAL] = g_signal_new ("test_merge_not_head", GITG_TEST_TYPE_MERGE_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestMergeRefClass, test_merge_not_head), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" - g_signal_new ("test_merge_not_head_would_have_conflicted", GITG_TEST_TYPE_MERGE_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestMergeRefClass, test_merge_not_head_would_have_conflicted), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_test_merge_ref_signals[GITG_TEST_MERGE_REF_TEST_MERGE_NOT_HEAD_WOULD_HAVE_CONFLICTED_SIGNAL] = g_signal_new ("test_merge_not_head_would_have_conflicted", GITG_TEST_TYPE_MERGE_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestMergeRefClass, test_merge_not_head_would_have_conflicted), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" - g_signal_new ("test_merge_theirs_conflicts_no_checkout", GITG_TEST_TYPE_MERGE_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestMergeRefClass, test_merge_theirs_conflicts_no_checkout), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_test_merge_ref_signals[GITG_TEST_MERGE_REF_TEST_MERGE_THEIRS_CONFLICTS_NO_CHECKOUT_SIGNAL] = g_signal_new ("test_merge_theirs_conflicts_no_checkout", GITG_TEST_TYPE_MERGE_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestMergeRefClass, test_merge_theirs_conflicts_no_checkout), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" - g_signal_new ("test_merge_theirs_conflicts_checkout", GITG_TEST_TYPE_MERGE_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestMergeRefClass, test_merge_theirs_conflicts_checkout), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_test_merge_ref_signals[GITG_TEST_MERGE_REF_TEST_MERGE_THEIRS_CONFLICTS_CHECKOUT_SIGNAL] = g_signal_new ("test_merge_theirs_conflicts_checkout", GITG_TEST_TYPE_MERGE_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestMergeRefClass, test_merge_theirs_conflicts_checkout), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" - g_signal_new ("test_merge_theirs_dirty_stash", GITG_TEST_TYPE_MERGE_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestMergeRefClass, test_merge_theirs_dirty_stash), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_test_merge_ref_signals[GITG_TEST_MERGE_REF_TEST_MERGE_THEIRS_DIRTY_STASH_SIGNAL] = g_signal_new ("test_merge_theirs_dirty_stash", GITG_TEST_TYPE_MERGE_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestMergeRefClass, test_merge_theirs_dirty_stash), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" - g_signal_new ("test_merge_theirs_not_master_conflicts_checkout", GITG_TEST_TYPE_MERGE_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestMergeRefClass, test_merge_theirs_not_master_conflicts_checkout), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_test_merge_ref_signals[GITG_TEST_MERGE_REF_TEST_MERGE_THEIRS_NOT_MASTER_CONFLICTS_CHECKOUT_SIGNAL] = g_signal_new ("test_merge_theirs_not_master_conflicts_checkout", GITG_TEST_TYPE_MERGE_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestMergeRefClass, test_merge_theirs_not_master_conflicts_checkout), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" - g_signal_new ("test_merge_theirs_not_master_conflicts_checkout_dirty", GITG_TEST_TYPE_MERGE_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestMergeRefClass, test_merge_theirs_not_master_conflicts_checkout_dirty), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gitg_test_merge_ref_signals[GITG_TEST_MERGE_REF_TEST_MERGE_THEIRS_NOT_MASTER_CONFLICTS_CHECKOUT_DIRTY_SIGNAL] = g_signal_new ("test_merge_theirs_not_master_conflicts_checkout_dirty", GITG_TEST_TYPE_MERGE_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestMergeRefClass, test_merge_theirs_not_master_conflicts_checkout_dirty), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" - g_signal_new ("test_merge_theirs_not_master_conflicts_checkout_dirty_no_stash", GITG_TEST_TYPE_MERGE_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestMergeRefClass, test_merge_theirs_not_master_conflicts_checkout_dirty_no_stash), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 3525 "test-merge-ref.c" + gitg_test_merge_ref_signals[GITG_TEST_MERGE_REF_TEST_MERGE_THEIRS_NOT_MASTER_CONFLICTS_CHECKOUT_DIRTY_NO_STASH_SIGNAL] = g_signal_new ("test_merge_theirs_not_master_conflicts_checkout_dirty_no_stash", GITG_TEST_TYPE_MERGE_REF, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GitgTestMergeRefClass, test_merge_theirs_not_master_conflicts_checkout_dirty_no_stash), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 3538 "test-merge-ref.c" } static void gitg_test_merge_ref_instance_init (GitgTestMergeRef * self) { #line 22 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" self->priv = GITG_TEST_MERGE_REF_GET_PRIVATE (self); -#line 3532 "test-merge-ref.c" +#line 3545 "test-merge-ref.c" } -static void gitg_test_merge_ref_finalize (GObject* obj) { +static void gitg_test_merge_ref_finalize (GObject * obj) { GitgTestMergeRef * self; #line 22 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TEST_TYPE_MERGE_REF, GitgTestMergeRef); @@ -3576,7 +3589,7 @@ _g_object_unref0 (self->priv->action); #line 22 "/home/jesse/dev/gitg/tests/gitg/test-merge-ref.vala" G_OBJECT_CLASS (gitg_test_merge_ref_parent_class)->finalize (obj); -#line 3554 "test-merge-ref.c" +#line 3567 "test-merge-ref.c" } diff -Nru gitg-3.22.0/tests/libgitg/main.c gitg-3.23.0/tests/libgitg/main.c --- gitg-3.22.0/tests/libgitg/main.c 2016-08-09 09:51:15.000000000 +0000 +++ gitg-3.23.0/tests/libgitg/main.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* main.c generated by valac 0.32.1, the Vala compiler +/* main.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from main.vala, do not modify */ /* @@ -167,7 +167,7 @@ void gitg_test_main_run (GitgTestMain* self); LibGitgTestMain* lib_gitg_test_main_new (void); LibGitgTestMain* lib_gitg_test_main_construct (GType object_type); -static void lib_gitg_test_main_finalize (LibGitgTestMain* obj); +static void lib_gitg_test_main_finalize (LibGitgTestMain * obj); void lib_gitg_test_main_main (gchar** args, int args_length1) { @@ -296,7 +296,7 @@ #line 20 "/home/jesse/dev/gitg/tests/libgitg/main.vala" if (collect_values[0].v_pointer) { #line 299 "main.c" - LibGitgTestMain* object; + LibGitgTestMain * object; object = collect_values[0].v_pointer; #line 20 "/home/jesse/dev/gitg/tests/libgitg/main.vala" if (object->parent_instance.g_class == NULL) { @@ -323,7 +323,7 @@ static gchar* lib_gitg_test_value_main_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - LibGitgTestMain** object_p; + LibGitgTestMain ** object_p; object_p = collect_values[0].v_pointer; #line 20 "/home/jesse/dev/gitg/tests/libgitg/main.vala" if (!object_p) { @@ -375,7 +375,7 @@ void lib_gitg_test_value_set_main (GValue* value, gpointer v_object) { - LibGitgTestMain* old; + LibGitgTestMain * old; #line 20 "/home/jesse/dev/gitg/tests/libgitg/main.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, LIB_GITG_TEST_TYPE_MAIN)); #line 20 "/home/jesse/dev/gitg/tests/libgitg/main.vala" @@ -406,7 +406,7 @@ void lib_gitg_test_value_take_main (GValue* value, gpointer v_object) { - LibGitgTestMain* old; + LibGitgTestMain * old; #line 20 "/home/jesse/dev/gitg/tests/libgitg/main.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, LIB_GITG_TEST_TYPE_MAIN)); #line 20 "/home/jesse/dev/gitg/tests/libgitg/main.vala" @@ -450,7 +450,7 @@ } -static void lib_gitg_test_main_finalize (LibGitgTestMain* obj) { +static void lib_gitg_test_main_finalize (LibGitgTestMain * obj) { LibGitgTestMain * self; #line 20 "/home/jesse/dev/gitg/tests/libgitg/main.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIB_GITG_TEST_TYPE_MAIN, LibGitgTestMain); @@ -475,7 +475,7 @@ gpointer lib_gitg_test_main_ref (gpointer instance) { - LibGitgTestMain* self; + LibGitgTestMain * self; self = instance; #line 20 "/home/jesse/dev/gitg/tests/libgitg/main.vala" g_atomic_int_inc (&self->ref_count); @@ -486,7 +486,7 @@ void lib_gitg_test_main_unref (gpointer instance) { - LibGitgTestMain* self; + LibGitgTestMain * self; self = instance; #line 20 "/home/jesse/dev/gitg/tests/libgitg/main.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { diff -Nru gitg-3.22.0/tests/libgitg/support-main.c gitg-3.23.0/tests/libgitg/support-main.c --- gitg-3.22.0/tests/libgitg/support-main.c 2016-09-12 20:04:31.000000000 +0000 +++ gitg-3.23.0/tests/libgitg/support-main.c 2016-11-26 13:25:20.000000000 +0000 @@ -1,4 +1,4 @@ -/* support-main.c generated by valac 0.32.1, the Vala compiler +/* support-main.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from support-main.vala, do not modify */ /* @@ -125,7 +125,7 @@ GTestSuite* gitg_test_test_get_suite (GitgTestTest* self); static GitgTestMainTestCase* gitg_test_main_test_case_new (GitgTestTest* test, const gchar* name, guint signal_id); static GitgTestMainTestCase* gitg_test_main_test_case_construct (GType object_type, GitgTestTest* test, const gchar* name, guint signal_id); -static void _vala_array_add1 (GitgTestMainTestCase*** array, int* length, int* size, GitgTestMainTestCase* value); +static void _vala_array_add1 (GitgTestMainTestCase** * array, int* length, int* size, GitgTestMainTestCase* value); static const gchar* gitg_test_main_test_case_get_name (GitgTestMainTestCase* self); static void gitg_test_main_test_case_set_up (GitgTestMainTestCase* self); static void _gitg_test_main_test_case_set_up_gtest_fixture_func (void* fixture, gpointer self); @@ -140,9 +140,9 @@ }; void gitg_test_test_set_up (GitgTestTest* self); void gitg_test_test_tear_down (GitgTestTest* self); -static void gitg_test_main_test_case_finalize (GObject* obj); +static void gitg_test_main_test_case_finalize (GObject * obj); static void _vala_gitg_test_main_test_case_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); -static void gitg_test_main_finalize (GitgTestMain* obj); +static void gitg_test_main_finalize (GitgTestMain * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -256,109 +256,109 @@ glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1347 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1348 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1349 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { #line 272 "support-main.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1350 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; #line 281 "support-main.c" } -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1352 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { #line 287 "support-main.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1353 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; #line 296 "support-main.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { #line 302 "support-main.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; #line 311 "support-main.c" } else { -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = FALSE; #line 315 "support-main.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1355 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { #line 323 "support-main.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; #line 332 "support-main.c" } else { -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 336 "support-main.c" } -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1356 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1357 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1358 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 358 "support-main.c" } -static void _vala_array_add1 (GitgTestMainTestCase*** array, int* length, int* size, GitgTestMainTestCase* value) { +static void _vala_array_add1 (GitgTestMainTestCase** * array, int* length, int* size, GitgTestMainTestCase* value) { #line 103 "/home/jesse/dev/gitg/tests/libgitg/support-main.vala" if ((*length) == (*size)) { #line 103 "/home/jesse/dev/gitg/tests/libgitg/support-main.vala" @@ -729,7 +729,7 @@ } -static void gitg_test_main_test_case_finalize (GObject* obj) { +static void gitg_test_main_test_case_finalize (GObject * obj) { GitgTestMainTestCase * self; #line 35 "/home/jesse/dev/gitg/tests/libgitg/support-main.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TEST_MAIN_TYPE_TEST_CASE, GitgTestMainTestCase); @@ -819,7 +819,7 @@ #line 20 "/home/jesse/dev/gitg/tests/libgitg/support-main.vala" if (collect_values[0].v_pointer) { #line 822 "support-main.c" - GitgTestMain* object; + GitgTestMain * object; object = collect_values[0].v_pointer; #line 20 "/home/jesse/dev/gitg/tests/libgitg/support-main.vala" if (object->parent_instance.g_class == NULL) { @@ -846,7 +846,7 @@ static gchar* gitg_test_value_main_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GitgTestMain** object_p; + GitgTestMain ** object_p; object_p = collect_values[0].v_pointer; #line 20 "/home/jesse/dev/gitg/tests/libgitg/support-main.vala" if (!object_p) { @@ -898,7 +898,7 @@ void gitg_test_value_set_main (GValue* value, gpointer v_object) { - GitgTestMain* old; + GitgTestMain * old; #line 20 "/home/jesse/dev/gitg/tests/libgitg/support-main.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TEST_TYPE_MAIN)); #line 20 "/home/jesse/dev/gitg/tests/libgitg/support-main.vala" @@ -929,7 +929,7 @@ void gitg_test_value_take_main (GValue* value, gpointer v_object) { - GitgTestMain* old; + GitgTestMain * old; #line 20 "/home/jesse/dev/gitg/tests/libgitg/support-main.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GITG_TEST_TYPE_MAIN)); #line 20 "/home/jesse/dev/gitg/tests/libgitg/support-main.vala" @@ -977,7 +977,7 @@ } -static void gitg_test_main_finalize (GitgTestMain* obj) { +static void gitg_test_main_finalize (GitgTestMain * obj) { GitgTestMain * self; #line 20 "/home/jesse/dev/gitg/tests/libgitg/support-main.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TEST_TYPE_MAIN, GitgTestMain); @@ -1004,7 +1004,7 @@ gpointer gitg_test_main_ref (gpointer instance) { - GitgTestMain* self; + GitgTestMain * self; self = instance; #line 20 "/home/jesse/dev/gitg/tests/libgitg/support-main.vala" g_atomic_int_inc (&self->ref_count); @@ -1015,7 +1015,7 @@ void gitg_test_main_unref (gpointer instance) { - GitgTestMain* self; + GitgTestMain * self; self = instance; #line 20 "/home/jesse/dev/gitg/tests/libgitg/support-main.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { diff -Nru gitg-3.22.0/tests/libgitg/support-repository.c gitg-3.23.0/tests/libgitg/support-repository.c --- gitg-3.22.0/tests/libgitg/support-repository.c 2016-09-12 20:04:31.000000000 +0000 +++ gitg-3.23.0/tests/libgitg/support-repository.c 2016-11-26 13:25:20.000000000 +0000 @@ -1,4 +1,4 @@ -/* support-repository.c generated by valac 0.32.1, the Vala compiler +/* support-repository.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from support-repository.vala, do not modify */ /* @@ -113,10 +113,10 @@ static void gitg_test_repository_file_copy (const GitgTestRepositoryFile* self, GitgTestRepositoryFile* dest); static void gitg_test_repository_file_destroy (GitgTestRepositoryFile* self); static GitgTestRepositoryFile* gitg_test_repository_files_from_varargs (GitgTestRepository* self, const gchar* filename, va_list l, int* result_length1); -static void _vala_array_add2 (GitgTestRepositoryFile** array, int* length, int* size, const GitgTestRepositoryFile* value); -static void _vala_GitgTestRepositoryFile_array_free (GitgTestRepositoryFile* array, gint array_length); +static void _vala_array_add2 (GitgTestRepositoryFile* * array, int* length, int* size, const GitgTestRepositoryFile* value); +static void _vala_GitgTestRepositoryFile_array_free (GitgTestRepositoryFile * array, gint array_length); static GitgTestRepositoryFile* gitg_test_repository_filenames_from_varargs (GitgTestRepository* self, const gchar* filename, va_list l, int* result_length1); -static void _vala_array_add3 (GitgTestRepositoryFile** array, int* length, int* size, const GitgTestRepositoryFile* value); +static void _vala_array_add3 (GitgTestRepositoryFile* * array, int* length, int* size, const GitgTestRepositoryFile* value); void gitg_test_repository_assert_file_contents (GitgTestRepository* self, const gchar* filename, const gchar* expected_contents); void gitg_test_assert_assert_file_contents (const gchar* filename, const gchar* expected_contents); gboolean gitg_test_repository_file_exists (GitgTestRepository* self, const gchar* filename); @@ -139,12 +139,12 @@ GitgTestRepository* gitg_test_repository_construct (GType object_type); GitgTestTest* gitg_test_test_new (void); GitgTestTest* gitg_test_test_construct (GType object_type); -static void gitg_test_repository_finalize (GObject* obj); +static void gitg_test_repository_finalize (GObject * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_add2 (GitgTestRepositoryFile** array, int* length, int* size, const GitgTestRepositoryFile* value) { +static void _vala_array_add2 (GitgTestRepositoryFile* * array, int* length, int* size, const GitgTestRepositoryFile* value) { #line 41 "/home/jesse/dev/gitg/tests/libgitg/support-repository.vala" if ((*length) == (*size)) { #line 41 "/home/jesse/dev/gitg/tests/libgitg/support-repository.vala" @@ -159,7 +159,7 @@ } -static void _vala_GitgTestRepositoryFile_array_free (GitgTestRepositoryFile* array, gint array_length) { +static void _vala_GitgTestRepositoryFile_array_free (GitgTestRepositoryFile * array, gint array_length) { #line 33 "/home/jesse/dev/gitg/tests/libgitg/support-repository.vala" if (array != NULL) { #line 166 "support-repository.c" @@ -274,7 +274,7 @@ } -static void _vala_array_add3 (GitgTestRepositoryFile** array, int* length, int* size, const GitgTestRepositoryFile* value) { +static void _vala_array_add3 (GitgTestRepositoryFile* * array, int* length, int* size, const GitgTestRepositoryFile* value) { #line 58 "/home/jesse/dev/gitg/tests/libgitg/support-repository.vala" if ((*length) == (*size)) { #line 58 "/home/jesse/dev/gitg/tests/libgitg/support-repository.vala" @@ -469,39 +469,39 @@ gint _tmp3__length1 = 0; guint8* _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 1398 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1420 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1421 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" res = (guint8*) self; -#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1421 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" res_length1 = -1; -#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1421 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _res_size_ = res_length1; -#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1422 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1422 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1422 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" res_length1 = (gint) _tmp1_; -#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1422 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = res_length1; -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = res; -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = res_length1; -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = _tmp3__length1; -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" if (result_length1) { -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" *result_length1 = _tmp4__length1; #line 501 "support-repository.c" } -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1423 "/home/jesse/.local/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 507 "support-repository.c" } @@ -3084,7 +3084,7 @@ } -static void gitg_test_repository_finalize (GObject* obj) { +static void gitg_test_repository_finalize (GObject * obj) { GitgTestRepository * self; #line 22 "/home/jesse/dev/gitg/tests/libgitg/support-repository.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TEST_TYPE_REPOSITORY, GitgTestRepository); diff -Nru gitg-3.22.0/tests/libgitg/support-test.c gitg-3.23.0/tests/libgitg/support-test.c --- gitg-3.22.0/tests/libgitg/support-test.c 2016-09-12 20:04:31.000000000 +0000 +++ gitg-3.23.0/tests/libgitg/support-test.c 2016-11-26 13:25:20.000000000 +0000 @@ -1,4 +1,4 @@ -/* support-test.c generated by valac 0.32.1, the Vala compiler +/* support-test.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from support-test.vala, do not modify */ /* @@ -73,7 +73,7 @@ GitgTestTest* gitg_test_test_construct (GType object_type); GTestSuite* gitg_test_test_get_suite (GitgTestTest* self); static GObject * gitg_test_test_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); -static void gitg_test_test_finalize (GObject* obj); +static void gitg_test_test_finalize (GObject * obj); static void _vala_gitg_test_test_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); void gitg_test_assert_assert_file_contents (const gchar* filename, const gchar* expected_contents); @@ -191,7 +191,7 @@ } -static void gitg_test_test_finalize (GObject* obj) { +static void gitg_test_test_finalize (GObject * obj) { GitgTestTest * self; #line 20 "/home/jesse/dev/gitg/tests/libgitg/support-test.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GITG_TEST_TYPE_TEST, GitgTestTest); diff -Nru gitg-3.22.0/tests/libgitg/test-commit.c gitg-3.23.0/tests/libgitg/test-commit.c --- gitg-3.22.0/tests/libgitg/test-commit.c 2016-08-09 09:51:15.000000000 +0000 +++ gitg-3.23.0/tests/libgitg/test-commit.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* test-commit.c generated by valac 0.32.1, the Vala compiler +/* test-commit.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from test-commit.vala, do not modify */ /* @@ -76,6 +76,16 @@ typedef struct _Block9Data Block9Data; typedef struct _Block10Data Block10Data; typedef struct _Block11Data Block11Data; +enum { + LIB_GITG_TEST_COMMIT_TEST_COMMIT_SIGNAL, + LIB_GITG_TEST_COMMIT_TEST_SIGN_OFF_SIGNAL, + LIB_GITG_TEST_COMMIT_TEST_PRE_COMMIT_HOOK_SIGNAL, + LIB_GITG_TEST_COMMIT_TEST_COMMIT_MSG_HOOK_SIGNAL, + LIB_GITG_TEST_COMMIT_TEST_SKIP_HOOKS_SIGNAL, + LIB_GITG_TEST_COMMIT_TEST_AMEND_SIGNAL, + LIB_GITG_TEST_COMMIT_LAST_SIGNAL +}; +static guint lib_gitg_test_commit_signals[LIB_GITG_TEST_COMMIT_LAST_SIGNAL] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -231,7 +241,7 @@ gitg_test_repository_index_modify ((GitgTestRepository*) self, "b", "staged changes\n", NULL); #line 32 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" gitg_test_repository_index_modify ((GitgTestRepository*) self, "a", "lala\n", NULL); -#line 235 "test-commit.c" +#line 245 "test-commit.c" } @@ -295,7 +305,7 @@ g_clear_error (&_inner_error_); #line 121 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 299 "test-commit.c" +#line 309 "test-commit.c" } #line 121 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _vala_assert (_tmp9_, "FileUtils.set_contents(pc, \"#!/bin/bash\\n\\necho 'pre-commit failed'; exit 1;\\n\")"); @@ -307,7 +317,7 @@ _g_free0 (pc); #line 116 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _g_object_unref0 (hookdir); -#line 311 "test-commit.c" +#line 321 "test-commit.c" } @@ -317,14 +327,14 @@ self = (LibGitgTestCommit*) gitg_test_repository_construct (object_type); #line 22 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return self; -#line 321 "test-commit.c" +#line 331 "test-commit.c" } LibGitgTestCommit* lib_gitg_test_commit_new (void) { #line 22 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return lib_gitg_test_commit_construct (LIB_GITG_TEST_TYPE_COMMIT); -#line 328 "test-commit.c" +#line 338 "test-commit.c" } @@ -333,7 +343,7 @@ g_atomic_int_inc (&_data6_->_ref_count_); #line 38 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return _data6_; -#line 337 "test-commit.c" +#line 347 "test-commit.c" } @@ -342,7 +352,7 @@ _data6_ = (Block6Data*) _userdata_; #line 38 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) { -#line 346 "test-commit.c" +#line 356 "test-commit.c" LibGitgTestCommit* self; #line 38 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" self = _data6_->self; @@ -358,7 +368,7 @@ _g_object_unref0 (self); #line 38 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" g_slice_free (Block6Data, _data6_); -#line 362 "test-commit.c" +#line 372 "test-commit.c" } } @@ -366,7 +376,7 @@ static void _vala_GgitOId_free (GgitOId* self) { #line 54 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" g_boxed_free (ggit_oid_get_type (), self); -#line 370 "test-commit.c" +#line 380 "test-commit.c" } @@ -456,7 +466,7 @@ g_clear_error (&_inner_error_); #line 53 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 460 "test-commit.c" +#line 470 "test-commit.c" } #line 54 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp2_ = ((GitgTestRepository*) self)->d_repository; @@ -476,7 +486,7 @@ g_clear_error (&_inner_error_); #line 54 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 480 "test-commit.c" +#line 490 "test-commit.c" } #line 56 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp5_ = commit; @@ -566,7 +576,7 @@ g_clear_error (&_inner_error_); #line 65 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 570 "test-commit.c" +#line 580 "test-commit.c" } #line 65 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp33_ = _tmp30_; @@ -618,7 +628,7 @@ g_clear_error (&_inner_error_); #line 68 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 622 "test-commit.c" +#line 632 "test-commit.c" } #line 68 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp45_ = _tmp42_; @@ -650,7 +660,7 @@ g_clear_error (&_inner_error_); #line 68 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 654 "test-commit.c" +#line 664 "test-commit.c" } #line 69 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp49_ = reflog; @@ -702,7 +712,7 @@ _g_object_unref0 (commit); #line 51 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" __vala_GgitOId_free0 (oid); -#line 706 "test-commit.c" +#line 716 "test-commit.c" } @@ -711,7 +721,7 @@ __lambda9_ (self, source_object, res); #line 48 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" block6_data_unref (self); -#line 715 "test-commit.c" +#line 725 "test-commit.c" } @@ -759,7 +769,7 @@ g_clear_error (&_inner_error_); #line 43 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 763 "test-commit.c" +#line 773 "test-commit.c" } #line 46 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp5_ = g_strdup ("This is the commit\n\nWith a message.\n"); @@ -775,7 +785,7 @@ block6_data_unref (_data6_); #line 38 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _data6_ = NULL; -#line 779 "test-commit.c" +#line 789 "test-commit.c" } @@ -784,7 +794,7 @@ g_atomic_int_inc (&_data7_->_ref_count_); #line 80 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return _data7_; -#line 788 "test-commit.c" +#line 798 "test-commit.c" } @@ -793,7 +803,7 @@ _data7_ = (Block7Data*) _userdata_; #line 80 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" if (g_atomic_int_dec_and_test (&_data7_->_ref_count_)) { -#line 797 "test-commit.c" +#line 807 "test-commit.c" LibGitgTestCommit* self; #line 80 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" self = _data7_->self; @@ -811,7 +821,7 @@ _g_object_unref0 (self); #line 80 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" g_slice_free (Block7Data, _data7_); -#line 815 "test-commit.c" +#line 825 "test-commit.c" } } @@ -877,7 +887,7 @@ g_clear_error (&_inner_error_); #line 98 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 881 "test-commit.c" +#line 891 "test-commit.c" } #line 100 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp3_ = ((GitgTestRepository*) self)->d_repository; @@ -897,7 +907,7 @@ g_clear_error (&_inner_error_); #line 100 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 901 "test-commit.c" +#line 911 "test-commit.c" } #line 102 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp6_ = commit; @@ -985,7 +995,7 @@ _g_object_unref0 (commit); #line 96 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" __vala_GgitOId_free0 (oid); -#line 989 "test-commit.c" +#line 999 "test-commit.c" } @@ -994,7 +1004,7 @@ __lambda10_ (self, source_object, res); #line 93 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" block7_data_unref (self); -#line 998 "test-commit.c" +#line 1008 "test-commit.c" } @@ -1047,7 +1057,7 @@ g_clear_error (&_inner_error_); #line 85 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 1051 "test-commit.c" +#line 1061 "test-commit.c" } #line 88 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp5_ = ggit_signature_new_now ("Jesse van den Kieboom", "jessevdk@gmail.com", &_inner_error_); @@ -1065,7 +1075,7 @@ g_clear_error (&_inner_error_); #line 88 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 1069 "test-commit.c" +#line 1079 "test-commit.c" } #line 91 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp6_ = g_strdup ("This is the commit\n\nWith a message.\n"); @@ -1089,7 +1099,7 @@ block7_data_unref (_data7_); #line 80 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _data7_ = NULL; -#line 1093 "test-commit.c" +#line 1103 "test-commit.c" } @@ -1098,7 +1108,7 @@ g_atomic_int_inc (&_data8_->_ref_count_); #line 125 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return _data8_; -#line 1102 "test-commit.c" +#line 1112 "test-commit.c" } @@ -1107,7 +1117,7 @@ _data8_ = (Block8Data*) _userdata_; #line 125 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" if (g_atomic_int_dec_and_test (&_data8_->_ref_count_)) { -#line 1111 "test-commit.c" +#line 1121 "test-commit.c" LibGitgTestCommit* self; #line 125 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" self = _data8_->self; @@ -1119,7 +1129,7 @@ _g_object_unref0 (self); #line 125 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" g_slice_free (Block8Data, _data8_); -#line 1123 "test-commit.c" +#line 1133 "test-commit.c" } } @@ -1127,7 +1137,7 @@ static gpointer _g_error_copy0 (gpointer self) { #line 144 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return self ? g_error_copy (self) : NULL; -#line 1131 "test-commit.c" +#line 1141 "test-commit.c" } @@ -1145,7 +1155,7 @@ g_return_if_fail (res != NULL); #line 136 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" e = NULL; -#line 1149 "test-commit.c" +#line 1159 "test-commit.c" { GAsyncResult* _tmp0_ = NULL; #line 140 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" @@ -1156,7 +1166,7 @@ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 140 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" if (_inner_error_->domain == GITG_STAGE_ERROR) { -#line 1160 "test-commit.c" +#line 1170 "test-commit.c" goto __catch4_gitg_stage_error; } #line 140 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" @@ -1167,7 +1177,7 @@ g_clear_error (&_inner_error_); #line 140 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 1171 "test-commit.c" +#line 1181 "test-commit.c" } } goto __finally4; @@ -1190,7 +1200,7 @@ e = _tmp2_; #line 138 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _g_error_free0 (err); -#line 1194 "test-commit.c" +#line 1204 "test-commit.c" } __finally4: #line 138 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" @@ -1203,7 +1213,7 @@ g_clear_error (&_inner_error_); #line 138 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 1207 "test-commit.c" +#line 1217 "test-commit.c" } #line 147 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp3_ = e; @@ -1223,7 +1233,7 @@ g_main_loop_quit (_data8_->loop); #line 135 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _g_error_free0 (e); -#line 1227 "test-commit.c" +#line 1237 "test-commit.c" } @@ -1232,7 +1242,7 @@ __lambda11_ (self, source_object, res); #line 135 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" block8_data_unref (self); -#line 1236 "test-commit.c" +#line 1246 "test-commit.c" } @@ -1281,7 +1291,7 @@ g_clear_error (&_inner_error_); #line 132 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 1285 "test-commit.c" +#line 1295 "test-commit.c" } #line 135 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" gitg_stage_pre_commit_hook (_data8_->stage, sig, ___lambda11__gasync_ready_callback, block8_data_ref (_data8_)); @@ -1293,7 +1303,7 @@ block8_data_unref (_data8_); #line 125 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _data8_ = NULL; -#line 1297 "test-commit.c" +#line 1307 "test-commit.c" } @@ -1302,7 +1312,7 @@ g_atomic_int_inc (&_data9_->_ref_count_); #line 157 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return _data9_; -#line 1306 "test-commit.c" +#line 1316 "test-commit.c" } @@ -1311,7 +1321,7 @@ _data9_ = (Block9Data*) _userdata_; #line 157 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" if (g_atomic_int_dec_and_test (&_data9_->_ref_count_)) { -#line 1315 "test-commit.c" +#line 1325 "test-commit.c" LibGitgTestCommit* self; #line 157 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" self = _data9_->self; @@ -1323,7 +1333,7 @@ _g_object_unref0 (self); #line 157 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" g_slice_free (Block9Data, _data9_); -#line 1327 "test-commit.c" +#line 1337 "test-commit.c" } } @@ -1362,7 +1372,7 @@ g_clear_error (&_inner_error_); #line 177 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 1366 "test-commit.c" +#line 1376 "test-commit.c" } #line 179 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp3_ = ((GitgTestRepository*) self)->d_repository; @@ -1382,7 +1392,7 @@ g_clear_error (&_inner_error_); #line 179 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 1386 "test-commit.c" +#line 1396 "test-commit.c" } #line 180 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp6_ = commit; @@ -1398,7 +1408,7 @@ _g_object_unref0 (commit); #line 176 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" __vala_GgitOId_free0 (oid); -#line 1402 "test-commit.c" +#line 1412 "test-commit.c" } @@ -1407,7 +1417,7 @@ __lambda12_ (self, source_object, res); #line 173 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" block9_data_unref (self); -#line 1411 "test-commit.c" +#line 1421 "test-commit.c" } @@ -1500,7 +1510,7 @@ g_clear_error (&_inner_error_); #line 162 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 1504 "test-commit.c" +#line 1514 "test-commit.c" } #line 162 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _vala_assert (_tmp10_, "FileUtils.set_contents(pc, \"#!/bin/bash\\n\\necho 'override message' > $1\\n\")"); @@ -1548,7 +1558,7 @@ g_clear_error (&_inner_error_); #line 170 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 1552 "test-commit.c" +#line 1562 "test-commit.c" } #line 173 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp21_ = _data9_->stage; @@ -1576,7 +1586,7 @@ block9_data_unref (_data9_); #line 157 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _data9_ = NULL; -#line 1580 "test-commit.c" +#line 1590 "test-commit.c" } @@ -1585,7 +1595,7 @@ g_atomic_int_inc (&_data10_->_ref_count_); #line 188 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return _data10_; -#line 1589 "test-commit.c" +#line 1599 "test-commit.c" } @@ -1594,7 +1604,7 @@ _data10_ = (Block10Data*) _userdata_; #line 188 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" if (g_atomic_int_dec_and_test (&_data10_->_ref_count_)) { -#line 1598 "test-commit.c" +#line 1608 "test-commit.c" LibGitgTestCommit* self; #line 188 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" self = _data10_->self; @@ -1606,7 +1616,7 @@ _g_object_unref0 (self); #line 188 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" g_slice_free (Block10Data, _data10_); -#line 1610 "test-commit.c" +#line 1620 "test-commit.c" } } @@ -1645,7 +1655,7 @@ g_clear_error (&_inner_error_); #line 208 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 1649 "test-commit.c" +#line 1659 "test-commit.c" } #line 210 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp3_ = ((GitgTestRepository*) self)->d_repository; @@ -1665,7 +1675,7 @@ g_clear_error (&_inner_error_); #line 210 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 1669 "test-commit.c" +#line 1679 "test-commit.c" } #line 211 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp6_ = commit; @@ -1681,7 +1691,7 @@ _g_object_unref0 (commit); #line 207 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" __vala_GgitOId_free0 (oid); -#line 1685 "test-commit.c" +#line 1695 "test-commit.c" } @@ -1690,7 +1700,7 @@ __lambda13_ (self, source_object, res); #line 204 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" block10_data_unref (self); -#line 1694 "test-commit.c" +#line 1704 "test-commit.c" } @@ -1783,7 +1793,7 @@ g_clear_error (&_inner_error_); #line 193 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 1787 "test-commit.c" +#line 1797 "test-commit.c" } #line 193 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _vala_assert (_tmp10_, "FileUtils.set_contents(pc, \"#!/bin/bash\\n\\necho 'override message' > $1\\n\")"); @@ -1831,7 +1841,7 @@ g_clear_error (&_inner_error_); #line 201 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 1835 "test-commit.c" +#line 1845 "test-commit.c" } #line 204 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp21_ = _data10_->stage; @@ -1859,7 +1869,7 @@ block10_data_unref (_data10_); #line 188 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _data10_ = NULL; -#line 1863 "test-commit.c" +#line 1873 "test-commit.c" } @@ -1868,7 +1878,7 @@ g_atomic_int_inc (&_data11_->_ref_count_); #line 219 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return _data11_; -#line 1872 "test-commit.c" +#line 1882 "test-commit.c" } @@ -1877,7 +1887,7 @@ _data11_ = (Block11Data*) _userdata_; #line 219 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" if (g_atomic_int_dec_and_test (&_data11_->_ref_count_)) { -#line 1881 "test-commit.c" +#line 1891 "test-commit.c" LibGitgTestCommit* self; #line 219 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" self = _data11_->self; @@ -1893,7 +1903,7 @@ _g_object_unref0 (self); #line 219 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" g_slice_free (Block11Data, _data11_); -#line 1897 "test-commit.c" +#line 1907 "test-commit.c" } } @@ -1993,7 +2003,7 @@ g_clear_error (&_inner_error_); #line 240 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 1997 "test-commit.c" +#line 2007 "test-commit.c" } #line 241 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp3_ = ((GitgTestRepository*) self)->d_repository; @@ -2013,7 +2023,7 @@ g_clear_error (&_inner_error_); #line 241 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 2017 "test-commit.c" +#line 2027 "test-commit.c" } #line 243 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp6_ = commit; @@ -2103,7 +2113,7 @@ g_clear_error (&_inner_error_); #line 252 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 2107 "test-commit.c" +#line 2117 "test-commit.c" } #line 252 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp34_ = _tmp31_; @@ -2169,7 +2179,7 @@ g_clear_error (&_inner_error_); #line 257 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 2173 "test-commit.c" +#line 2183 "test-commit.c" } #line 257 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp51_ = _tmp48_; @@ -2201,7 +2211,7 @@ g_clear_error (&_inner_error_); #line 257 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 2205 "test-commit.c" +#line 2215 "test-commit.c" } #line 258 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp55_ = reflog; @@ -2255,7 +2265,7 @@ _g_object_unref0 (commit); #line 238 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" __vala_GgitOId_free0 (oid); -#line 2259 "test-commit.c" +#line 2269 "test-commit.c" } @@ -2264,7 +2274,7 @@ __lambda14_ (self, source_object, res); #line 235 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" block11_data_unref (self); -#line 2268 "test-commit.c" +#line 2278 "test-commit.c" } @@ -2332,7 +2342,7 @@ g_clear_error (&_inner_error_); #line 227 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 2336 "test-commit.c" +#line 2346 "test-commit.c" } #line 230 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp6_ = ((GitgTestRepository*) self)->d_repository; @@ -2352,7 +2362,7 @@ g_clear_error (&_inner_error_); #line 230 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 2356 "test-commit.c" +#line 2366 "test-commit.c" } #line 230 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp8_ = _tmp5_; @@ -2392,7 +2402,7 @@ g_clear_error (&_inner_error_); #line 231 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" return; -#line 2396 "test-commit.c" +#line 2406 "test-commit.c" } #line 233 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _tmp15_ = g_strdup ("This is the commit\n\nWith a message.\n"); @@ -2428,7 +2438,7 @@ block11_data_unref (_data11_); #line 219 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" _data11_ = NULL; -#line 2432 "test-commit.c" +#line 2442 "test-commit.c" } @@ -2449,23 +2459,23 @@ ((LibGitgTestCommitClass *) klass)->test_skip_hooks = lib_gitg_test_commit_real_test_skip_hooks; #line 22 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" ((LibGitgTestCommitClass *) klass)->test_amend = lib_gitg_test_commit_real_test_amend; -#line 2453 "test-commit.c" +#line 2463 "test-commit.c" /** * test commit. */ #line 22 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" - g_signal_new ("test_commit", LIB_GITG_TEST_TYPE_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestCommitClass, test_commit), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + lib_gitg_test_commit_signals[LIB_GITG_TEST_COMMIT_TEST_COMMIT_SIGNAL] = g_signal_new ("test_commit", LIB_GITG_TEST_TYPE_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestCommitClass, test_commit), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" - g_signal_new ("test_sign_off", LIB_GITG_TEST_TYPE_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestCommitClass, test_sign_off), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + lib_gitg_test_commit_signals[LIB_GITG_TEST_COMMIT_TEST_SIGN_OFF_SIGNAL] = g_signal_new ("test_sign_off", LIB_GITG_TEST_TYPE_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestCommitClass, test_sign_off), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" - g_signal_new ("test_pre_commit_hook", LIB_GITG_TEST_TYPE_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestCommitClass, test_pre_commit_hook), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + lib_gitg_test_commit_signals[LIB_GITG_TEST_COMMIT_TEST_PRE_COMMIT_HOOK_SIGNAL] = g_signal_new ("test_pre_commit_hook", LIB_GITG_TEST_TYPE_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestCommitClass, test_pre_commit_hook), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" - g_signal_new ("test_commit_msg_hook", LIB_GITG_TEST_TYPE_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestCommitClass, test_commit_msg_hook), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + lib_gitg_test_commit_signals[LIB_GITG_TEST_COMMIT_TEST_COMMIT_MSG_HOOK_SIGNAL] = g_signal_new ("test_commit_msg_hook", LIB_GITG_TEST_TYPE_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestCommitClass, test_commit_msg_hook), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" - g_signal_new ("test_skip_hooks", LIB_GITG_TEST_TYPE_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestCommitClass, test_skip_hooks), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + lib_gitg_test_commit_signals[LIB_GITG_TEST_COMMIT_TEST_SKIP_HOOKS_SIGNAL] = g_signal_new ("test_skip_hooks", LIB_GITG_TEST_TYPE_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestCommitClass, test_skip_hooks), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/libgitg/test-commit.vala" - g_signal_new ("test_amend", LIB_GITG_TEST_TYPE_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestCommitClass, test_amend), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 2469 "test-commit.c" + lib_gitg_test_commit_signals[LIB_GITG_TEST_COMMIT_TEST_AMEND_SIGNAL] = g_signal_new ("test_amend", LIB_GITG_TEST_TYPE_COMMIT, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestCommitClass, test_amend), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 2479 "test-commit.c" } diff -Nru gitg-3.22.0/tests/libgitg/test-date.c gitg-3.23.0/tests/libgitg/test-date.c --- gitg-3.22.0/tests/libgitg/test-date.c 2016-08-09 09:51:15.000000000 +0000 +++ gitg-3.23.0/tests/libgitg/test-date.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* test-date.c generated by valac 0.32.1, the Vala compiler +/* test-date.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from test-date.vala, do not modify */ /* @@ -51,6 +51,13 @@ typedef struct _LibGitgTestDatePrivate LibGitgTestDatePrivate; #define _g_date_time_unref0(var) ((var == NULL) ? NULL : (var = (g_date_time_unref (var), NULL))) #define _g_time_zone_unref0(var) ((var == NULL) ? NULL : (var = (g_time_zone_unref (var), NULL))) +enum { + LIB_GITG_TEST_DATE_TEST_ISO8601_SIGNAL, + LIB_GITG_TEST_DATE_TEST_RFC2822_SIGNAL, + LIB_GITG_TEST_DATE_TEST_INTERNAL_SIGNAL, + LIB_GITG_TEST_DATE_LAST_SIGNAL +}; +static guint lib_gitg_test_date_signals[LIB_GITG_TEST_DATE_LAST_SIGNAL] = {0}; struct _GitgTestTest { GObject parent_instance; @@ -98,14 +105,14 @@ self = (LibGitgTestDate*) gitg_test_test_construct (object_type); #line 22 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return self; -#line 102 "test-date.c" +#line 109 "test-date.c" } LibGitgTestDate* lib_gitg_test_date_new (void) { #line 22 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return lib_gitg_test_date_construct (LIB_GITG_TEST_TYPE_DATE); -#line 109 "test-date.c" +#line 116 "test-date.c" } @@ -225,7 +232,7 @@ g_clear_error (&_inner_error_); #line 26 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 229 "test-date.c" +#line 236 "test-date.c" } #line 26 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp2_ = g_date_time_new_local (2005, 1, 1, 0, 0, (gdouble) 0); @@ -249,7 +256,7 @@ g_clear_error (&_inner_error_); #line 29 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 253 "test-date.c" +#line 260 "test-date.c" } #line 29 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp6_ = g_date_time_new_local (2005, 4, 1, 0, 0, (gdouble) 0); @@ -275,7 +282,7 @@ g_clear_error (&_inner_error_); #line 32 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 279 "test-date.c" +#line 286 "test-date.c" } #line 32 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp10_ = g_date_time_new_local (2005, 4, 1, 0, 0, (gdouble) 0); @@ -303,7 +310,7 @@ g_clear_error (&_inner_error_); #line 35 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 307 "test-date.c" +#line 314 "test-date.c" } #line 35 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp14_ = g_date_time_new_local (2005, 4, 1, 0, 0, (gdouble) 0); @@ -333,7 +340,7 @@ g_clear_error (&_inner_error_); #line 38 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 337 "test-date.c" +#line 344 "test-date.c" } #line 38 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp18_ = g_date_time_new_local (2005, 4, 7, 0, 0, (gdouble) 0); @@ -365,7 +372,7 @@ g_clear_error (&_inner_error_); #line 41 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 369 "test-date.c" +#line 376 "test-date.c" } #line 41 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp22_ = g_date_time_new_local (2005, 4, 7, 0, 0, (gdouble) 0); @@ -399,7 +406,7 @@ g_clear_error (&_inner_error_); #line 44 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 403 "test-date.c" +#line 410 "test-date.c" } #line 44 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp26_ = g_date_time_new_local (2005, 4, 7, 0, 0, (gdouble) 0); @@ -435,7 +442,7 @@ g_clear_error (&_inner_error_); #line 47 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 439 "test-date.c" +#line 446 "test-date.c" } #line 47 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp30_ = g_date_time_new_local (2005, 4, 7, 22, 0, (gdouble) 0); @@ -473,7 +480,7 @@ g_clear_error (&_inner_error_); #line 50 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 477 "test-date.c" +#line 484 "test-date.c" } #line 50 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp34_ = g_date_time_new_local (2005, 4, 7, 22, 13, (gdouble) 0); @@ -513,7 +520,7 @@ g_clear_error (&_inner_error_); #line 53 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 517 "test-date.c" +#line 524 "test-date.c" } #line 53 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp38_ = g_date_time_new_local (2005, 4, 7, 22, 13, (gdouble) 0); @@ -555,7 +562,7 @@ g_clear_error (&_inner_error_); #line 56 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 559 "test-date.c" +#line 566 "test-date.c" } #line 56 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp42_ = g_date_time_new_local (2005, 4, 7, 22, 13, (gdouble) 13); @@ -599,7 +606,7 @@ g_clear_error (&_inner_error_); #line 59 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 603 "test-date.c" +#line 610 "test-date.c" } #line 59 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp46_ = g_date_time_new_local (2005, 4, 7, 22, 13, (gdouble) 13); @@ -645,7 +652,7 @@ g_clear_error (&_inner_error_); #line 62 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 649 "test-date.c" +#line 656 "test-date.c" } #line 62 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp50_ = g_date_time_new_local (2005, 4, 7, 22, 13, (gdouble) 13); @@ -693,7 +700,7 @@ g_clear_error (&_inner_error_); #line 65 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 697 "test-date.c" +#line 704 "test-date.c" } #line 65 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp54_ = g_date_time_new_local (2005, 4, 7, 22, 13, (gdouble) 13); @@ -743,7 +750,7 @@ g_clear_error (&_inner_error_); #line 68 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 747 "test-date.c" +#line 754 "test-date.c" } #line 68 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp58_ = g_date_time_new_local (2005, 4, 7, 22, 13, (gdouble) 13); @@ -795,7 +802,7 @@ g_clear_error (&_inner_error_); #line 71 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 799 "test-date.c" +#line 806 "test-date.c" } #line 71 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp62_ = g_date_time_new_local (2005, 4, 7, 22, 13, (gdouble) 13); @@ -849,7 +856,7 @@ g_clear_error (&_inner_error_); #line 74 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 853 "test-date.c" +#line 860 "test-date.c" } #line 74 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp66_ = g_date_time_new_local (2005, 4, 7, 22, 13, (gdouble) 13); @@ -905,7 +912,7 @@ g_clear_error (&_inner_error_); #line 77 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 909 "test-date.c" +#line 916 "test-date.c" } #line 77 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp70_ = g_date_time_new_utc (2005, 4, 7, 22, 13, (gdouble) 13); @@ -963,7 +970,7 @@ g_clear_error (&_inner_error_); #line 80 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 967 "test-date.c" +#line 974 "test-date.c" } #line 80 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp74_ = g_time_zone_new ("+0200"); @@ -1029,7 +1036,7 @@ g_clear_error (&_inner_error_); #line 83 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 1033 "test-date.c" +#line 1040 "test-date.c" } #line 83 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp80_ = g_time_zone_new ("-0400"); @@ -1097,7 +1104,7 @@ g_clear_error (&_inner_error_); #line 86 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 1101 "test-date.c" +#line 1108 "test-date.c" } #line 86 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp86_ = g_time_zone_new ("+0202"); @@ -1167,7 +1174,7 @@ g_clear_error (&_inner_error_); #line 89 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 1171 "test-date.c" +#line 1178 "test-date.c" } #line 89 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp92_ = g_time_zone_new ("+0300"); @@ -1239,7 +1246,7 @@ g_clear_error (&_inner_error_); #line 92 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 1243 "test-date.c" +#line 1250 "test-date.c" } #line 92 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp98_ = g_time_zone_new ("+0320"); @@ -1301,7 +1308,7 @@ _g_date_time_unref0 (_tmp4_); #line 24 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _g_date_time_unref0 (_tmp0_); -#line 1305 "test-date.c" +#line 1312 "test-date.c" } @@ -1343,7 +1350,7 @@ g_clear_error (&_inner_error_); #line 99 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 1347 "test-date.c" +#line 1354 "test-date.c" } #line 99 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp2_ = g_time_zone_new ("+0200"); @@ -1373,7 +1380,7 @@ g_clear_error (&_inner_error_); #line 102 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 1377 "test-date.c" +#line 1384 "test-date.c" } #line 102 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp8_ = g_time_zone_new ("-0200"); @@ -1405,7 +1412,7 @@ g_clear_error (&_inner_error_); #line 105 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 1409 "test-date.c" +#line 1416 "test-date.c" } #line 105 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp14_ = g_time_zone_new ("-0200"); @@ -1439,7 +1446,7 @@ g_clear_error (&_inner_error_); #line 108 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 1443 "test-date.c" +#line 1450 "test-date.c" } #line 108 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp20_ = g_time_zone_new ("+0300"); @@ -1463,7 +1470,7 @@ _g_date_time_unref0 (_tmp6_); #line 97 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _g_date_time_unref0 (_tmp0_); -#line 1467 "test-date.c" +#line 1474 "test-date.c" } @@ -1497,7 +1504,7 @@ g_clear_error (&_inner_error_); #line 115 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 1501 "test-date.c" +#line 1508 "test-date.c" } #line 115 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp2_ = g_date_time_new_from_unix_utc ((gint64) 457849203); @@ -1533,7 +1540,7 @@ g_clear_error (&_inner_error_); #line 119 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" return; -#line 1537 "test-date.c" +#line 1544 "test-date.c" } #line 119 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _tmp10_ = g_date_time_new_from_unix_utc ((gint64) 457849203); @@ -1559,7 +1566,7 @@ _g_date_time_unref0 (_tmp8_); #line 113 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" _g_date_time_unref0 (_tmp0_); -#line 1563 "test-date.c" +#line 1570 "test-date.c" } @@ -1573,12 +1580,12 @@ #line 22 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" ((LibGitgTestDateClass *) klass)->test_internal = lib_gitg_test_date_real_test_internal; #line 22 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" - g_signal_new ("test_iso8601", LIB_GITG_TEST_TYPE_DATE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestDateClass, test_iso8601), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + lib_gitg_test_date_signals[LIB_GITG_TEST_DATE_TEST_ISO8601_SIGNAL] = g_signal_new ("test_iso8601", LIB_GITG_TEST_TYPE_DATE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestDateClass, test_iso8601), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" - g_signal_new ("test_rfc2822", LIB_GITG_TEST_TYPE_DATE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestDateClass, test_rfc2822), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + lib_gitg_test_date_signals[LIB_GITG_TEST_DATE_TEST_RFC2822_SIGNAL] = g_signal_new ("test_rfc2822", LIB_GITG_TEST_TYPE_DATE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestDateClass, test_rfc2822), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 22 "/home/jesse/dev/gitg/tests/libgitg/test-date.vala" - g_signal_new ("test_internal", LIB_GITG_TEST_TYPE_DATE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestDateClass, test_internal), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 1582 "test-date.c" + lib_gitg_test_date_signals[LIB_GITG_TEST_DATE_TEST_INTERNAL_SIGNAL] = g_signal_new ("test_internal", LIB_GITG_TEST_TYPE_DATE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestDateClass, test_internal), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 1589 "test-date.c" } diff -Nru gitg-3.22.0/tests/libgitg/test-encoding.c gitg-3.23.0/tests/libgitg/test-encoding.c --- gitg-3.22.0/tests/libgitg/test-encoding.c 2016-08-09 09:51:15.000000000 +0000 +++ gitg-3.23.0/tests/libgitg/test-encoding.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* test-encoding.c generated by valac 0.32.1, the Vala compiler +/* test-encoding.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from test-encoding.vala, do not modify */ /* @@ -67,6 +67,11 @@ #define _g_free0(var) (var = (g_free (var), NULL)) #define _g_main_loop_unref0(var) ((var == NULL) ? NULL : (var = (g_main_loop_unref (var), NULL))) #define __vala_GgitOId_free0(var) ((var == NULL) ? NULL : (var = (_vala_GgitOId_free (var), NULL))) +enum { + LIB_GITG_TEST_ENCODING_TEST_COMMIT_ENCODING_SIGNAL, + LIB_GITG_TEST_ENCODING_LAST_SIGNAL +}; +static guint lib_gitg_test_encoding_signals[LIB_GITG_TEST_ENCODING_LAST_SIGNAL] = {0}; struct _GitgTestTest { GObject parent_instance; @@ -160,7 +165,7 @@ g_clear_error (&_inner_error_); #line 31 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" return; -#line 164 "test-encoding.c" +#line 169 "test-encoding.c" } #line 31 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" _tmp3_ = _tmp0_; @@ -182,7 +187,7 @@ g_clear_error (&_inner_error_); #line 31 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" return; -#line 186 "test-encoding.c" +#line 191 "test-encoding.c" } #line 33 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" gitg_test_repository_index_modify ((GitgTestRepository*) self, "b", "staged changes\n", NULL); @@ -190,7 +195,7 @@ gitg_test_repository_index_modify ((GitgTestRepository*) self, "a", "lala\n", NULL); #line 27 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" _g_object_unref0 (_tmp0_); -#line 194 "test-encoding.c" +#line 199 "test-encoding.c" } @@ -200,14 +205,14 @@ self = (LibGitgTestEncoding*) gitg_test_repository_construct (object_type); #line 22 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" return self; -#line 204 "test-encoding.c" +#line 209 "test-encoding.c" } LibGitgTestEncoding* lib_gitg_test_encoding_new (void) { #line 22 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" return lib_gitg_test_encoding_construct (LIB_GITG_TEST_TYPE_ENCODING); -#line 211 "test-encoding.c" +#line 216 "test-encoding.c" } @@ -216,7 +221,7 @@ g_atomic_int_inc (&_data12_->_ref_count_); #line 40 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" return _data12_; -#line 220 "test-encoding.c" +#line 225 "test-encoding.c" } @@ -225,7 +230,7 @@ _data12_ = (Block12Data*) _userdata_; #line 40 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" if (g_atomic_int_dec_and_test (&_data12_->_ref_count_)) { -#line 229 "test-encoding.c" +#line 234 "test-encoding.c" LibGitgTestEncoding* self; #line 40 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" self = _data12_->self; @@ -239,7 +244,7 @@ _g_object_unref0 (self); #line 40 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" g_slice_free (Block12Data, _data12_); -#line 243 "test-encoding.c" +#line 248 "test-encoding.c" } } @@ -247,7 +252,7 @@ static void _vala_GgitOId_free (GgitOId* self) { #line 56 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" g_boxed_free (ggit_oid_get_type (), self); -#line 251 "test-encoding.c" +#line 256 "test-encoding.c" } @@ -282,7 +287,7 @@ g_clear_error (&_inner_error_); #line 55 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" return; -#line 286 "test-encoding.c" +#line 291 "test-encoding.c" } #line 56 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" _tmp2_ = ((GitgTestRepository*) self)->d_repository; @@ -302,7 +307,7 @@ g_clear_error (&_inner_error_); #line 56 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" return; -#line 306 "test-encoding.c" +#line 311 "test-encoding.c" } #line 58 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" _tmp5_ = commit; @@ -318,7 +323,7 @@ _g_object_unref0 (commit); #line 53 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" __vala_GgitOId_free0 (oid); -#line 322 "test-encoding.c" +#line 327 "test-encoding.c" } @@ -327,7 +332,7 @@ __lambda15_ (self, source_object, res); #line 50 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" block12_data_unref (self); -#line 331 "test-encoding.c" +#line 336 "test-encoding.c" } @@ -376,7 +381,7 @@ g_clear_error (&_inner_error_); #line 45 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" return; -#line 380 "test-encoding.c" +#line 385 "test-encoding.c" } #line 48 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" _tmp5_ = g_strdup ("This is the commit\n\nWith some cyЯЯilic.\n"); @@ -394,7 +399,7 @@ block12_data_unref (_data12_); #line 40 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" _data12_ = NULL; -#line 398 "test-encoding.c" +#line 403 "test-encoding.c" } @@ -405,13 +410,13 @@ ((GitgTestTestClass *) klass)->set_up = lib_gitg_test_encoding_real_set_up; #line 22 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" ((LibGitgTestEncodingClass *) klass)->test_commit_encoding = lib_gitg_test_encoding_real_test_commit_encoding; -#line 409 "test-encoding.c" +#line 414 "test-encoding.c" /** * test commit. */ #line 22 "/home/jesse/dev/gitg/tests/libgitg/test-encoding.vala" - g_signal_new ("test_commit_encoding", LIB_GITG_TEST_TYPE_ENCODING, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestEncodingClass, test_commit_encoding), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 415 "test-encoding.c" + lib_gitg_test_encoding_signals[LIB_GITG_TEST_ENCODING_TEST_COMMIT_ENCODING_SIGNAL] = g_signal_new ("test_commit_encoding", LIB_GITG_TEST_TYPE_ENCODING, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestEncodingClass, test_commit_encoding), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 420 "test-encoding.c" } diff -Nru gitg-3.22.0/tests/libgitg/test-stage.c gitg-3.23.0/tests/libgitg/test-stage.c --- gitg-3.22.0/tests/libgitg/test-stage.c 2016-08-09 09:51:15.000000000 +0000 +++ gitg-3.23.0/tests/libgitg/test-stage.c 2016-11-26 13:23:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* test-stage.c generated by valac 0.32.1, the Vala compiler +/* test-stage.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from test-stage.vala, do not modify */ /* @@ -72,6 +72,15 @@ typedef struct _Block3Data Block3Data; typedef struct _Block4Data Block4Data; typedef struct _Block5Data Block5Data; +enum { + LIB_GITG_TEST_STAGE_TEST_FILE_STATUS_SIGNAL, + LIB_GITG_TEST_STAGE_TEST_STAGE_SIGNAL, + LIB_GITG_TEST_STAGE_TEST_UNSTAGE_SIGNAL, + LIB_GITG_TEST_STAGE_TEST_REVERT_SIGNAL, + LIB_GITG_TEST_STAGE_TEST_DELETE_SIGNAL, + LIB_GITG_TEST_STAGE_LAST_SIGNAL +}; +static guint lib_gitg_test_stage_signals[LIB_GITG_TEST_STAGE_LAST_SIGNAL] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -217,21 +226,21 @@ gitg_test_repository_workdir_modify ((GitgTestRepository*) self, "b", "changed test\n", NULL); #line 41 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" gitg_test_repository_index_modify ((GitgTestRepository*) self, "b", "staged changes\n", NULL); -#line 221 "test-stage.c" +#line 230 "test-stage.c" } static gpointer _g_main_loop_ref0 (gpointer self) { #line 44 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" return self ? g_main_loop_ref (self) : NULL; -#line 228 "test-stage.c" +#line 237 "test-stage.c" } static gpointer _g_object_ref0 (gpointer self) { #line 44 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" return self ? g_object_ref (self) : NULL; -#line 235 "test-stage.c" +#line 244 "test-stage.c" } @@ -240,7 +249,7 @@ g_atomic_int_inc (&_data1_->_ref_count_); #line 44 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" return _data1_; -#line 244 "test-stage.c" +#line 253 "test-stage.c" } @@ -249,7 +258,7 @@ _data1_ = (Block1Data*) _userdata_; #line 44 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { -#line 253 "test-stage.c" +#line 262 "test-stage.c" LibGitgTestStage* self; #line 44 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" self = _data1_->self; @@ -265,7 +274,7 @@ _g_object_unref0 (self); #line 44 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" g_slice_free (Block1Data, _data1_); -#line 269 "test-stage.c" +#line 278 "test-stage.c" } } @@ -319,7 +328,7 @@ _tmp7_ = items; #line 61 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _tmp7__length1 = items_length1; -#line 323 "test-stage.c" +#line 332 "test-stage.c" { GitgStageStatusItem** item_collection = NULL; gint item_collection_length1 = 0; @@ -331,14 +340,14 @@ item_collection_length1 = _tmp7__length1; #line 61 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" for (item_it = 0; item_it < _tmp7__length1; item_it = item_it + 1) { -#line 335 "test-stage.c" +#line 344 "test-stage.c" GitgStageStatusItem* _tmp8_ = NULL; GitgStageStatusItem* item = NULL; #line 61 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _tmp8_ = _g_object_ref0 (item_collection[item_it]); #line 61 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" item = _tmp8_; -#line 342 "test-stage.c" +#line 351 "test-stage.c" { GitgStageStatusFile* f = NULL; GitgStageStatusItem* _tmp9_ = NULL; @@ -425,7 +434,7 @@ _g_object_unref0 (f); #line 61 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _g_object_unref0 (item); -#line 429 "test-stage.c" +#line 438 "test-stage.c" } } } @@ -443,7 +452,7 @@ g_main_loop_quit (_tmp34_); #line 56 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" items = (_vala_array_free (items, items_length1, (GDestroyNotify) g_object_unref), NULL); -#line 447 "test-stage.c" +#line 456 "test-stage.c" } @@ -452,7 +461,7 @@ __lambda4_ (self, source_object, res); #line 56 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" block1_data_unref (self); -#line 456 "test-stage.c" +#line 465 "test-stage.c" } @@ -500,7 +509,7 @@ _tmp4_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 46 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _data1_->seen = _tmp4_; -#line 504 "test-stage.c" +#line 513 "test-stage.c" { GeeIterator* _f_it = NULL; GeeHashMap* _tmp5_ = NULL; @@ -527,7 +536,7 @@ _f_it = _tmp10_; #line 48 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" while (TRUE) { -#line 531 "test-stage.c" +#line 540 "test-stage.c" GeeIterator* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; gchar* f = NULL; @@ -543,7 +552,7 @@ if (!_tmp12_) { #line 48 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" break; -#line 547 "test-stage.c" +#line 556 "test-stage.c" } #line 48 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _tmp13_ = _f_it; @@ -559,11 +568,11 @@ gee_abstract_collection_add ((GeeAbstractCollection*) _tmp15_, _tmp16_); #line 48 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _g_free0 (f); -#line 563 "test-stage.c" +#line 572 "test-stage.c" } #line 48 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _g_object_unref0 (_f_it); -#line 567 "test-stage.c" +#line 576 "test-stage.c" } #line 53 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _tmp17_ = ((GitgTestRepository*) self)->d_repository; @@ -585,7 +594,7 @@ block1_data_unref (_data1_); #line 44 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _data1_ = NULL; -#line 589 "test-stage.c" +#line 598 "test-stage.c" } @@ -595,14 +604,14 @@ self = (LibGitgTestStage*) gitg_test_repository_construct (object_type); #line 23 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" return self; -#line 599 "test-stage.c" +#line 608 "test-stage.c" } LibGitgTestStage* lib_gitg_test_stage_new (void) { #line 23 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" return lib_gitg_test_stage_construct (LIB_GITG_TEST_TYPE_STAGE); -#line 606 "test-stage.c" +#line 615 "test-stage.c" } @@ -633,7 +642,7 @@ _g_main_loop_unref0 (loop); #line 80 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _g_object_unref0 (m); -#line 637 "test-stage.c" +#line 646 "test-stage.c" } @@ -642,7 +651,7 @@ g_atomic_int_inc (&_data2_->_ref_count_); #line 97 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" return _data2_; -#line 646 "test-stage.c" +#line 655 "test-stage.c" } @@ -651,7 +660,7 @@ _data2_ = (Block2Data*) _userdata_; #line 97 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { -#line 655 "test-stage.c" +#line 664 "test-stage.c" LibGitgTestStage* self; #line 97 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" self = _data2_->self; @@ -663,7 +672,7 @@ _g_object_unref0 (self); #line 97 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" g_slice_free (Block2Data, _data2_); -#line 667 "test-stage.c" +#line 676 "test-stage.c" } } @@ -677,7 +686,7 @@ self = _data2_->self; #line 103 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" g_return_if_fail (res != NULL); -#line 681 "test-stage.c" +#line 690 "test-stage.c" { GAsyncResult* _tmp0_ = NULL; #line 106 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" @@ -686,7 +695,7 @@ gitg_stage_stage_finish (_data2_->stage, _tmp0_, &_inner_error_); #line 106 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 690 "test-stage.c" +#line 699 "test-stage.c" goto __catch0_g_error; } } @@ -705,7 +714,7 @@ gitg_test_assert_assert_no_error (_tmp1_); #line 104 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _g_error_free0 (e); -#line 709 "test-stage.c" +#line 718 "test-stage.c" } __finally0: #line 104 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" @@ -716,7 +725,7 @@ g_clear_error (&_inner_error_); #line 104 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" return; -#line 720 "test-stage.c" +#line 729 "test-stage.c" } #line 109 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, ggit_status_flags_get_type (), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); @@ -732,7 +741,7 @@ lib_gitg_test_stage_check_file_status (self, _data2_->loop, m); #line 103 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _g_object_unref0 (m); -#line 736 "test-stage.c" +#line 745 "test-stage.c" } @@ -741,7 +750,7 @@ __lambda5_ (self, source_object, res); #line 103 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" block2_data_unref (self); -#line 745 "test-stage.c" +#line 754 "test-stage.c" } @@ -777,7 +786,7 @@ block2_data_unref (_data2_); #line 97 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _data2_ = NULL; -#line 781 "test-stage.c" +#line 790 "test-stage.c" } @@ -786,7 +795,7 @@ g_atomic_int_inc (&_data3_->_ref_count_); #line 124 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" return _data3_; -#line 790 "test-stage.c" +#line 799 "test-stage.c" } @@ -795,7 +804,7 @@ _data3_ = (Block3Data*) _userdata_; #line 124 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) { -#line 799 "test-stage.c" +#line 808 "test-stage.c" LibGitgTestStage* self; #line 124 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" self = _data3_->self; @@ -807,7 +816,7 @@ _g_object_unref0 (self); #line 124 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" g_slice_free (Block3Data, _data3_); -#line 811 "test-stage.c" +#line 820 "test-stage.c" } } @@ -821,7 +830,7 @@ self = _data3_->self; #line 130 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" g_return_if_fail (res != NULL); -#line 825 "test-stage.c" +#line 834 "test-stage.c" { GAsyncResult* _tmp0_ = NULL; #line 133 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" @@ -830,7 +839,7 @@ gitg_stage_unstage_finish (_data3_->stage, _tmp0_, &_inner_error_); #line 133 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 834 "test-stage.c" +#line 843 "test-stage.c" goto __catch1_g_error; } } @@ -849,7 +858,7 @@ gitg_test_assert_assert_no_error (_tmp1_); #line 131 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _g_error_free0 (e); -#line 853 "test-stage.c" +#line 862 "test-stage.c" } __finally1: #line 131 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" @@ -860,7 +869,7 @@ g_clear_error (&_inner_error_); #line 131 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" return; -#line 864 "test-stage.c" +#line 873 "test-stage.c" } #line 136 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, ggit_status_flags_get_type (), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); @@ -876,7 +885,7 @@ lib_gitg_test_stage_check_file_status (self, _data3_->loop, m); #line 130 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _g_object_unref0 (m); -#line 880 "test-stage.c" +#line 889 "test-stage.c" } @@ -885,7 +894,7 @@ __lambda6_ (self, source_object, res); #line 130 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" block3_data_unref (self); -#line 889 "test-stage.c" +#line 898 "test-stage.c" } @@ -921,7 +930,7 @@ block3_data_unref (_data3_); #line 124 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _data3_ = NULL; -#line 925 "test-stage.c" +#line 934 "test-stage.c" } @@ -930,7 +939,7 @@ g_atomic_int_inc (&_data4_->_ref_count_); #line 151 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" return _data4_; -#line 934 "test-stage.c" +#line 943 "test-stage.c" } @@ -939,7 +948,7 @@ _data4_ = (Block4Data*) _userdata_; #line 151 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) { -#line 943 "test-stage.c" +#line 952 "test-stage.c" LibGitgTestStage* self; #line 151 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" self = _data4_->self; @@ -951,7 +960,7 @@ _g_object_unref0 (self); #line 151 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" g_slice_free (Block4Data, _data4_); -#line 955 "test-stage.c" +#line 964 "test-stage.c" } } @@ -965,7 +974,7 @@ self = _data4_->self; #line 157 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" g_return_if_fail (res != NULL); -#line 969 "test-stage.c" +#line 978 "test-stage.c" { GAsyncResult* _tmp0_ = NULL; #line 160 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" @@ -974,7 +983,7 @@ gitg_stage_revert_finish (_data4_->stage, _tmp0_, &_inner_error_); #line 160 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 978 "test-stage.c" +#line 987 "test-stage.c" goto __catch2_g_error; } } @@ -993,7 +1002,7 @@ gitg_test_assert_assert_no_error (_tmp1_); #line 158 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _g_error_free0 (e); -#line 997 "test-stage.c" +#line 1006 "test-stage.c" } __finally2: #line 158 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" @@ -1004,7 +1013,7 @@ g_clear_error (&_inner_error_); #line 158 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" return; -#line 1008 "test-stage.c" +#line 1017 "test-stage.c" } #line 163 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, ggit_status_flags_get_type (), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); @@ -1018,7 +1027,7 @@ lib_gitg_test_stage_check_file_status (self, _data4_->loop, m); #line 157 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _g_object_unref0 (m); -#line 1022 "test-stage.c" +#line 1031 "test-stage.c" } @@ -1027,7 +1036,7 @@ __lambda7_ (self, source_object, res); #line 157 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" block4_data_unref (self); -#line 1031 "test-stage.c" +#line 1040 "test-stage.c" } @@ -1063,7 +1072,7 @@ block4_data_unref (_data4_); #line 151 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _data4_ = NULL; -#line 1067 "test-stage.c" +#line 1076 "test-stage.c" } @@ -1072,7 +1081,7 @@ g_atomic_int_inc (&_data5_->_ref_count_); #line 177 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" return _data5_; -#line 1076 "test-stage.c" +#line 1085 "test-stage.c" } @@ -1081,7 +1090,7 @@ _data5_ = (Block5Data*) _userdata_; #line 177 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" if (g_atomic_int_dec_and_test (&_data5_->_ref_count_)) { -#line 1085 "test-stage.c" +#line 1094 "test-stage.c" LibGitgTestStage* self; #line 177 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" self = _data5_->self; @@ -1093,7 +1102,7 @@ _g_object_unref0 (self); #line 177 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" g_slice_free (Block5Data, _data5_); -#line 1097 "test-stage.c" +#line 1106 "test-stage.c" } } @@ -1107,7 +1116,7 @@ self = _data5_->self; #line 183 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" g_return_if_fail (res != NULL); -#line 1111 "test-stage.c" +#line 1120 "test-stage.c" { GAsyncResult* _tmp0_ = NULL; #line 186 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" @@ -1116,7 +1125,7 @@ gitg_stage_delete_finish (_data5_->stage, _tmp0_, &_inner_error_); #line 186 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1120 "test-stage.c" +#line 1129 "test-stage.c" goto __catch3_g_error; } } @@ -1135,7 +1144,7 @@ gitg_test_assert_assert_no_error (_tmp1_); #line 184 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _g_error_free0 (e); -#line 1139 "test-stage.c" +#line 1148 "test-stage.c" } __finally3: #line 184 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" @@ -1146,7 +1155,7 @@ g_clear_error (&_inner_error_); #line 184 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" return; -#line 1150 "test-stage.c" +#line 1159 "test-stage.c" } #line 189 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, ggit_status_flags_get_type (), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); @@ -1162,7 +1171,7 @@ lib_gitg_test_stage_check_file_status (self, _data5_->loop, m); #line 183 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _g_object_unref0 (m); -#line 1166 "test-stage.c" +#line 1175 "test-stage.c" } @@ -1171,7 +1180,7 @@ __lambda8_ (self, source_object, res); #line 183 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" block5_data_unref (self); -#line 1175 "test-stage.c" +#line 1184 "test-stage.c" } @@ -1207,7 +1216,7 @@ block5_data_unref (_data5_); #line 177 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" _data5_ = NULL; -#line 1211 "test-stage.c" +#line 1220 "test-stage.c" } @@ -1226,38 +1235,38 @@ ((LibGitgTestStageClass *) klass)->test_revert = lib_gitg_test_stage_real_test_revert; #line 23 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" ((LibGitgTestStageClass *) klass)->test_delete = lib_gitg_test_stage_real_test_delete; -#line 1230 "test-stage.c" +#line 1239 "test-stage.c" /** * Test whether the different file statuses created by the set_up() * are properly reported by the stage file status enumerator. */ #line 23 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" - g_signal_new ("test_file_status", LIB_GITG_TEST_TYPE_STAGE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestStageClass, test_file_status), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 1237 "test-stage.c" + lib_gitg_test_stage_signals[LIB_GITG_TEST_STAGE_TEST_FILE_STATUS_SIGNAL] = g_signal_new ("test_file_status", LIB_GITG_TEST_TYPE_STAGE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestStageClass, test_file_status), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 1246 "test-stage.c" /** * test staging a complete file in the index. */ #line 23 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" - g_signal_new ("test_stage", LIB_GITG_TEST_TYPE_STAGE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestStageClass, test_stage), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 1243 "test-stage.c" + lib_gitg_test_stage_signals[LIB_GITG_TEST_STAGE_TEST_STAGE_SIGNAL] = g_signal_new ("test_stage", LIB_GITG_TEST_TYPE_STAGE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestStageClass, test_stage), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 1252 "test-stage.c" /** * test staging a complete file in the index. */ #line 23 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" - g_signal_new ("test_unstage", LIB_GITG_TEST_TYPE_STAGE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestStageClass, test_unstage), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 1249 "test-stage.c" + lib_gitg_test_stage_signals[LIB_GITG_TEST_STAGE_TEST_UNSTAGE_SIGNAL] = g_signal_new ("test_unstage", LIB_GITG_TEST_TYPE_STAGE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestStageClass, test_unstage), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 1258 "test-stage.c" /** * test reverting a complete file in the index. */ #line 23 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" - g_signal_new ("test_revert", LIB_GITG_TEST_TYPE_STAGE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestStageClass, test_revert), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 1255 "test-stage.c" + lib_gitg_test_stage_signals[LIB_GITG_TEST_STAGE_TEST_REVERT_SIGNAL] = g_signal_new ("test_revert", LIB_GITG_TEST_TYPE_STAGE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestStageClass, test_revert), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 1264 "test-stage.c" /** * test deleting a file in the index. */ #line 23 "/home/jesse/dev/gitg/tests/libgitg/test-stage.vala" - g_signal_new ("test_delete", LIB_GITG_TEST_TYPE_STAGE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestStageClass, test_delete), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 1261 "test-stage.c" + lib_gitg_test_stage_signals[LIB_GITG_TEST_STAGE_TEST_DELETE_SIGNAL] = g_signal_new ("test_delete", LIB_GITG_TEST_TYPE_STAGE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibGitgTestStageClass, test_delete), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 1270 "test-stage.c" } diff -Nru gitg-3.22.0/tests/progress-bin.c gitg-3.23.0/tests/progress-bin.c --- gitg-3.22.0/tests/progress-bin.c 2016-08-09 09:51:14.000000000 +0000 +++ gitg-3.23.0/tests/progress-bin.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* progress-bin.c generated by valac 0.32.1, the Vala compiler +/* progress-bin.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from progress-bin.vala, do not modify */ @@ -60,7 +60,7 @@ static gboolean ___lambda4__gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self); TestProgressGrid* test_progress_grid_new (void); TestProgressGrid* test_progress_grid_construct (GType object_type); -static void test_progress_grid_finalize (TestProgressGrid* obj); +static void test_progress_grid_finalize (TestProgressGrid * obj); static gboolean __lambda4_ (GtkWidget* w, GdkEventAny* ev) { @@ -268,7 +268,7 @@ #line 4 "/home/jesse/dev/gitg/tests/progress-bin.vala" if (collect_values[0].v_pointer) { #line 271 "progress-bin.c" - TestProgressGrid* object; + TestProgressGrid * object; object = collect_values[0].v_pointer; #line 4 "/home/jesse/dev/gitg/tests/progress-bin.vala" if (object->parent_instance.g_class == NULL) { @@ -295,7 +295,7 @@ static gchar* value_test_progress_grid_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - TestProgressGrid** object_p; + TestProgressGrid ** object_p; object_p = collect_values[0].v_pointer; #line 4 "/home/jesse/dev/gitg/tests/progress-bin.vala" if (!object_p) { @@ -347,7 +347,7 @@ void value_set_test_progress_grid (GValue* value, gpointer v_object) { - TestProgressGrid* old; + TestProgressGrid * old; #line 4 "/home/jesse/dev/gitg/tests/progress-bin.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEST_PROGRESS_GRID)); #line 4 "/home/jesse/dev/gitg/tests/progress-bin.vala" @@ -378,7 +378,7 @@ void value_take_test_progress_grid (GValue* value, gpointer v_object) { - TestProgressGrid* old; + TestProgressGrid * old; #line 4 "/home/jesse/dev/gitg/tests/progress-bin.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEST_PROGRESS_GRID)); #line 4 "/home/jesse/dev/gitg/tests/progress-bin.vala" @@ -422,7 +422,7 @@ } -static void test_progress_grid_finalize (TestProgressGrid* obj) { +static void test_progress_grid_finalize (TestProgressGrid * obj) { TestProgressGrid * self; #line 4 "/home/jesse/dev/gitg/tests/progress-bin.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TEST_PROGRESS_GRID, TestProgressGrid); @@ -447,7 +447,7 @@ gpointer test_progress_grid_ref (gpointer instance) { - TestProgressGrid* self; + TestProgressGrid * self; self = instance; #line 4 "/home/jesse/dev/gitg/tests/progress-bin.vala" g_atomic_int_inc (&self->ref_count); @@ -458,7 +458,7 @@ void test_progress_grid_unref (gpointer instance) { - TestProgressGrid* self; + TestProgressGrid * self; self = instance; #line 4 "/home/jesse/dev/gitg/tests/progress-bin.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { diff -Nru gitg-3.22.0/tests/repository-list-box.c gitg-3.23.0/tests/repository-list-box.c --- gitg-3.22.0/tests/repository-list-box.c 2016-08-09 09:51:14.000000000 +0000 +++ gitg-3.23.0/tests/repository-list-box.c 2016-11-26 13:23:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* repository-list-box.c generated by valac 0.32.1, the Vala compiler +/* repository-list-box.c generated by valac 0.34.0.108-f56ac, the Vala compiler * generated from repository-list-box.vala, do not modify */ @@ -60,7 +60,7 @@ static gboolean ___lambda4__gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self); TestRepositoryListBox* test_repository_list_box_new (void); TestRepositoryListBox* test_repository_list_box_construct (GType object_type); -static void test_repository_list_box_finalize (TestRepositoryListBox* obj); +static void test_repository_list_box_finalize (TestRepositoryListBox * obj); static gboolean __lambda4_ (GtkWidget* w, GdkEventAny* ev) { @@ -260,7 +260,7 @@ #line 4 "/home/jesse/dev/gitg/tests/repository-list-box.vala" if (collect_values[0].v_pointer) { #line 263 "repository-list-box.c" - TestRepositoryListBox* object; + TestRepositoryListBox * object; object = collect_values[0].v_pointer; #line 4 "/home/jesse/dev/gitg/tests/repository-list-box.vala" if (object->parent_instance.g_class == NULL) { @@ -287,7 +287,7 @@ static gchar* value_test_repository_list_box_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - TestRepositoryListBox** object_p; + TestRepositoryListBox ** object_p; object_p = collect_values[0].v_pointer; #line 4 "/home/jesse/dev/gitg/tests/repository-list-box.vala" if (!object_p) { @@ -339,7 +339,7 @@ void value_set_test_repository_list_box (GValue* value, gpointer v_object) { - TestRepositoryListBox* old; + TestRepositoryListBox * old; #line 4 "/home/jesse/dev/gitg/tests/repository-list-box.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEST_REPOSITORY_LIST_BOX)); #line 4 "/home/jesse/dev/gitg/tests/repository-list-box.vala" @@ -370,7 +370,7 @@ void value_take_test_repository_list_box (GValue* value, gpointer v_object) { - TestRepositoryListBox* old; + TestRepositoryListBox * old; #line 4 "/home/jesse/dev/gitg/tests/repository-list-box.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEST_REPOSITORY_LIST_BOX)); #line 4 "/home/jesse/dev/gitg/tests/repository-list-box.vala" @@ -414,7 +414,7 @@ } -static void test_repository_list_box_finalize (TestRepositoryListBox* obj) { +static void test_repository_list_box_finalize (TestRepositoryListBox * obj) { TestRepositoryListBox * self; #line 4 "/home/jesse/dev/gitg/tests/repository-list-box.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TEST_REPOSITORY_LIST_BOX, TestRepositoryListBox); @@ -439,7 +439,7 @@ gpointer test_repository_list_box_ref (gpointer instance) { - TestRepositoryListBox* self; + TestRepositoryListBox * self; self = instance; #line 4 "/home/jesse/dev/gitg/tests/repository-list-box.vala" g_atomic_int_inc (&self->ref_count); @@ -450,7 +450,7 @@ void test_repository_list_box_unref (gpointer instance) { - TestRepositoryListBox* self; + TestRepositoryListBox * self; self = instance; #line 4 "/home/jesse/dev/gitg/tests/repository-list-box.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { diff -Nru gitg-3.22.0/win32/make-installer gitg-3.23.0/win32/make-installer --- gitg-3.22.0/win32/make-installer 2016-08-09 09:43:09.000000000 +0000 +++ gitg-3.23.0/win32/make-installer 2016-11-26 08:32:35.000000000 +0000 @@ -104,7 +104,7 @@ find installer/SourceDir -name *.exe | xargs strip # remove some translation which seem to add a lot of size - find installer/SourceDir/share/locale/ -type f | grep -v atk10.mo | grep -v gtk30.mo | grep -v libpeas.mo | grep -v gsettings-desktop-schemas.mo | grep -v json-glib-1.0.mo | grep -v glib20.mo | grep -v gitg.mo | grep -v gdk-pixbuf.mo | grep -v gtk30.mo | grep -v gtk30-properties.mo | grep -v gtksourceview-3.0.mo | grep -v iso_*.mo | xargs rm + find installer/SourceDir/share/locale/ -type f | grep -v atk10.mo | grep -v libpeas.mo | grep -v gsettings-desktop-schemas.mo | grep -v json-glib-1.0.mo | grep -v glib20.mo | grep -v gitg.mo | grep -v gdk-pixbuf.mo | grep -v gtk30.mo | grep -v gtk30-properties.mo | grep -v gtksourceview-3.0.mo | grep -v iso_*.mo | xargs rm find installer/SourceDir/share/locale -type d | xargs rmdir -p --ignore-fail-on-non-empty } diff -Nru gitg-3.22.0/win32/make-installer.bat gitg-3.23.0/win32/make-installer.bat --- gitg-3.22.0/win32/make-installer.bat 2016-08-09 09:43:09.000000000 +0000 +++ gitg-3.23.0/win32/make-installer.bat 2016-11-26 08:32:35.000000000 +0000 @@ -1,9 +1,9 @@ -C:/msys64/usr/bin/bash.exe -c "./make-gedit-installer stage1" +C:/msys64/usr/bin/bash.exe -c "./make-installer stage1" if errorlevel 1 ( exit /b %errorlevel% ) -C:/msys64/tmp/newgedit/msys64/usr/bin/bash.exe -c "./make-gedit-installer stage2" +C:/msys64/usr/bin/bash.exe -c "./make-installer stage2" if errorlevel 1 ( exit /b %errorlevel% )