diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 16:48:02 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 16:48:02 +0100 |
| commit | abdaad68fb94e2d61448a6dfc14847df8a2c32b9 (patch) | |
| tree | 26855c5dd3bfffdbf319d5ba4a38223a28de3e7c /src/util/system.c | |
| parent | 0f67b3cc674377559e66c5a6729fd499049a992f (diff) | |
| parent | dd7f98a232efe86f6e6055119c9414a0f9d9e67b (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/util/system.c')
| -rw-r--r-- | src/util/system.c | 38 |
1 files changed, 19 insertions, 19 deletions
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); |