From 72e3d4c55a6569d966059f762824c38d06055871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 29 Oct 2016 23:24:31 +0200 Subject: New upstream version 0.25.0 --- src/data_imports/DataImportSource.c | 32 ++++++++++++++--------------- src/data_imports/DataImportsPluginHost.c | 4 ++-- src/data_imports/DataImportsPluginHost.vala | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/data_imports') diff --git a/src/data_imports/DataImportSource.c b/src/data_imports/DataImportSource.c index b85a8d2..e5e0321 100644 --- a/src/data_imports/DataImportSource.c +++ b/src/data_imports/DataImportSource.c @@ -364,11 +364,11 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 367 "DataImportSource.c" - goto __catch202_g_error; + goto __catch215_g_error; } } - goto __finally202; - __catch202_g_error: + goto __finally215; + __catch215_g_error: { GError* e = NULL; gchar* _tmp26_ = NULL; @@ -399,7 +399,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct _g_error_free0 (e); #line 401 "DataImportSource.c" } - __finally202: + __finally215: #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -583,7 +583,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 586 "DataImportSource.c" - goto __catch203_g_error; + goto __catch216_g_error; } #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" _tmp57_ = preview_raw; @@ -603,8 +603,8 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct preview_raw = (g_free (preview_raw), NULL); #line 605 "DataImportSource.c" } - goto __finally203; - __catch203_g_error: + goto __finally216; + __catch216_g_error: { GError* e = NULL; gchar* _tmp60_ = NULL; @@ -631,7 +631,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct _g_error_free0 (e); #line 633 "DataImportSource.c" } - __finally203: + __finally216: #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -670,14 +670,14 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 673 "DataImportSource.c" - goto __catch204_g_error; + goto __catch217_g_error; } #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" self->priv->file_size = _tmp64_; #line 678 "DataImportSource.c" } - goto __finally204; - __catch204_g_error: + goto __finally217; + __catch217_g_error: { GError* e = NULL; gchar* _tmp67_ = NULL; @@ -704,7 +704,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct _g_error_free0 (e); #line 706 "DataImportSource.c" } - __finally204: + __finally217: #line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" @@ -742,14 +742,14 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct #line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 745 "DataImportSource.c" - goto __catch205_g_error; + goto __catch218_g_error; } #line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" self->priv->modification_time = _tmp71_; #line 750 "DataImportSource.c" } - goto __finally205; - __catch205_g_error: + goto __finally218; + __catch218_g_error: { GError* e = NULL; gchar* _tmp74_ = NULL; @@ -776,7 +776,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct _g_error_free0 (e); #line 778 "DataImportSource.c" } - __finally205: + __finally218: #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala" diff --git a/src/data_imports/DataImportsPluginHost.c b/src/data_imports/DataImportsPluginHost.c index be5e38c..4bd94a6 100644 --- a/src/data_imports/DataImportsPluginHost.c +++ b/src/data_imports/DataImportsPluginHost.c @@ -1638,7 +1638,7 @@ static void spit_data_imports_concrete_data_imports_host_real_post_error_message #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (message != NULL); #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = _ ("Importing from %s can't continue because an error occurred:"); + _tmp0_ = _ ("Importing from %s can’t continue because an error occurred:"); #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp1_ = self->priv->active_importer; #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" @@ -2306,7 +2306,7 @@ static void spit_data_imports_welcome_data_imports_host_real_post_error_message #line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" g_return_if_fail (message != NULL); #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" - _tmp0_ = _ ("Importing from %s can't continue because an error occurred:"); + _tmp0_ = _ ("Importing from %s can’t continue because an error occurred:"); #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" _tmp1_ = self->priv->active_importer; #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala" diff --git a/src/data_imports/DataImportsPluginHost.vala b/src/data_imports/DataImportsPluginHost.vala index 6939ea5..158b8f4 100644 --- a/src/data_imports/DataImportsPluginHost.vala +++ b/src/data_imports/DataImportsPluginHost.vala @@ -145,7 +145,7 @@ public class ConcreteDataImportsHost : Plugins.StandardHostInterface, } public void post_error_message(string message) { - string msg = _("Importing from %s can't continue because an error occurred:").printf( + string msg = _("Importing from %s can’t continue because an error occurred:").printf( active_importer.get_service().get_pluggable_name()); msg += GLib.Markup.printf_escaped("\n\n%s\n\n", message); msg += _("To try importing from another service, select one from the above menu."); @@ -291,7 +291,7 @@ public class WelcomeDataImportsHost : Plugins.StandardHostInterface, } public void post_error_message(string message) { - string msg = _("Importing from %s can't continue because an error occurred:").printf( + string msg = _("Importing from %s can’t continue because an error occurred:").printf( active_importer.get_service().get_pluggable_name()); debug(msg); -- cgit v1.2.3