summaryrefslogtreecommitdiff
path: root/src/tags
diff options
context:
space:
mode:
Diffstat (limited to 'src/tags')
-rw-r--r--src/tags/Branch.c18
-rw-r--r--src/tags/HierarchicalTagUtilities.c12
-rw-r--r--src/tags/HierarchicalTagUtilities.vala2
-rw-r--r--src/tags/TagPage.c2
4 files changed, 17 insertions, 17 deletions
diff --git a/src/tags/Branch.c b/src/tags/Branch.c
index 20ba882..a36626e 100644
--- a/src/tags/Branch.c
+++ b/src/tags/Branch.c
@@ -1810,11 +1810,11 @@ static void tags_header_setup_context_menu (TagsHeader* self) {
#line 148 "/home/jens/Source/shotwell/src/tags/Branch.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1813 "Branch.c"
- goto __catch51_g_error;
+ goto __catch52_g_error;
}
}
- goto __finally51;
- __catch51_g_error:
+ goto __finally52;
+ __catch52_g_error:
{
GError* err = NULL;
gchar* _tmp11_ = NULL;
@@ -1859,7 +1859,7 @@ static void tags_header_setup_context_menu (TagsHeader* self) {
_g_error_free0 (err);
#line 1861 "Branch.c"
}
- __finally51:
+ __finally52:
#line 147 "/home/jens/Source/shotwell/src/tags/Branch.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 147 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -2454,7 +2454,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 2457 "Branch.c"
- goto __catch52_g_regex_error;
+ goto __catch53_g_regex_error;
}
#line 1382 "/usr/share/vala-0.34/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);
@@ -2479,7 +2479,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 2482 "Branch.c"
- goto __catch52_g_regex_error;
+ goto __catch53_g_regex_error;
}
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
@@ -2505,8 +2505,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
return result;
#line 2507 "Branch.c"
}
- goto __finally52;
- __catch52_g_regex_error:
+ goto __finally53;
+ __catch53_g_regex_error:
{
GError* e = NULL;
#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -2519,7 +2519,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_g_error_free0 (e);
#line 2521 "Branch.c"
}
- __finally52:
+ __finally53:
#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
diff --git a/src/tags/HierarchicalTagUtilities.c b/src/tags/HierarchicalTagUtilities.c
index 1f9b2de..bc4b608 100644
--- a/src/tags/HierarchicalTagUtilities.c
+++ b/src/tags/HierarchicalTagUtilities.c
@@ -252,7 +252,7 @@ gchar* hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name) {
/**
* converts a hierarchical tag path 'path' (e.g., "/Animals") to a flat tag name
* (e.g., "Animals"); if 'path' is already a flat tag name, 'path' is returned untouched; note
- * that 'path' must be a top-level path (i.e., "/Animals" not "/Animals/Mammals/...") with
+ * that 'path' must be a top-level path (i.e., "/Animals" not "/Animals/Mammals/…") with
* only one path component; invoking this method with a 'path' argument other than a top-level
* path will cause an assertion failure.
*/
@@ -1311,7 +1311,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 1314 "HierarchicalTagUtilities.c"
- goto __catch53_g_regex_error;
+ goto __catch54_g_regex_error;
}
#line 1382 "/usr/share/vala-0.34/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);
@@ -1336,7 +1336,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 1339 "HierarchicalTagUtilities.c"
- goto __catch53_g_regex_error;
+ goto __catch54_g_regex_error;
}
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
@@ -1362,8 +1362,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
return result;
#line 1364 "HierarchicalTagUtilities.c"
}
- goto __finally53;
- __catch53_g_regex_error:
+ goto __finally54;
+ __catch54_g_regex_error:
{
GError* e = NULL;
#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1376,7 +1376,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_g_error_free0 (e);
#line 1378 "HierarchicalTagUtilities.c"
}
- __finally53:
+ __finally54:
#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
diff --git a/src/tags/HierarchicalTagUtilities.vala b/src/tags/HierarchicalTagUtilities.vala
index bbb556b..3fca3ca 100644
--- a/src/tags/HierarchicalTagUtilities.vala
+++ b/src/tags/HierarchicalTagUtilities.vala
@@ -21,7 +21,7 @@ class HierarchicalTagUtilities {
/**
* converts a hierarchical tag path 'path' (e.g., "/Animals") to a flat tag name
* (e.g., "Animals"); if 'path' is already a flat tag name, 'path' is returned untouched; note
- * that 'path' must be a top-level path (i.e., "/Animals" not "/Animals/Mammals/...") with
+ * that 'path' must be a top-level path (i.e., "/Animals" not "/Animals/Mammals/…") with
* only one path component; invoking this method with a 'path' argument other than a top-level
* path will cause an assertion failure.
*/
diff --git a/src/tags/TagPage.c b/src/tags/TagPage.c
index c2cb74f..54af84d 100644
--- a/src/tags/TagPage.c
+++ b/src/tags/TagPage.c
@@ -691,7 +691,7 @@ static void _tag_page_on_remove_tag_from_photos_gtk_action_callback (GtkAction*
static void _vala_array_add136 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
#define RESOURCES_DELETE_TAG_SIDEBAR_MENU _ ("_Delete")
static void _vala_array_add137 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_RENAME_TAG_SIDEBAR_MENU _ ("_Rename...")
+#define RESOURCES_RENAME_TAG_SIDEBAR_MENU _ ("_Rename…")
static void _vala_array_add138 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
#define RESOURCES_NEW_CHILD_TAG_SIDEBAR_MENU _ ("_New")
static void tag_page_on_new_child_tag_sidebar (TagPage* self);