summaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 15:53:58 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 15:53:58 +0100
commit2492891f112caac6076ce49721d9d5d78a152c3a (patch)
tree36dd11a60bd963e6bd44e2e312b6e4b57d1849ea /src/util
parent3c829c50a8f705402bdc759946d49ae7caebd003 (diff)
New upstream version 0.26.4upstream/0.26.4
Diffstat (limited to 'src/util')
-rw-r--r--src/util/KeyValueMap.c314
-rw-r--r--src/util/Util.c2
-rw-r--r--src/util/file.c665
-rw-r--r--src/util/image.c932
-rw-r--r--src/util/misc.c710
-rw-r--r--src/util/string.c884
-rw-r--r--src/util/system.c38
-rw-r--r--src/util/ui.c40
8 files changed, 1786 insertions, 1799 deletions
diff --git a/src/util/KeyValueMap.c b/src/util/KeyValueMap.c
index 1c584c3..ff453c2 100644
--- a/src/util/KeyValueMap.c
+++ b/src/util/KeyValueMap.c
@@ -1,4 +1,4 @@
-/* KeyValueMap.c generated by valac 0.34.7, the Vala compiler
+/* KeyValueMap.c generated by valac 0.36.6, the Vala compiler
* generated from KeyValueMap.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -90,13 +90,13 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def)
gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean def);
void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def, GdkPoint* result);
void key_value_map_set_point (KeyValueMap* self, const gchar* key, GdkPoint* point);
-static void key_value_map_finalize (KeyValueMap* obj);
+static void key_value_map_finalize (KeyValueMap * obj);
KeyValueMap* key_value_map_construct (GType object_type, const gchar* group) {
KeyValueMap* self = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 11 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
g_return_val_if_fail (group != NULL, NULL);
#line 11 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -125,8 +125,8 @@ KeyValueMap* key_value_map_new (const gchar* group) {
KeyValueMap* key_value_map_copy (KeyValueMap* self) {
KeyValueMap* result = NULL;
KeyValueMap* clone = NULL;
- const gchar* _tmp0_ = NULL;
- KeyValueMap* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ KeyValueMap* _tmp1_;
#line 15 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
g_return_val_if_fail (IS_KEY_VALUE_MAP (self), NULL);
#line 16 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -138,12 +138,12 @@ KeyValueMap* key_value_map_copy (KeyValueMap* self) {
#line 139 "KeyValueMap.c"
{
GeeIterator* _key_it = NULL;
- GeeHashMap* _tmp2_ = NULL;
- GeeSet* _tmp3_ = NULL;
- GeeSet* _tmp4_ = NULL;
- GeeSet* _tmp5_ = NULL;
- GeeIterator* _tmp6_ = NULL;
- GeeIterator* _tmp7_ = NULL;
+ GeeHashMap* _tmp2_;
+ GeeSet* _tmp3_;
+ GeeSet* _tmp4_;
+ GeeSet* _tmp5_;
+ GeeIterator* _tmp6_;
+ GeeIterator* _tmp7_;
#line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
_tmp2_ = self->priv->map;
#line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -163,18 +163,18 @@ KeyValueMap* key_value_map_copy (KeyValueMap* self) {
#line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
while (TRUE) {
#line 166 "KeyValueMap.c"
- GeeIterator* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+ GeeIterator* _tmp8_;
+ gboolean _tmp9_;
gchar* key = NULL;
- GeeIterator* _tmp10_ = NULL;
- gpointer _tmp11_ = NULL;
- KeyValueMap* _tmp12_ = NULL;
- GeeHashMap* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
- GeeHashMap* _tmp15_ = NULL;
- const gchar* _tmp16_ = NULL;
- gpointer _tmp17_ = NULL;
- gchar* _tmp18_ = NULL;
+ GeeIterator* _tmp10_;
+ gpointer _tmp11_;
+ KeyValueMap* _tmp12_;
+ GeeHashMap* _tmp13_;
+ const gchar* _tmp14_;
+ GeeHashMap* _tmp15_;
+ const gchar* _tmp16_;
+ gpointer _tmp17_;
+ gchar* _tmp18_;
#line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
_tmp8_ = _key_it;
#line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -227,8 +227,8 @@ KeyValueMap* key_value_map_copy (KeyValueMap* self) {
gchar* key_value_map_get_group (KeyValueMap* self) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 23 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
g_return_val_if_fail (IS_KEY_VALUE_MAP (self), NULL);
#line 24 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -245,9 +245,9 @@ gchar* key_value_map_get_group (KeyValueMap* self) {
GeeSet* key_value_map_get_keys (KeyValueMap* self) {
GeeSet* result = NULL;
- GeeHashMap* _tmp0_ = NULL;
- GeeSet* _tmp1_ = NULL;
- GeeSet* _tmp2_ = NULL;
+ GeeHashMap* _tmp0_;
+ GeeSet* _tmp1_;
+ GeeSet* _tmp2_;
#line 27 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
g_return_val_if_fail (IS_KEY_VALUE_MAP (self), NULL);
#line 28 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -266,9 +266,9 @@ GeeSet* key_value_map_get_keys (KeyValueMap* self) {
gboolean key_value_map_has_key (KeyValueMap* self, const gchar* key) {
gboolean result = FALSE;
- GeeHashMap* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ GeeHashMap* _tmp0_;
+ const gchar* _tmp1_;
+ gboolean _tmp2_;
#line 31 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
g_return_val_if_fail (IS_KEY_VALUE_MAP (self), FALSE);
#line 31 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -288,10 +288,10 @@ gboolean key_value_map_has_key (KeyValueMap* self, const gchar* key) {
void key_value_map_set_string (KeyValueMap* self, const gchar* key, const gchar* value) {
- const gchar* _tmp0_ = NULL;
- GeeHashMap* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
+ const gchar* _tmp0_;
+ GeeHashMap* _tmp1_;
+ const gchar* _tmp2_;
+ const gchar* _tmp3_;
#line 35 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
g_return_if_fail (IS_KEY_VALUE_MAP (self));
#line 35 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -315,12 +315,12 @@ void key_value_map_set_string (KeyValueMap* self, const gchar* key, const gchar*
void key_value_map_set_int (KeyValueMap* self, const gchar* key, gint value) {
- const gchar* _tmp0_ = NULL;
- GeeHashMap* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+ const gchar* _tmp0_;
+ GeeHashMap* _tmp1_;
+ const gchar* _tmp2_;
+ gint _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
#line 41 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
g_return_if_fail (IS_KEY_VALUE_MAP (self));
#line 41 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -349,41 +349,41 @@ void key_value_map_set_int (KeyValueMap* self, const gchar* key, gint value) {
static gchar* double_to_string (gdouble self) {
gchar* result = NULL;
- gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gint _tmp1__length1 = 0;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ gint _tmp1__length1;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1__length1 = G_ASCII_DTOSTR_BUF_SIZE;
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = g_ascii_dtostr (_tmp1_, G_ASCII_DTOSTR_BUF_SIZE, self);
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = g_strdup (_tmp2_);
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = (g_free (_tmp1_), NULL);
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 377 "KeyValueMap.c"
}
void key_value_map_set_double (KeyValueMap* self, const gchar* key, gdouble value) {
- const gchar* _tmp0_ = NULL;
- GeeHashMap* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gdouble _tmp3_ = 0.0;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+ const gchar* _tmp0_;
+ GeeHashMap* _tmp1_;
+ const gchar* _tmp2_;
+ gdouble _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
#line 47 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
g_return_if_fail (IS_KEY_VALUE_MAP (self));
#line 47 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -411,12 +411,12 @@ void key_value_map_set_double (KeyValueMap* self, const gchar* key, gdouble valu
void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value) {
- const gchar* _tmp0_ = NULL;
- GeeHashMap* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gfloat _tmp3_ = 0.0F;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+ const gchar* _tmp0_;
+ GeeHashMap* _tmp1_;
+ const gchar* _tmp2_;
+ gfloat _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
#line 53 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
g_return_if_fail (IS_KEY_VALUE_MAP (self));
#line 53 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -445,24 +445,24 @@ void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value)
static gchar* bool_to_string (gboolean self) {
gchar* result = NULL;
-#line 37 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 37 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (self) {
#line 451 "KeyValueMap.c"
- gchar* _tmp0_ = NULL;
-#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup ("true");
-#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp0_;
-#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 459 "KeyValueMap.c"
} else {
- gchar* _tmp1_ = NULL;
-#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp1_;
+#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = g_strdup ("false");
-#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 468 "KeyValueMap.c"
}
@@ -470,12 +470,12 @@ static gchar* bool_to_string (gboolean self) {
void key_value_map_set_bool (KeyValueMap* self, const gchar* key, gboolean value) {
- const gchar* _tmp0_ = NULL;
- GeeHashMap* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+ const gchar* _tmp0_;
+ GeeHashMap* _tmp1_;
+ const gchar* _tmp2_;
+ gboolean _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
#line 59 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
g_return_if_fail (IS_KEY_VALUE_MAP (self));
#line 59 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -505,12 +505,12 @@ void key_value_map_set_bool (KeyValueMap* self, const gchar* key, gboolean value
gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gchar* def) {
gchar* result = NULL;
gchar* value = NULL;
- GeeHashMap* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gpointer _tmp2_ = NULL;
+ GeeHashMap* _tmp0_;
+ const gchar* _tmp1_;
+ gpointer _tmp2_;
const gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- gchar* _tmp7_ = NULL;
+ const gchar* _tmp4_;
+ gchar* _tmp7_;
#line 65 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
g_return_val_if_fail (IS_KEY_VALUE_MAP (self), NULL);
#line 65 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -528,14 +528,14 @@ gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gcha
#line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
if (_tmp4_ != NULL) {
#line 531 "KeyValueMap.c"
- const gchar* _tmp5_ = NULL;
+ const gchar* _tmp5_;
#line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
_tmp5_ = value;
#line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
_tmp3_ = _tmp5_;
#line 537 "KeyValueMap.c"
} else {
- const gchar* _tmp6_ = NULL;
+ const gchar* _tmp6_;
#line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
_tmp6_ = def;
#line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -557,11 +557,11 @@ gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gcha
gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def) {
gint result = 0;
gchar* value = NULL;
- GeeHashMap* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gpointer _tmp2_ = NULL;
+ GeeHashMap* _tmp0_;
+ const gchar* _tmp1_;
+ gpointer _tmp2_;
gint _tmp3_ = 0;
- const gchar* _tmp4_ = NULL;
+ const gchar* _tmp4_;
#line 71 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
g_return_val_if_fail (IS_KEY_VALUE_MAP (self), 0);
#line 71 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -579,8 +579,8 @@ gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def) {
#line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
if (_tmp4_ != NULL) {
#line 582 "KeyValueMap.c"
- const gchar* _tmp5_ = NULL;
- gint _tmp6_ = 0;
+ const gchar* _tmp5_;
+ gint _tmp6_;
#line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
_tmp5_ = value;
#line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -589,7 +589,7 @@ gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def) {
_tmp3_ = _tmp6_;
#line 591 "KeyValueMap.c"
} else {
- gint _tmp7_ = 0;
+ gint _tmp7_;
#line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
_tmp7_ = def;
#line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -608,17 +608,17 @@ gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def) {
static gdouble double_parse (const gchar* str) {
gdouble result = 0.0;
- const gchar* _tmp0_ = NULL;
- gdouble _tmp1_ = 0.0;
-#line 869 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ const gchar* _tmp0_;
+ gdouble _tmp1_;
+#line 877 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (str != NULL, 0.0);
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = g_ascii_strtod (_tmp0_, NULL);
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 624 "KeyValueMap.c"
}
@@ -627,11 +627,11 @@ static gdouble double_parse (const gchar* str) {
gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble def) {
gdouble result = 0.0;
gchar* value = NULL;
- GeeHashMap* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gpointer _tmp2_ = NULL;
+ GeeHashMap* _tmp0_;
+ const gchar* _tmp1_;
+ gpointer _tmp2_;
gdouble _tmp3_ = 0.0;
- const gchar* _tmp4_ = NULL;
+ const gchar* _tmp4_;
#line 77 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
g_return_val_if_fail (IS_KEY_VALUE_MAP (self), 0.0);
#line 77 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -649,8 +649,8 @@ gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble d
#line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
if (_tmp4_ != NULL) {
#line 652 "KeyValueMap.c"
- const gchar* _tmp5_ = NULL;
- gdouble _tmp6_ = 0.0;
+ const gchar* _tmp5_;
+ gdouble _tmp6_;
#line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
_tmp5_ = value;
#line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -659,7 +659,7 @@ gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble d
_tmp3_ = _tmp6_;
#line 661 "KeyValueMap.c"
} else {
- gdouble _tmp7_ = 0.0;
+ gdouble _tmp7_;
#line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
_tmp7_ = def;
#line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -679,11 +679,11 @@ gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble d
gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def) {
gfloat result = 0.0F;
gchar* value = NULL;
- GeeHashMap* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gpointer _tmp2_ = NULL;
+ GeeHashMap* _tmp0_;
+ const gchar* _tmp1_;
+ gpointer _tmp2_;
gfloat _tmp3_ = 0.0F;
- const gchar* _tmp4_ = NULL;
+ const gchar* _tmp4_;
#line 83 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
g_return_val_if_fail (IS_KEY_VALUE_MAP (self), 0.0F);
#line 83 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -701,8 +701,8 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def)
#line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
if (_tmp4_ != NULL) {
#line 704 "KeyValueMap.c"
- const gchar* _tmp5_ = NULL;
- gdouble _tmp6_ = 0.0;
+ const gchar* _tmp5_;
+ gdouble _tmp6_;
#line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
_tmp5_ = value;
#line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -711,7 +711,7 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def)
_tmp3_ = (gfloat) _tmp6_;
#line 713 "KeyValueMap.c"
} else {
- gfloat _tmp7_ = 0.0F;
+ gfloat _tmp7_;
#line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
_tmp7_ = def;
#line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -730,22 +730,22 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def)
static gboolean bool_parse (const gchar* str) {
gboolean result = FALSE;
- const gchar* _tmp0_ = NULL;
-#line 44 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ const gchar* _tmp0_;
+#line 44 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (str != NULL, FALSE);
-#line 45 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 45 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 45 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 45 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (g_strcmp0 (_tmp0_, "true") == 0) {
-#line 46 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 46 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = TRUE;
-#line 46 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 46 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 745 "KeyValueMap.c"
} else {
-#line 48 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 48 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = FALSE;
-#line 48 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 48 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 751 "KeyValueMap.c"
}
@@ -755,11 +755,11 @@ static gboolean bool_parse (const gchar* str) {
gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean def) {
gboolean result = FALSE;
gchar* value = NULL;
- GeeHashMap* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gpointer _tmp2_ = NULL;
+ GeeHashMap* _tmp0_;
+ const gchar* _tmp1_;
+ gpointer _tmp2_;
gboolean _tmp3_ = FALSE;
- const gchar* _tmp4_ = NULL;
+ const gchar* _tmp4_;
#line 89 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
g_return_val_if_fail (IS_KEY_VALUE_MAP (self), FALSE);
#line 89 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -777,8 +777,8 @@ gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean d
#line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
if (_tmp4_ != NULL) {
#line 780 "KeyValueMap.c"
- const gchar* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
+ const gchar* _tmp5_;
+ gboolean _tmp6_;
#line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
_tmp5_ = value;
#line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -787,7 +787,7 @@ gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean d
_tmp3_ = _tmp6_;
#line 789 "KeyValueMap.c"
} else {
- gboolean _tmp7_ = FALSE;
+ gboolean _tmp7_;
#line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
_tmp7_ = def;
#line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -806,10 +806,10 @@ gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean d
void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def, GdkPoint* result) {
gchar* value = NULL;
- GeeHashMap* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gpointer _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
+ GeeHashMap* _tmp0_;
+ const gchar* _tmp1_;
+ gpointer _tmp2_;
+ const gchar* _tmp3_;
#line 100 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
g_return_if_fail (IS_KEY_VALUE_MAP (self));
#line 100 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -829,7 +829,7 @@ void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def
#line 103 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
if (_tmp3_ == NULL) {
#line 832 "KeyValueMap.c"
- GdkPoint _tmp4_ = {0};
+ GdkPoint _tmp4_;
#line 104 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
_tmp4_ = *def;
#line 104 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -842,8 +842,8 @@ void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def
} else {
GdkPoint _result_ = {0};
GdkPoint _tmp5_ = {0};
- const gchar* _tmp6_ = NULL;
- gint _tmp7_ = 0;
+ const gchar* _tmp6_;
+ gint _tmp7_;
#line 106 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
_tmp5_.x = 0;
#line 106 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -862,7 +862,7 @@ void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def
return;
#line 864 "KeyValueMap.c"
} else {
- GdkPoint _tmp8_ = {0};
+ GdkPoint _tmp8_;
#line 110 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
_tmp8_ = *def;
#line 110 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -881,14 +881,14 @@ void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def
void key_value_map_set_point (KeyValueMap* self, const gchar* key, GdkPoint* point) {
- GeeHashMap* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- GdkPoint _tmp2_ = {0};
- gint _tmp3_ = 0;
- GdkPoint _tmp4_ = {0};
- gint _tmp5_ = 0;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
+ GeeHashMap* _tmp0_;
+ const gchar* _tmp1_;
+ GdkPoint _tmp2_;
+ gint _tmp3_;
+ GdkPoint _tmp4_;
+ gint _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
#line 114 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
g_return_if_fail (IS_KEY_VALUE_MAP (self));
#line 114 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -961,7 +961,7 @@ static gchar* value_key_value_map_collect_value (GValue* value, guint n_collect_
#line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
if (collect_values[0].v_pointer) {
#line 964 "KeyValueMap.c"
- KeyValueMap* object;
+ KeyValueMap * object;
object = collect_values[0].v_pointer;
#line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
if (object->parent_instance.g_class == NULL) {
@@ -988,7 +988,7 @@ static gchar* value_key_value_map_collect_value (GValue* value, guint n_collect_
static gchar* value_key_value_map_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- KeyValueMap** object_p;
+ KeyValueMap ** object_p;
object_p = collect_values[0].v_pointer;
#line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
if (!object_p) {
@@ -1040,7 +1040,7 @@ gpointer value_get_key_value_map (const GValue* value) {
void value_set_key_value_map (GValue* value, gpointer v_object) {
- KeyValueMap* old;
+ KeyValueMap * old;
#line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEY_VALUE_MAP));
#line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -1071,7 +1071,7 @@ void value_set_key_value_map (GValue* value, gpointer v_object) {
void value_take_key_value_map (GValue* value, gpointer v_object) {
- KeyValueMap* old;
+ KeyValueMap * old;
#line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEY_VALUE_MAP));
#line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -1111,7 +1111,7 @@ static void key_value_map_class_init (KeyValueMapClass * klass) {
static void key_value_map_instance_init (KeyValueMap * self) {
- GeeHashMap* _tmp0_ = NULL;
+ GeeHashMap* _tmp0_;
#line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
self->priv = KEY_VALUE_MAP_GET_PRIVATE (self);
#line 9 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -1124,7 +1124,7 @@ static void key_value_map_instance_init (KeyValueMap * self) {
}
-static void key_value_map_finalize (KeyValueMap* obj) {
+static void key_value_map_finalize (KeyValueMap * obj) {
KeyValueMap * self;
#line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_KEY_VALUE_MAP, KeyValueMap);
@@ -1153,7 +1153,7 @@ GType key_value_map_get_type (void) {
gpointer key_value_map_ref (gpointer instance) {
- KeyValueMap* self;
+ KeyValueMap * self;
self = instance;
#line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
g_atomic_int_inc (&self->ref_count);
@@ -1164,7 +1164,7 @@ gpointer key_value_map_ref (gpointer instance) {
void key_value_map_unref (gpointer instance) {
- KeyValueMap* self;
+ KeyValueMap * self;
self = instance;
#line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
diff --git a/src/util/Util.c b/src/util/Util.c
index 65ba704..45f48d9 100644
--- a/src/util/Util.c
+++ b/src/util/Util.c
@@ -1,4 +1,4 @@
-/* Util.c generated by valac 0.34.7, the Vala compiler
+/* Util.c generated by valac 0.36.6, the Vala compiler
* generated from Util.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/util/file.c b/src/util/file.c
index 3f4b228..2afe738 100644
--- a/src/util/file.c
+++ b/src/util/file.c
@@ -1,4 +1,4 @@
-/* file.c generated by valac 0.34.7, the Vala compiler
+/* file.c generated by valac 0.36.6, the Vala compiler
* generated from file.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -29,7 +29,7 @@ typedef gboolean (*ProgressMonitor) (guint64 current, guint64 total, gboolean do
gboolean claim_file (GFile* file, GError** error);
GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error);
-void disassemble_filename (const gchar* basename, gchar** name, gchar** ext);
+void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext);
glong find_last_offset (const gchar* str, gchar c);
guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GError** error);
void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor, void* monitor_target, guint64 file_count, GCancellable* cancellable, GError** error);
@@ -60,9 +60,9 @@ gboolean claim_file (GFile* file, GError** error) {
g_return_val_if_fail (G_IS_FILE (file), FALSE);
#line 62 "file.c"
{
- GFile* _tmp0_ = NULL;
- GFileOutputStream* _tmp1_ = NULL;
- GFileOutputStream* _tmp2_ = NULL;
+ GFile* _tmp0_;
+ GFileOutputStream* _tmp1_;
+ GFileOutputStream* _tmp2_;
#line 14 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp0_ = file;
#line 14 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -86,7 +86,7 @@ gboolean claim_file (GFile* file, GError** error) {
__catch0_g_error:
{
GError* err = NULL;
- GError* _tmp3_ = NULL;
+ GError* _tmp3_;
#line 13 "/home/jens/Source/shotwell/src/util/file.vala"
err = _inner_error_;
#line 13 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -96,13 +96,13 @@ gboolean claim_file (GFile* file, GError** error) {
#line 20 "/home/jens/Source/shotwell/src/util/file.vala"
if (!g_error_matches (_tmp3_, G_IO_ERROR, G_IO_ERROR_EXISTS)) {
#line 99 "file.c"
- GFile* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- GError* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- GError* _tmp9_ = NULL;
- GError* _tmp10_ = NULL;
+ GFile* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ GError* _tmp7_;
+ const gchar* _tmp8_;
+ GError* _tmp9_;
+ GError* _tmp10_;
#line 21 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp4_ = file;
#line 21 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -149,21 +149,21 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
gboolean _vala_collision = FALSE;
GFile* result = NULL;
GFile* file = NULL;
- GFile* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
+ GFile* _tmp0_;
+ const gchar* _tmp1_;
+ GFile* _tmp2_;
gboolean _tmp3_ = FALSE;
- GFile* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
+ GFile* _tmp4_;
+ gboolean _tmp5_;
gchar* name = NULL;
gchar* ext = NULL;
- const gchar* _tmp6_ = NULL;
+ const gchar* _tmp6_;
gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
- GFile* _tmp28_ = NULL;
- gchar* _tmp29_ = NULL;
- gchar* _tmp30_ = NULL;
- const gchar* _tmp31_ = NULL;
+ GFile* _tmp28_;
+ gchar* _tmp29_;
+ gchar* _tmp30_;
+ const gchar* _tmp31_;
GError * _inner_error_ = NULL;
#line 36 "/home/jens/Source/shotwell/src/util/file.vala"
g_return_val_if_fail (G_IS_FILE (dir), NULL);
@@ -236,21 +236,21 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
#line 52 "/home/jens/Source/shotwell/src/util/file.vala"
while (TRUE) {
#line 239 "file.c"
- gint _tmp11_ = 0;
+ gint _tmp11_;
gchar* _tmp12_ = NULL;
- const gchar* _tmp13_ = NULL;
+ const gchar* _tmp13_;
gchar* new_name = NULL;
- gchar* _tmp21_ = NULL;
- GFile* _tmp22_ = NULL;
- const gchar* _tmp23_ = NULL;
- GFile* _tmp24_ = NULL;
+ gchar* _tmp21_;
+ GFile* _tmp22_;
+ const gchar* _tmp23_;
+ GFile* _tmp24_;
gboolean _tmp25_ = FALSE;
- GFile* _tmp26_ = NULL;
- gboolean _tmp27_ = FALSE;
+ GFile* _tmp26_;
+ gboolean _tmp27_;
#line 52 "/home/jens/Source/shotwell/src/util/file.vala"
if (!_tmp9_) {
#line 253 "file.c"
- gint _tmp10_ = 0;
+ gint _tmp10_;
#line 52 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp10_ = ctr;
#line 52 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -272,10 +272,10 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
#line 53 "/home/jens/Source/shotwell/src/util/file.vala"
if (_tmp13_ != NULL) {
#line 275 "file.c"
- const gchar* _tmp14_ = NULL;
- gint _tmp15_ = 0;
- const gchar* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
+ const gchar* _tmp14_;
+ gint _tmp15_;
+ const gchar* _tmp16_;
+ gchar* _tmp17_;
#line 53 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp14_ = name;
#line 53 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -290,9 +290,9 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
_tmp12_ = _tmp17_;
#line 292 "file.c"
} else {
- const gchar* _tmp18_ = NULL;
- gint _tmp19_ = 0;
- gchar* _tmp20_ = NULL;
+ const gchar* _tmp18_;
+ gint _tmp19_;
+ gchar* _tmp20_;
#line 53 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp18_ = name;
#line 53 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -408,41 +408,41 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
static glong string_strnlen (gchar* str, glong maxlen) {
glong result = 0L;
gchar* end = NULL;
- gchar* _tmp0_ = NULL;
- glong _tmp1_ = 0L;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+ glong _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
#line 428 "file.c"
- glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 436 "file.c"
} else {
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 448 "file.c"
}
@@ -453,133 +453,133 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
gchar* result = NULL;
glong string_length = 0L;
gboolean _tmp0_ = FALSE;
- glong _tmp1_ = 0L;
- glong _tmp8_ = 0L;
- glong _tmp14_ = 0L;
- glong _tmp17_ = 0L;
- glong _tmp18_ = 0L;
- glong _tmp19_ = 0L;
- glong _tmp20_ = 0L;
- glong _tmp21_ = 0L;
- gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp1_;
+ glong _tmp8_;
+ glong _tmp14_;
+ glong _tmp17_;
+ glong _tmp18_;
+ glong _tmp19_;
+ glong _tmp20_;
+ glong _tmp21_;
+ gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
#line 472 "file.c"
- glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
#line 478 "file.c"
} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
#line 482 "file.c"
}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp0_) {
#line 486 "file.c"
- glong _tmp3_ = 0L;
- glong _tmp4_ = 0L;
- glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp3_;
+ glong _tmp4_;
+ glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
string_length = _tmp5_;
#line 498 "file.c"
} else {
- gint _tmp6_ = 0;
- gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gint _tmp6_;
+ gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
#line 508 "file.c"
}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
#line 514 "file.c"
- glong _tmp9_ = 0L;
- glong _tmp10_ = 0L;
- glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp9_;
+ glong _tmp10_;
+ glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
#line 528 "file.c"
} else {
- glong _tmp12_ = 0L;
- glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp12_;
+ glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
#line 538 "file.c"
}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
#line 544 "file.c"
- glong _tmp15_ = 0L;
- glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp15_;
+ glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
#line 553 "file.c"
}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 573 "file.c"
}
-void disassemble_filename (const gchar* basename, gchar** name, gchar** ext) {
+void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext) {
gchar* _vala_name = NULL;
gchar* _vala_ext = NULL;
glong offset = 0L;
- const gchar* _tmp0_ = NULL;
- glong _tmp1_ = 0L;
- glong _tmp2_ = 0L;
+ const gchar* _tmp0_;
+ glong _tmp1_;
+ glong _tmp2_;
#line 65 "/home/jens/Source/shotwell/src/util/file.vala"
g_return_if_fail (basename != NULL);
#line 66 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -593,8 +593,8 @@ void disassemble_filename (const gchar* basename, gchar** name, gchar** ext) {
#line 67 "/home/jens/Source/shotwell/src/util/file.vala"
if (_tmp2_ <= ((glong) 0)) {
#line 596 "file.c"
- const gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
#line 68 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp3_ = basename;
#line 68 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -609,12 +609,12 @@ void disassemble_filename (const gchar* basename, gchar** name, gchar** ext) {
_vala_ext = NULL;
#line 611 "file.c"
} else {
- const gchar* _tmp5_ = NULL;
- glong _tmp6_ = 0L;
- gchar* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- glong _tmp9_ = 0L;
- gchar* _tmp10_ = NULL;
+ const gchar* _tmp5_;
+ glong _tmp6_;
+ gchar* _tmp7_;
+ const gchar* _tmp8_;
+ glong _tmp9_;
+ gchar* _tmp10_;
#line 71 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp5_ = basename;
#line 71 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -663,9 +663,9 @@ void disassemble_filename (const gchar* basename, gchar** name, gchar** ext) {
guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GError** error) {
guint64 result = 0ULL;
GFileType type = 0;
- GFile* _tmp0_ = NULL;
- GFileType _tmp1_ = 0;
- GFileType _tmp2_ = 0;
+ GFile* _tmp0_;
+ GFileType _tmp1_;
+ GFileType _tmp2_;
GFileEnumerator* enumerator = NULL;
guint64 total_bytes = 0ULL;
GFileInfo* info = NULL;
@@ -686,17 +686,17 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
if (_tmp2_ == G_FILE_TYPE_REGULAR) {
#line 688 "file.c"
GFileInfo* info = NULL;
- GFileInfo* _tmp17_ = NULL;
- gint64 _tmp18_ = 0LL;
+ GFileInfo* _tmp17_;
+ gint64 _tmp18_;
#line 80 "/home/jens/Source/shotwell/src/util/file.vala"
info = NULL;
#line 694 "file.c"
{
GFileInfo* _tmp3_ = NULL;
- GFile* _tmp4_ = NULL;
- GCancellable* _tmp5_ = NULL;
- GFileInfo* _tmp6_ = NULL;
- GFileInfo* _tmp7_ = NULL;
+ GFile* _tmp4_;
+ GCancellable* _tmp5_;
+ GFileInfo* _tmp6_;
+ GFileInfo* _tmp7_;
#line 82 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp4_ = file_or_dir;
#line 82 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -726,12 +726,12 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
__catch1_g_error:
{
GError* err = NULL;
- GError* _tmp8_ = NULL;
- GFile* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
- GError* _tmp14_ = NULL;
- const gchar* _tmp15_ = NULL;
+ GError* _tmp8_;
+ GFile* _tmp11_;
+ gchar* _tmp12_;
+ gchar* _tmp13_;
+ GError* _tmp14_;
+ const gchar* _tmp15_;
#line 81 "/home/jens/Source/shotwell/src/util/file.vala"
err = _inner_error_;
#line 81 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -741,8 +741,8 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
#line 85 "/home/jens/Source/shotwell/src/util/file.vala"
if (g_error_matches (_tmp8_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
#line 744 "file.c"
- GError* _tmp9_ = NULL;
- GError* _tmp10_ = NULL;
+ GError* _tmp9_;
+ GError* _tmp10_;
#line 86 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp9_ = err;
#line 86 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -803,7 +803,7 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
return result;
#line 805 "file.c"
} else {
- GFileType _tmp19_ = 0;
+ GFileType _tmp19_;
#line 94 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp19_ = type;
#line 94 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -817,11 +817,11 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
}
{
GFileEnumerator* _tmp20_ = NULL;
- GFile* _tmp21_ = NULL;
- GCancellable* _tmp22_ = NULL;
- GFileEnumerator* _tmp23_ = NULL;
- GFileEnumerator* _tmp24_ = NULL;
- GFileEnumerator* _tmp25_ = NULL;
+ GFile* _tmp21_;
+ GCancellable* _tmp22_;
+ GFileEnumerator* _tmp23_;
+ GFileEnumerator* _tmp24_;
+ GFileEnumerator* _tmp25_;
#line 100 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp21_ = file_or_dir;
#line 100 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -866,9 +866,9 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
{
GError* err = NULL;
gboolean _tmp26_ = FALSE;
- GError* _tmp27_ = NULL;
- GError* _tmp29_ = NULL;
- GError* _tmp30_ = NULL;
+ GError* _tmp27_;
+ GError* _tmp29_;
+ GError* _tmp30_;
#line 99 "/home/jens/Source/shotwell/src/util/file.vala"
err = _inner_error_;
#line 99 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -881,7 +881,7 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
_tmp26_ = TRUE;
#line 883 "file.c"
} else {
- GError* _tmp28_ = NULL;
+ GError* _tmp28_;
#line 106 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp28_ = err;
#line 106 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -932,21 +932,21 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
while (TRUE) {
#line 934 "file.c"
GFileInfo* _tmp32_ = NULL;
- GFileEnumerator* _tmp33_ = NULL;
- GCancellable* _tmp34_ = NULL;
- GFileInfo* _tmp35_ = NULL;
- GFileInfo* _tmp37_ = NULL;
- GFileInfo* _tmp38_ = NULL;
+ GFileEnumerator* _tmp33_;
+ GCancellable* _tmp34_;
+ GFileInfo* _tmp35_;
+ GFileInfo* _tmp37_;
+ GFileInfo* _tmp38_;
guint64 _tmp39_ = 0ULL;
- GFile* _tmp40_ = NULL;
- GFileInfo* _tmp41_ = NULL;
- const gchar* _tmp42_ = NULL;
- GFile* _tmp43_ = NULL;
- GFile* _tmp44_ = NULL;
- GCancellable* _tmp45_ = NULL;
- guint64 _tmp46_ = 0ULL;
- guint64 _tmp47_ = 0ULL;
- guint64 _tmp49_ = 0ULL;
+ GFile* _tmp40_;
+ GFileInfo* _tmp41_;
+ const gchar* _tmp42_;
+ GFile* _tmp43_;
+ GFile* _tmp44_;
+ GCancellable* _tmp45_;
+ guint64 _tmp46_;
+ guint64 _tmp47_;
+ guint64 _tmp49_;
#line 115 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp33_ = enumerator;
#line 115 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1045,13 +1045,13 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor, void* monitor_target, guint64 file_count, GCancellable* cancellable, GError** error) {
GFileType type = 0;
- GFile* _tmp0_ = NULL;
- GFileType _tmp1_ = 0;
- GFileType _tmp2_ = 0;
+ GFile* _tmp0_;
+ GFileType _tmp1_;
+ GFileType _tmp2_;
GFileEnumerator* enumerator = NULL;
- GFile* _tmp10_ = NULL;
- GCancellable* _tmp11_ = NULL;
- GFileEnumerator* _tmp12_ = NULL;
+ GFile* _tmp10_;
+ GCancellable* _tmp11_;
+ GFileEnumerator* _tmp12_;
GFileInfo* info = NULL;
guint64 i = 0ULL;
GError * _inner_error_ = NULL;
@@ -1072,13 +1072,13 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
#line 128 "/home/jens/Source/shotwell/src/util/file.vala"
if (_tmp2_ != G_FILE_TYPE_DIRECTORY) {
#line 1075 "file.c"
- GFile* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- GError* _tmp8_ = NULL;
- GError* _tmp9_ = NULL;
+ GFile* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ GError* _tmp8_;
+ GError* _tmp9_;
#line 129 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp3_ = dir;
#line 129 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1129,23 +1129,23 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
while (TRUE) {
#line 1131 "file.c"
GFileInfo* _tmp13_ = NULL;
- GFileEnumerator* _tmp14_ = NULL;
- GCancellable* _tmp15_ = NULL;
- GFileInfo* _tmp16_ = NULL;
- GFileInfo* _tmp17_ = NULL;
- GFileInfo* _tmp18_ = NULL;
- GFileInfo* _tmp19_ = NULL;
- GFileType _tmp20_ = 0;
+ GFileEnumerator* _tmp14_;
+ GCancellable* _tmp15_;
+ GFileInfo* _tmp16_;
+ GFileInfo* _tmp17_;
+ GFileInfo* _tmp18_;
+ GFileInfo* _tmp19_;
+ GFileType _tmp20_;
gboolean _tmp21_ = FALSE;
- GeeSet* _tmp22_ = NULL;
+ GeeSet* _tmp22_;
GFile* file = NULL;
- GFile* _tmp27_ = NULL;
- GFileInfo* _tmp28_ = NULL;
- const gchar* _tmp29_ = NULL;
- GFile* _tmp30_ = NULL;
+ GFile* _tmp27_;
+ GFileInfo* _tmp28_;
+ const gchar* _tmp29_;
+ GFile* _tmp30_;
gboolean _tmp38_ = FALSE;
- ProgressMonitor _tmp39_ = NULL;
- void* _tmp39__target = NULL;
+ ProgressMonitor _tmp39_;
+ void* _tmp39__target;
#line 135 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp14_ = enumerator;
#line 135 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1201,10 +1201,10 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
#line 139 "/home/jens/Source/shotwell/src/util/file.vala"
if (_tmp22_ != NULL) {
#line 1204 "file.c"
- GeeSet* _tmp23_ = NULL;
- GFileInfo* _tmp24_ = NULL;
- const gchar* _tmp25_ = NULL;
- gboolean _tmp26_ = FALSE;
+ GeeSet* _tmp23_;
+ GFileInfo* _tmp24_;
+ const gchar* _tmp25_;
+ gboolean _tmp26_;
#line 139 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp23_ = exceptions;
#line 139 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1241,8 +1241,8 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
file = _tmp30_;
#line 1243 "file.c"
{
- GFile* _tmp31_ = NULL;
- GCancellable* _tmp32_ = NULL;
+ GFile* _tmp31_;
+ GCancellable* _tmp32_;
#line 144 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp31_ = file;
#line 144 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1259,11 +1259,11 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
__catch3_g_error:
{
GError* err = NULL;
- GFile* _tmp33_ = NULL;
- gchar* _tmp34_ = NULL;
- gchar* _tmp35_ = NULL;
- GError* _tmp36_ = NULL;
- const gchar* _tmp37_ = NULL;
+ GFile* _tmp33_;
+ gchar* _tmp34_;
+ gchar* _tmp35_;
+ GError* _tmp36_;
+ const gchar* _tmp37_;
#line 143 "/home/jens/Source/shotwell/src/util/file.vala"
err = _inner_error_;
#line 143 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1310,7 +1310,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
#line 149 "/home/jens/Source/shotwell/src/util/file.vala"
if (_tmp39_ != NULL) {
#line 1313 "file.c"
- guint64 _tmp40_ = 0ULL;
+ guint64 _tmp40_;
#line 149 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp40_ = file_count;
#line 149 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1324,11 +1324,11 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
#line 149 "/home/jens/Source/shotwell/src/util/file.vala"
if (_tmp38_) {
#line 1327 "file.c"
- ProgressMonitor _tmp41_ = NULL;
- void* _tmp41__target = NULL;
- guint64 _tmp42_ = 0ULL;
- guint64 _tmp43_ = 0ULL;
- guint64 _tmp44_ = 0ULL;
+ ProgressMonitor _tmp41_;
+ void* _tmp41__target;
+ guint64 _tmp42_;
+ guint64 _tmp43_;
+ guint64 _tmp44_;
#line 150 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp41_ = monitor;
#line 150 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1362,10 +1362,10 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
time_t query_file_modified (GFile* file, GError** error) {
time_t result = 0;
GFileInfo* info = NULL;
- GFile* _tmp0_ = NULL;
- GFileInfo* _tmp1_ = NULL;
+ GFile* _tmp0_;
+ GFileInfo* _tmp1_;
GTimeVal _tmp3_ = {0};
- glong _tmp4_ = 0L;
+ glong _tmp4_;
GError * _inner_error_ = NULL;
#line 154 "/home/jens/Source/shotwell/src/util/file.vala"
g_return_val_if_fail (G_IS_FILE (file), 0);
@@ -1401,8 +1401,8 @@ time_t query_file_modified (GFile* file, GError** error) {
gboolean query_is_directory (GFile* file) {
gboolean result = FALSE;
- GFile* _tmp0_ = NULL;
- GFileType _tmp1_ = 0;
+ GFile* _tmp0_;
+ GFileType _tmp1_;
#line 161 "/home/jens/Source/shotwell/src/util/file.vala"
g_return_val_if_fail (G_IS_FILE (file), FALSE);
#line 162 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1419,18 +1419,15 @@ gboolean query_is_directory (GFile* file) {
gboolean query_is_directory_empty (GFile* dir, GError** error) {
gboolean result = FALSE;
- GFile* _tmp0_ = NULL;
- GFileType _tmp1_ = 0;
+ GFile* _tmp0_;
+ GFileType _tmp1_;
GFileEnumerator* enumerator = NULL;
- GFile* _tmp2_ = NULL;
- GFileEnumerator* _tmp3_ = NULL;
- GFileEnumerator* _tmp5_ = NULL;
+ GFile* _tmp2_;
+ GFileEnumerator* _tmp3_;
+ GFileEnumerator* _tmp5_;
GFileInfo* _tmp6_ = NULL;
- GFileEnumerator* _tmp7_ = NULL;
- GFileInfo* _tmp8_ = NULL;
- GFileInfo* _tmp10_ = NULL;
- GFileInfo* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
+ GFileEnumerator* _tmp7_;
+ GFileInfo* _tmp8_;
GError * _inner_error_ = NULL;
#line 165 "/home/jens/Source/shotwell/src/util/file.vala"
g_return_val_if_fail (G_IS_FILE (dir), FALSE);
@@ -1444,7 +1441,7 @@ gboolean query_is_directory_empty (GFile* dir, GError** error) {
result = FALSE;
#line 167 "/home/jens/Source/shotwell/src/util/file.vala"
return result;
-#line 1448 "file.c"
+#line 1445 "file.c"
}
#line 169 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp2_ = dir;
@@ -1454,13 +1451,13 @@ gboolean query_is_directory_empty (GFile* dir, GError** error) {
enumerator = _tmp3_;
#line 169 "/home/jens/Source/shotwell/src/util/file.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1458 "file.c"
+#line 1455 "file.c"
gboolean _tmp4_ = FALSE;
#line 169 "/home/jens/Source/shotwell/src/util/file.vala"
g_propagate_error (error, _inner_error_);
#line 169 "/home/jens/Source/shotwell/src/util/file.vala"
return _tmp4_;
-#line 1464 "file.c"
+#line 1461 "file.c"
}
#line 171 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp5_ = enumerator;
@@ -1472,7 +1469,7 @@ gboolean query_is_directory_empty (GFile* dir, GError** error) {
_g_object_unref0 (enumerator);
#line 172 "/home/jens/Source/shotwell/src/util/file.vala"
return result;
-#line 1476 "file.c"
+#line 1473 "file.c"
}
#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp7_ = enumerator;
@@ -1482,7 +1479,7 @@ gboolean query_is_directory_empty (GFile* dir, GError** error) {
_tmp6_ = _tmp8_;
#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1486 "file.c"
+#line 1483 "file.c"
gboolean _tmp9_ = FALSE;
#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
g_propagate_error (error, _inner_error_);
@@ -1490,43 +1487,33 @@ gboolean query_is_directory_empty (GFile* dir, GError** error) {
_g_object_unref0 (enumerator);
#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
return _tmp9_;
-#line 1494 "file.c"
+#line 1491 "file.c"
}
#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
- _tmp10_ = _tmp6_;
-#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
- _tmp6_ = NULL;
-#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
- _tmp11_ = _tmp10_;
-#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
- _tmp12_ = _tmp11_ == NULL;
-#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
- _g_object_unref0 (_tmp11_);
-#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
- result = _tmp12_;
+ result = _tmp6_ == NULL;
#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
_g_object_unref0 (_tmp6_);
#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
_g_object_unref0 (enumerator);
#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
return result;
-#line 1514 "file.c"
+#line 1501 "file.c"
}
gchar* get_display_pathname (GFile* file) {
gchar* result = NULL;
gchar* path = NULL;
- GFile* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ GFile* _tmp0_;
+ gchar* _tmp1_;
gchar* home = NULL;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- const gchar* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
+ const gchar* _tmp4_;
+ const gchar* _tmp5_;
+ const gchar* _tmp7_;
+ const gchar* _tmp8_;
+ gboolean _tmp9_;
#line 177 "/home/jens/Source/shotwell/src/util/file.vala"
g_return_val_if_fail (G_IS_FILE (file), NULL);
#line 179 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1547,8 +1534,8 @@ gchar* get_display_pathname (GFile* file) {
_tmp5_ = home;
#line 182 "/home/jens/Source/shotwell/src/util/file.vala"
if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 1551 "file.c"
- gchar* _tmp6_ = NULL;
+#line 1538 "file.c"
+ gchar* _tmp6_;
#line 183 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp6_ = g_strdup ("~");
#line 183 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1559,7 +1546,7 @@ gchar* get_display_pathname (GFile* file) {
_g_free0 (path);
#line 183 "/home/jens/Source/shotwell/src/util/file.vala"
return result;
-#line 1563 "file.c"
+#line 1550 "file.c"
}
#line 185 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp7_ = path;
@@ -1569,15 +1556,15 @@ gchar* get_display_pathname (GFile* file) {
_tmp9_ = g_str_has_prefix (_tmp7_, _tmp8_);
#line 185 "/home/jens/Source/shotwell/src/util/file.vala"
if (_tmp9_) {
-#line 1573 "file.c"
- const gchar* _tmp10_ = NULL;
- const gchar* _tmp11_ = NULL;
- gint _tmp12_ = 0;
- gint _tmp13_ = 0;
- gchar* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
+#line 1560 "file.c"
+ const gchar* _tmp10_;
+ const gchar* _tmp11_;
+ gint _tmp12_;
+ gint _tmp13_;
+ gchar* _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
+ gchar* _tmp17_;
#line 186 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp10_ = path;
#line 186 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1604,7 +1591,7 @@ gchar* get_display_pathname (GFile* file) {
_g_free0 (path);
#line 186 "/home/jens/Source/shotwell/src/util/file.vala"
return result;
-#line 1608 "file.c"
+#line 1595 "file.c"
}
#line 188 "/home/jens/Source/shotwell/src/util/file.vala"
result = path;
@@ -1612,20 +1599,20 @@ gchar* get_display_pathname (GFile* file) {
_g_free0 (home);
#line 188 "/home/jens/Source/shotwell/src/util/file.vala"
return result;
-#line 1616 "file.c"
+#line 1603 "file.c"
}
gchar* strip_pretty_path (const gchar* path) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- const gchar* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
+ const gchar* _tmp0_;
+ gboolean _tmp1_;
+ const gchar* _tmp4_;
+ const gchar* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
#line 191 "/home/jens/Source/shotwell/src/util/file.vala"
g_return_val_if_fail (path != NULL, NULL);
#line 192 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1634,9 +1621,9 @@ gchar* strip_pretty_path (const gchar* path) {
_tmp1_ = g_str_has_prefix (_tmp0_, "~");
#line 192 "/home/jens/Source/shotwell/src/util/file.vala"
if (!_tmp1_) {
-#line 1638 "file.c"
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
+#line 1625 "file.c"
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
#line 193 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp2_ = path;
#line 193 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1645,7 +1632,7 @@ gchar* strip_pretty_path (const gchar* path) {
result = _tmp3_;
#line 193 "/home/jens/Source/shotwell/src/util/file.vala"
return result;
-#line 1649 "file.c"
+#line 1636 "file.c"
}
#line 195 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp4_ = g_get_home_dir ();
@@ -1665,15 +1652,15 @@ gchar* strip_pretty_path (const gchar* path) {
result = _tmp9_;
#line 195 "/home/jens/Source/shotwell/src/util/file.vala"
return result;
-#line 1669 "file.c"
+#line 1656 "file.c"
}
gchar* get_file_info_id (GFileInfo* info) {
gchar* result = NULL;
- GFileInfo* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
+ GFileInfo* _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
#line 198 "/home/jens/Source/shotwell/src/util/file.vala"
g_return_val_if_fail (G_IS_FILE_INFO (info), NULL);
#line 199 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1686,7 +1673,7 @@ gchar* get_file_info_id (GFileInfo* info) {
result = _tmp2_;
#line 199 "/home/jens/Source/shotwell/src/util/file.vala"
return result;
-#line 1690 "file.c"
+#line 1677 "file.c"
}
@@ -1696,24 +1683,24 @@ void skip_uint64 (GInputStream* input, guint64 skip_amount, GError** error) {
g_return_if_fail (G_IS_INPUT_STREAM (input));
#line 204 "/home/jens/Source/shotwell/src/util/file.vala"
while (TRUE) {
-#line 1700 "file.c"
- guint64 _tmp0_ = 0ULL;
- guint64 _tmp1_ = 0ULL;
+#line 1687 "file.c"
+ guint64 _tmp0_;
+ guint64 _tmp1_;
#line 204 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp0_ = skip_amount;
#line 204 "/home/jens/Source/shotwell/src/util/file.vala"
if (!(_tmp0_ > ((guint64) 0))) {
#line 204 "/home/jens/Source/shotwell/src/util/file.vala"
break;
-#line 1709 "file.c"
+#line 1696 "file.c"
}
#line 206 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp1_ = skip_amount;
#line 206 "/home/jens/Source/shotwell/src/util/file.vala"
if (_tmp1_ >= ((guint64) G_MAXSSIZE)) {
-#line 1715 "file.c"
- GInputStream* _tmp2_ = NULL;
- guint64 _tmp3_ = 0ULL;
+#line 1702 "file.c"
+ GInputStream* _tmp2_;
+ guint64 _tmp3_;
#line 207 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp2_ = input;
#line 207 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1724,16 +1711,16 @@ void skip_uint64 (GInputStream* input, guint64 skip_amount, GError** error) {
g_propagate_error (error, _inner_error_);
#line 207 "/home/jens/Source/shotwell/src/util/file.vala"
return;
-#line 1728 "file.c"
+#line 1715 "file.c"
}
#line 208 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp3_ = skip_amount;
#line 208 "/home/jens/Source/shotwell/src/util/file.vala"
skip_amount = _tmp3_ - G_MAXSSIZE;
-#line 1734 "file.c"
+#line 1721 "file.c"
} else {
- GInputStream* _tmp4_ = NULL;
- guint64 _tmp5_ = 0ULL;
+ GInputStream* _tmp4_;
+ guint64 _tmp5_;
#line 210 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp4_ = input;
#line 210 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1746,11 +1733,11 @@ void skip_uint64 (GInputStream* input, guint64 skip_amount, GError** error) {
g_propagate_error (error, _inner_error_);
#line 210 "/home/jens/Source/shotwell/src/util/file.vala"
return;
-#line 1750 "file.c"
+#line 1737 "file.c"
}
#line 211 "/home/jens/Source/shotwell/src/util/file.vala"
skip_amount = (guint64) 0;
-#line 1754 "file.c"
+#line 1741 "file.c"
}
}
}
@@ -1758,12 +1745,12 @@ void skip_uint64 (GInputStream* input, guint64 skip_amount, GError** error) {
guint64 count_files_in_directory (GFile* dir, GError** error) {
guint64 result = 0ULL;
- GFile* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ GFile* _tmp0_;
+ gboolean _tmp1_;
guint64 count = 0ULL;
GFileEnumerator* enumerator = NULL;
- GFile* _tmp2_ = NULL;
- GFileEnumerator* _tmp3_ = NULL;
+ GFile* _tmp2_;
+ GFileEnumerator* _tmp3_;
GFileInfo* info = NULL;
GError * _inner_error_ = NULL;
#line 217 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1778,7 +1765,7 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
result = (guint64) 0;
#line 219 "/home/jens/Source/shotwell/src/util/file.vala"
return result;
-#line 1782 "file.c"
+#line 1769 "file.c"
}
#line 221 "/home/jens/Source/shotwell/src/util/file.vala"
count = (guint64) 0;
@@ -1790,25 +1777,25 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
enumerator = _tmp3_;
#line 222 "/home/jens/Source/shotwell/src/util/file.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1794 "file.c"
+#line 1781 "file.c"
guint64 _tmp4_ = 0ULL;
#line 222 "/home/jens/Source/shotwell/src/util/file.vala"
g_propagate_error (error, _inner_error_);
#line 222 "/home/jens/Source/shotwell/src/util/file.vala"
return _tmp4_;
-#line 1800 "file.c"
+#line 1787 "file.c"
}
#line 225 "/home/jens/Source/shotwell/src/util/file.vala"
info = NULL;
#line 226 "/home/jens/Source/shotwell/src/util/file.vala"
while (TRUE) {
-#line 1806 "file.c"
+#line 1793 "file.c"
GFileInfo* _tmp5_ = NULL;
- GFileEnumerator* _tmp6_ = NULL;
- GFileInfo* _tmp7_ = NULL;
- GFileInfo* _tmp9_ = NULL;
- GFileInfo* _tmp10_ = NULL;
- guint64 _tmp11_ = 0ULL;
+ GFileEnumerator* _tmp6_;
+ GFileInfo* _tmp7_;
+ GFileInfo* _tmp9_;
+ GFileInfo* _tmp10_;
+ guint64 _tmp11_;
#line 226 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp6_ = enumerator;
#line 226 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1817,7 +1804,7 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
_tmp5_ = _tmp7_;
#line 226 "/home/jens/Source/shotwell/src/util/file.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1821 "file.c"
+#line 1808 "file.c"
guint64 _tmp8_ = 0ULL;
#line 226 "/home/jens/Source/shotwell/src/util/file.vala"
g_propagate_error (error, _inner_error_);
@@ -1827,7 +1814,7 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
_g_object_unref0 (enumerator);
#line 226 "/home/jens/Source/shotwell/src/util/file.vala"
return _tmp8_;
-#line 1831 "file.c"
+#line 1818 "file.c"
}
#line 226 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp9_ = _tmp5_;
@@ -1845,7 +1832,7 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
_g_object_unref0 (_tmp5_);
#line 226 "/home/jens/Source/shotwell/src/util/file.vala"
break;
-#line 1849 "file.c"
+#line 1836 "file.c"
}
#line 227 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp11_ = count;
@@ -1853,7 +1840,7 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
count = _tmp11_ + 1;
#line 226 "/home/jens/Source/shotwell/src/util/file.vala"
_g_object_unref0 (_tmp5_);
-#line 1857 "file.c"
+#line 1844 "file.c"
}
#line 229 "/home/jens/Source/shotwell/src/util/file.vala"
result = count;
@@ -1863,7 +1850,7 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
_g_object_unref0 (enumerator);
#line 229 "/home/jens/Source/shotwell/src/util/file.vala"
return result;
-#line 1867 "file.c"
+#line 1854 "file.c"
}
@@ -1871,7 +1858,7 @@ gboolean file_equal (GFile* a, GFile* b) {
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
- GFile* _tmp2_ = NULL;
+ GFile* _tmp2_;
#line 233 "/home/jens/Source/shotwell/src/util/file.vala"
g_return_val_if_fail ((a == NULL) || G_IS_FILE (a), FALSE);
#line 233 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1880,24 +1867,24 @@ gboolean file_equal (GFile* a, GFile* b) {
_tmp2_ = a;
#line 234 "/home/jens/Source/shotwell/src/util/file.vala"
if (_tmp2_ != NULL) {
-#line 1884 "file.c"
- GFile* _tmp3_ = NULL;
+#line 1871 "file.c"
+ GFile* _tmp3_;
#line 234 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp3_ = b;
#line 234 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp1_ = _tmp3_ != NULL;
-#line 1890 "file.c"
+#line 1877 "file.c"
} else {
#line 234 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp1_ = FALSE;
-#line 1894 "file.c"
+#line 1881 "file.c"
}
#line 234 "/home/jens/Source/shotwell/src/util/file.vala"
if (_tmp1_) {
-#line 1898 "file.c"
- GFile* _tmp4_ = NULL;
- GFile* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
+#line 1885 "file.c"
+ GFile* _tmp4_;
+ GFile* _tmp5_;
+ gboolean _tmp6_;
#line 234 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp4_ = a;
#line 234 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1906,50 +1893,50 @@ gboolean file_equal (GFile* a, GFile* b) {
_tmp6_ = g_file_equal (_tmp4_, _tmp5_);
#line 234 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp0_ = _tmp6_;
-#line 1910 "file.c"
+#line 1897 "file.c"
} else {
#line 234 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp0_ = FALSE;
-#line 1914 "file.c"
+#line 1901 "file.c"
}
#line 234 "/home/jens/Source/shotwell/src/util/file.vala"
result = _tmp0_;
#line 234 "/home/jens/Source/shotwell/src/util/file.vala"
return result;
-#line 1920 "file.c"
+#line 1907 "file.c"
}
guint file_hash (GFile* file) {
guint result = 0U;
guint _tmp0_ = 0U;
- GFile* _tmp1_ = NULL;
+ GFile* _tmp1_;
#line 238 "/home/jens/Source/shotwell/src/util/file.vala"
g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), 0U);
#line 239 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp1_ = file;
#line 239 "/home/jens/Source/shotwell/src/util/file.vala"
if (_tmp1_ != NULL) {
-#line 1934 "file.c"
- GFile* _tmp2_ = NULL;
- guint _tmp3_ = 0U;
+#line 1921 "file.c"
+ GFile* _tmp2_;
+ guint _tmp3_;
#line 239 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp2_ = file;
#line 239 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp3_ = g_file_hash (_tmp2_);
#line 239 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp0_ = _tmp3_;
-#line 1943 "file.c"
+#line 1930 "file.c"
} else {
#line 239 "/home/jens/Source/shotwell/src/util/file.vala"
_tmp0_ = (guint) 0;
-#line 1947 "file.c"
+#line 1934 "file.c"
}
#line 239 "/home/jens/Source/shotwell/src/util/file.vala"
result = _tmp0_;
#line 239 "/home/jens/Source/shotwell/src/util/file.vala"
return result;
-#line 1953 "file.c"
+#line 1940 "file.c"
}
diff --git a/src/util/image.c b/src/util/image.c
index 1bc543b..d103a3f 100644
--- a/src/util/image.c
+++ b/src/util/image.c
@@ -1,4 +1,4 @@
-/* image.c generated by valac 0.34.7, the Vala compiler
+/* image.c generated by valac 0.36.6, the Vala compiler
* generated from image.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -94,8 +94,8 @@ const gchar* fallback_image_missing[103] = {"48 48 54 1 ", " c #6A6D67", ". c #
gboolean is_color_parsable (const gchar* spec) {
gboolean result = FALSE;
GdkRGBA color = {0};
- const gchar* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ const gchar* _tmp0_;
+ gboolean _tmp1_;
#line 117 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_val_if_fail (spec != NULL, FALSE);
#line 118 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -113,7 +113,7 @@ gboolean is_color_parsable (const gchar* spec) {
void parse_color (const gchar* spec, GdkRGBA* result) {
- const gchar* _tmp0_ = NULL;
+ const gchar* _tmp0_;
GdkRGBA _tmp1_ = {0};
#line 122 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (spec != NULL);
@@ -131,8 +131,8 @@ void parse_color (const gchar* spec, GdkRGBA* result) {
void fetch_color (const gchar* spec, GdkRGBA* result) {
GdkRGBA rgba = {0};
- const gchar* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ const gchar* _tmp0_;
+ gboolean _tmp1_;
#line 126 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (spec != NULL);
#line 127 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -144,7 +144,7 @@ void fetch_color (const gchar* spec, GdkRGBA* result) {
#line 128 "/home/jens/Source/shotwell/src/util/image.vala"
if (!_tmp1_) {
#line 147 "image.c"
- const gchar* _tmp2_ = NULL;
+ const gchar* _tmp2_;
#line 129 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = spec;
#line 129 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -161,17 +161,17 @@ void fetch_color (const gchar* spec, GdkRGBA* result) {
void set_source_color_from_string (cairo_t* ctx, const gchar* spec) {
GdkRGBA rgba = {0};
- const gchar* _tmp0_ = NULL;
+ const gchar* _tmp0_;
GdkRGBA _tmp1_ = {0};
- cairo_t* _tmp2_ = NULL;
- GdkRGBA _tmp3_ = {0};
- gdouble _tmp4_ = 0.0;
- GdkRGBA _tmp5_ = {0};
- gdouble _tmp6_ = 0.0;
- GdkRGBA _tmp7_ = {0};
- gdouble _tmp8_ = 0.0;
- GdkRGBA _tmp9_ = {0};
- gdouble _tmp10_ = 0.0;
+ cairo_t* _tmp2_;
+ GdkRGBA _tmp3_;
+ gdouble _tmp4_;
+ GdkRGBA _tmp5_;
+ gdouble _tmp6_;
+ GdkRGBA _tmp7_;
+ gdouble _tmp8_;
+ GdkRGBA _tmp9_;
+ gdouble _tmp10_;
#line 134 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (ctx != NULL);
#line 134 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -222,11 +222,11 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
#line 223 "image.c"
{
GtkIconTheme* icon_theme = NULL;
- GtkIconTheme* _tmp0_ = NULL;
- GtkIconTheme* _tmp1_ = NULL;
+ GtkIconTheme* _tmp0_;
+ GtkIconTheme* _tmp1_;
GdkPixbuf* _tmp2_ = NULL;
- GdkPixbuf* _tmp3_ = NULL;
- GdkPixbuf* _tmp4_ = NULL;
+ GdkPixbuf* _tmp3_;
+ GdkPixbuf* _tmp4_;
#line 147 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_ = gtk_icon_theme_get_default ();
#line 147 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -262,9 +262,9 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
__catch4_g_error:
{
GError* _error_ = NULL;
- GdkPixbuf* _tmp5_ = NULL;
- GError* _tmp6_ = NULL;
- const gchar* _tmp7_ = NULL;
+ GdkPixbuf* _tmp5_;
+ GError* _tmp6_;
+ const gchar* _tmp7_;
#line 146 "/home/jens/Source/shotwell/src/util/image.vala"
_error_ = _inner_error_;
#line 146 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -309,25 +309,25 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gboolean scale_up) {
GdkPixbuf* result = NULL;
Dimensions original = {0};
- GdkPixbuf* _tmp0_ = NULL;
+ GdkPixbuf* _tmp0_;
Dimensions _tmp1_ = {0};
Dimensions scaled = {0};
- gint _tmp2_ = 0;
- gboolean _tmp3_ = FALSE;
+ gint _tmp2_;
+ gboolean _tmp3_;
Dimensions _tmp4_ = {0};
gboolean _tmp5_ = FALSE;
- Dimensions _tmp6_ = {0};
- gint _tmp7_ = 0;
- Dimensions _tmp8_ = {0};
- gint _tmp9_ = 0;
+ Dimensions _tmp6_;
+ gint _tmp7_;
+ Dimensions _tmp8_;
+ gint _tmp9_;
Dimensions _tmp16_ = {0};
- GdkPixbuf* _tmp17_ = NULL;
- Dimensions _tmp18_ = {0};
- gint _tmp19_ = 0;
- Dimensions _tmp20_ = {0};
- gint _tmp21_ = 0;
- GdkInterpType _tmp22_ = 0;
- GdkPixbuf* _tmp23_ = NULL;
+ GdkPixbuf* _tmp17_;
+ Dimensions _tmp18_;
+ gint _tmp19_;
+ Dimensions _tmp20_;
+ gint _tmp21_;
+ GdkInterpType _tmp22_;
+ GdkPixbuf* _tmp23_;
#line 158 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
#line 159 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -355,10 +355,10 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
#line 161 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp7_ == _tmp9_) {
#line 358 "image.c"
- Dimensions _tmp10_ = {0};
- gint _tmp11_ = 0;
- Dimensions _tmp12_ = {0};
- gint _tmp13_ = 0;
+ Dimensions _tmp10_;
+ gint _tmp11_;
+ Dimensions _tmp12_;
+ gint _tmp13_;
#line 161 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp10_ = original;
#line 161 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -378,8 +378,8 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
#line 161 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp5_) {
#line 381 "image.c"
- GdkPixbuf* _tmp14_ = NULL;
- GdkPixbuf* _tmp15_ = NULL;
+ GdkPixbuf* _tmp14_;
+ GdkPixbuf* _tmp15_;
#line 162 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp14_ = pixbuf;
#line 162 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -419,21 +419,21 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp) {
GdkPixbuf* result = NULL;
Dimensions original = {0};
- GdkPixbuf* _tmp0_ = NULL;
+ GdkPixbuf* _tmp0_;
Dimensions _tmp1_ = {0};
gboolean _tmp2_ = FALSE;
- Dimensions _tmp3_ = {0};
- gint _tmp4_ = 0;
- Dimensions _tmp5_ = {0};
- gint _tmp6_ = 0;
+ Dimensions _tmp3_;
+ gint _tmp4_;
+ Dimensions _tmp5_;
+ gint _tmp6_;
Dimensions _tmp13_ = {0};
- GdkPixbuf* _tmp14_ = NULL;
- Dimensions _tmp15_ = {0};
- gint _tmp16_ = 0;
- Dimensions _tmp17_ = {0};
- gint _tmp18_ = 0;
- GdkInterpType _tmp19_ = 0;
- GdkPixbuf* _tmp20_ = NULL;
+ GdkPixbuf* _tmp14_;
+ Dimensions _tmp15_;
+ gint _tmp16_;
+ Dimensions _tmp17_;
+ gint _tmp18_;
+ GdkInterpType _tmp19_;
+ GdkPixbuf* _tmp20_;
#line 170 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
#line 170 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -455,10 +455,10 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
#line 172 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp4_ == _tmp6_) {
#line 458 "image.c"
- Dimensions _tmp7_ = {0};
- gint _tmp8_ = 0;
- Dimensions _tmp9_ = {0};
- gint _tmp10_ = 0;
+ Dimensions _tmp7_;
+ gint _tmp8_;
+ Dimensions _tmp9_;
+ gint _tmp10_;
#line 172 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp7_ = original;
#line 172 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -478,8 +478,8 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
#line 172 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp2_) {
#line 481 "image.c"
- GdkPixbuf* _tmp11_ = NULL;
- GdkPixbuf* _tmp12_ = NULL;
+ GdkPixbuf* _tmp11_;
+ GdkPixbuf* _tmp12_;
#line 173 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp11_ = pixbuf;
#line 173 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -517,11 +517,11 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
void draw_rounded_corners_filled (cairo_t* ctx, Dimensions* dim, GdkPoint* origin, gdouble radius_proportion) {
- cairo_t* _tmp0_ = NULL;
- Dimensions _tmp1_ = {0};
- GdkPoint _tmp2_ = {0};
- gdouble _tmp3_ = 0.0;
- cairo_t* _tmp4_ = NULL;
+ cairo_t* _tmp0_;
+ Dimensions _tmp1_;
+ GdkPoint _tmp2_;
+ gdouble _tmp3_;
+ cairo_t* _tmp4_;
#line 183 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (ctx != NULL);
#line 183 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -547,33 +547,33 @@ void draw_rounded_corners_filled (cairo_t* ctx, Dimensions* dim, GdkPoint* origi
void context_rounded_corners (cairo_t* cx, Dimensions* dim, GdkPoint* origin, gdouble radius_proportion) {
- gdouble _tmp0_ = 0.0;
- gdouble _tmp1_ = 0.0;
+ gdouble _tmp0_;
+ gdouble _tmp1_;
gdouble left = 0.0;
- GdkPoint _tmp2_ = {0};
- gint _tmp3_ = 0;
+ GdkPoint _tmp2_;
+ gint _tmp3_;
gdouble top = 0.0;
- GdkPoint _tmp4_ = {0};
- gint _tmp5_ = 0;
+ GdkPoint _tmp4_;
+ gint _tmp5_;
gdouble right = 0.0;
- GdkPoint _tmp6_ = {0};
- gint _tmp7_ = 0;
- Dimensions _tmp8_ = {0};
- gint _tmp9_ = 0;
+ GdkPoint _tmp6_;
+ gint _tmp7_;
+ Dimensions _tmp8_;
+ gint _tmp9_;
gdouble bottom = 0.0;
- GdkPoint _tmp10_ = {0};
- gint _tmp11_ = 0;
- Dimensions _tmp12_ = {0};
- gint _tmp13_ = 0;
+ GdkPoint _tmp10_;
+ gint _tmp11_;
+ Dimensions _tmp12_;
+ gint _tmp13_;
gdouble radius = 0.0;
- gint _tmp14_ = 0;
- gdouble _tmp15_ = 0.0;
- cairo_t* _tmp16_ = NULL;
- cairo_t* _tmp17_ = NULL;
- cairo_t* _tmp18_ = NULL;
- cairo_t* _tmp19_ = NULL;
- cairo_t* _tmp20_ = NULL;
- cairo_t* _tmp21_ = NULL;
+ gint _tmp14_;
+ gdouble _tmp15_;
+ cairo_t* _tmp16_;
+ cairo_t* _tmp17_;
+ cairo_t* _tmp18_;
+ cairo_t* _tmp19_;
+ cairo_t* _tmp20_;
+ cairo_t* _tmp21_;
#line 189 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (cx != NULL);
#line 189 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -654,9 +654,9 @@ void context_rounded_corners (cairo_t* cx, Dimensions* dim, GdkPoint* origin, gd
inline guchar shift_color_byte (gint b, gint shift) {
guchar result = '\0';
- gint _tmp0_ = 0;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
+ gint _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
#line 213 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_ = b;
#line 213 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -673,33 +673,33 @@ inline guchar shift_color_byte (gint b, gint shift) {
void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alpha) {
gboolean _tmp0_ = FALSE;
- gint _tmp1_ = 0;
+ gint _tmp1_;
gboolean _tmp3_ = FALSE;
- gint _tmp4_ = 0;
+ gint _tmp4_;
gboolean _tmp6_ = FALSE;
- gint _tmp7_ = 0;
+ gint _tmp7_;
gboolean _tmp9_ = FALSE;
- gint _tmp10_ = 0;
+ gint _tmp10_;
gint width = 0;
- GdkPixbuf* _tmp12_ = NULL;
- gint _tmp13_ = 0;
+ GdkPixbuf* _tmp12_;
+ gint _tmp13_;
gint height = 0;
- GdkPixbuf* _tmp14_ = NULL;
- gint _tmp15_ = 0;
+ GdkPixbuf* _tmp14_;
+ gint _tmp15_;
gint rowstride = 0;
- GdkPixbuf* _tmp16_ = NULL;
- gint _tmp17_ = 0;
+ GdkPixbuf* _tmp16_;
+ gint _tmp17_;
gint channels = 0;
- GdkPixbuf* _tmp18_ = NULL;
- gint _tmp19_ = 0;
+ GdkPixbuf* _tmp18_;
+ gint _tmp19_;
guchar* pixels = NULL;
- GdkPixbuf* _tmp20_ = NULL;
- guint8* _tmp21_ = NULL;
- gint _tmp22_ = 0;
- GdkPixbuf* _tmp23_ = NULL;
- GdkColorspace _tmp24_ = 0;
- GdkPixbuf* _tmp25_ = NULL;
- gint _tmp26_ = 0;
+ GdkPixbuf* _tmp20_;
+ guint8* _tmp21_;
+ gint _tmp22_;
+ GdkPixbuf* _tmp23_;
+ GdkColorspace _tmp24_;
+ GdkPixbuf* _tmp25_;
+ gint _tmp26_;
#line 216 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
#line 217 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -707,7 +707,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
#line 217 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp1_ >= -255) {
#line 710 "image.c"
- gint _tmp2_ = 0;
+ gint _tmp2_;
#line 217 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = red;
#line 217 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -725,7 +725,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
#line 218 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp4_ >= -255) {
#line 728 "image.c"
- gint _tmp5_ = 0;
+ gint _tmp5_;
#line 218 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp5_ = green;
#line 218 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -743,7 +743,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
#line 219 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp7_ >= -255) {
#line 746 "image.c"
- gint _tmp8_ = 0;
+ gint _tmp8_;
#line 219 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp8_ = blue;
#line 219 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -761,7 +761,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
#line 220 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp10_ >= -255) {
#line 764 "image.c"
- gint _tmp11_ = 0;
+ gint _tmp11_;
#line 220 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp11_ = alpha;
#line 220 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -833,15 +833,15 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
while (TRUE) {
#line 836 "image.c"
- gint _tmp29_ = 0;
- gint _tmp30_ = 0;
+ gint _tmp29_;
+ gint _tmp30_;
gint y_offset = 0;
- gint _tmp31_ = 0;
- gint _tmp32_ = 0;
+ gint _tmp31_;
+ gint _tmp32_;
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
if (!_tmp27_) {
#line 844 "image.c"
- gint _tmp28_ = 0;
+ gint _tmp28_;
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp28_ = y;
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -879,21 +879,21 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
while (TRUE) {
#line 882 "image.c"
- gint _tmp35_ = 0;
- gint _tmp36_ = 0;
+ gint _tmp35_;
+ gint _tmp36_;
gint offset = 0;
- gint _tmp37_ = 0;
- gint _tmp38_ = 0;
- gint _tmp39_ = 0;
- gint _tmp40_ = 0;
- gint _tmp49_ = 0;
- gint _tmp58_ = 0;
+ gint _tmp37_;
+ gint _tmp38_;
+ gint _tmp39_;
+ gint _tmp40_;
+ gint _tmp49_;
+ gint _tmp58_;
gboolean _tmp67_ = FALSE;
- gint _tmp68_ = 0;
+ gint _tmp68_;
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
if (!_tmp33_) {
#line 896 "image.c"
- gint _tmp34_ = 0;
+ gint _tmp34_;
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp34_ = x;
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -925,14 +925,14 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
#line 238 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp40_ != 0) {
#line 928 "image.c"
- guchar* _tmp41_ = NULL;
- gint _tmp42_ = 0;
- guchar* _tmp43_ = NULL;
- gint _tmp44_ = 0;
- guchar _tmp45_ = '\0';
- gint _tmp46_ = 0;
- guchar _tmp47_ = '\0';
- guchar _tmp48_ = '\0';
+ guchar* _tmp41_;
+ gint _tmp42_;
+ guchar* _tmp43_;
+ gint _tmp44_;
+ guchar _tmp45_;
+ gint _tmp46_;
+ guchar _tmp47_;
+ guchar _tmp48_;
#line 239 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp41_ = pixels;
#line 239 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -958,14 +958,14 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
#line 241 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp49_ != 0) {
#line 961 "image.c"
- guchar* _tmp50_ = NULL;
- gint _tmp51_ = 0;
- guchar* _tmp52_ = NULL;
- gint _tmp53_ = 0;
- guchar _tmp54_ = '\0';
- gint _tmp55_ = 0;
- guchar _tmp56_ = '\0';
- guchar _tmp57_ = '\0';
+ guchar* _tmp50_;
+ gint _tmp51_;
+ guchar* _tmp52_;
+ gint _tmp53_;
+ guchar _tmp54_;
+ gint _tmp55_;
+ guchar _tmp56_;
+ guchar _tmp57_;
#line 242 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp50_ = pixels;
#line 242 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -991,14 +991,14 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
#line 244 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp58_ != 0) {
#line 994 "image.c"
- guchar* _tmp59_ = NULL;
- gint _tmp60_ = 0;
- guchar* _tmp61_ = NULL;
- gint _tmp62_ = 0;
- guchar _tmp63_ = '\0';
- gint _tmp64_ = 0;
- guchar _tmp65_ = '\0';
- guchar _tmp66_ = '\0';
+ guchar* _tmp59_;
+ gint _tmp60_;
+ guchar* _tmp61_;
+ gint _tmp62_;
+ guchar _tmp63_;
+ gint _tmp64_;
+ guchar _tmp65_;
+ guchar _tmp66_;
#line 245 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp59_ = pixels;
#line 245 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1024,7 +1024,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
#line 247 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp68_ != 0) {
#line 1027 "image.c"
- gint _tmp69_ = 0;
+ gint _tmp69_;
#line 247 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp69_ = channels;
#line 247 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1038,14 +1038,14 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
#line 247 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp67_) {
#line 1041 "image.c"
- guchar* _tmp70_ = NULL;
- gint _tmp71_ = 0;
- guchar* _tmp72_ = NULL;
- gint _tmp73_ = 0;
- guchar _tmp74_ = '\0';
- gint _tmp75_ = 0;
- guchar _tmp76_ = '\0';
- guchar _tmp77_ = '\0';
+ guchar* _tmp70_;
+ gint _tmp71_;
+ guchar* _tmp72_;
+ gint _tmp73_;
+ guchar _tmp74_;
+ gint _tmp75_;
+ guchar _tmp76_;
+ guchar _tmp77_;
#line 248 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp70_ = pixels;
#line 248 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1080,9 +1080,9 @@ gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
gboolean _tmp2_ = FALSE;
- gint _tmp3_ = 0;
- GdkRectangle _tmp4_ = {0};
- gint _tmp5_ = 0;
+ gint _tmp3_;
+ GdkRectangle _tmp4_;
+ gint _tmp5_;
#line 253 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_val_if_fail (rect != NULL, FALSE);
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1094,11 +1094,11 @@ gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp3_ >= _tmp5_) {
#line 1097 "image.c"
- gint _tmp6_ = 0;
- GdkRectangle _tmp7_ = {0};
- gint _tmp8_ = 0;
- GdkRectangle _tmp9_ = {0};
- gint _tmp10_ = 0;
+ gint _tmp6_;
+ GdkRectangle _tmp7_;
+ gint _tmp8_;
+ GdkRectangle _tmp9_;
+ gint _tmp10_;
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp6_ = x;
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1120,9 +1120,9 @@ gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp2_) {
#line 1123 "image.c"
- gint _tmp11_ = 0;
- GdkRectangle _tmp12_ = {0};
- gint _tmp13_ = 0;
+ gint _tmp11_;
+ GdkRectangle _tmp12_;
+ gint _tmp13_;
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp11_ = y;
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1140,11 +1140,11 @@ gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp1_) {
#line 1143 "image.c"
- gint _tmp14_ = 0;
- GdkRectangle _tmp15_ = {0};
- gint _tmp16_ = 0;
- GdkRectangle _tmp17_ = {0};
- gint _tmp18_ = 0;
+ gint _tmp14_;
+ GdkRectangle _tmp15_;
+ gint _tmp16_;
+ GdkRectangle _tmp17_;
+ gint _tmp18_;
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp14_ = y;
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1176,10 +1176,10 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
gboolean _tmp2_ = FALSE;
- GdkRectangle _tmp3_ = {0};
- gint _tmp4_ = 0;
- GdkRectangle _tmp5_ = {0};
- gint _tmp6_ = 0;
+ GdkRectangle _tmp3_;
+ gint _tmp4_;
+ GdkRectangle _tmp5_;
+ gint _tmp6_;
#line 257 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_val_if_fail (a != NULL, FALSE);
#line 257 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1195,10 +1195,10 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp4_ == _tmp6_) {
#line 1198 "image.c"
- GdkRectangle _tmp7_ = {0};
- gint _tmp8_ = 0;
- GdkRectangle _tmp9_ = {0};
- gint _tmp10_ = 0;
+ GdkRectangle _tmp7_;
+ gint _tmp8_;
+ GdkRectangle _tmp9_;
+ gint _tmp10_;
#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp7_ = *a;
#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1218,10 +1218,10 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp2_) {
#line 1221 "image.c"
- GdkRectangle _tmp11_ = {0};
- gint _tmp12_ = 0;
- GdkRectangle _tmp13_ = {0};
- gint _tmp14_ = 0;
+ GdkRectangle _tmp11_;
+ gint _tmp12_;
+ GdkRectangle _tmp13_;
+ gint _tmp14_;
#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp11_ = *a;
#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1241,10 +1241,10 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp1_) {
#line 1244 "image.c"
- GdkRectangle _tmp15_ = {0};
- gint _tmp16_ = 0;
- GdkRectangle _tmp17_ = {0};
- gint _tmp18_ = 0;
+ GdkRectangle _tmp15_;
+ gint _tmp16_;
+ GdkRectangle _tmp17_;
+ gint _tmp18_;
#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp15_ = *a;
#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1271,15 +1271,15 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
gchar* rectangle_to_string (GdkRectangle* rect) {
gchar* result = NULL;
- GdkRectangle _tmp0_ = {0};
- gint _tmp1_ = 0;
- GdkRectangle _tmp2_ = {0};
- gint _tmp3_ = 0;
- GdkRectangle _tmp4_ = {0};
- gint _tmp5_ = 0;
- GdkRectangle _tmp6_ = {0};
- gint _tmp7_ = 0;
- gchar* _tmp8_ = NULL;
+ GdkRectangle _tmp0_;
+ gint _tmp1_;
+ GdkRectangle _tmp2_;
+ gint _tmp3_;
+ GdkRectangle _tmp4_;
+ gint _tmp5_;
+ GdkRectangle _tmp6_;
+ gint _tmp7_;
+ gchar* _tmp8_;
#line 261 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_val_if_fail (rect != NULL, NULL);
#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1310,26 +1310,26 @@ gchar* rectangle_to_string (GdkRectangle* rect) {
void clamp_rectangle (GdkRectangle* original, Dimensions* max, GdkRectangle* result) {
GdkRectangle rect = {0};
- GdkRectangle _tmp0_ = {0};
- gint _tmp1_ = 0;
- Dimensions _tmp2_ = {0};
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
- GdkRectangle _tmp5_ = {0};
- gint _tmp6_ = 0;
- Dimensions _tmp7_ = {0};
- gint _tmp8_ = 0;
- gint _tmp9_ = 0;
- GdkRectangle _tmp10_ = {0};
- gint _tmp11_ = 0;
- Dimensions _tmp12_ = {0};
- gint _tmp13_ = 0;
- gint _tmp14_ = 0;
- GdkRectangle _tmp15_ = {0};
- gint _tmp16_ = 0;
- Dimensions _tmp17_ = {0};
- gint _tmp18_ = 0;
- gint _tmp19_ = 0;
+ GdkRectangle _tmp0_;
+ gint _tmp1_;
+ Dimensions _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
+ GdkRectangle _tmp5_;
+ gint _tmp6_;
+ Dimensions _tmp7_;
+ gint _tmp8_;
+ gint _tmp9_;
+ GdkRectangle _tmp10_;
+ gint _tmp11_;
+ Dimensions _tmp12_;
+ gint _tmp13_;
+ gint _tmp14_;
+ GdkRectangle _tmp15_;
+ gint _tmp16_;
+ Dimensions _tmp17_;
+ gint _tmp18_;
+ gint _tmp19_;
#line 265 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (original != NULL);
#line 265 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1395,12 +1395,12 @@ void clamp_rectangle (GdkRectangle* original, Dimensions* max, GdkRectangle* res
void scale_point (GdkPoint* p, gdouble factor, GdkPoint* result) {
GdkPoint _result_ = {0};
GdkPoint _tmp0_ = {0};
- gdouble _tmp1_ = 0.0;
- GdkPoint _tmp2_ = {0};
- gint _tmp3_ = 0;
- gdouble _tmp4_ = 0.0;
- GdkPoint _tmp5_ = {0};
- gint _tmp6_ = 0;
+ gdouble _tmp1_;
+ GdkPoint _tmp2_;
+ gint _tmp3_;
+ gdouble _tmp4_;
+ GdkPoint _tmp5_;
+ gint _tmp6_;
#line 275 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (p != NULL);
#line 276 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1434,14 +1434,14 @@ void scale_point (GdkPoint* p, gdouble factor, GdkPoint* result) {
void add_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
GdkPoint _result_ = {0};
GdkPoint _tmp0_ = {0};
- GdkPoint _tmp1_ = {0};
- gint _tmp2_ = 0;
- GdkPoint _tmp3_ = {0};
- gint _tmp4_ = 0;
- GdkPoint _tmp5_ = {0};
- gint _tmp6_ = 0;
- GdkPoint _tmp7_ = {0};
- gint _tmp8_ = 0;
+ GdkPoint _tmp1_;
+ gint _tmp2_;
+ GdkPoint _tmp3_;
+ gint _tmp4_;
+ GdkPoint _tmp5_;
+ gint _tmp6_;
+ GdkPoint _tmp7_;
+ gint _tmp8_;
#line 283 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (p1 != NULL);
#line 283 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1481,14 +1481,14 @@ void add_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
void subtract_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
GdkPoint _result_ = {0};
GdkPoint _tmp0_ = {0};
- GdkPoint _tmp1_ = {0};
- gint _tmp2_ = 0;
- GdkPoint _tmp3_ = {0};
- gint _tmp4_ = 0;
- GdkPoint _tmp5_ = {0};
- gint _tmp6_ = 0;
- GdkPoint _tmp7_ = {0};
- gint _tmp8_ = 0;
+ GdkPoint _tmp1_;
+ gint _tmp2_;
+ GdkPoint _tmp3_;
+ gint _tmp4_;
+ GdkPoint _tmp5_;
+ gint _tmp6_;
+ GdkPoint _tmp7_;
+ gint _tmp8_;
#line 291 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (p1 != NULL);
#line 291 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1527,9 +1527,9 @@ void subtract_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
guchar* gdk_pixels = NULL;
- GdkPixbuf* _tmp0_ = NULL;
- void* _tmp1_ = NULL;
- void* _tmp2_ = NULL;
+ GdkPixbuf* _tmp0_;
+ void* _tmp1_;
+ void* _tmp2_;
#line 300 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1553,25 +1553,25 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
while (TRUE) {
#line 1556 "image.c"
- gint _tmp5_ = 0;
- GdkPixbuf* _tmp6_ = NULL;
- gint _tmp7_ = 0;
- gint _tmp8_ = 0;
+ gint _tmp5_;
+ GdkPixbuf* _tmp6_;
+ gint _tmp7_;
+ gint _tmp8_;
guchar* p = NULL;
- guchar* _tmp9_ = NULL;
+ guchar* _tmp9_;
guchar* end = NULL;
- guchar* _tmp10_ = NULL;
- GdkPixbuf* _tmp11_ = NULL;
- gint _tmp12_ = 0;
- gint _tmp13_ = 0;
- guchar* _tmp26_ = NULL;
- GdkPixbuf* _tmp27_ = NULL;
- gint _tmp28_ = 0;
- gint _tmp29_ = 0;
+ guchar* _tmp10_;
+ GdkPixbuf* _tmp11_;
+ gint _tmp12_;
+ gint _tmp13_;
+ guchar* _tmp26_;
+ GdkPixbuf* _tmp27_;
+ gint _tmp28_;
+ gint _tmp29_;
#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
if (!_tmp3_) {
#line 1574 "image.c"
- gint _tmp4_ = 0;
+ gint _tmp4_;
#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp4_ = j;
#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1611,19 +1611,19 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
#line 306 "/home/jens/Source/shotwell/src/util/image.vala"
while (TRUE) {
#line 1614 "image.c"
- guchar* _tmp14_ = NULL;
- guchar* _tmp15_ = NULL;
+ guchar* _tmp14_;
+ guchar* _tmp15_;
guchar tmp = '\0';
- guchar* _tmp16_ = NULL;
- guchar _tmp17_ = '\0';
- guchar* _tmp18_ = NULL;
- guchar* _tmp19_ = NULL;
- guchar _tmp20_ = '\0';
- guchar _tmp21_ = '\0';
- guchar* _tmp22_ = NULL;
- guchar _tmp23_ = '\0';
- guchar _tmp24_ = '\0';
- guchar* _tmp25_ = NULL;
+ guchar* _tmp16_;
+ guchar _tmp17_;
+ guchar* _tmp18_;
+ guchar* _tmp19_;
+ guchar _tmp20_;
+ guchar _tmp21_;
+ guchar* _tmp22_;
+ guchar _tmp23_;
+ guchar _tmp24_;
+ guchar* _tmp25_;
#line 306 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp14_ = p;
#line 306 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1694,22 +1694,22 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
void compute_arb_rotated_size (gdouble src_width, gdouble src_height, gdouble angle, gdouble* dest_width, gdouble* dest_height) {
gdouble _vala_dest_width = 0.0;
gdouble _vala_dest_height = 0.0;
- gdouble _tmp0_ = 0.0;
- gdouble _tmp1_ = 0.0;
- gdouble _tmp2_ = 0.0;
- gdouble _tmp3_ = 0.0;
- gdouble _tmp4_ = 0.0;
- gdouble _tmp5_ = 0.0;
- gdouble _tmp6_ = 0.0;
- gdouble _tmp7_ = 0.0;
- gdouble _tmp8_ = 0.0;
- gdouble _tmp9_ = 0.0;
- gdouble _tmp10_ = 0.0;
- gdouble _tmp11_ = 0.0;
- gdouble _tmp12_ = 0.0;
- gdouble _tmp13_ = 0.0;
- gdouble _tmp14_ = 0.0;
- gdouble _tmp15_ = 0.0;
+ gdouble _tmp0_;
+ gdouble _tmp1_;
+ gdouble _tmp2_;
+ gdouble _tmp3_;
+ gdouble _tmp4_;
+ gdouble _tmp5_;
+ gdouble _tmp6_;
+ gdouble _tmp7_;
+ gdouble _tmp8_;
+ gdouble _tmp9_;
+ gdouble _tmp10_;
+ gdouble _tmp11_;
+ gdouble _tmp12_;
+ gdouble _tmp13_;
+ gdouble _tmp14_;
+ gdouble _tmp15_;
#line 337 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_ = angle;
#line 337 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1773,77 +1773,77 @@ void compute_arb_rotated_size (gdouble src_width, gdouble src_height, gdouble an
*/
GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
GdkPixbuf* result = NULL;
- gdouble _tmp0_ = 0.0;
+ gdouble _tmp0_;
gdouble x_tmp = 0.0;
gdouble y_tmp = 0.0;
- GdkPixbuf* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- gint _tmp5_ = 0;
- GdkPixbuf* _tmp6_ = NULL;
- gint _tmp7_ = 0;
- gint _tmp8_ = 0;
- gdouble _tmp9_ = 0.0;
+ GdkPixbuf* _tmp3_;
+ gint _tmp4_;
+ gint _tmp5_;
+ GdkPixbuf* _tmp6_;
+ gint _tmp7_;
+ gint _tmp8_;
+ gdouble _tmp9_;
gdouble _tmp10_ = 0.0;
gdouble _tmp11_ = 0.0;
GdkPixbuf* dest_pixbuf = NULL;
- gdouble _tmp12_ = 0.0;
- gdouble _tmp13_ = 0.0;
- gdouble _tmp14_ = 0.0;
- gdouble _tmp15_ = 0.0;
- GdkPixbuf* _tmp16_ = NULL;
+ gdouble _tmp12_;
+ gdouble _tmp13_;
+ gdouble _tmp14_;
+ gdouble _tmp15_;
+ GdkPixbuf* _tmp16_;
cairo_format_t _tmp17_ = 0;
- GdkPixbuf* _tmp18_ = NULL;
- gboolean _tmp19_ = FALSE;
- gboolean _tmp20_ = FALSE;
+ GdkPixbuf* _tmp18_;
+ gboolean _tmp19_;
+ gboolean _tmp20_;
cairo_surface_t* surface = NULL;
- GdkPixbuf* _tmp21_ = NULL;
- void* _tmp22_ = NULL;
- void* _tmp23_ = NULL;
- GdkPixbuf* _tmp24_ = NULL;
- gint _tmp25_ = 0;
- gint _tmp26_ = 0;
- GdkPixbuf* _tmp27_ = NULL;
- gint _tmp28_ = 0;
- gint _tmp29_ = 0;
- GdkPixbuf* _tmp30_ = NULL;
- gint _tmp31_ = 0;
- gint _tmp32_ = 0;
- cairo_surface_t* _tmp33_ = NULL;
+ GdkPixbuf* _tmp21_;
+ void* _tmp22_;
+ void* _tmp23_;
+ GdkPixbuf* _tmp24_;
+ gint _tmp25_;
+ gint _tmp26_;
+ GdkPixbuf* _tmp27_;
+ gint _tmp28_;
+ gint _tmp29_;
+ GdkPixbuf* _tmp30_;
+ gint _tmp31_;
+ gint _tmp32_;
+ cairo_surface_t* _tmp33_;
cairo_t* context = NULL;
- cairo_surface_t* _tmp34_ = NULL;
- cairo_t* _tmp35_ = NULL;
- cairo_t* _tmp36_ = NULL;
- cairo_t* _tmp37_ = NULL;
- GdkPixbuf* _tmp38_ = NULL;
- gint _tmp39_ = 0;
- gint _tmp40_ = 0;
- GdkPixbuf* _tmp41_ = NULL;
- gint _tmp42_ = 0;
- gint _tmp43_ = 0;
- cairo_t* _tmp44_ = NULL;
- cairo_t* _tmp45_ = NULL;
- GdkPixbuf* _tmp46_ = NULL;
- gint _tmp47_ = 0;
- gint _tmp48_ = 0;
- GdkPixbuf* _tmp49_ = NULL;
- gint _tmp50_ = 0;
- gint _tmp51_ = 0;
- cairo_t* _tmp52_ = NULL;
- gdouble _tmp53_ = 0.0;
- gdouble _tmp54_ = 0.0;
- cairo_t* _tmp55_ = NULL;
- GdkPixbuf* _tmp56_ = NULL;
- gint _tmp57_ = 0;
- gint _tmp58_ = 0;
- GdkPixbuf* _tmp59_ = NULL;
- gint _tmp60_ = 0;
- gint _tmp61_ = 0;
- cairo_t* _tmp62_ = NULL;
- GdkPixbuf* _tmp63_ = NULL;
- cairo_t* _tmp64_ = NULL;
- cairo_pattern_t* _tmp65_ = NULL;
- cairo_t* _tmp66_ = NULL;
- GdkPixbuf* _tmp67_ = NULL;
+ cairo_surface_t* _tmp34_;
+ cairo_t* _tmp35_;
+ cairo_t* _tmp36_;
+ cairo_t* _tmp37_;
+ GdkPixbuf* _tmp38_;
+ gint _tmp39_;
+ gint _tmp40_;
+ GdkPixbuf* _tmp41_;
+ gint _tmp42_;
+ gint _tmp43_;
+ cairo_t* _tmp44_;
+ cairo_t* _tmp45_;
+ GdkPixbuf* _tmp46_;
+ gint _tmp47_;
+ gint _tmp48_;
+ GdkPixbuf* _tmp49_;
+ gint _tmp50_;
+ gint _tmp51_;
+ cairo_t* _tmp52_;
+ gdouble _tmp53_;
+ gdouble _tmp54_;
+ cairo_t* _tmp55_;
+ GdkPixbuf* _tmp56_;
+ gint _tmp57_;
+ gint _tmp58_;
+ GdkPixbuf* _tmp59_;
+ gint _tmp60_;
+ gint _tmp61_;
+ cairo_t* _tmp62_;
+ GdkPixbuf* _tmp63_;
+ cairo_t* _tmp64_;
+ cairo_pattern_t* _tmp65_;
+ cairo_t* _tmp66_;
+ GdkPixbuf* _tmp67_;
#line 349 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_val_if_fail (GDK_IS_PIXBUF (source_pixbuf), NULL);
#line 353 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1851,8 +1851,8 @@ GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
#line 353 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp0_ == 0.0) {
#line 1854 "image.c"
- GdkPixbuf* _tmp1_ = NULL;
- GdkPixbuf* _tmp2_ = NULL;
+ GdkPixbuf* _tmp1_;
+ GdkPixbuf* _tmp2_;
#line 354 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp1_ = source_pixbuf;
#line 354 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2055,30 +2055,30 @@ GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
* @param angle The angle the source image is to be rotated by to straighten it.
*/
void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble angle, gboolean invert, GdkPoint* result) {
- gdouble _tmp0_ = 0.0;
+ gdouble _tmp0_;
gdouble dest_width = 0.0;
gdouble dest_height = 0.0;
- gint _tmp2_ = 0;
- gint _tmp3_ = 0;
- gdouble _tmp4_ = 0.0;
+ gint _tmp2_;
+ gint _tmp3_;
+ gdouble _tmp4_;
gdouble _tmp5_ = 0.0;
gdouble _tmp6_ = 0.0;
cairo_matrix_t matrix = {0};
- gdouble _tmp7_ = 0.0;
- gdouble _tmp8_ = 0.0;
- gdouble _tmp9_ = 0.0;
- gdouble _tmp10_ = 0.0;
- gint _tmp11_ = 0;
- gint _tmp12_ = 0;
- gboolean _tmp13_ = FALSE;
+ gdouble _tmp7_;
+ gdouble _tmp8_;
+ gdouble _tmp9_;
+ gdouble _tmp10_;
+ gint _tmp11_;
+ gint _tmp12_;
+ gboolean _tmp13_;
gdouble dest_x = 0.0;
- GdkPoint _tmp15_ = {0};
- gint _tmp16_ = 0;
+ GdkPoint _tmp15_;
+ gint _tmp16_;
gdouble dest_y = 0.0;
- GdkPoint _tmp17_ = {0};
- gint _tmp18_ = 0;
- gdouble _tmp19_ = 0.0;
- gdouble _tmp20_ = 0.0;
+ GdkPoint _tmp17_;
+ gint _tmp18_;
+ gdouble _tmp19_;
+ gdouble _tmp20_;
GdkPoint _tmp21_ = {0};
#line 406 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (source_point != NULL);
@@ -2087,7 +2087,7 @@ void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble a
#line 409 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp0_ == 0.0) {
#line 2090 "image.c"
- GdkPoint _tmp1_ = {0};
+ GdkPoint _tmp1_;
#line 411 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp1_ = *source_point;
#line 411 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2133,7 +2133,7 @@ void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble a
#line 422 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp13_) {
#line 2136 "image.c"
- cairo_status_t _tmp14_ = 0;
+ cairo_status_t _tmp14_;
#line 423 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp14_ = cairo_matrix_invert (&matrix);
#line 423 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2184,10 +2184,10 @@ void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble a
* @param angle The angle the source image is to be rotated by to straighten it.
*/
void derotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble angle, GdkPoint* result) {
- GdkPoint _tmp0_ = {0};
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
- gdouble _tmp3_ = 0.0;
+ GdkPoint _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
+ gdouble _tmp3_;
GdkPoint _tmp4_ = {0};
#line 445 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (source_point != NULL);
@@ -2211,84 +2211,84 @@ void derotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble
void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle_deg, gboolean preserve_geom, Box* result) {
GdkPoint top_left = {0};
- Box _tmp0_ = {0};
- gint _tmp1_ = 0;
- Box _tmp2_ = {0};
- gint _tmp3_ = 0;
+ Box _tmp0_;
+ gint _tmp1_;
+ Box _tmp2_;
+ gint _tmp3_;
GdkPoint _tmp4_ = {0};
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
- gdouble _tmp7_ = 0.0;
+ gint _tmp5_;
+ gint _tmp6_;
+ gdouble _tmp7_;
GdkPoint _tmp8_ = {0};
GdkPoint top_right = {0};
- Box _tmp9_ = {0};
- gint _tmp10_ = 0;
- Box _tmp11_ = {0};
- gint _tmp12_ = 0;
+ Box _tmp9_;
+ gint _tmp10_;
+ Box _tmp11_;
+ gint _tmp12_;
GdkPoint _tmp13_ = {0};
- gint _tmp14_ = 0;
- gint _tmp15_ = 0;
- gdouble _tmp16_ = 0.0;
+ gint _tmp14_;
+ gint _tmp15_;
+ gdouble _tmp16_;
GdkPoint _tmp17_ = {0};
GdkPoint bottom_left = {0};
- Box _tmp18_ = {0};
- gint _tmp19_ = 0;
- Box _tmp20_ = {0};
- gint _tmp21_ = 0;
+ Box _tmp18_;
+ gint _tmp19_;
+ Box _tmp20_;
+ gint _tmp21_;
GdkPoint _tmp22_ = {0};
- gint _tmp23_ = 0;
- gint _tmp24_ = 0;
- gdouble _tmp25_ = 0.0;
+ gint _tmp23_;
+ gint _tmp24_;
+ gdouble _tmp25_;
GdkPoint _tmp26_ = {0};
GdkPoint bottom_right = {0};
- Box _tmp27_ = {0};
- gint _tmp28_ = 0;
- Box _tmp29_ = {0};
- gint _tmp30_ = 0;
+ Box _tmp27_;
+ gint _tmp28_;
+ Box _tmp29_;
+ gint _tmp30_;
GdkPoint _tmp31_ = {0};
- gint _tmp32_ = 0;
- gint _tmp33_ = 0;
- gdouble _tmp34_ = 0.0;
+ gint _tmp32_;
+ gint _tmp33_;
+ gdouble _tmp34_;
GdkPoint _tmp35_ = {0};
gdouble angle = 0.0;
- gdouble _tmp36_ = 0.0;
- gdouble _tmp37_ = 0.0;
+ gdouble _tmp36_;
+ gdouble _tmp37_;
gint top_offset = 0;
gint bottom_offset = 0;
gint left_offset = 0;
gint right_offset = 0;
gint top = 0;
- GdkPoint _tmp38_ = {0};
- gint _tmp39_ = 0;
- GdkPoint _tmp40_ = {0};
- gint _tmp41_ = 0;
- gint _tmp42_ = 0;
- gint _tmp43_ = 0;
+ GdkPoint _tmp38_;
+ gint _tmp39_;
+ GdkPoint _tmp40_;
+ gint _tmp41_;
+ gint _tmp42_;
+ gint _tmp43_;
gint bottom = 0;
- GdkPoint _tmp47_ = {0};
- gint _tmp48_ = 0;
- GdkPoint _tmp49_ = {0};
- gint _tmp50_ = 0;
- gint _tmp51_ = 0;
- gint _tmp52_ = 0;
- gint _tmp53_ = 0;
+ GdkPoint _tmp47_;
+ gint _tmp48_;
+ GdkPoint _tmp49_;
+ gint _tmp50_;
+ gint _tmp51_;
+ gint _tmp52_;
+ gint _tmp53_;
gint left = 0;
- GdkPoint _tmp58_ = {0};
- gint _tmp59_ = 0;
- GdkPoint _tmp60_ = {0};
- gint _tmp61_ = 0;
- gint _tmp62_ = 0;
- gint _tmp63_ = 0;
+ GdkPoint _tmp58_;
+ gint _tmp59_;
+ GdkPoint _tmp60_;
+ gint _tmp61_;
+ gint _tmp62_;
+ gint _tmp63_;
gint right = 0;
- GdkPoint _tmp67_ = {0};
- gint _tmp68_ = 0;
- GdkPoint _tmp69_ = {0};
- gint _tmp70_ = 0;
- gint _tmp71_ = 0;
- gint _tmp72_ = 0;
- gint _tmp73_ = 0;
+ GdkPoint _tmp67_;
+ gint _tmp68_;
+ GdkPoint _tmp69_;
+ gint _tmp70_;
+ gint _tmp71_;
+ gint _tmp72_;
+ gint _tmp73_;
Box _tmp78_ = {0};
- gboolean _tmp79_ = FALSE;
+ gboolean _tmp79_;
#line 451 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (src != NULL);
#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2410,9 +2410,9 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp43_ < 0) {
#line 2413 "image.c"
- gint _tmp44_ = 0;
- gdouble _tmp45_ = 0.0;
- gdouble _tmp46_ = 0.0;
+ gint _tmp44_;
+ gdouble _tmp45_;
+ gdouble _tmp46_;
#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp44_ = top;
#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2442,10 +2442,10 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp52_ > _tmp53_) {
#line 2445 "image.c"
- gint _tmp54_ = 0;
- gint _tmp55_ = 0;
- gdouble _tmp56_ = 0.0;
- gdouble _tmp57_ = 0.0;
+ gint _tmp54_;
+ gint _tmp55_;
+ gdouble _tmp56_;
+ gdouble _tmp57_;
#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp54_ = img_h;
#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2475,9 +2475,9 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
#line 471 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp63_ < 0) {
#line 2478 "image.c"
- gint _tmp64_ = 0;
- gdouble _tmp65_ = 0.0;
- gdouble _tmp66_ = 0.0;
+ gint _tmp64_;
+ gdouble _tmp65_;
+ gdouble _tmp66_;
#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp64_ = left;
#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2507,10 +2507,10 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
#line 475 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp72_ > _tmp73_) {
#line 2510 "image.c"
- gint _tmp74_ = 0;
- gint _tmp75_ = 0;
- gdouble _tmp76_ = 0.0;
- gdouble _tmp77_ = 0.0;
+ gint _tmp74_;
+ gint _tmp75_;
+ gdouble _tmp76_;
+ gdouble _tmp77_;
#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp74_ = img_w;
#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2528,10 +2528,10 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp79_) {
#line 2531 "image.c"
- gint _tmp80_ = 0;
- gint _tmp81_ = 0;
- gint _tmp82_ = 0;
- gint _tmp83_ = 0;
+ gint _tmp80_;
+ gint _tmp81_;
+ gint _tmp82_;
+ gint _tmp83_;
Box _tmp84_ = {0};
#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp80_ = left_offset;
@@ -2547,18 +2547,18 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
_tmp78_ = _tmp84_;
#line 2549 "image.c"
} else {
- Box _tmp85_ = {0};
- gint _tmp86_ = 0;
- gint _tmp87_ = 0;
- Box _tmp88_ = {0};
- gint _tmp89_ = 0;
- gint _tmp90_ = 0;
- Box _tmp91_ = {0};
- gint _tmp92_ = 0;
- gint _tmp93_ = 0;
- Box _tmp94_ = {0};
- gint _tmp95_ = 0;
- gint _tmp96_ = 0;
+ Box _tmp85_;
+ gint _tmp86_;
+ gint _tmp87_;
+ Box _tmp88_;
+ gint _tmp89_;
+ gint _tmp90_;
+ Box _tmp91_;
+ gint _tmp92_;
+ gint _tmp93_;
+ Box _tmp94_;
+ gint _tmp95_;
+ gint _tmp96_;
#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp85_ = *src;
#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
diff --git a/src/util/misc.c b/src/util/misc.c
index 69a38e7..98b6719 100644
--- a/src/util/misc.c
+++ b/src/util/misc.c
@@ -1,4 +1,4 @@
-/* misc.c generated by valac 0.34.7, the Vala compiler
+/* misc.c generated by valac 0.36.6, the Vala compiler
* generated from misc.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -251,7 +251,7 @@ static gboolean one_shot_scheduler_callback_wrapper (OneShotScheduler* self);
static gboolean _one_shot_scheduler_callback_wrapper_gsource_func (gpointer self);
void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule);
void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint priority, guint msec, gboolean reschedule);
-static void one_shot_scheduler_finalize (OneShotScheduler* obj);
+static void one_shot_scheduler_finalize (OneShotScheduler * obj);
gpointer op_timer_ref (gpointer instance);
void op_timer_unref (gpointer instance);
GParamSpec* param_spec_op_timer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -268,13 +268,13 @@ OpTimer* op_timer_construct (GType object_type, const gchar* name);
void op_timer_start (OpTimer* self);
void op_timer_stop (OpTimer* self);
gchar* op_timer_to_string (OpTimer* self);
-static void op_timer_finalize (OpTimer* obj);
+static void op_timer_finalize (OpTimer * obj);
guint int64_hash (gint64* n) {
guint result = 0U;
guint8* u8 = NULL;
- gint64* _tmp0_ = NULL;
+ gint64* _tmp0_;
guint hash = 0U;
#line 9 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp0_ = n;
@@ -295,14 +295,14 @@ guint int64_hash (gint64* n) {
#line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
while (TRUE) {
#line 298 "misc.c"
- gint _tmp3_ = 0;
- guint _tmp4_ = 0U;
- guint _tmp5_ = 0U;
- guint8* _tmp6_ = NULL;
+ gint _tmp3_;
+ guint _tmp4_;
+ guint _tmp5_;
+ guint8* _tmp6_;
#line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
if (!_tmp1_) {
#line 305 "misc.c"
- gint _tmp2_ = 0;
+ gint _tmp2_;
#line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp2_ = ctr;
#line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -344,9 +344,9 @@ guint int64_hash (gint64* n) {
gboolean int64_equal (gint64* a, gint64* b) {
gboolean result = FALSE;
gint64* bia = NULL;
- gint64* _tmp0_ = NULL;
+ gint64* _tmp0_;
gint64* bib = NULL;
- gint64* _tmp1_ = NULL;
+ gint64* _tmp1_;
#line 19 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp0_ = a;
#line 19 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -366,9 +366,9 @@ gboolean int64_equal (gint64* a, gint64* b) {
gint int64_compare (gint64* a, gint64* b) {
gint result = 0;
gint64 diff = 0LL;
- gint64* _tmp0_ = NULL;
- gint64* _tmp1_ = NULL;
- gint64 _tmp2_ = 0LL;
+ gint64* _tmp0_;
+ gint64* _tmp1_;
+ gint64 _tmp2_;
#line 26 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp0_ = a;
#line 26 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -385,7 +385,7 @@ gint int64_compare (gint64* a, gint64* b) {
return result;
#line 387 "misc.c"
} else {
- gint64 _tmp3_ = 0LL;
+ gint64 _tmp3_;
#line 29 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp3_ = diff;
#line 29 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -409,11 +409,11 @@ gint int64_compare (gint64* a, gint64* b) {
gint uint64_compare (guint64* a, guint64* b) {
gint result = 0;
guint64 a64 = 0ULL;
- guint64* _tmp0_ = NULL;
+ guint64* _tmp0_;
guint64 b64 = 0ULL;
- guint64* _tmp1_ = NULL;
- guint64 _tmp2_ = 0ULL;
- guint64 _tmp3_ = 0ULL;
+ guint64* _tmp1_;
+ guint64 _tmp2_;
+ guint64 _tmp3_;
#line 36 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp0_ = a;
#line 36 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -434,8 +434,8 @@ gint uint64_compare (guint64* a, guint64* b) {
return result;
#line 436 "misc.c"
} else {
- guint64 _tmp4_ = 0ULL;
- guint64 _tmp5_ = 0ULL;
+ guint64 _tmp4_;
+ guint64 _tmp5_;
#line 41 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp4_ = a64;
#line 41 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -460,8 +460,8 @@ gint uint64_compare (guint64* a, guint64* b) {
gboolean bool_value_equals (GValue* a, GValue* b) {
gboolean result = FALSE;
- GValue _tmp0_ = {0};
- GValue _tmp1_ = {0};
+ GValue _tmp0_;
+ GValue _tmp1_;
#line 49 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_val_if_fail (a != NULL, FALSE);
#line 49 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -480,8 +480,8 @@ gboolean bool_value_equals (GValue* a, GValue* b) {
gboolean int_value_equals (GValue* a, GValue* b) {
gboolean result = FALSE;
- GValue _tmp0_ = {0};
- GValue _tmp1_ = {0};
+ GValue _tmp0_;
+ GValue _tmp1_;
#line 53 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_val_if_fail (a != NULL, FALSE);
#line 53 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -500,10 +500,10 @@ gboolean int_value_equals (GValue* a, GValue* b) {
gulong timeval_to_ms (GTimeVal* time_val) {
gulong result = 0UL;
- GTimeVal _tmp0_ = {0};
- glong _tmp1_ = 0L;
- GTimeVal _tmp2_ = {0};
- glong _tmp3_ = 0L;
+ GTimeVal _tmp0_;
+ glong _tmp1_;
+ GTimeVal _tmp2_;
+ glong _tmp3_;
#line 57 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_val_if_fail (time_val != NULL, 0UL);
#line 58 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -525,7 +525,7 @@ gulong timeval_to_ms (GTimeVal* time_val) {
gulong now_ms (void) {
gulong result = 0UL;
GTimeVal _tmp0_ = {0};
- gulong _tmp1_ = 0UL;
+ gulong _tmp1_;
#line 62 "/home/jens/Source/shotwell/src/util/misc.vala"
g_get_current_time (&_tmp0_);
#line 62 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -541,8 +541,8 @@ gulong now_ms (void) {
gulong now_sec (void) {
gulong result = 0UL;
GTimeVal time_val = {0};
- GTimeVal _tmp0_ = {0};
- glong _tmp1_ = 0L;
+ GTimeVal _tmp0_;
+ glong _tmp1_;
#line 66 "/home/jens/Source/shotwell/src/util/misc.vala"
g_get_current_time (&time_val);
#line 68 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -559,7 +559,7 @@ gulong now_sec (void) {
inline time_t now_time_t (void) {
time_t result = 0;
- gulong _tmp0_ = 0UL;
+ gulong _tmp0_;
#line 72 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp0_ = now_sec ();
#line 72 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -572,13 +572,13 @@ inline time_t now_time_t (void) {
gchar* md5_binary (guint8* buffer, gsize length) {
gchar* result = NULL;
- gsize _tmp0_ = 0UL;
+ gsize _tmp0_;
GChecksum* md5 = NULL;
- GChecksum* _tmp1_ = NULL;
- guint8* _tmp2_ = NULL;
- gsize _tmp3_ = 0UL;
- const gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+ GChecksum* _tmp1_;
+ guint8* _tmp2_;
+ gsize _tmp3_;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
#line 76 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp0_ = length;
#line 76 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -610,17 +610,17 @@ gchar* md5_binary (guint8* buffer, gsize length) {
gchar* md5_file (GFile* file, GError** error) {
gchar* result = NULL;
GChecksum* md5 = NULL;
- GChecksum* _tmp0_ = NULL;
+ GChecksum* _tmp0_;
guint8* buffer = NULL;
- guint8* _tmp1_ = NULL;
- gint buffer_length1 = 0;
- gint _buffer_size_ = 0;
+ guint8* _tmp1_;
+ gint buffer_length1;
+ gint _buffer_size_;
GFileInputStream* fins = NULL;
- GFile* _tmp2_ = NULL;
- GFileInputStream* _tmp3_ = NULL;
- GChecksum* _tmp18_ = NULL;
- const gchar* _tmp19_ = NULL;
- gchar* _tmp20_ = NULL;
+ GFile* _tmp2_;
+ GFileInputStream* _tmp3_;
+ GChecksum* _tmp18_;
+ const gchar* _tmp19_;
+ gchar* _tmp20_;
GError * _inner_error_ = NULL;
#line 84 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_val_if_fail (G_IS_FILE (file), NULL);
@@ -662,15 +662,15 @@ gchar* md5_file (GFile* file, GError** error) {
while (TRUE) {
#line 664 "misc.c"
gsize bytes_read = 0UL;
- GFileInputStream* _tmp5_ = NULL;
- guint8* _tmp6_ = NULL;
- gint _tmp6__length1 = 0;
- gssize _tmp7_ = 0L;
- gsize _tmp8_ = 0UL;
- GChecksum* _tmp9_ = NULL;
- guint8* _tmp10_ = NULL;
- gint _tmp10__length1 = 0;
- gsize _tmp11_ = 0UL;
+ GFileInputStream* _tmp5_;
+ guint8* _tmp6_;
+ gint _tmp6__length1;
+ gssize _tmp7_;
+ gsize _tmp8_;
+ GChecksum* _tmp9_;
+ guint8* _tmp10_;
+ gint _tmp10__length1;
+ gsize _tmp11_;
#line 89 "/home/jens/Source/shotwell/src/util/misc.vala"
if (!_tmp4_) {
#line 677 "misc.c"
@@ -723,7 +723,7 @@ gchar* md5_file (GFile* file, GError** error) {
}
}
{
- GFileInputStream* _tmp12_ = NULL;
+ GFileInputStream* _tmp12_;
#line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp12_ = fins;
#line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -738,11 +738,11 @@ gchar* md5_file (GFile* file, GError** error) {
__catch5_g_error:
{
GError* err = NULL;
- GFile* _tmp13_ = NULL;
- gchar* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- GError* _tmp16_ = NULL;
- const gchar* _tmp17_ = NULL;
+ GFile* _tmp13_;
+ gchar* _tmp14_;
+ gchar* _tmp15_;
+ GError* _tmp16_;
+ const gchar* _tmp17_;
#line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
err = _inner_error_;
#line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -804,20 +804,20 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
- GeeSet* _tmp2_ = NULL;
+ GeeSet* _tmp2_;
gboolean _tmp7_ = FALSE;
- GeeSet* _tmp8_ = NULL;
+ GeeSet* _tmp8_;
gboolean _tmp14_ = FALSE;
gboolean _tmp15_ = FALSE;
- GeeSet* _tmp16_ = NULL;
+ GeeSet* _tmp16_;
gboolean _tmp21_ = FALSE;
- GeeSet* _tmp22_ = NULL;
- GeeSet* _tmp24_ = NULL;
- gint _tmp25_ = 0;
- gint _tmp26_ = 0;
- GeeSet* _tmp27_ = NULL;
- gint _tmp28_ = 0;
- gint _tmp29_ = 0;
+ GeeSet* _tmp22_;
+ GeeSet* _tmp24_;
+ gint _tmp25_;
+ gint _tmp26_;
+ GeeSet* _tmp27_;
+ gint _tmp28_;
+ gint _tmp29_;
#line 107 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_val_if_fail ((a == NULL) || GEE_IS_SET (a), FALSE);
#line 107 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -827,9 +827,9 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp2_ != NULL) {
#line 830 "misc.c"
- GeeSet* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- gint _tmp5_ = 0;
+ GeeSet* _tmp3_;
+ gint _tmp4_;
+ gint _tmp5_;
#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp3_ = a;
#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -847,7 +847,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp1_) {
#line 850 "misc.c"
- GeeSet* _tmp6_ = NULL;
+ GeeSet* _tmp6_;
#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp6_ = b;
#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -872,15 +872,15 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
if (_tmp8_ == NULL) {
#line 874 "misc.c"
gboolean _tmp9_ = FALSE;
- GeeSet* _tmp10_ = NULL;
+ GeeSet* _tmp10_;
#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp10_ = b;
#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp10_ != NULL) {
#line 881 "misc.c"
- GeeSet* _tmp11_ = NULL;
- gint _tmp12_ = 0;
- gint _tmp13_ = 0;
+ GeeSet* _tmp11_;
+ gint _tmp12_;
+ gint _tmp13_;
#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp11_ = b;
#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -916,7 +916,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp16_ == NULL) {
#line 919 "misc.c"
- GeeSet* _tmp17_ = NULL;
+ GeeSet* _tmp17_;
#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp17_ = b;
#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -934,13 +934,13 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
#line 935 "misc.c"
} else {
gboolean _tmp18_ = FALSE;
- GeeSet* _tmp19_ = NULL;
+ GeeSet* _tmp19_;
#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp19_ = a;
#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp19_ != NULL) {
#line 943 "misc.c"
- GeeSet* _tmp20_ = NULL;
+ GeeSet* _tmp20_;
#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp20_ = b;
#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -968,7 +968,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
#line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp22_ == NULL) {
#line 971 "misc.c"
- GeeSet* _tmp23_ = NULL;
+ GeeSet* _tmp23_;
#line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp23_ = b;
#line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1009,8 +1009,8 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
}
{
GeeIterator* _element_it = NULL;
- GeeSet* _tmp30_ = NULL;
- GeeIterator* _tmp31_ = NULL;
+ GeeSet* _tmp30_;
+ GeeIterator* _tmp31_;
#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp30_ = a;
#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1020,14 +1020,14 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
while (TRUE) {
#line 1023 "misc.c"
- GeeIterator* _tmp32_ = NULL;
- gboolean _tmp33_ = FALSE;
+ GeeIterator* _tmp32_;
+ gboolean _tmp33_;
gchar* element = NULL;
- GeeIterator* _tmp34_ = NULL;
- gpointer _tmp35_ = NULL;
- GeeSet* _tmp36_ = NULL;
- const gchar* _tmp37_ = NULL;
- gboolean _tmp38_ = FALSE;
+ GeeIterator* _tmp34_;
+ gpointer _tmp35_;
+ GeeSet* _tmp36_;
+ const gchar* _tmp37_;
+ gboolean _tmp38_;
#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp32_ = _element_it;
#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1088,16 +1088,16 @@ static gpointer _g_object_ref0 (gpointer self) {
GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
GeeSet* result = NULL;
gboolean _tmp0_ = FALSE;
- GeeSet* _tmp1_ = NULL;
+ GeeSet* _tmp1_;
gboolean _tmp6_ = FALSE;
- GeeSet* _tmp7_ = NULL;
+ GeeSet* _tmp7_;
GeeSet* intersection = NULL;
- GeeHashSet* _tmp12_ = NULL;
+ GeeHashSet* _tmp12_;
GeeSet* _tmp41_ = NULL;
- GeeSet* _tmp42_ = NULL;
- gint _tmp43_ = 0;
- gint _tmp44_ = 0;
- GeeSet* _tmp46_ = NULL;
+ GeeSet* _tmp42_;
+ gint _tmp43_;
+ gint _tmp44_;
+ GeeSet* _tmp46_;
#line 134 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_val_if_fail ((a == NULL) || GEE_IS_SET (a), NULL);
#line 134 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1109,7 +1109,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
#line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp1_ != NULL) {
#line 1112 "misc.c"
- GeeSet* _tmp2_ = NULL;
+ GeeSet* _tmp2_;
#line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp2_ = b;
#line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1123,14 +1123,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
#line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp0_) {
#line 1126 "misc.c"
- GeeSet* _tmp3_ = NULL;
+ GeeSet* _tmp3_;
#line 137 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp3_ = excluded;
#line 137 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp3_ != NULL) {
#line 1132 "misc.c"
- GeeSet* _tmp4_ = NULL;
- GeeSet* _tmp5_ = NULL;
+ GeeSet* _tmp4_;
+ GeeSet* _tmp5_;
#line 138 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp4_ = excluded;
#line 138 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1150,7 +1150,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp7_ == NULL) {
#line 1153 "misc.c"
- GeeSet* _tmp8_ = NULL;
+ GeeSet* _tmp8_;
#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp8_ = b;
#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1164,14 +1164,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp6_) {
#line 1167 "misc.c"
- GeeSet* _tmp9_ = NULL;
+ GeeSet* _tmp9_;
#line 144 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp9_ = excluded;
#line 144 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp9_ != NULL) {
#line 1173 "misc.c"
- GeeSet* _tmp10_ = NULL;
- GeeSet* _tmp11_ = NULL;
+ GeeSet* _tmp10_;
+ GeeSet* _tmp11_;
#line 145 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp10_ = excluded;
#line 145 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1193,8 +1193,8 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
#line 1194 "misc.c"
{
GeeIterator* _element_it = NULL;
- GeeSet* _tmp13_ = NULL;
- GeeIterator* _tmp14_ = NULL;
+ GeeSet* _tmp13_;
+ GeeIterator* _tmp14_;
#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp13_ = a;
#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1204,14 +1204,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
while (TRUE) {
#line 1207 "misc.c"
- GeeIterator* _tmp15_ = NULL;
- gboolean _tmp16_ = FALSE;
+ GeeIterator* _tmp15_;
+ gboolean _tmp16_;
gchar* element = NULL;
- GeeIterator* _tmp17_ = NULL;
- gpointer _tmp18_ = NULL;
- GeeSet* _tmp19_ = NULL;
- const gchar* _tmp20_ = NULL;
- gboolean _tmp21_ = FALSE;
+ GeeIterator* _tmp17_;
+ gpointer _tmp18_;
+ GeeSet* _tmp19_;
+ const gchar* _tmp20_;
+ gboolean _tmp21_;
#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp15_ = _element_it;
#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1237,8 +1237,8 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
#line 153 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp21_) {
#line 1240 "misc.c"
- GeeSet* _tmp22_ = NULL;
- const gchar* _tmp23_ = NULL;
+ GeeSet* _tmp22_;
+ const gchar* _tmp23_;
#line 154 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp22_ = intersection;
#line 154 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1247,14 +1247,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
#line 1249 "misc.c"
} else {
- GeeSet* _tmp24_ = NULL;
+ GeeSet* _tmp24_;
#line 155 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp24_ = excluded;
#line 155 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp24_ != NULL) {
#line 1256 "misc.c"
- GeeSet* _tmp25_ = NULL;
- const gchar* _tmp26_ = NULL;
+ GeeSet* _tmp25_;
+ const gchar* _tmp26_;
#line 156 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp25_ = excluded;
#line 156 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1274,8 +1274,8 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
}
{
GeeIterator* _element_it = NULL;
- GeeSet* _tmp27_ = NULL;
- GeeIterator* _tmp28_ = NULL;
+ GeeSet* _tmp27_;
+ GeeIterator* _tmp28_;
#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp27_ = b;
#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1285,14 +1285,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
while (TRUE) {
#line 1288 "misc.c"
- GeeIterator* _tmp29_ = NULL;
- gboolean _tmp30_ = FALSE;
+ GeeIterator* _tmp29_;
+ gboolean _tmp30_;
gchar* element = NULL;
- GeeIterator* _tmp31_ = NULL;
- gpointer _tmp32_ = NULL;
- GeeSet* _tmp33_ = NULL;
- const gchar* _tmp34_ = NULL;
- gboolean _tmp35_ = FALSE;
+ GeeIterator* _tmp31_;
+ gpointer _tmp32_;
+ GeeSet* _tmp33_;
+ const gchar* _tmp34_;
+ gboolean _tmp35_;
#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp29_ = _element_it;
#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1318,8 +1318,8 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
#line 160 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp35_) {
#line 1321 "misc.c"
- GeeSet* _tmp36_ = NULL;
- const gchar* _tmp37_ = NULL;
+ GeeSet* _tmp36_;
+ const gchar* _tmp37_;
#line 161 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp36_ = intersection;
#line 161 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1328,14 +1328,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), _tmp37_);
#line 1330 "misc.c"
} else {
- GeeSet* _tmp38_ = NULL;
+ GeeSet* _tmp38_;
#line 162 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp38_ = excluded;
#line 162 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp38_ != NULL) {
#line 1337 "misc.c"
- GeeSet* _tmp39_ = NULL;
- const gchar* _tmp40_ = NULL;
+ GeeSet* _tmp39_;
+ const gchar* _tmp40_;
#line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp39_ = excluded;
#line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1362,7 +1362,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp44_ > 0) {
#line 1365 "misc.c"
- GeeSet* _tmp45_ = NULL;
+ GeeSet* _tmp45_;
#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp45_ = intersection;
#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1388,25 +1388,25 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
guchar* result = NULL;
gint64* ids = NULL;
- GeeCollection* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
- gint64* _tmp3_ = NULL;
- gint ids_length1 = 0;
- gint _ids_size_ = 0;
+ GeeCollection* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
+ gint64* _tmp3_;
+ gint ids_length1;
+ gint _ids_size_;
gint ctr = 0;
gsize bytes = 0UL;
- GeeCollection* _tmp16_ = NULL;
- gint _tmp17_ = 0;
- gint _tmp18_ = 0;
+ GeeCollection* _tmp16_;
+ gint _tmp17_;
+ gint _tmp18_;
guchar* serialized = NULL;
- guchar* _tmp19_ = NULL;
- gint serialized_length1 = 0;
- gint _serialized_size_ = 0;
- gint64* _tmp20_ = NULL;
- gint _tmp20__length1 = 0;
- guchar* _tmp21_ = NULL;
- gint _tmp21__length1 = 0;
+ guchar* _tmp19_;
+ gint serialized_length1;
+ gint _serialized_size_;
+ gint64* _tmp20_;
+ gint _tmp20__length1;
+ guchar* _tmp21_;
+ gint _tmp21__length1;
#line 169 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_val_if_fail (GEE_IS_COLLECTION (photos), NULL);
#line 170 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1428,8 +1428,8 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
#line 1429 "misc.c"
{
GeeIterator* _photo_it = NULL;
- GeeCollection* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
+ GeeCollection* _tmp4_;
+ GeeIterator* _tmp5_;
#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp4_ = photos;
#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1439,18 +1439,18 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
while (TRUE) {
#line 1442 "misc.c"
- GeeIterator* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+ GeeIterator* _tmp6_;
+ gboolean _tmp7_;
Photo* photo = NULL;
- GeeIterator* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
- gint64* _tmp10_ = NULL;
- gint _tmp10__length1 = 0;
- gint _tmp11_ = 0;
- Photo* _tmp12_ = NULL;
+ GeeIterator* _tmp8_;
+ gpointer _tmp9_;
+ gint64* _tmp10_;
+ gint _tmp10__length1;
+ gint _tmp11_;
+ Photo* _tmp12_;
PhotoID _tmp13_ = {0};
- gint64 _tmp14_ = 0LL;
- gint64 _tmp15_ = 0LL;
+ gint64 _tmp14_;
+ gint64 _tmp15_;
#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp6_ = _photo_it;
#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1538,22 +1538,22 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
GeeList* result = NULL;
gsize count = 0UL;
- gint _tmp0_ = 0;
+ gint _tmp0_;
gboolean _tmp1_ = FALSE;
- gsize _tmp2_ = 0UL;
+ gsize _tmp2_;
gint64* ids = NULL;
- gsize _tmp4_ = 0UL;
- gint64* _tmp5_ = NULL;
- gint ids_length1 = 0;
- gint _ids_size_ = 0;
- gint64* _tmp6_ = NULL;
- gint _tmp6__length1 = 0;
- guchar* _tmp7_ = NULL;
- gint _tmp8_ = 0;
+ gsize _tmp4_;
+ gint64* _tmp5_;
+ gint ids_length1;
+ gint _ids_size_;
+ gint64* _tmp6_;
+ gint _tmp6__length1;
+ guchar* _tmp7_;
+ gint _tmp8_;
GeeArrayList* list = NULL;
- GeeArrayList* _tmp9_ = NULL;
- gint64* _tmp10_ = NULL;
- gint _tmp10__length1 = 0;
+ GeeArrayList* _tmp9_;
+ gint64* _tmp10_;
+ gint _tmp10__length1;
#line 183 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp0_ = size;
#line 183 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1566,7 +1566,7 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
_tmp1_ = TRUE;
#line 1568 "misc.c"
} else {
- guchar* _tmp3_ = NULL;
+ guchar* _tmp3_;
#line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp3_ = serialized;
#line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1627,8 +1627,8 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
id = id_collection[id_it];
#line 1629 "misc.c"
{
- GeeArrayList* _tmp11_ = NULL;
- gint64 _tmp12_ = 0LL;
+ GeeArrayList* _tmp11_;
+ gint64 _tmp12_;
PhotoID _tmp13_ = {0};
#line 192 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp11_ = list;
@@ -1655,25 +1655,25 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
guchar* result = NULL;
GdkAtom* atoms = NULL;
- GeeCollection* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
- GdkAtom* _tmp3_ = NULL;
- gint atoms_length1 = 0;
- gint _atoms_size_ = 0;
+ GeeCollection* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
+ GdkAtom* _tmp3_;
+ gint atoms_length1;
+ gint _atoms_size_;
gint ctr = 0;
gsize bytes = 0UL;
- GeeCollection* _tmp17_ = NULL;
- gint _tmp18_ = 0;
- gint _tmp19_ = 0;
+ GeeCollection* _tmp17_;
+ gint _tmp18_;
+ gint _tmp19_;
guchar* serialized = NULL;
- guchar* _tmp20_ = NULL;
- gint serialized_length1 = 0;
- gint _serialized_size_ = 0;
- GdkAtom* _tmp21_ = NULL;
- gint _tmp21__length1 = 0;
- guchar* _tmp22_ = NULL;
- gint _tmp22__length1 = 0;
+ guchar* _tmp20_;
+ gint serialized_length1;
+ gint _serialized_size_;
+ GdkAtom* _tmp21_;
+ gint _tmp21__length1;
+ guchar* _tmp22_;
+ gint _tmp22__length1;
#line 197 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_val_if_fail (GEE_IS_COLLECTION (media), NULL);
#line 198 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1695,8 +1695,8 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
#line 1696 "misc.c"
{
GeeIterator* _current_media_it = NULL;
- GeeCollection* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
+ GeeCollection* _tmp4_;
+ GeeIterator* _tmp5_;
#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp4_ = media;
#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1706,19 +1706,19 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
while (TRUE) {
#line 1709 "misc.c"
- GeeIterator* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+ GeeIterator* _tmp6_;
+ gboolean _tmp7_;
MediaSource* current_media = NULL;
- GeeIterator* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
- GdkAtom* _tmp10_ = NULL;
- gint _tmp10__length1 = 0;
- gint _tmp11_ = 0;
- MediaSource* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
- gchar* _tmp14_ = NULL;
- GdkAtom _tmp15_ = 0U;
- GdkAtom _tmp16_ = 0U;
+ GeeIterator* _tmp8_;
+ gpointer _tmp9_;
+ GdkAtom* _tmp10_;
+ gint _tmp10__length1;
+ gint _tmp11_;
+ MediaSource* _tmp12_;
+ gchar* _tmp13_;
+ gchar* _tmp14_;
+ GdkAtom _tmp15_;
+ GdkAtom _tmp16_;
#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp6_ = _current_media_it;
#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1810,22 +1810,22 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
GeeList* unserialize_media_sources (guchar* serialized, gint size) {
GeeList* result = NULL;
gsize count = 0UL;
- gint _tmp0_ = 0;
+ gint _tmp0_;
gboolean _tmp1_ = FALSE;
- gsize _tmp2_ = 0UL;
+ gsize _tmp2_;
GdkAtom* atoms = NULL;
- gsize _tmp4_ = 0UL;
- GdkAtom* _tmp5_ = NULL;
- gint atoms_length1 = 0;
- gint _atoms_size_ = 0;
- GdkAtom* _tmp6_ = NULL;
- gint _tmp6__length1 = 0;
- guchar* _tmp7_ = NULL;
- gint _tmp8_ = 0;
+ gsize _tmp4_;
+ GdkAtom* _tmp5_;
+ gint atoms_length1;
+ gint _atoms_size_;
+ GdkAtom* _tmp6_;
+ gint _tmp6__length1;
+ guchar* _tmp7_;
+ gint _tmp8_;
GeeArrayList* list = NULL;
- GeeArrayList* _tmp9_ = NULL;
- GdkAtom* _tmp10_ = NULL;
- gint _tmp10__length1 = 0;
+ GeeArrayList* _tmp9_;
+ GdkAtom* _tmp10_;
+ gint _tmp10__length1;
#line 211 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp0_ = size;
#line 211 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1838,7 +1838,7 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
_tmp1_ = TRUE;
#line 1840 "misc.c"
} else {
- guchar* _tmp3_ = NULL;
+ guchar* _tmp3_;
#line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp3_ = serialized;
#line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1900,16 +1900,16 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
#line 1901 "misc.c"
{
MediaSource* media = NULL;
- MediaCollectionRegistry* _tmp11_ = NULL;
- MediaCollectionRegistry* _tmp12_ = NULL;
- GdkAtom _tmp13_ = 0U;
- gchar* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- MediaSource* _tmp16_ = NULL;
- MediaSource* _tmp17_ = NULL;
- MediaSource* _tmp18_ = NULL;
- GeeArrayList* _tmp19_ = NULL;
- MediaSource* _tmp20_ = NULL;
+ MediaCollectionRegistry* _tmp11_;
+ MediaCollectionRegistry* _tmp12_;
+ GdkAtom _tmp13_;
+ gchar* _tmp14_;
+ gchar* _tmp15_;
+ MediaSource* _tmp16_;
+ MediaSource* _tmp17_;
+ MediaSource* _tmp18_;
+ GeeArrayList* _tmp19_;
+ MediaSource* _tmp20_;
#line 220 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp11_ = media_collection_registry_get_instance ();
#line 220 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1959,44 +1959,44 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
static gchar* g_time_format (struct tm *self, const gchar* format) {
gchar* result = NULL;
gchar* buffer = NULL;
- gchar* _tmp0_ = NULL;
- gint buffer_length1 = 0;
- gint _buffer_size_ = 0;
- gchar* _tmp1_ = NULL;
- gint _tmp1__length1 = 0;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gint _tmp3__length1 = 0;
- gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+ gint buffer_length1;
+ gint _buffer_size_;
+ gchar* _tmp1_;
+ gint _tmp1__length1;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
+ gint _tmp3__length1;
+ gchar* _tmp4_;
+#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 2002 "misc.c"
}
@@ -2006,20 +2006,20 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
gchar* result = NULL;
gchar* from_format = NULL;
gchar* to_format = NULL;
- struct tm _tmp0_ = {0};
- gint _tmp1_ = 0;
- struct tm _tmp2_ = {0};
- gint _tmp3_ = 0;
- const gchar* _tmp19_ = NULL;
- gchar* _tmp20_ = NULL;
- gchar* _tmp21_ = NULL;
- const gchar* _tmp22_ = NULL;
- gchar* _tmp23_ = NULL;
- gchar* _tmp24_ = NULL;
- gchar* _tmp25_ = NULL;
- gchar* _tmp26_ = NULL;
- gchar* _tmp27_ = NULL;
- gchar* _tmp28_ = NULL;
+ struct tm _tmp0_;
+ gint _tmp1_;
+ struct tm _tmp2_;
+ gint _tmp3_;
+ const gchar* _tmp19_;
+ gchar* _tmp20_;
+ gchar* _tmp21_;
+ const gchar* _tmp22_;
+ gchar* _tmp23_;
+ gchar* _tmp24_;
+ gchar* _tmp25_;
+ gchar* _tmp26_;
+ gchar* _tmp27_;
+ gchar* _tmp28_;
#line 228 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_val_if_fail (from_date != NULL, NULL);
#line 228 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2036,10 +2036,10 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
if (_tmp1_ == _tmp3_) {
#line 2038 "misc.c"
gboolean _tmp4_ = FALSE;
- struct tm _tmp5_ = {0};
- gint _tmp6_ = 0;
- struct tm _tmp7_ = {0};
- gint _tmp8_ = 0;
+ struct tm _tmp5_;
+ gint _tmp6_;
+ struct tm _tmp7_;
+ gint _tmp8_;
#line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp5_ = *from_date;
#line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2051,10 +2051,10 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
#line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp6_ == _tmp8_) {
#line 2054 "misc.c"
- struct tm _tmp9_ = {0};
- gint _tmp10_ = 0;
- struct tm _tmp11_ = {0};
- gint _tmp12_ = 0;
+ struct tm _tmp9_;
+ gint _tmp10_;
+ struct tm _tmp11_;
+ gint _tmp12_;
#line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp9_ = *from_date;
#line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2074,8 +2074,8 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
#line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp4_) {
#line 2077 "misc.c"
- gchar* _tmp13_ = NULL;
- gchar* _tmp14_ = NULL;
+ gchar* _tmp13_;
+ gchar* _tmp14_;
#line 237 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp13_ = resources_get_start_multiday_span_format_string ();
#line 237 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2090,8 +2090,8 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
to_format = _tmp14_;
#line 2092 "misc.c"
} else {
- gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
#line 242 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp15_ = resources_get_start_multimonth_span_format_string ();
#line 242 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2107,8 +2107,8 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
#line 2108 "misc.c"
}
} else {
- gchar* _tmp17_ = NULL;
- gchar* _tmp18_ = NULL;
+ gchar* _tmp17_;
+ gchar* _tmp18_;
#line 248 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp17_ = resources_get_long_date_format_string ();
#line 248 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2163,12 +2163,12 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
gchar* format_local_date (struct tm* date) {
gchar* result = NULL;
- gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
#line 256 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_val_if_fail (date != NULL, NULL);
#line 257 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2197,10 +2197,10 @@ gchar* format_local_date (struct tm* date) {
OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target) {
OneShotScheduler* self = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- OneShotCallback _tmp2_ = NULL;
- void* _tmp2__target = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+ OneShotCallback _tmp2_;
+ void* _tmp2__target;
#line 267 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 267 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2236,7 +2236,7 @@ OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback cal
gboolean one_shot_scheduler_is_scheduled (OneShotScheduler* self) {
gboolean result = FALSE;
- guint _tmp0_ = 0U;
+ guint _tmp0_;
#line 280 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_val_if_fail (IS_ONE_SHOT_SCHEDULER (self), FALSE);
#line 281 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2268,7 +2268,7 @@ static gboolean _one_shot_scheduler_callback_wrapper_gsource_func (gpointer self
void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority) {
- guint _tmp0_ = 0U;
+ guint _tmp0_;
#line 288 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self));
#line 289 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2276,8 +2276,8 @@ void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority)
#line 289 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp0_ == ((guint) 0)) {
#line 2279 "misc.c"
- gint _tmp1_ = 0;
- guint _tmp2_ = 0U;
+ gint _tmp1_;
+ guint _tmp2_;
#line 290 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp1_ = priority;
#line 290 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2290,8 +2290,8 @@ void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority)
void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule) {
- guint _tmp0_ = 0U;
- gboolean _tmp1_ = FALSE;
+ guint _tmp0_;
+ gboolean _tmp1_;
#line 293 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self));
#line 294 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2306,11 +2306,11 @@ void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gbool
void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint priority, guint msec, gboolean reschedule) {
gboolean _tmp0_ = FALSE;
- guint _tmp1_ = 0U;
- guint _tmp3_ = 0U;
- gint _tmp5_ = 0;
- guint _tmp6_ = 0U;
- guint _tmp7_ = 0U;
+ guint _tmp1_;
+ guint _tmp3_;
+ gint _tmp5_;
+ guint _tmp6_;
+ guint _tmp7_;
#line 297 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self));
#line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2318,7 +2318,7 @@ void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint pri
#line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp1_ != ((guint) 0)) {
#line 2321 "misc.c"
- gboolean _tmp2_ = FALSE;
+ gboolean _tmp2_;
#line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp2_ = reschedule;
#line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2340,7 +2340,7 @@ void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint pri
#line 301 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp3_ != ((guint) 0)) {
#line 2343 "misc.c"
- guint _tmp4_ = 0U;
+ guint _tmp4_;
#line 302 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp4_ = self->priv->scheduled;
#line 302 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2360,8 +2360,8 @@ void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint pri
void one_shot_scheduler_cancel (OneShotScheduler* self) {
- guint _tmp0_ = 0U;
- guint _tmp1_ = 0U;
+ guint _tmp0_;
+ guint _tmp1_;
#line 307 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self));
#line 308 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2384,8 +2384,8 @@ void one_shot_scheduler_cancel (OneShotScheduler* self) {
static gboolean one_shot_scheduler_callback_wrapper (OneShotScheduler* self) {
gboolean result = FALSE;
- OneShotCallback _tmp0_ = NULL;
- void* _tmp0__target = NULL;
+ OneShotCallback _tmp0_;
+ void* _tmp0__target;
#line 315 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_val_if_fail (IS_ONE_SHOT_SCHEDULER (self), FALSE);
#line 316 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2446,7 +2446,7 @@ static gchar* value_one_shot_scheduler_collect_value (GValue* value, guint n_col
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
if (collect_values[0].v_pointer) {
#line 2449 "misc.c"
- OneShotScheduler* object;
+ OneShotScheduler * object;
object = collect_values[0].v_pointer;
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
if (object->parent_instance.g_class == NULL) {
@@ -2473,7 +2473,7 @@ static gchar* value_one_shot_scheduler_collect_value (GValue* value, guint n_col
static gchar* value_one_shot_scheduler_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- OneShotScheduler** object_p;
+ OneShotScheduler ** object_p;
object_p = collect_values[0].v_pointer;
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
if (!object_p) {
@@ -2525,7 +2525,7 @@ gpointer value_get_one_shot_scheduler (const GValue* value) {
void value_set_one_shot_scheduler (GValue* value, gpointer v_object) {
- OneShotScheduler* old;
+ OneShotScheduler * old;
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ONE_SHOT_SCHEDULER));
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2556,7 +2556,7 @@ void value_set_one_shot_scheduler (GValue* value, gpointer v_object) {
void value_take_one_shot_scheduler (GValue* value, gpointer v_object) {
- OneShotScheduler* old;
+ OneShotScheduler * old;
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ONE_SHOT_SCHEDULER));
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2606,7 +2606,7 @@ static void one_shot_scheduler_instance_init (OneShotScheduler * self) {
}
-static void one_shot_scheduler_finalize (OneShotScheduler* obj) {
+static void one_shot_scheduler_finalize (OneShotScheduler * obj) {
OneShotScheduler * self;
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ONE_SHOT_SCHEDULER, OneShotScheduler);
@@ -2635,7 +2635,7 @@ GType one_shot_scheduler_get_type (void) {
gpointer one_shot_scheduler_ref (gpointer instance) {
- OneShotScheduler* self;
+ OneShotScheduler * self;
self = instance;
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
g_atomic_int_inc (&self->ref_count);
@@ -2646,7 +2646,7 @@ gpointer one_shot_scheduler_ref (gpointer instance) {
void one_shot_scheduler_unref (gpointer instance) {
- OneShotScheduler* self;
+ OneShotScheduler * self;
self = instance;
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -2661,8 +2661,8 @@ void one_shot_scheduler_unref (gpointer instance) {
OpTimer* op_timer_construct (GType object_type, const gchar* name) {
OpTimer* self = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 331 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 331 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2689,7 +2689,7 @@ OpTimer* op_timer_new (const gchar* name) {
void op_timer_start (OpTimer* self) {
- GTimer* _tmp0_ = NULL;
+ GTimer* _tmp0_;
#line 335 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_if_fail (IS_OP_TIMER (self));
#line 336 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2702,15 +2702,15 @@ void op_timer_start (OpTimer* self) {
void op_timer_stop (OpTimer* self) {
gdouble time = 0.0;
- GTimer* _tmp0_ = NULL;
- gdouble _tmp1_ = 0.0;
- gdouble _tmp2_ = 0.0;
- gdouble _tmp3_ = 0.0;
- gdouble _tmp4_ = 0.0;
- gdouble _tmp5_ = 0.0;
- gdouble _tmp7_ = 0.0;
- gdouble _tmp8_ = 0.0;
- glong _tmp10_ = 0L;
+ GTimer* _tmp0_;
+ gdouble _tmp1_;
+ gdouble _tmp2_;
+ gdouble _tmp3_;
+ gdouble _tmp4_;
+ gdouble _tmp5_;
+ gdouble _tmp7_;
+ gdouble _tmp8_;
+ glong _tmp10_;
#line 339 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_if_fail (IS_OP_TIMER (self));
#line 340 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2732,7 +2732,7 @@ void op_timer_stop (OpTimer* self) {
#line 344 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp4_ < _tmp5_) {
#line 2735 "misc.c"
- gdouble _tmp6_ = 0.0;
+ gdouble _tmp6_;
#line 345 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp6_ = time;
#line 345 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2746,7 +2746,7 @@ void op_timer_stop (OpTimer* self) {
#line 347 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp7_ > _tmp8_) {
#line 2749 "misc.c"
- gdouble _tmp9_ = 0.0;
+ gdouble _tmp9_;
#line 348 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp9_ = time;
#line 348 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2763,7 +2763,7 @@ void op_timer_stop (OpTimer* self) {
gchar* op_timer_to_string (OpTimer* self) {
gchar* result = NULL;
- glong _tmp0_ = 0L;
+ glong _tmp0_;
#line 353 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_val_if_fail (IS_OP_TIMER (self), NULL);
#line 354 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2771,14 +2771,14 @@ gchar* op_timer_to_string (OpTimer* self) {
#line 354 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp0_ > ((glong) 0)) {
#line 2774 "misc.c"
- const gchar* _tmp1_ = NULL;
- glong _tmp2_ = 0L;
- gdouble _tmp3_ = 0.0;
- gdouble _tmp4_ = 0.0;
- gdouble _tmp5_ = 0.0;
- glong _tmp6_ = 0L;
- gdouble _tmp7_ = 0.0;
- gchar* _tmp8_ = NULL;
+ const gchar* _tmp1_;
+ glong _tmp2_;
+ gdouble _tmp3_;
+ gdouble _tmp4_;
+ gdouble _tmp5_;
+ glong _tmp6_;
+ gdouble _tmp7_;
+ gchar* _tmp8_;
#line 355 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp1_ = self->priv->name;
#line 355 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2801,8 +2801,8 @@ gchar* op_timer_to_string (OpTimer* self) {
return result;
#line 2803 "misc.c"
} else {
- const gchar* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
+ const gchar* _tmp9_;
+ gchar* _tmp10_;
#line 358 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp9_ = self->priv->name;
#line 358 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2858,7 +2858,7 @@ static gchar* value_op_timer_collect_value (GValue* value, guint n_collect_value
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
if (collect_values[0].v_pointer) {
#line 2861 "misc.c"
- OpTimer* object;
+ OpTimer * object;
object = collect_values[0].v_pointer;
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
if (object->parent_instance.g_class == NULL) {
@@ -2885,7 +2885,7 @@ static gchar* value_op_timer_collect_value (GValue* value, guint n_collect_value
static gchar* value_op_timer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- OpTimer** object_p;
+ OpTimer ** object_p;
object_p = collect_values[0].v_pointer;
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
if (!object_p) {
@@ -2937,7 +2937,7 @@ gpointer value_get_op_timer (const GValue* value) {
void value_set_op_timer (GValue* value, gpointer v_object) {
- OpTimer* old;
+ OpTimer * old;
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_OP_TIMER));
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2968,7 +2968,7 @@ void value_set_op_timer (GValue* value, gpointer v_object) {
void value_take_op_timer (GValue* value, gpointer v_object) {
- OpTimer* old;
+ OpTimer * old;
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_OP_TIMER));
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -3008,7 +3008,7 @@ static void op_timer_class_init (OpTimerClass * klass) {
static void op_timer_instance_init (OpTimer * self) {
- GTimer* _tmp0_ = NULL;
+ GTimer* _tmp0_;
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
self->priv = OP_TIMER_GET_PRIVATE (self);
#line 325 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -3029,7 +3029,7 @@ static void op_timer_instance_init (OpTimer * self) {
}
-static void op_timer_finalize (OpTimer* obj) {
+static void op_timer_finalize (OpTimer * obj) {
OpTimer * self;
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_OP_TIMER, OpTimer);
@@ -3058,7 +3058,7 @@ GType op_timer_get_type (void) {
gpointer op_timer_ref (gpointer instance) {
- OpTimer* self;
+ OpTimer * self;
self = instance;
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
g_atomic_int_inc (&self->ref_count);
@@ -3069,7 +3069,7 @@ gpointer op_timer_ref (gpointer instance) {
void op_timer_unref (gpointer instance) {
- OpTimer* self;
+ OpTimer * self;
self = instance;
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
diff --git a/src/util/string.c b/src/util/string.c
index ee1a1bb..642e9fa 100644
--- a/src/util/string.c
+++ b/src/util/string.c
@@ -1,4 +1,4 @@
-/* string.c generated by valac 0.34.7, the Vala compiler
+/* string.c generated by valac 0.36.6, the Vala compiler
* generated from string.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -37,7 +37,7 @@ gint utf8_cs_compare (void* a, void* b);
gint utf8_ci_compare (void* a, void* b);
gchar* uchar_array_to_string (guchar* data, int data_length1, gint length);
guchar* string_to_uchar_array (const gchar* str, int* result_length1);
-static void _vala_array_add1 (guchar** array, int* length, int* size, guchar value);
+static void _vala_array_add1 (guchar* * array, int* length, int* size, guchar value);
gchar* guarded_markup_escape_text (const gchar* plain);
glong find_last_offset (const gchar* str, gchar c);
gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1);
@@ -65,17 +65,17 @@ gboolean string_precollated_equals (const gchar* astr, const gchar* akey, const
static gchar string_get (const gchar* self, glong index) {
gchar result = '\0';
- glong _tmp0_ = 0L;
- gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp0_;
+ gchar _tmp1_;
+#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 81 "string.c"
}
@@ -84,7 +84,7 @@ static gchar string_get (const gchar* self, glong index) {
inline gboolean is_string_empty (const gchar* s) {
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
- const gchar* _tmp1_ = NULL;
+ const gchar* _tmp1_;
#line 12 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp1_ = s;
#line 12 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -93,8 +93,8 @@ inline gboolean is_string_empty (const gchar* s) {
_tmp0_ = TRUE;
#line 95 "string.c"
} else {
- const gchar* _tmp2_ = NULL;
- gchar _tmp3_ = '\0';
+ const gchar* _tmp2_;
+ gchar _tmp3_;
#line 12 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp2_ = s;
#line 12 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -113,9 +113,9 @@ inline gboolean is_string_empty (const gchar* s) {
gint utf8_cs_compare (void* a, void* b) {
gint result = 0;
- void* _tmp0_ = NULL;
- void* _tmp1_ = NULL;
- gint _tmp2_ = 0;
+ void* _tmp0_;
+ void* _tmp1_;
+ gint _tmp2_;
#line 17 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp0_ = a;
#line 17 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -132,14 +132,14 @@ gint utf8_cs_compare (void* a, void* b) {
gint utf8_ci_compare (void* a, void* b) {
gint result = 0;
- void* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- void* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gint _tmp6_ = 0;
- gint _tmp7_ = 0;
+ void* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ void* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ gint _tmp6_;
+ gint _tmp7_;
#line 22 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp0_ = a;
#line 22 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -170,19 +170,19 @@ gint utf8_ci_compare (void* a, void* b) {
gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) {
gchar* result = NULL;
- gint _tmp0_ = 0;
+ gint _tmp0_;
GString* builder = NULL;
- GString* _tmp2_ = NULL;
- GString* _tmp14_ = NULL;
- const gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
+ GString* _tmp2_;
+ GString* _tmp14_;
+ const gchar* _tmp15_;
+ gchar* _tmp16_;
#line 27 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp0_ = length;
#line 27 "/home/jens/Source/shotwell/src/util/string.vala"
if (_tmp0_ < 0) {
#line 184 "string.c"
- guchar* _tmp1_ = NULL;
- gint _tmp1__length1 = 0;
+ guchar* _tmp1_;
+ gint _tmp1__length1;
#line 28 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp1_ = data;
#line 28 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -208,16 +208,16 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) {
#line 31 "/home/jens/Source/shotwell/src/util/string.vala"
while (TRUE) {
#line 211 "string.c"
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
- guchar* _tmp7_ = NULL;
- gint _tmp7__length1 = 0;
- gint _tmp8_ = 0;
- guchar _tmp9_ = '\0';
+ gint _tmp5_;
+ gint _tmp6_;
+ guchar* _tmp7_;
+ gint _tmp7__length1;
+ gint _tmp8_;
+ guchar _tmp9_;
#line 31 "/home/jens/Source/shotwell/src/util/string.vala"
if (!_tmp3_) {
#line 220 "string.c"
- gint _tmp4_ = 0;
+ gint _tmp4_;
#line 31 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp4_ = ctr;
#line 31 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -247,11 +247,11 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) {
#line 32 "/home/jens/Source/shotwell/src/util/string.vala"
if (_tmp9_ != ((guchar) '\0')) {
#line 250 "string.c"
- GString* _tmp10_ = NULL;
- guchar* _tmp11_ = NULL;
- gint _tmp11__length1 = 0;
- gint _tmp12_ = 0;
- guchar _tmp13_ = '\0';
+ GString* _tmp10_;
+ guchar* _tmp11_;
+ gint _tmp11__length1;
+ gint _tmp12_;
+ guchar _tmp13_;
#line 33 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp10_ = builder;
#line 33 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -289,7 +289,7 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) {
}
-static void _vala_array_add1 (guchar** array, int* length, int* size, guchar value) {
+static void _vala_array_add1 (guchar* * array, int* length, int* size, guchar value) {
#line 45 "/home/jens/Source/shotwell/src/util/string.vala"
if ((*length) == (*size)) {
#line 45 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -307,11 +307,11 @@ static void _vala_array_add1 (guchar** array, int* length, int* size, guchar val
guchar* string_to_uchar_array (const gchar* str, int* result_length1) {
guchar* result = NULL;
guchar* data = NULL;
- guchar* _tmp0_ = NULL;
- gint data_length1 = 0;
- gint _data_size_ = 0;
- guchar* _tmp11_ = NULL;
- gint _tmp11__length1 = 0;
+ guchar* _tmp0_;
+ gint data_length1;
+ gint _data_size_;
+ guchar* _tmp11_;
+ gint _tmp11__length1;
#line 42 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (str != NULL, NULL);
#line 43 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -335,19 +335,19 @@ guchar* string_to_uchar_array (const gchar* str, int* result_length1) {
#line 44 "/home/jens/Source/shotwell/src/util/string.vala"
while (TRUE) {
#line 338 "string.c"
- gint _tmp3_ = 0;
- const gchar* _tmp4_ = NULL;
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
- guchar* _tmp7_ = NULL;
- gint _tmp7__length1 = 0;
- const gchar* _tmp8_ = NULL;
- gint _tmp9_ = 0;
- gchar _tmp10_ = '\0';
+ gint _tmp3_;
+ const gchar* _tmp4_;
+ gint _tmp5_;
+ gint _tmp6_;
+ guchar* _tmp7_;
+ gint _tmp7__length1;
+ const gchar* _tmp8_;
+ gint _tmp9_;
+ gchar _tmp10_;
#line 44 "/home/jens/Source/shotwell/src/util/string.vala"
if (!_tmp1_) {
#line 350 "string.c"
- gint _tmp2_ = 0;
+ gint _tmp2_;
#line 44 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp2_ = ctr;
#line 44 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -408,8 +408,8 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) {
gchar* result = NULL;
gchar* _tmp0_ = NULL;
gboolean _tmp1_ = FALSE;
- const gchar* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+ const gchar* _tmp2_;
+ gboolean _tmp3_;
#line 58 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp2_ = plain;
#line 58 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -417,8 +417,8 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) {
#line 58 "/home/jens/Source/shotwell/src/util/string.vala"
if (!_tmp3_) {
#line 420 "string.c"
- const gchar* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
+ const gchar* _tmp4_;
+ gboolean _tmp5_;
#line 58 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp4_ = plain;
#line 58 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -434,8 +434,8 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) {
#line 58 "/home/jens/Source/shotwell/src/util/string.vala"
if (_tmp1_) {
#line 437 "string.c"
- const gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
+ const gchar* _tmp6_;
+ gchar* _tmp7_;
#line 58 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp6_ = plain;
#line 58 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -446,7 +446,7 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) {
_tmp0_ = _tmp7_;
#line 448 "string.c"
} else {
- gchar* _tmp8_ = NULL;
+ gchar* _tmp8_;
#line 58 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp8_ = g_strdup ("");
#line 58 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -466,9 +466,9 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) {
glong find_last_offset (const gchar* str, gchar c) {
glong result = 0L;
glong offset = 0L;
- const gchar* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
+ const gchar* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
#line 61 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (str != NULL, 0L);
#line 62 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -482,12 +482,12 @@ glong find_last_offset (const gchar* str, gchar c) {
#line 63 "/home/jens/Source/shotwell/src/util/string.vala"
while (TRUE) {
#line 485 "string.c"
- glong _tmp3_ = 0L;
- glong _tmp4_ = 0L;
- const gchar* _tmp5_ = NULL;
- glong _tmp6_ = 0L;
- gchar _tmp7_ = '\0';
- gchar _tmp8_ = '\0';
+ glong _tmp3_;
+ glong _tmp4_;
+ const gchar* _tmp5_;
+ glong _tmp6_;
+ gchar _tmp7_;
+ gchar _tmp8_;
#line 63 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp3_ = offset;
#line 63 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -528,10 +528,10 @@ glong find_last_offset (const gchar* str, gchar c) {
gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1) {
gboolean result = FALSE;
gchar* strdown = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar** _tmp2_ = NULL;
- gint _tmp2__length1 = 0;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar** _tmp2_;
+ gint _tmp2__length1;
#line 73 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (str != NULL, FALSE);
#line 74 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -557,7 +557,7 @@ gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1)
#line 75 "/home/jens/Source/shotwell/src/util/string.vala"
for (str_element_it = 0; str_element_it < _tmp2__length1; str_element_it = str_element_it + 1) {
#line 560 "string.c"
- gchar* _tmp3_ = NULL;
+ gchar* _tmp3_;
gchar* str_element = NULL;
#line 75 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp3_ = g_strdup (str_element_collection[str_element_it]);
@@ -565,8 +565,8 @@ gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1)
str_element = _tmp3_;
#line 567 "string.c"
{
- const gchar* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
+ const gchar* _tmp4_;
+ const gchar* _tmp5_;
#line 76 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp4_ = strdown;
#line 76 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -617,11 +617,11 @@ gchar* guess_convert (const gchar* text) {
gsize bytes_read = 0UL;
const gchar* charset = NULL;
const gchar* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- gsize _tmp30_ = 0UL;
- const gchar* _tmp31_ = NULL;
- gint _tmp32_ = 0;
- gint _tmp33_ = 0;
+ gboolean _tmp1_;
+ gsize _tmp30_;
+ const gchar* _tmp31_;
+ gint _tmp32_;
+ gint _tmp33_;
GError * _inner_error_ = NULL;
#line 94 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (text != NULL, NULL);
@@ -641,16 +641,16 @@ gchar* guess_convert (const gchar* text) {
#line 101 "/home/jens/Source/shotwell/src/util/string.vala"
if (!_tmp1_) {
#line 643 "string.c"
- const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- gint _tmp5_ = 0;
+ const gchar* _tmp2_;
+ const gchar* _tmp3_;
+ gint _tmp4_;
+ gint _tmp5_;
gsize _tmp6_ = 0UL;
- gchar* _tmp7_ = NULL;
- gsize _tmp8_ = 0UL;
- const gchar* _tmp9_ = NULL;
- gint _tmp10_ = 0;
- gint _tmp11_ = 0;
+ gchar* _tmp7_;
+ gsize _tmp8_;
+ const gchar* _tmp9_;
+ gint _tmp10_;
+ gint _tmp11_;
#line 102 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp2_ = text;
#line 102 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -678,7 +678,7 @@ gchar* guess_convert (const gchar* text) {
#line 103 "/home/jens/Source/shotwell/src/util/string.vala"
if (_tmp8_ == ((gsize) _tmp11_)) {
#line 680 "string.c"
- const gchar* _tmp12_ = NULL;
+ const gchar* _tmp12_;
#line 104 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp12_ = charset;
#line 104 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -692,13 +692,13 @@ gchar* guess_convert (const gchar* text) {
}
{
gchar* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
- const gchar* _tmp15_ = NULL;
- gint _tmp16_ = 0;
- gint _tmp17_ = 0;
+ const gchar* _tmp14_;
+ const gchar* _tmp15_;
+ gint _tmp16_;
+ gint _tmp17_;
gsize _tmp18_ = 0UL;
- gchar* _tmp19_ = NULL;
- gchar* _tmp20_ = NULL;
+ gchar* _tmp19_;
+ gchar* _tmp20_;
#line 110 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp14_ = text;
#line 110 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -748,7 +748,7 @@ gchar* guess_convert (const gchar* text) {
__catch6_g_convert_error:
{
GError* _error_ = NULL;
- GError* _tmp21_ = NULL;
+ GError* _tmp21_;
#line 109 "/home/jens/Source/shotwell/src/util/string.vala"
_error_ = _inner_error_;
#line 109 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -760,13 +760,13 @@ gchar* guess_convert (const gchar* text) {
#line 760 "string.c"
{
gchar* _tmp22_ = NULL;
- const gchar* _tmp23_ = NULL;
- const gchar* _tmp24_ = NULL;
- gint _tmp25_ = 0;
- gint _tmp26_ = 0;
+ const gchar* _tmp23_;
+ const gchar* _tmp24_;
+ gint _tmp25_;
+ gint _tmp26_;
gsize _tmp27_ = 0UL;
- gchar* _tmp28_ = NULL;
- gchar* _tmp29_ = NULL;
+ gchar* _tmp28_;
+ gchar* _tmp29_;
#line 115 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp23_ = text;
#line 115 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -858,7 +858,7 @@ gchar* guess_convert (const gchar* text) {
#line 121 "/home/jens/Source/shotwell/src/util/string.vala"
if (_tmp30_ == ((gsize) _tmp33_)) {
#line 860 "string.c"
- const gchar* _tmp34_ = NULL;
+ const gchar* _tmp34_;
#line 122 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp34_ = charset;
#line 122 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -882,21 +882,21 @@ gchar* guess_convert (const gchar* text) {
static gchar* string_strip (const gchar* self) {
gchar* result = NULL;
gchar* _result_ = NULL;
- gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+ const gchar* _tmp1_;
+#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 901 "string.c"
}
@@ -905,29 +905,29 @@ static gchar* string_strip (const gchar* self) {
static gchar* string_delimit (const gchar* self, const gchar* delimiters, gchar new_delimiter) {
gchar* result = NULL;
gchar* _result_ = NULL;
- gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar _tmp3_ = '\0';
-#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ gchar _tmp3_;
+#line 1242 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1242 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (delimiters != NULL, NULL);
-#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = delimiters;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = new_delimiter;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_strdelimit (_tmp1_, _tmp2_, _tmp3_);
-#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1245 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _result_;
-#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1245 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 932 "string.c"
}
@@ -935,17 +935,17 @@ static gchar* string_delimit (const gchar* self, const gchar* delimiters, gchar
gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
+ const gchar* _tmp0_;
gchar* prepped = NULL;
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- PrepareInputTextOptions _tmp3_ = 0;
- PrepareInputTextOptions _tmp12_ = 0;
- PrepareInputTextOptions _tmp15_ = 0;
- PrepareInputTextOptions _tmp18_ = 0;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+ PrepareInputTextOptions _tmp3_;
+ PrepareInputTextOptions _tmp12_;
+ PrepareInputTextOptions _tmp15_;
+ PrepareInputTextOptions _tmp18_;
gboolean _tmp21_ = FALSE;
- PrepareInputTextOptions _tmp22_ = 0;
- gint _tmp25_ = 0;
+ PrepareInputTextOptions _tmp22_;
+ gint _tmp25_;
#line 131 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp0_ = text;
#line 131 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -967,8 +967,8 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
#line 135 "/home/jens/Source/shotwell/src/util/string.vala"
if ((_tmp3_ & PREPARE_INPUT_TEXT_OPTIONS_VALIDATE) == PREPARE_INPUT_TEXT_OPTIONS_VALIDATE) {
#line 969 "string.c"
- const gchar* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
+ const gchar* _tmp4_;
+ gboolean _tmp5_;
#line 136 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp4_ = text;
#line 136 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -976,9 +976,9 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
#line 136 "/home/jens/Source/shotwell/src/util/string.vala"
if (!_tmp5_) {
#line 978 "string.c"
- const gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
+ const gchar* _tmp6_;
+ gchar* _tmp7_;
+ const gchar* _tmp8_;
#line 137 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp6_ = text;
#line 137 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -993,8 +993,8 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
if (_tmp8_ == NULL) {
#line 994 "string.c"
const gchar* _tmp9_ = NULL;
- PrepareInputTextOptions _tmp10_ = 0;
- gchar* _tmp11_ = NULL;
+ PrepareInputTextOptions _tmp10_;
+ gchar* _tmp11_;
#line 140 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp10_ = options;
#line 140 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1024,8 +1024,8 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
#line 149 "/home/jens/Source/shotwell/src/util/string.vala"
if ((_tmp12_ & PREPARE_INPUT_TEXT_OPTIONS_NORMALIZE) != 0) {
#line 1026 "string.c"
- const gchar* _tmp13_ = NULL;
- gchar* _tmp14_ = NULL;
+ const gchar* _tmp13_;
+ gchar* _tmp14_;
#line 150 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp13_ = prepped;
#line 150 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1041,8 +1041,8 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
#line 152 "/home/jens/Source/shotwell/src/util/string.vala"
if ((_tmp15_ & PREPARE_INPUT_TEXT_OPTIONS_STRIP) != 0) {
#line 1043 "string.c"
- const gchar* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
+ const gchar* _tmp16_;
+ gchar* _tmp17_;
#line 153 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp16_ = prepped;
#line 153 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1058,8 +1058,8 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
#line 157 "/home/jens/Source/shotwell/src/util/string.vala"
if ((_tmp18_ & PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF) != 0) {
#line 1060 "string.c"
- const gchar* _tmp19_ = NULL;
- gchar* _tmp20_ = NULL;
+ const gchar* _tmp19_;
+ gchar* _tmp20_;
#line 158 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp19_ = prepped;
#line 158 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1075,8 +1075,8 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
#line 160 "/home/jens/Source/shotwell/src/util/string.vala"
if ((_tmp22_ & PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL) != 0) {
#line 1077 "string.c"
- const gchar* _tmp23_ = NULL;
- gboolean _tmp24_ = FALSE;
+ const gchar* _tmp23_;
+ gboolean _tmp24_;
#line 160 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp23_ = prepped;
#line 160 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1105,13 +1105,13 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
if (_tmp25_ >= 0) {
#line 1106 "string.c"
GString* sb = NULL;
- const gchar* _tmp26_ = NULL;
- GString* _tmp27_ = NULL;
- GString* _tmp28_ = NULL;
- gint _tmp29_ = 0;
- GString* _tmp30_ = NULL;
- const gchar* _tmp31_ = NULL;
- gchar* _tmp32_ = NULL;
+ const gchar* _tmp26_;
+ GString* _tmp27_;
+ GString* _tmp28_;
+ gint _tmp29_;
+ GString* _tmp30_;
+ const gchar* _tmp31_;
+ gchar* _tmp32_;
#line 167 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp26_ = prepped;
#line 167 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1150,9 +1150,9 @@ gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, g
gint64 parse_int64 (const gchar* str, gint num_base) {
gint64 result = 0LL;
- const gchar* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint64 _tmp2_ = 0LL;
+ const gchar* _tmp0_;
+ gint _tmp1_;
+ gint64 _tmp2_;
#line 176 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (str != NULL, 0LL);
#line 177 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1172,37 +1172,37 @@ gint64 parse_int64 (const gchar* str, gint num_base) {
static gint string_index_of_char (const gchar* self, gunichar c, gint start_index) {
gint result = 0;
gchar* _result_ = NULL;
- gint _tmp0_ = 0;
- gunichar _tmp1_ = 0U;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
-#line 1007 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gint _tmp0_;
+ gunichar _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+#line 1031 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = start_index;
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = c;
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_result_ = _tmp2_;
-#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = _result_;
-#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
#line 1193 "string.c"
- gchar* _tmp4_ = NULL;
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp4_;
+#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1201 "string.c"
} else {
-#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = -1;
-#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1207 "string.c"
}
@@ -1211,9 +1211,9 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde
inline gboolean string_contains_char (const gchar* haystack, gunichar needle) {
gboolean result = FALSE;
- const gchar* _tmp0_ = NULL;
- gunichar _tmp1_ = 0U;
- gint _tmp2_ = 0;
+ const gchar* _tmp0_;
+ gunichar _tmp1_;
+ gint _tmp2_;
#line 182 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (haystack != NULL, FALSE);
#line 183 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1233,39 +1233,39 @@ inline gboolean string_contains_char (const gchar* haystack, gunichar needle) {
static gint string_index_of (const gchar* self, const gchar* needle, gint start_index) {
gint result = 0;
gchar* _result_ = NULL;
- gint _tmp0_ = 0;
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gint _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, 0);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = start_index;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = needle;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1012 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_result_ = _tmp2_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = _result_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1014 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
#line 1256 "string.c"
- gchar* _tmp4_ = NULL;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp4_;
+#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = (gint) (_tmp4_ - ((gchar*) self));
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1264 "string.c"
} else {
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = -1;
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1270 "string.c"
}
@@ -1274,9 +1274,9 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
inline gboolean string_contains_str (const gchar* haystack, const gchar* needle) {
gboolean result = FALSE;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gint _tmp2_ = 0;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ gint _tmp2_;
#line 186 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (haystack != NULL, FALSE);
#line 186 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1298,117 +1298,117 @@ inline gboolean string_contains_str (const gchar* haystack, const gchar* needle)
static gchar* string_slice (const gchar* self, glong start, glong end) {
gchar* result = NULL;
glong string_length = 0L;
- gint _tmp0_ = 0;
- gint _tmp1_ = 0;
- glong _tmp2_ = 0L;
- glong _tmp5_ = 0L;
+ gint _tmp0_;
+ gint _tmp1_;
+ glong _tmp2_;
+ glong _tmp5_;
gboolean _tmp8_ = FALSE;
- glong _tmp9_ = 0L;
+ glong _tmp9_;
gboolean _tmp12_ = FALSE;
- glong _tmp13_ = 0L;
- glong _tmp16_ = 0L;
- glong _tmp17_ = 0L;
- glong _tmp18_ = 0L;
- glong _tmp19_ = 0L;
- glong _tmp20_ = 0L;
- gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp13_;
+ glong _tmp16_;
+ glong _tmp17_;
+ glong _tmp18_;
+ glong _tmp19_;
+ glong _tmp20_;
+ gchar* _tmp21_;
+#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp2_ < ((glong) 0)) {
#line 1327 "string.c"
- glong _tmp3_ = 0L;
- glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp3_;
+ glong _tmp4_;
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
start = _tmp3_ + _tmp4_;
#line 1336 "string.c"
}
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp5_ < ((glong) 0)) {
#line 1342 "string.c"
- glong _tmp6_ = 0L;
- glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp6_;
+ glong _tmp7_;
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
end = _tmp6_ + _tmp7_;
#line 1351 "string.c"
}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp9_ >= ((glong) 0)) {
#line 1357 "string.c"
- glong _tmp10_ = 0L;
- glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp10_;
+ glong _tmp11_;
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp8_ = _tmp10_ <= _tmp11_;
#line 1366 "string.c"
} else {
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp8_ = FALSE;
#line 1370 "string.c"
}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp13_ >= ((glong) 0)) {
#line 1378 "string.c"
- glong _tmp14_ = 0L;
- glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp14_;
+ glong _tmp15_;
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp12_ = _tmp14_ <= _tmp15_;
#line 1387 "string.c"
} else {
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp12_ = FALSE;
#line 1391 "string.c"
}
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp21_;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1413 "string.c"
}
@@ -1417,7 +1417,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
inline gchar* string_sliced_at (const gchar* str, gint index) {
gchar* result = NULL;
gchar* _tmp0_ = NULL;
- gint _tmp1_ = 0;
+ gint _tmp1_;
#line 190 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (str != NULL, NULL);
#line 191 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1425,12 +1425,12 @@ inline gchar* string_sliced_at (const gchar* str, gint index) {
#line 191 "/home/jens/Source/shotwell/src/util/string.vala"
if (_tmp1_ >= 0) {
#line 1427 "string.c"
- const gchar* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- const gchar* _tmp4_ = NULL;
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
- gchar* _tmp7_ = NULL;
+ const gchar* _tmp2_;
+ gint _tmp3_;
+ const gchar* _tmp4_;
+ gint _tmp5_;
+ gint _tmp6_;
+ gchar* _tmp7_;
#line 191 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp2_ = str;
#line 191 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1465,12 +1465,12 @@ inline gchar* string_sliced_at (const gchar* str, gint index) {
inline gchar* string_sliced_at_first_str (const gchar* haystack, const gchar* needle, gint start_index) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
- gchar* _tmp5_ = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
+ gchar* _tmp5_;
#line 194 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (haystack != NULL, NULL);
#line 194 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1498,39 +1498,39 @@ inline gchar* string_sliced_at_first_str (const gchar* haystack, const gchar* ne
static gint string_last_index_of (const gchar* self, const gchar* needle, gint start_index) {
gint result = 0;
gchar* _result_ = NULL;
- gint _tmp0_ = 0;
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
-#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gint _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+#line 1021 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, 0);
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = start_index;
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = needle;
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = g_strrstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_result_ = _tmp2_;
-#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1024 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = _result_;
-#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1024 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
#line 1521 "string.c"
- gchar* _tmp4_ = NULL;
-#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp4_;
+#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
-#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1529 "string.c"
} else {
-#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1027 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = -1;
-#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1027 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1535 "string.c"
}
@@ -1539,12 +1539,12 @@ static gint string_last_index_of (const gchar* self, const gchar* needle, gint s
inline gchar* string_sliced_at_last_str (const gchar* haystack, const gchar* needle, gint start_index) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
- gchar* _tmp5_ = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
+ gchar* _tmp5_;
#line 198 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (haystack != NULL, NULL);
#line 198 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1571,12 +1571,12 @@ inline gchar* string_sliced_at_last_str (const gchar* haystack, const gchar* nee
inline gchar* string_sliced_at_first_char (const gchar* haystack, gunichar ch, gint start_index) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gunichar _tmp2_ = 0U;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
- gchar* _tmp5_ = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ gunichar _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
+ gchar* _tmp5_;
#line 202 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (haystack != NULL, NULL);
#line 203 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1602,37 +1602,37 @@ inline gchar* string_sliced_at_first_char (const gchar* haystack, gunichar ch, g
static gint string_last_index_of_char (const gchar* self, gunichar c, gint start_index) {
gint result = 0;
gchar* _result_ = NULL;
- gint _tmp0_ = 0;
- gunichar _tmp1_ = 0U;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
-#line 1017 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gint _tmp0_;
+ gunichar _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+#line 1041 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = start_index;
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = c;
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_result_ = _tmp2_;
-#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = _result_;
-#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
#line 1623 "string.c"
- gchar* _tmp4_ = NULL;
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp4_;
+#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1631 "string.c"
} else {
-#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = -1;
-#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1637 "string.c"
}
@@ -1641,12 +1641,12 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
inline gchar* string_sliced_at_last_char (const gchar* haystack, gunichar ch, gint start_index) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gunichar _tmp2_ = 0U;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
- gchar* _tmp5_ = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ gunichar _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
+ gchar* _tmp5_;
#line 206 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (haystack != NULL, NULL);
#line 207 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1671,17 +1671,17 @@ inline gchar* string_sliced_at_last_char (const gchar* haystack, gunichar ch, gi
static gunichar string_get_char (const gchar* self, glong index) {
gunichar result = 0U;
- glong _tmp0_ = 0L;
- gunichar _tmp1_ = 0U;
-#line 1116 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp0_;
+ gunichar _tmp1_;
+#line 1140 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0U);
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1686 "string.c"
}
@@ -1690,11 +1690,11 @@ static gunichar string_get_char (const gchar* self, glong index) {
gchar* string_strip_leading_zeroes (const gchar* str) {
gchar* result = NULL;
GString* stripped = NULL;
- GString* _tmp0_ = NULL;
+ GString* _tmp0_;
gboolean prev_is_space = FALSE;
- GString* _tmp16_ = NULL;
- const gchar* _tmp17_ = NULL;
- gchar* _tmp18_ = NULL;
+ GString* _tmp16_;
+ const gchar* _tmp17_;
+ gchar* _tmp18_;
#line 211 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (str != NULL, NULL);
#line 212 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1706,7 +1706,7 @@ gchar* string_strip_leading_zeroes (const gchar* str) {
#line 1706 "string.c"
{
const gchar* iter = NULL;
- const gchar* _tmp1_ = NULL;
+ const gchar* _tmp1_;
#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp1_ = str;
#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1719,18 +1719,18 @@ gchar* string_strip_leading_zeroes (const gchar* str) {
#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
while (TRUE) {
#line 1721 "string.c"
- const gchar* _tmp5_ = NULL;
- gunichar _tmp6_ = 0U;
+ const gchar* _tmp5_;
+ gunichar _tmp6_;
gunichar ch = 0U;
- const gchar* _tmp7_ = NULL;
- gunichar _tmp8_ = 0U;
+ const gchar* _tmp7_;
+ gunichar _tmp8_;
gboolean _tmp9_ = FALSE;
- gboolean _tmp10_ = FALSE;
+ gboolean _tmp10_;
#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
if (!_tmp2_) {
#line 1731 "string.c"
- const gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp3_ = iter;
#line 214 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1765,7 +1765,7 @@ gchar* string_strip_leading_zeroes (const gchar* str) {
_tmp9_ = TRUE;
#line 1766 "string.c"
} else {
- gunichar _tmp11_ = 0U;
+ gunichar _tmp11_;
#line 217 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp11_ = ch;
#line 217 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1775,10 +1775,10 @@ gchar* string_strip_leading_zeroes (const gchar* str) {
#line 217 "/home/jens/Source/shotwell/src/util/string.vala"
if (_tmp9_) {
#line 1777 "string.c"
- GString* _tmp12_ = NULL;
- gunichar _tmp13_ = 0U;
- gunichar _tmp14_ = 0U;
- gboolean _tmp15_ = FALSE;
+ GString* _tmp12_;
+ gunichar _tmp13_;
+ gunichar _tmp14_;
+ gboolean _tmp15_;
#line 218 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp12_ = stripped;
#line 218 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1815,57 +1815,57 @@ gchar* string_strip_leading_zeroes (const gchar* str) {
static gboolean string_get_next_char (const gchar* self, gint* index, gunichar* c) {
gunichar _vala_c = 0U;
gboolean result = FALSE;
- gint _tmp0_ = 0;
- gunichar _tmp1_ = 0U;
- gunichar _tmp2_ = 0U;
-#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gint _tmp0_;
+ gunichar _tmp1_;
+ gunichar _tmp2_;
+#line 1129 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1130 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = *index;
-#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1130 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1130 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_vala_c = _tmp1_;
-#line 1107 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1131 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = _vala_c;
-#line 1107 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1131 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp2_ != ((gunichar) 0)) {
#line 1833 "string.c"
- gint _tmp3_ = 0;
- gchar* _tmp4_ = NULL;
-#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gint _tmp3_;
+ gchar* _tmp4_;
+#line 1132 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = *index;
-#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1132 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = g_utf8_next_char (((gchar*) self) + _tmp3_);
-#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1132 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
*index = (gint) (_tmp4_ - ((gchar*) self));
-#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1133 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = TRUE;
-#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1133 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (c) {
-#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1133 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
*c = _vala_c;
#line 1848 "string.c"
}
-#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1133 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1852 "string.c"
} else {
-#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1135 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = FALSE;
-#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1135 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (c) {
-#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1135 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
*c = _vala_c;
#line 1860 "string.c"
}
-#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1135 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
#line 1864 "string.c"
}
-#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1129 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (c) {
-#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1129 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
*c = _vala_c;
#line 1870 "string.c"
}
@@ -1875,12 +1875,12 @@ static gboolean string_get_next_char (const gchar* self, gint* index, gunichar*
gchar* string_remove_diacritics (const gchar* istring) {
gchar* result = NULL;
GString* builder = NULL;
- GString* _tmp0_ = NULL;
+ GString* _tmp0_;
gunichar ch = 0U;
gint i = 0;
- GString* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
+ GString* _tmp11_;
+ const gchar* _tmp12_;
+ gchar* _tmp13_;
#line 226 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (istring != NULL, NULL);
#line 227 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1892,16 +1892,16 @@ gchar* string_remove_diacritics (const gchar* istring) {
#line 230 "/home/jens/Source/shotwell/src/util/string.vala"
while (TRUE) {
#line 1894 "string.c"
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
gunichar _tmp4_ = 0U;
- gboolean _tmp5_ = FALSE;
- gboolean _tmp6_ = FALSE;
- gunichar _tmp7_ = 0U;
- GUnicodeType _tmp8_ = 0;
- GString* _tmp9_ = NULL;
- gunichar _tmp10_ = 0U;
+ gboolean _tmp5_;
+ gboolean _tmp6_;
+ gunichar _tmp7_;
+ GUnicodeType _tmp8_;
+ GString* _tmp9_;
+ gunichar _tmp10_;
#line 230 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp1_ = istring;
#line 230 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1978,12 +1978,12 @@ gchar* string_remove_diacritics (const gchar* istring) {
gchar* string_to_hex_string (const gchar* str) {
gchar* result = NULL;
GString* builder = NULL;
- GString* _tmp0_ = NULL;
+ GString* _tmp0_;
guint8* data = NULL;
- const gchar* _tmp1_ = NULL;
- GString* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
+ const gchar* _tmp1_;
+ GString* _tmp7_;
+ const gchar* _tmp8_;
+ gchar* _tmp9_;
#line 246 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (str != NULL, NULL);
#line 247 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -1997,11 +1997,11 @@ gchar* string_to_hex_string (const gchar* str) {
#line 250 "/home/jens/Source/shotwell/src/util/string.vala"
while (TRUE) {
#line 1999 "string.c"
- guint8* _tmp2_ = NULL;
+ guint8* _tmp2_;
const gchar* _tmp3_ = NULL;
- guint8* _tmp4_ = NULL;
- GString* _tmp5_ = NULL;
- guint8* _tmp6_ = NULL;
+ guint8* _tmp4_;
+ GString* _tmp5_;
+ guint8* _tmp6_;
#line 250 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp2_ = data;
#line 250 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2051,13 +2051,13 @@ gchar* string_to_hex_string (const gchar* str) {
guint string_collated_hash (void* ptr) {
guint result = 0U;
gchar* str = NULL;
- void* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- GHashFunc _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- guint _tmp5_ = 0U;
- guint _tmp6_ = 0U;
+ void* _tmp0_;
+ gchar* _tmp1_;
+ GHashFunc _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ guint _tmp5_;
+ guint _tmp6_;
#line 273 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp0_ = ptr;
#line 273 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2088,9 +2088,9 @@ guint string_collated_hash (void* ptr) {
guint string_precollated_hash (void* ptr) {
guint result = 0U;
- GHashFunc _tmp0_ = NULL;
- void* _tmp1_ = NULL;
- guint _tmp2_ = 0U;
+ GHashFunc _tmp0_;
+ void* _tmp1_;
+ guint _tmp2_;
#line 280 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp0_ = g_str_hash;
#line 280 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2108,17 +2108,17 @@ guint string_precollated_hash (void* ptr) {
gint string_collated_compare (void* a, void* b) {
gint result = 0;
gchar* astr = NULL;
- void* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ void* _tmp0_;
+ gchar* _tmp1_;
gchar* bstr = NULL;
- void* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
+ void* _tmp2_;
+ gchar* _tmp3_;
gint _result_ = 0;
- const gchar* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- gint _tmp6_ = 0;
+ const gchar* _tmp4_;
+ const gchar* _tmp5_;
+ gint _tmp6_;
gint _tmp7_ = 0;
- gint _tmp8_ = 0;
+ gint _tmp8_;
#line 285 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp0_ = a;
#line 285 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2144,17 +2144,17 @@ gint string_collated_compare (void* a, void* b) {
#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
if (_tmp8_ != 0) {
#line 2146 "string.c"
- gint _tmp9_ = 0;
+ gint _tmp9_;
#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp9_ = _result_;
#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp7_ = _tmp9_;
#line 2152 "string.c"
} else {
- GCompareFunc _tmp10_ = NULL;
- const gchar* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
- gint _tmp13_ = 0;
+ GCompareFunc _tmp10_;
+ const gchar* _tmp11_;
+ const gchar* _tmp12_;
+ gint _tmp13_;
#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp10_ = g_strcmp0;
#line 290 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2182,12 +2182,12 @@ gint string_collated_compare (void* a, void* b) {
gint string_precollated_compare (const gchar* astr, const gchar* akey, const gchar* bstr, const gchar* bkey) {
gint result = 0;
gint _result_ = 0;
- GCompareFunc _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gint _tmp3_ = 0;
+ GCompareFunc _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ gint _tmp3_;
gint _tmp4_ = 0;
- gint _tmp5_ = 0;
+ gint _tmp5_;
#line 294 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (astr != NULL, 0);
#line 294 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2211,17 +2211,17 @@ gint string_precollated_compare (const gchar* astr, const gchar* akey, const gch
#line 297 "/home/jens/Source/shotwell/src/util/string.vala"
if (_tmp5_ != 0) {
#line 2213 "string.c"
- gint _tmp6_ = 0;
+ gint _tmp6_;
#line 297 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp6_ = _result_;
#line 297 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp4_ = _tmp6_;
#line 2219 "string.c"
} else {
- GCompareFunc _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
- gint _tmp10_ = 0;
+ GCompareFunc _tmp7_;
+ const gchar* _tmp8_;
+ const gchar* _tmp9_;
+ gint _tmp10_;
#line 297 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp7_ = g_strcmp0;
#line 297 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2244,9 +2244,9 @@ gint string_precollated_compare (const gchar* astr, const gchar* akey, const gch
gboolean string_collated_equals (void* a, void* b) {
gboolean result = FALSE;
- void* _tmp0_ = NULL;
- void* _tmp1_ = NULL;
- gint _tmp2_ = 0;
+ void* _tmp0_;
+ void* _tmp1_;
+ gint _tmp2_;
#line 302 "/home/jens/Source/shotwell/src/util/string.vala"
_tmp0_ = a;
#line 302 "/home/jens/Source/shotwell/src/util/string.vala"
@@ -2263,11 +2263,11 @@ gboolean string_collated_equals (void* a, void* b) {
gboolean string_precollated_equals (const gchar* astr, const gchar* akey, const gchar* bstr, const gchar* bkey) {
gboolean result = FALSE;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- gint _tmp4_ = 0;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ const gchar* _tmp3_;
+ gint _tmp4_;
#line 306 "/home/jens/Source/shotwell/src/util/string.vala"
g_return_val_if_fail (astr != NULL, FALSE);
#line 306 "/home/jens/Source/shotwell/src/util/string.vala"
diff --git a/src/util/system.c b/src/util/system.c
index e7ff262..d099120 100644
--- a/src/util/system.c
+++ b/src/util/system.c
@@ -1,4 +1,4 @@
-/* system.c generated by valac 0.34.7, the Vala compiler
+/* system.c generated by valac 0.36.6, the Vala compiler
* generated from system.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -32,13 +32,13 @@ void show_file_in_nautilus (const gchar* filename, GError** error);
GFile* get_sys_install_dir (GFile* exec_dir) {
GFile* result = NULL;
GFile* child = NULL;
- GFile* _tmp0_ = NULL;
- GFile* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- gboolean _tmp6_ = FALSE;
+ GFile* _tmp0_;
+ GFile* _tmp1_;
+ GFile* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ gboolean _tmp5_;
+ gboolean _tmp6_;
#line 8 "/home/jens/Source/shotwell/src/util/system.vala"
g_return_val_if_fail (G_IS_FILE (exec_dir), NULL);
#line 10 "/home/jens/Source/shotwell/src/util/system.vala"
@@ -62,7 +62,7 @@ GFile* get_sys_install_dir (GFile* exec_dir) {
#line 12 "/home/jens/Source/shotwell/src/util/system.vala"
if (_tmp6_) {
#line 65 "system.c"
- GFile* _tmp7_ = NULL;
+ GFile* _tmp7_;
#line 13 "/home/jens/Source/shotwell/src/util/system.vala"
_tmp7_ = g_file_new_for_path (RESOURCES_PREFIX);
#line 13 "/home/jens/Source/shotwell/src/util/system.vala"
@@ -85,7 +85,7 @@ GFile* get_sys_install_dir (GFile* exec_dir) {
gchar* get_nautilus_install_location (void) {
gchar* result = NULL;
- gchar* _tmp0_ = NULL;
+ gchar* _tmp0_;
#line 20 "/home/jens/Source/shotwell/src/util/system.vala"
_tmp0_ = g_find_program_in_path ("nautilus");
#line 20 "/home/jens/Source/shotwell/src/util/system.vala"
@@ -97,8 +97,8 @@ gchar* get_nautilus_install_location (void) {
void sys_show_uri (GdkScreen* screen, const gchar* uri, GError** error) {
- GdkScreen* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
+ GdkScreen* _tmp0_;
+ const gchar* _tmp1_;
GError * _inner_error_ = NULL;
#line 23 "/home/jens/Source/shotwell/src/util/system.vala"
g_return_if_fail (GDK_IS_SCREEN (screen));
@@ -122,13 +122,13 @@ void sys_show_uri (GdkScreen* screen, const gchar* uri, GError** error) {
void show_file_in_nautilus (const gchar* filename, GError** error) {
- gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
GError * _inner_error_ = NULL;
#line 27 "/home/jens/Source/shotwell/src/util/system.vala"
g_return_if_fail (filename != NULL);
diff --git a/src/util/ui.c b/src/util/ui.c
index e881e93..8a7e0d7 100644
--- a/src/util/ui.c
+++ b/src/util/ui.c
@@ -1,4 +1,4 @@
-/* ui.c generated by valac 0.34.7, the Vala compiler
+/* ui.c generated by valac 0.36.6, the Vala compiler
* generated from ui.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -130,7 +130,7 @@ void spin_event_loop (void) {
#line 39 "/home/jens/Source/shotwell/src/util/ui.vala"
while (TRUE) {
#line 133 "ui.c"
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 39 "/home/jens/Source/shotwell/src/util/ui.vala"
_tmp0_ = gtk_events_pending ();
#line 39 "/home/jens/Source/shotwell/src/util/ui.vala"
@@ -148,9 +148,9 @@ void spin_event_loop (void) {
AdjustmentRelation get_adjustment_relation (GtkAdjustment* adjustment, gint value) {
AdjustmentRelation result = 0;
- gint _tmp0_ = 0;
- GtkAdjustment* _tmp1_ = NULL;
- gdouble _tmp2_ = 0.0;
+ gint _tmp0_;
+ GtkAdjustment* _tmp1_;
+ gdouble _tmp2_;
#line 43 "/home/jens/Source/shotwell/src/util/ui.vala"
g_return_val_if_fail (GTK_IS_ADJUSTMENT (adjustment), 0);
#line 44 "/home/jens/Source/shotwell/src/util/ui.vala"
@@ -167,11 +167,11 @@ AdjustmentRelation get_adjustment_relation (GtkAdjustment* adjustment, gint valu
return result;
#line 169 "ui.c"
} else {
- gint _tmp3_ = 0;
- GtkAdjustment* _tmp4_ = NULL;
- gdouble _tmp5_ = 0.0;
- GtkAdjustment* _tmp6_ = NULL;
- gdouble _tmp7_ = 0.0;
+ gint _tmp3_;
+ GtkAdjustment* _tmp4_;
+ gdouble _tmp5_;
+ GtkAdjustment* _tmp6_;
+ gdouble _tmp7_;
#line 46 "/home/jens/Source/shotwell/src/util/ui.vala"
_tmp3_ = value;
#line 46 "/home/jens/Source/shotwell/src/util/ui.vala"
@@ -202,14 +202,14 @@ AdjustmentRelation get_adjustment_relation (GtkAdjustment* adjustment, gint valu
void get_adjustment_page (GtkAdjustment* hadj, GtkAdjustment* vadj, GdkRectangle* result) {
GdkRectangle rect = {0};
- GtkAdjustment* _tmp0_ = NULL;
- gdouble _tmp1_ = 0.0;
- GtkAdjustment* _tmp2_ = NULL;
- gdouble _tmp3_ = 0.0;
- GtkAdjustment* _tmp4_ = NULL;
- gdouble _tmp5_ = 0.0;
- GtkAdjustment* _tmp6_ = NULL;
- gdouble _tmp7_ = 0.0;
+ GtkAdjustment* _tmp0_;
+ gdouble _tmp1_;
+ GtkAdjustment* _tmp2_;
+ gdouble _tmp3_;
+ GtkAdjustment* _tmp4_;
+ gdouble _tmp5_;
+ GtkAdjustment* _tmp6_;
+ gdouble _tmp7_;
#line 52 "/home/jens/Source/shotwell/src/util/ui.vala"
g_return_if_fail (GTK_IS_ADJUSTMENT (hadj));
#line 52 "/home/jens/Source/shotwell/src/util/ui.vala"
@@ -250,8 +250,8 @@ void get_adjustment_page (GtkAdjustment* hadj, GtkAdjustment* vadj, GdkRectangle
gboolean has_only_key_modifier (GdkModifierType field, GdkModifierType mask) {
gboolean result = FALSE;
- GdkModifierType _tmp0_ = 0;
- GdkModifierType _tmp1_ = 0;
+ GdkModifierType _tmp0_;
+ GdkModifierType _tmp1_;
#line 77 "/home/jens/Source/shotwell/src/util/ui.vala"
_tmp0_ = field;
#line 77 "/home/jens/Source/shotwell/src/util/ui.vala"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 22:03:20 +0000