Merged in CMaiku/pidgin (pull request #128)

Sat, 17 Sep 2016 11:43:36 -0500

author
Gary Kramlich <grim@reaperworld.com>
date
Sat, 17 Sep 2016 11:43:36 -0500
changeset 38044
b26906320440
parent 38042
b11347d83ec0 (current diff)
parent 38043
3549ff786eab (diff)
child 38046
3ca907207239
child 38054
adcd38bcc1d0

Merged in CMaiku/pidgin (pull request #128)

util: Fix purple_running_gnome() to check for gvfs-open too

--- a/libpurple/util.c	Thu Sep 15 14:34:33 2016 -0500
+++ b/libpurple/util.c	Sat Sep 17 11:43:36 2016 -0500
@@ -3222,10 +3222,16 @@
 purple_running_gnome(void)
 {
 #ifndef _WIN32
-	gchar *tmp = g_find_program_in_path("gnome-open");
-
-	if (tmp == NULL)
-		return FALSE;
+	gchar *tmp = g_find_program_in_path("gvfs-open");
+
+	if (tmp == NULL) {
+		tmp = g_find_program_in_path("gnome-open");
+
+		if (tmp == NULL) {
+			return FALSE;
+		}
+	}
+
 	g_free(tmp);
 
 	tmp = (gchar *)g_getenv("GNOME_DESKTOP_SESSION_ID");

mercurial