commit d3ecd72dac981b15c098fb29c03500667d8ffd55 Author: Claudio Saavedra Date: Wed Jul 22 14:45:38 2015 +0300 [release] 3.17.2 NEWS | 12 ++++++++++++ configure.ac | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) commit 46916be759f08f9f560acb4eadf76103fc808b4e Author: Carlos Garcia Campos Date: Mon Jun 22 09:44:08 2015 +0200 embed: Make sure private instances don't leave data outside their profile dir Create the WebKitWebContext with a WebKitWebsiteDataManager configured for the current profile. configure.ac | 2 +- embed/ephy-embed-shell.c | 38 +++++++++++++++++++++----------------- 2 files changed, 22 insertions(+), 18 deletions(-) commit 18c227908098a715b7b1686ffab6d151dc2459ba Author: Michael Catanzaro Date: Mon Jul 20 13:16:14 2015 -0500 Set page title as a tooltip for tabs https://bugzilla.gnome.org/show_bug.cgi?id=752606 src/ephy-notebook.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit 51e844a9e0e7e9901cbe22c923debeaa45bed006 Author: Balázs Úr Date: Fri Jul 17 12:46:06 2015 +0000 Updated Hungarian translation po/hu.po | 127 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 69 insertions(+), 58 deletions(-) commit 290774f2d27df8ff365e97e1e6e2b1a92ddd2512 Author: Yosef Or Boczko Date: Thu Jul 16 14:27:37 2015 +0300 Updated Hebrew translation po/he.po | 278 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 140 insertions(+), 138 deletions(-) commit e28f16a9f5a248939b4c8c297445fb6a1651bb4c Author: Daniel Mustieles Date: Mon Jul 13 10:27:12 2015 +0200 Updated Spanish translation po/es.po | 134 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 72 insertions(+), 62 deletions(-) commit 9f00bb5991e48efb65e463c436179cb29aa87e0c Author: Ting-Wei Lan Date: Tue Jul 7 16:11:04 2015 +0800 build: Fix -Werror build for clang https://bugzilla.gnome.org/show_bug.cgi?id=752050 embed/ephy-embed-prefs.c | 4 ++-- embed/ephy-find-toolbar.c | 3 +++ embed/ephy-web-view.c | 2 +- lib/ephy-langs.c | 2 +- src/bookmarks/ephy-bookmarks-editor.c | 6 +++--- src/bookmarks/ephy-bookmarks-export.c | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) commit 89464813d02df5459fa3cceaa752d33252d9cb94 Author: Michael Catanzaro Date: Tue Sep 9 17:07:48 2014 -0500 ephy-location-entry: update padding for latest Adwaita Our code for aligning the URL of completions with the URL in the location entry seems to be theme-dependent, and the alignment isn't quite right with the latest Adwaita. https://bugzilla.gnome.org/show_bug.cgi?id=736363 lib/widgets/ephy-location-entry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8eb582bc36e39c2cfc321fe80de9be694a1b5811 Author: Pedro Albuquerque Date: Sat Jul 4 06:21:19 2015 +0000 Updated Portuguese translation po/pt.po | 373 +++++++++++++++++++++++++++++---------------------------------- 1 file changed, 173 insertions(+), 200 deletions(-) commit 86058f219c4cf81d88387a44e68a698083ddb8f3 Author: Michael Catanzaro Date: Fri Jul 3 10:26:03 2015 -0500 configure.ac: Use AX_REQUIRE_DEFINED Let's assume the user has an up-to-date copy of autoconf-archive (otherwise, he probably does not even have AX_REQUIRE_DEFINED). If so, we can ensure a better error message when a required external macro is missing. configure.ac | 5 +++++ 1 file changed, 5 insertions(+) commit 4615a1debb36d723bbbc47525e836b1afb281c0e Author: Michael Catanzaro Date: Thu Jul 2 14:04:27 2015 -0500 Be more careful with weak pointers As a follow-up to bug #747422, be careful to remove weak pointers to objects when it appears that the lifetime of the object can outlive the lifetime of the memory location of the pointer. https://bugzilla.gnome.org/show_bug.cgi?id=751858 embed/ephy-web-view.c | 6 ++++++ embed/web-extension/ephy-web-extension.c | 2 ++ 2 files changed, 8 insertions(+) commit 0f1f02930040ee14a373fef7a86e2976d599acf3 Author: Michael Catanzaro Date: Thu Jul 2 13:51:40 2015 -0500 Add a FIXME comment src/bookmarks/ephy-bookmarks-editor.c | 1 + 1 file changed, 1 insertion(+) commit 3596b8e88b0b98a5133c609124458d6d0d968062 Author: Carlos Garnacho Date: Thu Jul 2 15:56:44 2015 +0200 ephy-web-view: Clean up after outliving web extension proxies If the EphyWebView is destroyed before the EphyWebExtensionProxy it's attached to does, we'll leave a dangling weak pointer, which will nullify random memory at the time the web extension proxy is actually destroyed. So, prepare for undoing the effects of page_created_cb() in case we ::dispose() when we still have a web extension attached. https://bugzilla.gnome.org/show_bug.cgi?id=747422 embed/ephy-web-view.c | 6 ++++++ 1 file changed, 6 insertions(+) commit b2a52f197cbd3f2db30154b3f9c2d38b25f77394 Author: Michael Catanzaro Date: Mon Jun 29 21:45:36 2015 -0500 Silence all the new warnings Let's fix these one-by-one, instead of dealing with a bajillion warnings that prevent us from seeing the build progress and noticing any warnings at all. Also, actually make use of AX_COMPILER_FLAGS to test the flags we pass, instead of using them unconditionally. configure.ac | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit 44845cacf5b4e6a1af0aef3552a40021f6a75312 Author: Michael Catanzaro Date: Mon Jun 29 21:34:22 2015 -0500 Silence a deprecation warning coming from egg Don't want to use the normal compiler warnings here, because I don't want to fix compiler warnings from egg generally. So we'll just leave this directory with only the default compiler warnings. But for some reason, -Wdeprecated-declaration is enabled by default. Maybe we'll rethink using the default warnings here in the future, but in the meantime, might as well placate it. Not upstreamed since the upstream code supports ancient GTK+. Also note: this code seems to be crashy, but it was crashy BEFORE this commit too. It seems to be a regression in GTK+ 3.17. lib/egg/eggtreemultidnd.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) commit 43d48f2196f09327a716a3f9d01b184067d9d41e Author: Michael Catanzaro Date: Mon Jun 29 20:08:01 2015 -0500 configure.ac: Add a comment about some warnings we can't fix yet configure.ac | 11 +++++++++++ 1 file changed, 11 insertions(+) commit ad7cb596703be3c4bc6b0f3b2d49c36a4b0b7c5b Author: Michael Catanzaro Date: Mon Jun 29 19:03:13 2015 -0500 Fix build of URI helpers test tests/Makefile.am:178: warning: variable 'test_ephy_uri_helpers_SOURCES' is defined but no program or tests/Makefile.am:178: library has 'test_ephy_uri_helpers' as canonical name (possible typo) Glad that was legal. "Glad." tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9d512444141203d7de5513b66ca9dd59dfd3816f Author: Michael Catanzaro Date: Mon Jun 29 18:39:14 2015 -0500 Clean data files in normal clean Let's reserve distclean for stuff generated by configure, and use clean for everything generated by make and not distributed (the usual rule). data/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0b0dd9c9212abda612b0ba92306f4288b6f36c19 Author: Michael Catanzaro Date: Mon Jun 29 18:33:09 2015 -0500 Don't list the same files in multiple clean targets Distclean also deletes files that would be deleted by normal clean, maintainerclean also deletes files that would be deleted by distclean, and clean also deletes files that are deleted by poor forgotten mostlyclean. embed/Makefile.am | 2 -- lib/Makefile.am | 2 -- lib/history/Makefile.am | 2 -- lib/widgets/Makefile.am | 2 -- src/Makefile.am | 2 -- src/bookmarks/Makefile.am | 2 -- 6 files changed, 12 deletions(-) commit 4966c40e75acb125f1ceef353d0d5c68c02b6eb1 Author: Michael Catanzaro Date: Mon Jun 29 18:30:15 2015 -0500 Remove POTFILES.skip Two of these files no longer exist, and the appdata file is already translated. po/POTFILES.skip | 3 --- 1 file changed, 3 deletions(-) commit 0711c69b583af8a5a455e75458a96058f74317d0 Author: Michael Catanzaro Date: Mon Jun 29 18:29:13 2015 -0500 Remove Bug Buddy crap from desktop file and simplify generation No need for the .desktop.in.in with the Bug Buddy stuff removed. configure.ac | 2 +- data/Makefile.am | 4 ++-- data/epiphany.desktop.in | 18 ++++++++++++++++++ data/epiphany.desktop.in.in | 23 ----------------------- po/POTFILES.in | 2 +- po/POTFILES.skip | 1 - 6 files changed, 22 insertions(+), 28 deletions(-) commit b012b48574425c6e17dd692306500fff3da78659 Author: Michael Catanzaro Date: Mon Jun 29 18:23:28 2015 -0500 Improve the appdata file Let's not show our codename in GNOME Software. Also, add a bit more description; I think we need two paragraphs to pass appstream-util validate. data/epiphany.appdata.xml.in | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit 72c138d4196238316c17ee666784f38e273d43c2 Author: Michael Catanzaro Date: Mon Jun 29 18:17:36 2015 -0500 Do not distribute org.gnome.Epiphany.service This is necessarily generated at make time. data/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6c3483ec695427bba018024fac1d035a8346ad8f Author: Michael Catanzaro Date: Mon Jun 29 18:08:28 2015 -0500 Modernize appdata generation and validate it during distcheck Using the standard appstream macros that replaced the appdata macros that replaced the do-it-manually method we have here. configure.ac | 1 + data/Makefile.am | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) commit 084f096535b08f17ddcb47b4d23ebd881c6e196e Author: Michael Catanzaro Date: Mon Jun 29 17:50:39 2015 -0500 configure.ac: Remove inexplicable blank line in output configure.ac | 1 - 1 file changed, 1 deletion(-) commit a5bb7498b9272a3768c1f0549b087116a93ce848 Author: Michael Catanzaro Date: Mon Jun 29 17:46:50 2015 -0500 Remove git branches from ChangeLog These aren't meaningful in the changelog, and cause the resultant changelog to differ based on the user's git configuration. Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e515d5769ed287fa4ca77259e8d0039348679672 Author: Michael Catanzaro Date: Mon Jun 29 17:43:53 2015 -0500 Put build goo under build-aux directory configure.ac | 1 + 1 file changed, 1 insertion(+) commit ff29f6f24ac3e8949d135eb08db18fce272b96e0 Author: Michael Catanzaro Date: Mon Jun 29 17:37:25 2015 -0500 EXTRA_DIST fewer things autogen.sh is for git builds. It has no place in our tarball. HACKING is for developers, who should be using git. ChangeLog is already distributed by default. Makefile.am | 8 -------- 1 file changed, 8 deletions(-) commit 03bfed408e51e032866f5c49a28704811080c7f4 Author: Michael Catanzaro Date: Mon Jun 29 17:33:35 2015 -0500 Remove MAINTAINERS It's obsoleted by the doap file, and hasn't been kept in sync. ChangeLog.README | 2 +- HACKING | 2 +- MAINTAINERS | 3 --- Makefile.am | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) commit 81c0572868febb8073f7d52aa65b53d8a703fc6c Author: Michael Catanzaro Date: Mon Jun 29 17:31:20 2015 -0500 Remove COPYING.README WebKit is a thing now. If we switch back to Mozilla in the future, then we can always resurrect this. I won't hold my breath. COPYING.README | 8 -------- Makefile.am | 1 - 2 files changed, 9 deletions(-) commit 16b1dd64cc7a6f5bc4b6b712a19e700eff51f908 Author: Michael Catanzaro Date: Mon Jun 29 17:29:43 2015 -0500 configure.ac: Add a few missing quotes More for style than safety configure.ac | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) commit 41b34cb38e174811fd226da1e3712b9682eb1542 Author: Michael Catanzaro Date: Mon Jun 29 17:27:26 2015 -0500 configure.ac: Rearrange This fixes a bajillion warnings about AX_CHECK_ENABLE_DEBUG being used before AC_PROG_CC, which we have had ever since GNOME_DEBUG_CHECK started using AX_CHECK_ENABLE_DEBUG internally. I rearrange a bit more to make it look nicer to me. :) configure.ac | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) commit 6fb87c2b8b1c71730cade3d02b2a00871e30ac2c Author: Michael Catanzaro Date: Mon Jun 29 17:21:26 2015 -0500 configure.ac: Remove EPHY_CHECK_VERSION cruft This no longer exists. If we add it in the future, we can bring it back, but that doesn't seem like a particularly-likely future to me. configure.ac | 5 ----- 1 file changed, 5 deletions(-) commit 7573f26fb584acf179ddcbc084b2b8aebfed53df Author: Michael Catanzaro Date: Mon Jun 29 17:15:27 2015 -0500 Reenable -Wmissing-prototype -Wmissing-prototype is good. Suppressing it for the entire project was a bad idea. We'll need to keep -Wno-deprecated-declarations until we can manage to move away from GtkUIManager, GtkAction, and friends. I kind of want to remove -Wdeclaration-after-statement as well, because it is 2015 and it's good to minimize the scope of your variable declarations by declaring them at point of first use, but this one is worth discussing before changing. configure.ac | 2 +- embed/web-extension/ephy-web-extension-main.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) commit d9a7d8e542357a321a49de4ce2b69855413bfd11 Author: Michael Catanzaro Date: Mon Jun 29 16:58:55 2015 -0500 Use AX_COMPILER_FLAGS instead of GNOME_COMPILE_WARNINGS GNOME_COMPILE_WARNINGS has been deprecated for AX_COMPILER_FLAGS. Behavior change: -Werror is not enabled by default for builds from git. Disable by configuring with --disable-Werror. jhbuild and GNOME Continuous will pass this by default. Werror will not be used for tarball builds. This was the product of negotiation, intended to encourage GNOME developers to fix warnings without causing needless breakage for jhbuilders or for downstreams (since -Werror will not be used for tarball builds). Behavior change #2: We have a ton of new warnings to fix now. https://wiki.gnome.org/Projects/GnomeCommon/Migration configure.ac | 3 +-- embed/Makefile.am | 1 + embed/web-extension/Makefile.am | 1 + lib/Makefile.am | 1 + lib/history/Makefile.am | 1 + lib/widgets/Makefile.am | 1 + src/Makefile.am | 5 ++++- src/bookmarks/Makefile.am | 1 + tests/Makefile.am | 2 ++ 9 files changed, 13 insertions(+), 3 deletions(-) commit 480536d5026e68d0d0211849cc5fde759a7797b6 Author: Michael Catanzaro Date: Mon Jun 29 16:55:12 2015 -0500 Enable compiler warnings in some places they were missing lib/Makefile.am | 2 ++ lib/history/Makefile.am | 2 ++ tests/Makefile.am | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) commit c10488db3416e9afed2564b1a61f240b0414b6f5 Author: Michael Catanzaro Date: Mon Jun 29 16:42:38 2015 -0500 Use AX_CHECK_ENABLE_DEBUG instead of GNOME_DEBUG_CHECK Behavior change: debug mode is now enabled by default for builds from git (but not for tarball builds). Now I don't need to pass --enable-debug in my module_autogenargs in jhbuildrc anymore, yay! https://wiki.gnome.org/Projects/GnomeCommon/Migration configure.ac | 2 +- lib/ephy-debug.c | 2 +- lib/ephy-debug.h | 2 +- lib/ephy-file-helpers.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) commit d05fcf358fd35f4448687de8444797ed4d1fed19 Author: Michael Catanzaro Date: Mon Jun 29 16:38:35 2015 -0500 configure.ac: Do not use GNOME_MAINTAINER_MODE_DEFINES I think this doesn't do anything anymore. https://wiki.gnome.org/Projects/GnomeCommon/Migration configure.ac | 1 - 1 file changed, 1 deletion(-) commit 16116312f12cd62c056ad2d7c95f31bc4405d314 Author: Michael Catanzaro Date: Mon Jun 29 16:35:25 2015 -0500 configure.ac: Use AX_IS_RELEASE This affects AX_CHECK_ENABLE_DEBUG and AX_COMPILER_FLAGS. configure.ac | 1 + 1 file changed, 1 insertion(+) commit f0478f98c1ba131088c6dcf50ff4bac465252b7c Author: Michael Catanzaro Date: Mon Jun 29 16:28:00 2015 -0500 Use AX_CODE_COVERAGE instead of GNOME_CODE_COVERAGE GNOME_CODE_COVERAGE has moved upstream. Note: This means we now depend on autoconf-archive for builds from git, which is now a mandatory dependency for GNOME (when building from git). All macros will be copied into the tarball and distributed automatically, so there are no new dependencies in our release. https://wiki.gnome.org/Projects/GnomeCommon/Migration Makefile.am | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 61b8ca251aad8c733ad7f033c09af67cefb930ef Author: Michael Catanzaro Date: Mon Jun 29 16:20:59 2015 -0500 Stop abusing ACLOCAL_AMFLAGS This is deprecated and it won't work in Automake 2.0, which is supposedly going to be released later this year. We don't need this anymore because we call aclocal --install in autogen.sh. Supposedly also Autoconf 2.70 will be released later this year as well; if that happens, then autoreconf --install should have learned to pass --install to aclocal, and we won't need to use it explicitly anymore. In the meantime, we'll continue to run aclocal in autogen.sh. This is the recommended practice for all GNOME projects. There is one downside: libtool 2.4.2 and older will complain that we have not added -I m4 to ACLOCAL_AMFLAGS. The warning is harmless and should be ignored. I believe libtool 2.4.3 no longer complains (although I don't have a new enough libtool to test this). https://wiki.gnome.org/Projects/GnomeCommon/Migration Makefile.am | 2 -- 1 file changed, 2 deletions(-) commit d483ea45db53b4326434a8d46eb0f88069a9d20b Author: Michael Catanzaro Date: Mon Jun 29 16:19:19 2015 -0500 Stop using gnome-autogen It's deprecated. This incidentally fixes the following warning: ***Warning*** PKG_NAME is deprecated, you may remove it from autogen.sh https://wiki.gnome.org/Projects/GnomeCommon/Migration autogen.sh | 44 ++++++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 16 deletions(-) commit 5e5bb440f756c0039c53058042c5fbe88fc0e3fc Author: Michael Catanzaro Date: Mon Jun 29 16:16:09 2015 -0500 configure.ac: Remove explicit use of PKG_PROG_PKG_CONFIG This is only needed if the first use of PKG_CHECK_MODULES is inside a conditional. See pkg-config(1). configure.ac | 2 -- 1 file changed, 2 deletions(-) commit 527dd7aa65ac38686191b5f0ad485572acf83db9 Author: Michael Catanzaro Date: Mon Jun 29 16:14:05 2015 -0500 configure.ac: Use AM_SILENT_RULES unconditionally It's guaranteed to be present because we already require automake 1.11 configure.ac | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) commit 8d03dd5d54049ea471e46bd720110a07ad676600 Author: Michael Catanzaro Date: Mon Jun 29 15:42:17 2015 -0500 Really fix translations in the search provider We need to call setlocale() manually because we are not a GTK+ application and do not call gtk_init() (which would normally handle this for us). src/ephy-search-provider-main.c | 2 ++ 1 file changed, 2 insertions(+) commit b73db5522be075a651a7b3a812ad726fde47f585 Author: Michael Catanzaro Date: Mon Jun 29 15:06:40 2015 -0500 Use plain LOCALEDIR The variable rename is itself of no consequence, just to be more standard. But $(localedir) may not necessarily be $(datadir)/locale, so this aspect of the change makes a real difference. lib/Makefile.am | 1 + lib/ephy-langs.c | 6 ++---- src/Makefile.am | 6 +++--- src/ephy-main.c | 2 +- src/ephy-search-provider-main.c | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) commit c205fbe91a1e725be4648688da4e35b8b352d1e6 Author: Michael Catanzaro Date: Mon Jun 29 14:46:12 2015 -0500 Make gettext mandatory and stop using glib-gettext It's fighting with intltool and intltool is winning, so no point in keeping it around and making things more complicated. In the future, it would be good to replace intltool with upstream gettext (not glib-gettext), but we still need intltool to translate the appdata file. In the meantime, we'll no longer have two competing applications that both want to create po/Makefile.in.in. The AM_GLIB_GNU_GETTEXT macro was defining ENABLE_NLS if gettext is available, to make i18n optional. But most GNOME programs require gettext nowadays, and it's installed pretty much everywhere, so there is no reason for it to be optional anymore. Note, the only reason we were using glib-gettext before, as far as I see, was to define ENABLE_NLS. configure.ac | 6 +----- lib/Makefile.am | 1 + lib/ephy-langs.c | 2 -- po/Makevars | 41 ----------------------------------------- src/Makefile.am | 10 ++++------ src/ephy-main.c | 2 -- src/ephy-search-provider-main.c | 2 -- 7 files changed, 6 insertions(+), 58 deletions(-) commit e3c3269b6bfb4f177b5b4ba3cd94d3348e5f64da Author: Michael Catanzaro Date: Sun Jun 21 17:12:06 2015 -0500 configure.ac: move IT_PROG_INTLTOOL down to the i18n section configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit db994dd473a84f28611d409f84f591a50fb808db Author: Michael Catanzaro Date: Mon Jun 29 20:51:31 2015 -0500 ephy-string: Remove dead code https://bugzilla.gnome.org/show_bug.cgi?id=751692 lib/ephy-string.c | 286 ------------------------------------------------------ lib/ephy-string.h | 16 --- 2 files changed, 302 deletions(-) commit ae0754c996c834c671aa89c38e1cf7cf7039b8a8 Author: Pedro Albuquerque Date: Mon Jun 29 22:38:04 2015 +0000 Updated Portuguese translation po/pt.po | 1315 ++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 805 insertions(+), 510 deletions(-) commit 0b4464039e0e1175abd0f90e2700631991d643c0 Author: Carlos Garcia Campos Date: Sat Jun 27 10:41:59 2015 +0200 webapp: Open links to the same base domain inside the web app This fixes the case of web apps like www.foo.com that have a login button that loads login.foo.com. Since we are just checking the hosts, they are different, and the login page is opened in a different browser or profile, making it impossible to login inside the web app. Now, when the hosts are different we also check the base domain, using soup_tld_get_base_domain(). embed/ephy-embed-utils.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) commit 8a1c9e21d1b1c1330caaaa67d4a6b80bb820b2e3 Author: Muhammet Kara Date: Sat Jun 27 08:48:20 2015 +0000 Updated Turkish translation po/tr.po | 250 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 128 insertions(+), 122 deletions(-)