summaryrefslogtreecommitdiff
path: root/src/tags
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-21 19:17:10 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-21 19:17:10 +0100
commita7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e (patch)
treed9f86def771c7845f241ec81219b243c70523c60 /src/tags
parent66f6a7bd3f7e00022191f16cb0e82a39e7333a76 (diff)
New upstream version 0.25.3upstream/0.25.3
Diffstat (limited to 'src/tags')
-rw-r--r--src/tags/Branch.c132
-rw-r--r--src/tags/HierarchicalTagIndex.c2
-rw-r--r--src/tags/HierarchicalTagUtilities.c458
-rw-r--r--src/tags/TagPage.c431
-rw-r--r--src/tags/TagPage.vala13
-rw-r--r--src/tags/Tags.c2
6 files changed, 548 insertions, 490 deletions
diff --git a/src/tags/Branch.c b/src/tags/Branch.c
index 30e05f0..2ed3ac9 100644
--- a/src/tags/Branch.c
+++ b/src/tags/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.32.1, the Vala compiler
+/* Branch.c generated by valac 0.34.4, the Vala compiler
* generated from Branch.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1668,7 +1668,7 @@ static void tags_header_setup_context_menu (TagsHeader* self) {
#line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1671 "Branch.c"
- goto __catch51_g_error;
+ goto __catch53_g_error;
}
#line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala"
_tmp2_ = self->priv->builder;
@@ -1692,8 +1692,8 @@ static void tags_header_setup_context_menu (TagsHeader* self) {
_g_object_unref0 (model);
#line 1694 "Branch.c"
}
- goto __finally51;
- __catch51_g_error:
+ goto __finally53;
+ __catch53_g_error:
{
GError* _error_ = NULL;
GError* _tmp7_ = NULL;
@@ -1730,7 +1730,7 @@ static void tags_header_setup_context_menu (TagsHeader* self) {
_g_error_free0 (_error_);
#line 1732 "Branch.c"
}
- __finally51:
+ __finally53:
#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -2212,11 +2212,11 @@ static gboolean tags_sidebar_entry_real_is_user_renameable (SidebarRenameableEnt
static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
gchar* result = NULL;
GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
#line 2222 "Branch.c"
{
@@ -2231,98 +2231,98 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
const gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 2253 "Branch.c"
- goto __catch52_g_regex_error;
+ goto __catch54_g_regex_error;
}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 2262 "Branch.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 2278 "Branch.c"
- goto __catch52_g_regex_error;
+ goto __catch54_g_regex_error;
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/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);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 2289 "Branch.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 2303 "Branch.c"
}
- goto __finally52;
- __catch52_g_regex_error:
+ goto __finally54;
+ __catch54_g_regex_error:
{
GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_error_free0 (e);
#line 2317 "Branch.c"
}
- __finally52:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+ __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.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 2328 "Branch.c"
}
@@ -2837,39 +2837,39 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
gint _tmp3__length1 = 0;
guint8* _tmp4_ = NULL;
gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
res_length1 = -1;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (result_length1) {
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*result_length1 = _tmp4__length1;
#line 2869 "Branch.c"
}
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 2875 "Branch.c"
}
diff --git a/src/tags/HierarchicalTagIndex.c b/src/tags/HierarchicalTagIndex.c
index dc5e970..0a163d3 100644
--- a/src/tags/HierarchicalTagIndex.c
+++ b/src/tags/HierarchicalTagIndex.c
@@ -1,4 +1,4 @@
-/* HierarchicalTagIndex.c generated by valac 0.32.1, the Vala compiler
+/* HierarchicalTagIndex.c generated by valac 0.34.4, the Vala compiler
* generated from HierarchicalTagIndex.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/tags/HierarchicalTagUtilities.c b/src/tags/HierarchicalTagUtilities.c
index 05d9126..0977264 100644
--- a/src/tags/HierarchicalTagUtilities.c
+++ b/src/tags/HierarchicalTagUtilities.c
@@ -1,4 +1,4 @@
-/* HierarchicalTagUtilities.c generated by valac 0.32.1, the Vala compiler
+/* HierarchicalTagUtilities.c generated by valac 0.34.4, the Vala compiler
* generated from HierarchicalTagUtilities.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -263,37 +263,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
glong _tmp1_ = 0L;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
#line 279 "HierarchicalTagUtilities.c"
glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 287 "HierarchicalTagUtilities.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 299 "HierarchicalTagUtilities.c"
}
@@ -313,112 +313,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
glong _tmp20_ = 0L;
glong _tmp21_ = 0L;
gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
#line 323 "HierarchicalTagUtilities.c"
glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
#line 329 "HierarchicalTagUtilities.c"
} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
#line 333 "HierarchicalTagUtilities.c"
}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
#line 337 "HierarchicalTagUtilities.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = _tmp5_;
#line 349 "HierarchicalTagUtilities.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
#line 359 "HierarchicalTagUtilities.c"
}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
#line 365 "HierarchicalTagUtilities.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
#line 379 "HierarchicalTagUtilities.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
#line 389 "HierarchicalTagUtilities.c"
}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
#line 395 "HierarchicalTagUtilities.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
#line 404 "HierarchicalTagUtilities.c"
}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 424 "HierarchicalTagUtilities.c"
}
@@ -756,72 +756,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
gboolean _tmp2_ = FALSE;
gchar** _tmp3_ = NULL;
gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
separator = "";
#line 766 "HierarchicalTagUtilities.c"
}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = TRUE;
#line 776 "HierarchicalTagUtilities.c"
} else {
gchar** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = _tmp4__length1 > 0;
#line 786 "HierarchicalTagUtilities.c"
}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = TRUE;
#line 792 "HierarchicalTagUtilities.c"
} else {
gboolean _tmp5_ = FALSE;
gchar** _tmp6_ = NULL;
gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp6__length1 == -1) {
#line 803 "HierarchicalTagUtilities.c"
gchar** _tmp7_ = NULL;
gint _tmp7__length1 = 0;
const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = _tmp8_ != NULL;
#line 815 "HierarchicalTagUtilities.c"
} else {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = FALSE;
#line 819 "HierarchicalTagUtilities.c"
}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _tmp5_;
#line 823 "HierarchicalTagUtilities.c"
}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_) {
#line 827 "HierarchicalTagUtilities.c"
gint i = 0;
@@ -844,16 +844,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
const gchar* _tmp44_ = NULL;
void* _tmp45_ = NULL;
const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = (gsize) 1;
#line 850 "HierarchicalTagUtilities.c"
{
gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
i = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
while (TRUE) {
#line 859 "HierarchicalTagUtilities.c"
gboolean _tmp11_ = FALSE;
@@ -866,97 +866,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
gint _tmp23_ = 0;
const gchar* _tmp24_ = NULL;
gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (!_tmp9_) {
#line 872 "HierarchicalTagUtilities.c"
gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
i = _tmp10_ + 1;
#line 878 "HierarchicalTagUtilities.c"
}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp13__length1 != -1) {
#line 888 "HierarchicalTagUtilities.c"
gint _tmp14_ = 0;
gchar** _tmp15_ = NULL;
gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = _tmp14_ < _tmp15__length1;
#line 900 "HierarchicalTagUtilities.c"
} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = FALSE;
#line 904 "HierarchicalTagUtilities.c"
}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = TRUE;
#line 910 "HierarchicalTagUtilities.c"
} else {
gboolean _tmp16_ = FALSE;
gchar** _tmp17_ = NULL;
gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp17__length1 == -1) {
#line 921 "HierarchicalTagUtilities.c"
gchar** _tmp18_ = NULL;
gint _tmp18__length1 = 0;
gint _tmp19_ = 0;
const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = _tmp20_ != NULL;
#line 936 "HierarchicalTagUtilities.c"
} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = FALSE;
#line 940 "HierarchicalTagUtilities.c"
}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = _tmp16_;
#line 944 "HierarchicalTagUtilities.c"
}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
break;
#line 950 "HierarchicalTagUtilities.c"
}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp24_ != NULL) {
#line 962 "HierarchicalTagUtilities.c"
gchar** _tmp25_ = NULL;
@@ -965,91 +965,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
const gchar* _tmp27_ = NULL;
gint _tmp28_ = 0;
gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = _tmp29_;
#line 983 "HierarchicalTagUtilities.c"
} else {
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = 0;
#line 987 "HierarchicalTagUtilities.c"
}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp30_ + _tmp21_;
#line 993 "HierarchicalTagUtilities.c"
}
}
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp31_ == 0) {
#line 1000 "HierarchicalTagUtilities.c"
gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp32_;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1008 "HierarchicalTagUtilities.c"
}
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
res = _tmp41_;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
ptr = _tmp45_;
#line 1046 "HierarchicalTagUtilities.c"
{
gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
i = 1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
while (TRUE) {
#line 1055 "HierarchicalTagUtilities.c"
gint _tmp48_ = 0;
@@ -1065,94 +1065,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
const gchar* _tmp56_ = NULL;
void* _tmp60_ = NULL;
void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (!_tmp46_) {
#line 1071 "HierarchicalTagUtilities.c"
gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
i = _tmp47_ + 1;
#line 1077 "HierarchicalTagUtilities.c"
}
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
break;
#line 1091 "HierarchicalTagUtilities.c"
}
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp56_ != NULL) {
#line 1111 "HierarchicalTagUtilities.c"
gchar** _tmp57_ = NULL;
gint _tmp57__length1 = 0;
gint _tmp58_ = 0;
const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp53_ = (const gchar*) _tmp59_;
#line 1126 "HierarchicalTagUtilities.c"
} else {
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp53_ = "";
#line 1130 "HierarchicalTagUtilities.c"
}
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
ptr = _tmp61_;
#line 1138 "HierarchicalTagUtilities.c"
}
}
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
res = NULL;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1149 "HierarchicalTagUtilities.c"
} else {
gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp63_;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1158 "HierarchicalTagUtilities.c"
}
@@ -1273,11 +1273,11 @@ gchar* hierarchical_tag_utilities_get_basename (const gchar* in_path) {
static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
gchar* result = NULL;
GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
#line 1283 "HierarchicalTagUtilities.c"
{
@@ -1292,98 +1292,98 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
const gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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 __catch55_g_regex_error;
}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 1323 "HierarchicalTagUtilities.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#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 __catch55_g_regex_error;
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/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);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 1350 "HierarchicalTagUtilities.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1364 "HierarchicalTagUtilities.c"
}
- goto __finally53;
- __catch53_g_regex_error:
+ goto __finally55;
+ __catch55_g_regex_error:
{
GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_error_free0 (e);
#line 1378 "HierarchicalTagUtilities.c"
}
- __finally53:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+ __finally55:
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 1389 "HierarchicalTagUtilities.c"
}
@@ -1394,15 +1394,15 @@ static gchar string_get (const gchar* self, glong index) {
gchar result = '\0';
glong _tmp0_ = 0L;
gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1408 "HierarchicalTagUtilities.c"
}
diff --git a/src/tags/TagPage.c b/src/tags/TagPage.c
index 8a95878..9c8acc0 100644
--- a/src/tags/TagPage.c
+++ b/src/tags/TagPage.c
@@ -1,4 +1,4 @@
-/* TagPage.c generated by valac 0.32.1, the Vala compiler
+/* TagPage.c generated by valac 0.34.4, the Vala compiler
* generated from TagPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -12,9 +12,9 @@
#include <gtk/gtk.h>
#include <stdlib.h>
#include <string.h>
+#include <gio/gio.h>
#include <gee.h>
#include <gdk/gdk.h>
-#include <gio/gio.h>
#define TYPE_PAGE (page_get_type ())
@@ -304,16 +304,6 @@ typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass;
typedef struct _ConfigFacade ConfigFacade;
typedef struct _ConfigFacadeClass ConfigFacadeClass;
-#define TYPE_APP_WINDOW (app_window_get_type ())
-#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
-#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
-#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
-#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
-#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
-
-typedef struct _AppWindow AppWindow;
-typedef struct _AppWindowClass AppWindowClass;
-
#define TYPE_COMMAND (command_get_type ())
#define COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMMAND, Command))
#define COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_COMMAND, CommandClass))
@@ -365,6 +355,16 @@ typedef struct _CommandManager CommandManager;
typedef struct _CommandManagerClass CommandManagerClass;
#define _command_manager_unref0(var) ((var == NULL) ? NULL : (var = (command_manager_unref (var), NULL)))
+#define TYPE_APP_WINDOW (app_window_get_type ())
+#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
+#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
+#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
+#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
+#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
+
+typedef struct _AppWindow AppWindow;
+typedef struct _AppWindowClass AppWindowClass;
+
#define TYPE_LIBRARY_WINDOW (library_window_get_type ())
#define LIBRARY_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_LIBRARY_WINDOW, LibraryWindow))
#define LIBRARY_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_LIBRARY_WINDOW, LibraryWindowClass))
@@ -435,7 +435,8 @@ struct _PageClass {
void (*ready) (Page* self);
void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
- void (*add_actions) (Page* self);
+ void (*add_actions) (Page* self, GActionMap* map);
+ void (*remove_actions) (Page* self, GActionMap* map);
void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
void (*init_actions) (Page* self, gint selected_count, gint count);
@@ -681,10 +682,10 @@ ConfigFacade* config_facade_get_instance (void);
void configuration_facade_get_event_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by);
static void tag_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by);
void configuration_facade_set_event_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by);
-static void tag_page_real_add_actions (Page* base);
-void page_add_actions (Page* self);
-GType app_window_get_type (void) G_GNUC_CONST;
-AppWindow* app_window_get_instance (void);
+static void tag_page_real_add_actions (Page* base, GActionMap* map);
+void page_add_actions (Page* self, GActionMap* map);
+static void tag_page_real_remove_actions (Page* base, GActionMap* map);
+void page_remove_actions (Page* self, GActionMap* map);
void page_set_page_name (Page* self, const gchar* page_name);
void page_update_actions (Page* self, gint selected_count, gint count);
gint view_collection_get_selected_count (ViewCollection* self);
@@ -713,6 +714,7 @@ gpointer value_get_command_manager (const GValue* value);
GType command_manager_get_type (void) G_GNUC_CONST;
CommandManager* app_window_get_command_manager (void);
void command_manager_execute (CommandManager* self, Command* command);
+GType app_window_get_type (void) G_GNUC_CONST;
GType library_window_get_type (void) G_GNUC_CONST;
LibraryWindow* library_window_get_app (void);
void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag);
@@ -735,42 +737,42 @@ static const GActionEntry TAG_PAGE_entries[4] = {{"DeleteTag", _tag_page_on_dele
static void _tag_page_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
#line 23 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
tag_page_on_tags_altered ((TagPage*) self, items);
-#line 739 "TagPage.c"
+#line 741 "TagPage.c"
}
static void _tag_page_on_delete_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
tag_page_on_delete_tag ((TagPage*) self);
-#line 746 "TagPage.c"
+#line 748 "TagPage.c"
}
static void _tag_page_on_rename_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
tag_page_on_rename_tag ((TagPage*) self);
-#line 753 "TagPage.c"
+#line 755 "TagPage.c"
}
static void _tag_page_on_remove_tag_from_photos_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
tag_page_on_remove_tag_from_photos ((TagPage*) self);
-#line 760 "TagPage.c"
+#line 762 "TagPage.c"
}
static void _tag_page_on_new_child_tag_sidebar_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
tag_page_on_new_child_tag_sidebar ((TagPage*) self);
-#line 767 "TagPage.c"
+#line 769 "TagPage.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 13 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
return self ? g_object_ref (self) : NULL;
-#line 774 "TagPage.c"
+#line 776 "TagPage.c"
}
@@ -779,7 +781,7 @@ static DataView* _media_page_create_thumbnail_create_view (DataSource* source, g
result = media_page_create_thumbnail ((MediaPage*) self, source);
#line 16 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
return result;
-#line 783 "TagPage.c"
+#line 785 "TagPage.c"
}
@@ -832,14 +834,14 @@ TagPage* tag_page_construct (GType object_type, Tag* tag) {
checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "TagsContextMenu");
#line 10 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
return self;
-#line 836 "TagPage.c"
+#line 838 "TagPage.c"
}
TagPage* tag_page_new (Tag* tag) {
#line 10 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
return tag_page_construct (TYPE_TAG_PAGE, tag);
-#line 843 "TagPage.c"
+#line 845 "TagPage.c"
}
@@ -859,7 +861,7 @@ static void tag_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_fil
_tmp1_ = ui_filenames;
#line 28 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "tags.ui");
-#line 863 "TagPage.c"
+#line 865 "TagPage.c"
}
@@ -877,7 +879,7 @@ Tag* tag_page_get_tag (TagPage* self) {
result = _tmp1_;
#line 32 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
return result;
-#line 881 "TagPage.c"
+#line 883 "TagPage.c"
}
@@ -907,13 +909,13 @@ static void tag_page_real_get_config_photos_sort (MediaPage* base, gboolean* sor
if (sort_order) {
#line 35 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
*sort_order = _vala_sort_order;
-#line 911 "TagPage.c"
+#line 913 "TagPage.c"
}
#line 35 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
if (sort_by) {
#line 35 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
*sort_by = _vala_sort_by;
-#line 917 "TagPage.c"
+#line 919 "TagPage.c"
}
}
@@ -938,27 +940,74 @@ static void tag_page_real_set_config_photos_sort (MediaPage* base, gboolean sort
configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
#line 40 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_g_object_unref0 (_tmp1_);
-#line 942 "TagPage.c"
+#line 944 "TagPage.c"
}
-static void tag_page_real_add_actions (Page* base) {
+static void tag_page_real_add_actions (Page* base, GActionMap* map) {
TagPage * self;
- AppWindow* _tmp0_ = NULL;
- AppWindow* _tmp1_ = NULL;
+ GActionMap* _tmp0_ = NULL;
+ GActionMap* _tmp1_ = NULL;
#line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage);
+#line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+ g_return_if_fail (G_IS_ACTION_MAP (map));
#line 51 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
- PAGE_CLASS (tag_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page));
-#line 53 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
- _tmp0_ = app_window_get_instance ();
-#line 53 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
- _tmp1_ = _tmp0_;
+ _tmp0_ = map;
+#line 51 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+ PAGE_CLASS (tag_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_);
#line 53 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
- g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), TAG_PAGE_entries, G_N_ELEMENTS (TAG_PAGE_entries), self);
+ _tmp1_ = map;
#line 53 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
- _g_object_unref0 (_tmp1_);
-#line 962 "TagPage.c"
+ g_action_map_add_action_entries (_tmp1_, TAG_PAGE_entries, G_N_ELEMENTS (TAG_PAGE_entries), self);
+#line 964 "TagPage.c"
+}
+
+
+static void tag_page_real_remove_actions (Page* base, GActionMap* map) {
+ TagPage * self;
+ GActionMap* _tmp0_ = NULL;
+#line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage);
+#line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+ g_return_if_fail (G_IS_ACTION_MAP (map));
+#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+ _tmp0_ = map;
+#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+ PAGE_CLASS (tag_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_);
+#line 979 "TagPage.c"
+ {
+ GActionEntry* entry_collection = NULL;
+ gint entry_collection_length1 = 0;
+ gint _entry_collection_size_ = 0;
+ gint entry_it = 0;
+#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+ entry_collection = TAG_PAGE_entries;
+#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+ entry_collection_length1 = G_N_ELEMENTS (TAG_PAGE_entries);
+#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+ for (entry_it = 0; entry_it < G_N_ELEMENTS (TAG_PAGE_entries); entry_it = entry_it + 1) {
+#line 991 "TagPage.c"
+ GActionEntry entry = {0};
+#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+ entry = entry_collection[entry_it];
+#line 995 "TagPage.c"
+ {
+ GActionMap* _tmp1_ = NULL;
+ GActionEntry _tmp2_ = {0};
+ const gchar* _tmp3_ = NULL;
+#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+ _tmp1_ = map;
+#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+ _tmp2_ = entry;
+#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+ _tmp3_ = _tmp2_.name;
+#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+ g_action_map_remove_action (_tmp1_, _tmp3_);
+#line 1008 "TagPage.c"
+ }
+ }
+ }
}
@@ -966,19 +1015,19 @@ static void tag_page_on_tags_altered (TagPage* self, GeeMap* map) {
GeeMap* _tmp0_ = NULL;
Tag* _tmp1_ = NULL;
gboolean _tmp2_ = FALSE;
-#line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
g_return_if_fail (IS_TAG_PAGE (self));
-#line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
g_return_if_fail (GEE_IS_MAP (map));
-#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp0_ = map;
-#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp1_ = self->priv->tag;
-#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp2_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
-#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
if (_tmp2_) {
-#line 982 "TagPage.c"
+#line 1031 "TagPage.c"
Tag* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
@@ -988,35 +1037,35 @@ static void tag_page_on_tags_altered (TagPage* self, GeeMap* map) {
ViewCollection* _tmp9_ = NULL;
ViewCollection* _tmp10_ = NULL;
gint _tmp11_ = 0;
-#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp3_ = self->priv->tag;
-#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp4_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp5_ = _tmp4_;
-#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp5_);
-#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_g_free0 (_tmp5_);
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp7_ = _tmp6_;
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp8_ = view_collection_get_selected_count (_tmp7_);
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp10_ = _tmp9_;
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp11_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection));
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
page_update_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp8_, _tmp11_);
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_data_collection_unref0 (_tmp10_);
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 66 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_data_collection_unref0 (_tmp7_);
-#line 1020 "TagPage.c"
+#line 1069 "TagPage.c"
}
}
@@ -1038,59 +1087,59 @@ static void tag_page_real_switched_to (Page* base) {
gchar* _tmp12_ = NULL;
gchar* _tmp13_ = NULL;
gchar* _tmp14_ = NULL;
-#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 70 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage);
-#line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 71 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
PAGE_CLASS (tag_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page));
-#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp0_ = self->priv->tag;
-#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp1_ = tag_get_user_visible_name (_tmp0_);
-#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp2_ = _tmp1_;
-#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp3_ = resources_delete_tag_menu (_tmp2_);
-#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp4_ = _tmp3_;
-#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DeleteTag", _tmp4_);
-#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_g_free0 (_tmp4_);
-#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_g_free0 (_tmp2_);
-#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp5_ = self->priv->tag;
-#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp6_ = tag_get_user_visible_name (_tmp5_);
-#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp7_ = _tmp6_;
-#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp8_ = resources_rename_tag_menu (_tmp7_);
-#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp9_ = _tmp8_;
-#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RenameTag", _tmp9_);
-#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_g_free0 (_tmp9_);
-#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_g_free0 (_tmp7_);
-#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp10_ = self->priv->tag;
-#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp11_ = tag_get_user_visible_name (_tmp10_);
-#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp12_ = _tmp11_;
-#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp13_ = resources_untag_photos_menu (_tmp12_, 0);
-#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp14_ = _tmp13_;
-#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveTagFromPhotos", _tmp14_);
-#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_g_free0 (_tmp14_);
-#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_g_free0 (_tmp12_);
-#line 1094 "TagPage.c"
+#line 1143 "TagPage.c"
}
@@ -1115,67 +1164,67 @@ static void tag_page_real_update_actions (Page* base, gint selected_count, gint
gint _tmp16_ = 0;
gint _tmp17_ = 0;
gint _tmp18_ = 0;
-#line 73 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage);
-#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp0_ = self->priv->tag;
-#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp1_ = tag_get_user_visible_name (_tmp0_);
-#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp2_ = _tmp1_;
-#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp3_ = resources_delete_tag_menu (_tmp2_);
-#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp4_ = _tmp3_;
-#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
page_set_action_details (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DeleteTag", _tmp4_, NULL, TRUE);
-#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_g_free0 (_tmp4_);
-#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_g_free0 (_tmp2_);
-#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp5_ = self->priv->tag;
-#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp6_ = tag_get_user_visible_name (_tmp5_);
-#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp7_ = _tmp6_;
-#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp8_ = resources_rename_tag_menu (_tmp7_);
-#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp9_ = _tmp8_;
-#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
page_set_action_details (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RenameTag", _tmp9_, NULL, TRUE);
-#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_g_free0 (_tmp9_);
-#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_g_free0 (_tmp7_);
-#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp10_ = self->priv->tag;
-#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp11_ = tag_get_user_visible_name (_tmp10_);
-#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp12_ = _tmp11_;
-#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp13_ = selected_count;
-#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp14_ = resources_untag_photos_menu (_tmp12_, _tmp13_);
-#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp15_ = _tmp14_;
-#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp16_ = selected_count;
-#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
page_set_action_details (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveTagFromPhotos", _tmp15_, NULL, _tmp16_ > 0);
-#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_g_free0 (_tmp15_);
-#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_g_free0 (_tmp12_);
-#line 89 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp17_ = selected_count;
-#line 89 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp18_ = count;
-#line 89 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
PAGE_CLASS (tag_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp17_, _tmp18_);
-#line 1179 "TagPage.c"
+#line 1228 "TagPage.c"
}
@@ -1189,39 +1238,39 @@ static void tag_page_on_new_child_tag_sidebar (TagPage* self) {
LibraryWindow* _tmp5_ = NULL;
Tag* _tmp6_ = NULL;
Tag* _tmp7_ = NULL;
-#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 99 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
g_return_if_fail (IS_TAG_PAGE (self));
-#line 93 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp0_ = self->priv->tag;
-#line 93 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp1_ = new_child_tag_command_new (_tmp0_);
-#line 93 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
creation_command = _tmp1_;
-#line 95 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp2_ = app_window_get_command_manager ();
-#line 95 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp3_ = _tmp2_;
-#line 95 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (creation_command, TYPE_COMMAND, Command));
-#line 95 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_command_manager_unref0 (_tmp3_);
-#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp4_ = library_window_get_app ();
-#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp5_ = _tmp4_;
-#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp6_ = new_child_tag_command_get_created_child (creation_command);
-#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp7_ = _tmp6_;
-#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
library_window_rename_tag_in_sidebar (_tmp5_, _tmp7_);
-#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_g_object_unref0 (_tmp7_);
-#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_g_object_unref0 (_tmp5_);
-#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 99 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_g_object_unref0 (creation_command);
-#line 1225 "TagPage.c"
+#line 1274 "TagPage.c"
}
@@ -1229,56 +1278,56 @@ static void tag_page_on_rename_tag (TagPage* self) {
LibraryWindow* _tmp0_ = NULL;
LibraryWindow* _tmp1_ = NULL;
Tag* _tmp2_ = NULL;
-#line 100 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 107 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
g_return_if_fail (IS_TAG_PAGE (self));
-#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp0_ = library_window_get_app ();
-#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp1_ = _tmp0_;
-#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp2_ = self->priv->tag;
-#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
library_window_rename_tag_in_sidebar (_tmp1_, _tmp2_);
-#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_g_object_unref0 (_tmp1_);
-#line 1245 "TagPage.c"
+#line 1294 "TagPage.c"
}
static void tag_page_on_delete_tag (TagPage* self) {
Tag* _tmp0_ = NULL;
gboolean _tmp1_ = FALSE;
-#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
g_return_if_fail (IS_TAG_PAGE (self));
-#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp0_ = self->priv->tag;
-#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp1_ = dialogs_confirm_delete_tag (_tmp0_);
-#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
if (_tmp1_) {
-#line 1260 "TagPage.c"
+#line 1309 "TagPage.c"
CommandManager* _tmp2_ = NULL;
CommandManager* _tmp3_ = NULL;
Tag* _tmp4_ = NULL;
DeleteTagCommand* _tmp5_ = NULL;
DeleteTagCommand* _tmp6_ = NULL;
-#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp2_ = app_window_get_command_manager ();
-#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp3_ = _tmp2_;
-#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp4_ = self->priv->tag;
-#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp5_ = delete_tag_command_new (_tmp4_);
-#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp6_ = _tmp5_;
-#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command));
-#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_g_object_unref0 (_tmp6_);
-#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_command_manager_unref0 (_tmp3_);
-#line 1282 "TagPage.c"
+#line 1331 "TagPage.c"
}
}
@@ -1288,21 +1337,21 @@ static void tag_page_on_remove_tag_from_photos (TagPage* self) {
ViewCollection* _tmp1_ = NULL;
gint _tmp2_ = 0;
gboolean _tmp3_ = FALSE;
-#line 109 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
g_return_if_fail (IS_TAG_PAGE (self));
-#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp1_ = _tmp0_;
-#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp3_ = _tmp2_ > 0;
-#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_data_collection_unref0 (_tmp1_);
-#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
if (_tmp3_) {
-#line 1306 "TagPage.c"
+#line 1355 "TagPage.c"
CommandManager* _tmp4_ = NULL;
CommandManager* _tmp5_ = NULL;
Tag* _tmp6_ = NULL;
@@ -1315,43 +1364,43 @@ static void tag_page_on_remove_tag_from_photos (TagPage* self) {
gint _tmp13_ = 0;
TagUntagPhotosCommand* _tmp14_ = NULL;
TagUntagPhotosCommand* _tmp15_ = NULL;
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp5_ = _tmp4_;
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp6_ = self->priv->tag;
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp8_ = _tmp7_;
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp9_ = view_collection_get_selected_sources (_tmp8_);
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp12_ = _tmp11_;
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp13_ = view_collection_get_selected_count (_tmp12_);
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp14_ = tag_untag_photos_command_new (_tmp6_, _tmp10_, _tmp13_, FALSE);
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_tmp15_ = _tmp14_;
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_COMMAND, Command));
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_g_object_unref0 (_tmp15_);
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_data_collection_unref0 (_tmp12_);
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_g_object_unref0 (_tmp10_);
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_data_collection_unref0 (_tmp8_);
-#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
_command_manager_unref0 (_tmp5_);
-#line 1355 "TagPage.c"
+#line 1404 "TagPage.c"
}
}
@@ -1370,19 +1419,21 @@ static void tag_page_class_init (TagPageClass * klass) {
#line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
((PageClass *) klass)->add_actions = tag_page_real_add_actions;
#line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+ ((PageClass *) klass)->remove_actions = tag_page_real_remove_actions;
+#line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
((PageClass *) klass)->switched_to = tag_page_real_switched_to;
#line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
((PageClass *) klass)->update_actions = tag_page_real_update_actions;
#line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
G_OBJECT_CLASS (klass)->finalize = tag_page_finalize;
-#line 1379 "TagPage.c"
+#line 1430 "TagPage.c"
}
static void tag_page_instance_init (TagPage * self) {
#line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
self->priv = TAG_PAGE_GET_PRIVATE (self);
-#line 1386 "TagPage.c"
+#line 1437 "TagPage.c"
}
@@ -1412,7 +1463,7 @@ static void tag_page_finalize (GObject* obj) {
_g_object_unref0 (self->priv->tag);
#line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
G_OBJECT_CLASS (tag_page_parent_class)->finalize (obj);
-#line 1416 "TagPage.c"
+#line 1467 "TagPage.c"
}
diff --git a/src/tags/TagPage.vala b/src/tags/TagPage.vala
index 04696c5..431eaf4 100644
--- a/src/tags/TagPage.vala
+++ b/src/tags/TagPage.vala
@@ -47,10 +47,17 @@ public class TagPage : CollectionPage {
{ "NewChildTagSidebar", on_new_child_tag_sidebar }
};
- protected override void add_actions () {
- base.add_actions ();
+ protected override void add_actions(GLib.ActionMap map) {
+ base.add_actions(map);
- AppWindow.get_instance ().add_action_entries (entries, this);
+ map.add_action_entries(entries, this);
+ }
+
+ protected override void remove_actions(GLib.ActionMap map) {
+ base.remove_actions(map);
+ foreach (var entry in entries) {
+ map.remove_action(entry.name);
+ }
}
private void on_tags_altered(Gee.Map<DataObject, Alteration> map) {
diff --git a/src/tags/Tags.c b/src/tags/Tags.c
index 0f14960..3cc2f18 100644
--- a/src/tags/Tags.c
+++ b/src/tags/Tags.c
@@ -1,4 +1,4 @@
-/* Tags.c generated by valac 0.32.1, the Vala compiler
+/* Tags.c generated by valac 0.34.4, the Vala compiler
* generated from Tags.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 10:36:52 +0000