Merge branch 'feature/upstream' into develop

1 files changed, 64 insertions, 40 deletions

diff --git a/src/util/system.c b/src/util/system.c
index d099120..3075260 100644
--- a/src/util/system.c
+++ b/src/util/system.c
@@ -63,36 +63,60 @@ GFile* get_sys_install_dir (GFile* exec_dir) {
 	if (_tmp6_) {
 #line 65 "system.c"
 		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"
-		result = _tmp7_;
-#line 13 "/home/jens/Source/shotwell/src/util/system.vala"
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		gboolean _tmp10_;
+		GFile* _tmp11_;
+#line 14 "/home/jens/Source/shotwell/src/util/system.vala"
+		_tmp7_ = exec_dir;
+#line 14 "/home/jens/Source/shotwell/src/util/system.vala"
+		_tmp8_ = g_file_get_basename (_tmp7_);
+#line 14 "/home/jens/Source/shotwell/src/util/system.vala"
+		_tmp9_ = _tmp8_;
+#line 14 "/home/jens/Source/shotwell/src/util/system.vala"
+		_tmp10_ = g_strcmp0 (_tmp9_, "src") == 0;
+#line 14 "/home/jens/Source/shotwell/src/util/system.vala"
+		_g_free0 (_tmp9_);
+#line 14 "/home/jens/Source/shotwell/src/util/system.vala"
+		if (_tmp10_) {
+#line 15 "/home/jens/Source/shotwell/src/util/system.vala"
+			result = NULL;
+#line 15 "/home/jens/Source/shotwell/src/util/system.vala"
+			_g_object_unref0 (child);
+#line 15 "/home/jens/Source/shotwell/src/util/system.vala"
+			return result;
+#line 89 "system.c"
+		}
+#line 18 "/home/jens/Source/shotwell/src/util/system.vala"
+		_tmp11_ = g_file_new_for_path (RESOURCES_PREFIX);
+#line 18 "/home/jens/Source/shotwell/src/util/system.vala"
+		result = _tmp11_;
+#line 18 "/home/jens/Source/shotwell/src/util/system.vala"
 		_g_object_unref0 (child);
-#line 13 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 18 "/home/jens/Source/shotwell/src/util/system.vala"
 		return result;
-#line 75 "system.c"
+#line 99 "system.c"
 	}
-#line 16 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 21 "/home/jens/Source/shotwell/src/util/system.vala"
 	result = NULL;
-#line 16 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 21 "/home/jens/Source/shotwell/src/util/system.vala"
 	_g_object_unref0 (child);
-#line 16 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 21 "/home/jens/Source/shotwell/src/util/system.vala"
 	return result;
-#line 83 "system.c"
+#line 107 "system.c"
 }
 
 
 gchar* get_nautilus_install_location (void) {
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 20 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 25 "/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"
+#line 25 "/home/jens/Source/shotwell/src/util/system.vala"
 	result = _tmp0_;
-#line 20 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 25 "/home/jens/Source/shotwell/src/util/system.vala"
 	return result;
-#line 96 "system.c"
+#line 120 "system.c"
 }
 
 
@@ -100,23 +124,23 @@ void sys_show_uri (GdkScreen* screen, const gchar* uri, GError** error) {
 	GdkScreen* _tmp0_;
 	const gchar* _tmp1_;
 	GError * _inner_error_ = NULL;
-#line 23 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
 	g_return_if_fail (GDK_IS_SCREEN (screen));
-#line 23 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
 	g_return_if_fail (uri != NULL);
-#line 24 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 29 "/home/jens/Source/shotwell/src/util/system.vala"
 	_tmp0_ = screen;
-#line 24 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 29 "/home/jens/Source/shotwell/src/util/system.vala"
 	_tmp1_ = uri;
-#line 24 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 29 "/home/jens/Source/shotwell/src/util/system.vala"
 	gtk_show_uri (_tmp0_, _tmp1_, (guint32) GDK_CURRENT_TIME, &_inner_error_);
-#line 24 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 29 "/home/jens/Source/shotwell/src/util/system.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 24 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 29 "/home/jens/Source/shotwell/src/util/system.vala"
 		g_propagate_error (error, _inner_error_);
-#line 24 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 29 "/home/jens/Source/shotwell/src/util/system.vala"
 		return;
-#line 120 "system.c"
+#line 144 "system.c"
 	}
 }
 
@@ -130,37 +154,37 @@ void show_file_in_nautilus (const gchar* filename, GError** error) {
 	gchar* _tmp5_;
 	gchar* _tmp6_;
 	GError * _inner_error_ = NULL;
-#line 27 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 32 "/home/jens/Source/shotwell/src/util/system.vala"
 	g_return_if_fail (filename != NULL);
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	_tmp0_ = get_nautilus_install_location ();
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	_tmp1_ = _tmp0_;
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	_tmp2_ = g_strconcat (_tmp1_, " ", NULL);
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	_tmp3_ = _tmp2_;
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	_tmp4_ = filename;
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	_tmp5_ = g_strconcat (_tmp3_, _tmp4_, NULL);
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	_tmp6_ = _tmp5_;
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	g_spawn_command_line_async (_tmp6_, &_inner_error_);
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	_g_free0 (_tmp6_);
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	_g_free0 (_tmp3_);
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	_g_free0 (_tmp1_);
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 		g_propagate_error (error, _inner_error_);
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 		return;
-#line 164 "system.c"
+#line 188 "system.c"
 	}
 }