[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pidgin-commits
Subject:    /pidgin/main: b26906320440: Merged in CMaiku/pidgin (pull reques...
From:       Gary Kramlich <grim () reaperworld ! com>
Date:       2016-09-17 16:43:53
Message-ID: hg.b26906320440.1474130633.-874508059 () rock ! pidgin ! im
[Download RAW message or body]

Changeset: b269063204407cad192591d3e5f5a92b459e8277
Author:	 Gary Kramlich <grim@reaperworld.com>
Date:	 2016-09-17 11:43 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/b26906320440

Description:

Merged in CMaiku/pidgin (pull request #128)

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

diffstat:

 libpurple/util.c |  14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diffs (24 lines):

diff --git a/libpurple/util.c b/libpurple/util.c
--- a/libpurple/util.c
+++ b/libpurple/util.c
@@ -3222,10 +3222,16 @@ gboolean
 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");

_______________________________________________
Commits mailing list
Commits@pidgin.im
https://pidgin.im/cgi-bin/mailman/listinfo/commits
[prev in list] [next in list] [prev in thread] [next in thread]