summaryrefslogtreecommitdiff
path: root/src/publishing
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-10-29 23:24:31 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-10-29 23:24:31 +0200
commit72e3d4c55a6569d966059f762824c38d06055871 (patch)
treecc0013086494a7c97140ffdb4a0513a5f5aac245 /src/publishing
parentb076314018e4b53d745823754a26eb6fb73a2801 (diff)
New upstream version 0.25.0upstream/0.25.0
Diffstat (limited to 'src/publishing')
-rw-r--r--src/publishing/APIGlue.c28
-rw-r--r--src/publishing/PublishingPluginHost.c10
-rw-r--r--src/publishing/PublishingPluginHost.vala2
-rw-r--r--src/publishing/PublishingUI.c4
-rw-r--r--src/publishing/PublishingUI.vala4
5 files changed, 24 insertions, 24 deletions
diff --git a/src/publishing/APIGlue.c b/src/publishing/APIGlue.c
index bce21cd..92b9412 100644
--- a/src/publishing/APIGlue.c
+++ b/src/publishing/APIGlue.c
@@ -416,11 +416,11 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe
#line 27 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 419 "APIGlue.c"
- goto __catch35_g_error;
+ goto __catch36_g_error;
}
}
- goto __finally35;
- __catch35_g_error:
+ goto __finally36;
+ __catch36_g_error:
{
GError* err = NULL;
GFile* _tmp5_ = NULL;
@@ -444,7 +444,7 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe
_g_error_free0 (err);
#line 446 "APIGlue.c"
}
- __finally35:
+ __finally36:
#line 26 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 26 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -692,11 +692,11 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
#line 60 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 694 "APIGlue.c"
- goto __catch36_g_error;
+ goto __catch37_g_error;
}
}
- goto __finally36;
- __catch36_g_error:
+ goto __finally37;
+ __catch37_g_error:
{
GError* err = NULL;
LibraryPhoto* _tmp25_ = NULL;
@@ -725,9 +725,9 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
#line 62 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
_g_error_free0 (err);
#line 727 "APIGlue.c"
- goto __finally36;
+ goto __finally37;
}
- __finally36:
+ __finally37:
#line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -882,11 +882,11 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
#line 80 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 883 "APIGlue.c"
- goto __catch37_g_error;
+ goto __catch38_g_error;
}
}
- goto __finally37;
- __catch37_g_error:
+ goto __finally38;
+ __catch38_g_error:
{
GError* err = NULL;
Video* _tmp56_ = NULL;
@@ -915,9 +915,9 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
#line 82 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
_g_error_free0 (err);
#line 916 "APIGlue.c"
- goto __finally37;
+ goto __finally38;
}
- __finally37:
+ __finally38:
#line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
diff --git a/src/publishing/PublishingPluginHost.c b/src/publishing/PublishingPluginHost.c
index dd04855..6e24dc1 100644
--- a/src/publishing/PublishingPluginHost.c
+++ b/src/publishing/PublishingPluginHost.c
@@ -618,7 +618,7 @@ static void spit_publishing_concrete_publishing_host_real_post_error (SpitPublis
#line 80 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
#line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
- _tmp0_ = _ ("Publishing to %s can't continue because an error occurred:");
+ _tmp0_ = _ ("Publishing to %s can’t continue because an error occurred:");
#line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_tmp1_ = self->priv->active_publisher;
#line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1273,7 +1273,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 1272 "PublishingPluginHost.c"
- goto __catch34_spit_publishing_publishing_error;
+ goto __catch35_spit_publishing_publishing_error;
}
#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
_g_object_unref0 (wrapper);
@@ -1293,8 +1293,8 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
_g_object_unref0 (wrapper);
#line 1291 "PublishingPluginHost.c"
}
- goto __finally34;
- __catch34_spit_publishing_publishing_error:
+ goto __finally35;
+ __catch35_spit_publishing_publishing_error:
{
GError* err = NULL;
GError* _tmp16_ = NULL;
@@ -1331,7 +1331,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
return result;
#line 1329 "PublishingPluginHost.c"
}
- __finally34:
+ __finally35:
#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
diff --git a/src/publishing/PublishingPluginHost.vala b/src/publishing/PublishingPluginHost.vala
index fed3802..ca935ab 100644
--- a/src/publishing/PublishingPluginHost.vala
+++ b/src/publishing/PublishingPluginHost.vala
@@ -78,7 +78,7 @@ public class ConcretePublishingHost : Plugins.StandardHostInterface,
}
public void post_error(Error err) {
- string msg = _("Publishing to %s can't continue because an error occurred:").printf(
+ string msg = _("Publishing to %s can’t continue because an error occurred:").printf(
active_publisher.get_service().get_pluggable_name());
msg += GLib.Markup.printf_escaped("\n\n<i>%s</i>\n\n", err.message);
msg += _("To try publishing to another service, select one from the above menu.");
diff --git a/src/publishing/PublishingUI.c b/src/publishing/PublishingUI.c
index 53471cd..a057694 100644
--- a/src/publishing/PublishingUI.c
+++ b/src/publishing/PublishingUI.c
@@ -1213,7 +1213,7 @@ PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_construc
PublishingUIAccountFetchWaitPane * self = NULL;
const gchar* _tmp0_ = NULL;
#line 122 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp0_ = _ ("Fetching account information...");
+ _tmp0_ = _ ("Fetching account information…");
#line 122 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self = (PublishingUIAccountFetchWaitPane*) publishing_ui_static_message_pane_construct (object_type, _tmp0_, FALSE);
#line 121 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1256,7 +1256,7 @@ PublishingUILoginWaitPane* publishing_ui_login_wait_pane_construct (GType object
PublishingUILoginWaitPane * self = NULL;
const gchar* _tmp0_ = NULL;
#line 128 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp0_ = _ ("Logging in...");
+ _tmp0_ = _ ("Logging in…");
#line 128 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self = (PublishingUILoginWaitPane*) publishing_ui_static_message_pane_construct (object_type, _tmp0_, FALSE);
#line 127 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
diff --git a/src/publishing/PublishingUI.vala b/src/publishing/PublishingUI.vala
index f1e4ce6..c0c3a34 100644
--- a/src/publishing/PublishingUI.vala
+++ b/src/publishing/PublishingUI.vala
@@ -119,13 +119,13 @@ public class SuccessPane : StaticMessagePane {
public class AccountFetchWaitPane : StaticMessagePane {
public AccountFetchWaitPane() {
- base(_("Fetching account information..."));
+ base(_("Fetching account information…"));
}
}
public class LoginWaitPane : StaticMessagePane {
public LoginWaitPane() {
- base(_("Logging in..."));
+ base(_("Logging in…"));
}
}