diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-21 19:17:10 +0100 | 
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-21 19:17:10 +0100 | 
| commit | a7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e (patch) | |
| tree | d9f86def771c7845f241ec81219b243c70523c60 /src/core | |
| parent | 66f6a7bd3f7e00022191f16cb0e82a39e7333a76 (diff) | |
New upstream version 0.25.3upstream/0.25.3
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Alteration.c | 16 | ||||
| -rw-r--r-- | src/core/ContainerSourceCollection.c | 2 | ||||
| -rw-r--r-- | src/core/Core.c | 2 | ||||
| -rw-r--r-- | src/core/DataCollection.c | 2 | ||||
| -rw-r--r-- | src/core/DataObject.c | 2 | ||||
| -rw-r--r-- | src/core/DataSet.c | 2 | ||||
| -rw-r--r-- | src/core/DataSource.c | 46 | ||||
| -rw-r--r-- | src/core/DataSourceTypes.c | 2 | ||||
| -rw-r--r-- | src/core/DataView.c | 2 | ||||
| -rw-r--r-- | src/core/DataViewTypes.c | 2 | ||||
| -rw-r--r-- | src/core/DatabaseSourceCollection.c | 2 | ||||
| -rw-r--r-- | src/core/SourceCollection.c | 10 | ||||
| -rw-r--r-- | src/core/SourceHoldingTank.c | 2 | ||||
| -rw-r--r-- | src/core/SourceInterfaces.c | 4 | ||||
| -rw-r--r-- | src/core/SourceInterfaces.vala | 2 | ||||
| -rw-r--r-- | src/core/Tracker.c | 2 | ||||
| -rw-r--r-- | src/core/ViewCollection.c | 2 | ||||
| -rw-r--r-- | src/core/util.c | 2 | 
18 files changed, 52 insertions, 52 deletions
| diff --git a/src/core/Alteration.c b/src/core/Alteration.c index 2bb624a..e9e435b 100644 --- a/src/core/Alteration.c +++ b/src/core/Alteration.c @@ -1,4 +1,4 @@ -/* Alteration.c generated by valac 0.32.1, the Vala compiler +/* Alteration.c generated by valac 0.34.4, the Vala compiler   * generated from Alteration.vala, do not modify */  /* Copyright 2016 Software Freedom Conservancy Inc. @@ -426,19 +426,19 @@ static gchar* string_strip (const gchar* self) {  	gchar* _result_ = NULL;  	gchar* _tmp0_ = NULL;  	const gchar* _tmp1_ = NULL; -#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1207 "/usr/share/vala-0.34/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 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"  	_tmp0_ = g_strdup (self); -#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"  	_result_ = _tmp0_; -#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"  	_tmp1_ = _result_; -#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"  	g_strstrip (_tmp1_); -#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"  	result = _result_; -#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"  	return result;  #line 444 "Alteration.c"  } diff --git a/src/core/ContainerSourceCollection.c b/src/core/ContainerSourceCollection.c index cd22228..26d26bd 100644 --- a/src/core/ContainerSourceCollection.c +++ b/src/core/ContainerSourceCollection.c @@ -1,4 +1,4 @@ -/* ContainerSourceCollection.c generated by valac 0.32.1, the Vala compiler +/* ContainerSourceCollection.c generated by valac 0.34.4, the Vala compiler   * generated from ContainerSourceCollection.vala, do not modify */  /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/Core.c b/src/core/Core.c index 7fd60d2..7316e4d 100644 --- a/src/core/Core.c +++ b/src/core/Core.c @@ -1,4 +1,4 @@ -/* Core.c generated by valac 0.32.1, the Vala compiler +/* Core.c generated by valac 0.34.4, the Vala compiler   * generated from Core.vala, do not modify */  /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/DataCollection.c b/src/core/DataCollection.c index 7040412..6f03093 100644 --- a/src/core/DataCollection.c +++ b/src/core/DataCollection.c @@ -1,4 +1,4 @@ -/* DataCollection.c generated by valac 0.32.1, the Vala compiler +/* DataCollection.c generated by valac 0.34.4, the Vala compiler   * generated from DataCollection.vala, do not modify */  /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/DataObject.c b/src/core/DataObject.c index 7aaf2eb..372fce2 100644 --- a/src/core/DataObject.c +++ b/src/core/DataObject.c @@ -1,4 +1,4 @@ -/* DataObject.c generated by valac 0.32.1, the Vala compiler +/* DataObject.c generated by valac 0.34.4, the Vala compiler   * generated from DataObject.vala, do not modify */  /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/DataSet.c b/src/core/DataSet.c index 75c2ca2..d0a3119 100644 --- a/src/core/DataSet.c +++ b/src/core/DataSet.c @@ -1,4 +1,4 @@ -/* DataSet.c generated by valac 0.32.1, the Vala compiler +/* DataSet.c generated by valac 0.34.4, the Vala compiler   * generated from DataSet.vala, do not modify */  /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/DataSource.c b/src/core/DataSource.c index cb4dfca..3009d24 100644 --- a/src/core/DataSource.c +++ b/src/core/DataSource.c @@ -1,4 +1,4 @@ -/* DataSource.c generated by valac 0.32.1, the Vala compiler +/* DataSource.c generated by valac 0.34.4, the Vala compiler   * generated from DataSource.vala, do not modify */  /* Copyright 2016 Software Freedom Conservancy Inc. @@ -2387,7 +2387,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)  #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala"  			if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 2389 "DataSource.c" -				goto __catch47_g_error; +				goto __catch49_g_error;  			}  #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala"  			ret = _tmp1_; @@ -2409,8 +2409,8 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)  #line 2409 "DataSource.c"  			}  		} -		goto __finally47; -		__catch47_g_error: +		goto __finally49; +		__catch49_g_error:  		{  			GError* err = NULL;  			gchar* _tmp6_ = NULL; @@ -2439,7 +2439,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)  			_g_error_free0 (err);  #line 2440 "DataSource.c"  		} -		__finally47: +		__finally49:  #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"  		if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala" @@ -3356,19 +3356,19 @@ static gchar* string_strip (const gchar* self) {  	gchar* _result_ = NULL;  	gchar* _tmp0_ = NULL;  	const gchar* _tmp1_ = NULL; -#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1207 "/usr/share/vala-0.34/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 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"  	_tmp0_ = g_strdup (self); -#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"  	_result_ = _tmp0_; -#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"  	_tmp1_ = _result_; -#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"  	g_strstrip (_tmp1_); -#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"  	result = _result_; -#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"  	return result;  #line 3373 "DataSource.c"  } @@ -3499,17 +3499,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {  	gboolean result = FALSE;  	const gchar* _tmp0_ = NULL;  	gchar* _tmp1_ = NULL; -#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1376 "/usr/share/vala-0.34/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 1376 "/usr/share/vala-0.34/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 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"  	_tmp0_ = needle; -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"  	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"  	result = _tmp1_ != NULL; -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"  	return result;  #line 3514 "DataSource.c"  } @@ -3745,15 +3745,15 @@ static gint64 int64_parse (const gchar* str) {  	gint64 result = 0LL;  	const gchar* _tmp0_ = NULL;  	gint64 _tmp1_ = 0LL; -#line 679 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 679 "/usr/share/vala-0.34/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 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"  	_tmp0_ = str; -#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 680 "/usr/share/vala-0.34/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 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"  	result = _tmp1_; -#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"  	return result;  #line 3758 "DataSource.c"  } diff --git a/src/core/DataSourceTypes.c b/src/core/DataSourceTypes.c index 0abd6e8..ea7d98a 100644 --- a/src/core/DataSourceTypes.c +++ b/src/core/DataSourceTypes.c @@ -1,4 +1,4 @@ -/* DataSourceTypes.c generated by valac 0.32.1, the Vala compiler +/* DataSourceTypes.c generated by valac 0.34.4, the Vala compiler   * generated from DataSourceTypes.vala, do not modify */  /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/DataView.c b/src/core/DataView.c index 40153fc..2e70156 100644 --- a/src/core/DataView.c +++ b/src/core/DataView.c @@ -1,4 +1,4 @@ -/* DataView.c generated by valac 0.32.1, the Vala compiler +/* DataView.c generated by valac 0.34.4, the Vala compiler   * generated from DataView.vala, do not modify */  /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/DataViewTypes.c b/src/core/DataViewTypes.c index 0e55db0..355700d 100644 --- a/src/core/DataViewTypes.c +++ b/src/core/DataViewTypes.c @@ -1,4 +1,4 @@ -/* DataViewTypes.c generated by valac 0.32.1, the Vala compiler +/* DataViewTypes.c generated by valac 0.34.4, the Vala compiler   * generated from DataViewTypes.vala, do not modify */  /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/DatabaseSourceCollection.c b/src/core/DatabaseSourceCollection.c index b83be40..0de87db 100644 --- a/src/core/DatabaseSourceCollection.c +++ b/src/core/DatabaseSourceCollection.c @@ -1,4 +1,4 @@ -/* DatabaseSourceCollection.c generated by valac 0.32.1, the Vala compiler +/* DatabaseSourceCollection.c generated by valac 0.34.4, the Vala compiler   * generated from DatabaseSourceCollection.vala, do not modify */  /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/SourceCollection.c b/src/core/SourceCollection.c index 6321f92..3cca952 100644 --- a/src/core/SourceCollection.c +++ b/src/core/SourceCollection.c @@ -1,4 +1,4 @@ -/* SourceCollection.c generated by valac 0.32.1, the Vala compiler +/* SourceCollection.c generated by valac 0.34.4, the Vala compiler   * generated from SourceCollection.vala, do not modify */  /* Copyright 2016 Software Freedom Conservancy Inc. @@ -757,14 +757,14 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s  #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 760 "SourceCollection.c" -			goto __catch46_g_error; +			goto __catch48_g_error;  		}  #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  		success = _tmp0_;  #line 765 "SourceCollection.c"  	} -	goto __finally46; -	__catch46_g_error: +	goto __finally48; +	__catch48_g_error:  	{  		GError* err = NULL;  #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" @@ -777,7 +777,7 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s  		_g_error_free0 (err);  #line 779 "SourceCollection.c"  	} -	__finally46: +	__finally48:  #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"  	if (G_UNLIKELY (_inner_error_ != NULL)) {  #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala" diff --git a/src/core/SourceHoldingTank.c b/src/core/SourceHoldingTank.c index ed7d671..eaf1815 100644 --- a/src/core/SourceHoldingTank.c +++ b/src/core/SourceHoldingTank.c @@ -1,4 +1,4 @@ -/* SourceHoldingTank.c generated by valac 0.32.1, the Vala compiler +/* SourceHoldingTank.c generated by valac 0.34.4, the Vala compiler   * generated from SourceHoldingTank.vala, do not modify */  /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/SourceInterfaces.c b/src/core/SourceInterfaces.c index 5cfc5a9..1b3292d 100644 --- a/src/core/SourceInterfaces.c +++ b/src/core/SourceInterfaces.c @@ -1,4 +1,4 @@ -/* SourceInterfaces.c generated by valac 0.32.1, the Vala compiler +/* SourceInterfaces.c generated by valac 0.34.4, the Vala compiler   * generated from SourceInterfaces.vala, do not modify */  /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,7 +7,7 @@   * (version 2.1 or later).  See the COPYING file in this distribution.   */  /* See the note in MediaInterfaces.vala for some thoughts on the theory of expanding Shotwell's*/ -/* features via interfaces rather than class heirarchies.*/ +/* features via interfaces rather than class hierarchies.*/  /* Indexable DataSources provide raw strings that may be searched against (and, in the future,*/  /* indexed) for free-text search queries.  DataSources implementing Indexable must prepare and*/  /* store (i.e. cache) these strings using prepare_indexable_string(s), as preparing the strings*/ diff --git a/src/core/SourceInterfaces.vala b/src/core/SourceInterfaces.vala index b1d1aa6..91a8aca 100644 --- a/src/core/SourceInterfaces.vala +++ b/src/core/SourceInterfaces.vala @@ -5,7 +5,7 @@   */  // See the note in MediaInterfaces.vala for some thoughts on the theory of expanding Shotwell's -// features via interfaces rather than class heirarchies. +// features via interfaces rather than class hierarchies.  // Indexable DataSources provide raw strings that may be searched against (and, in the future,  // indexed) for free-text search queries.  DataSources implementing Indexable must prepare and diff --git a/src/core/Tracker.c b/src/core/Tracker.c index fa66f0e..4a340ab 100644 --- a/src/core/Tracker.c +++ b/src/core/Tracker.c @@ -1,4 +1,4 @@ -/* Tracker.c generated by valac 0.32.1, the Vala compiler +/* Tracker.c generated by valac 0.34.4, the Vala compiler   * generated from Tracker.vala, do not modify */  /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/ViewCollection.c b/src/core/ViewCollection.c index dceff91..fd1e603 100644 --- a/src/core/ViewCollection.c +++ b/src/core/ViewCollection.c @@ -1,4 +1,4 @@ -/* ViewCollection.c generated by valac 0.32.1, the Vala compiler +/* ViewCollection.c generated by valac 0.34.4, the Vala compiler   * generated from ViewCollection.vala, do not modify */  /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/core/util.c b/src/core/util.c index 0088011..e398d67 100644 --- a/src/core/util.c +++ b/src/core/util.c @@ -1,4 +1,4 @@ -/* util.c generated by valac 0.32.1, the Vala compiler +/* util.c generated by valac 0.34.4, the Vala compiler   * generated from util.vala, do not modify */  /* Copyright 2016 Software Freedom Conservancy Inc. | 
