From: Andy Spencer <andy753421@gmail.com>
Date: Wed, 5 May 2010 05:02:30 +0000 (+0000)
Subject: Fix default browser
X-Git-Tag: v0.4~13
X-Git-Url: http://pileus.org/git/?p=aweather;a=commitdiff_plain;h=a9c7078e69b49d54f86169fde67b7fee55256b52

Fix default browser
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 7bba88f..64939a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,6 +8,7 @@ aweather_SOURCES  = main.c \
 	aweather-gui.c      aweather-gui.h \
 	aweather-location.c aweather-location.h
 aweather_CPPFLAGS = \
+	-DBROWSER="\"$(browser)\"" \
 	-DHTMLDIR="\"$(dots)$(htmldir)\"" \
 	-DPKGDATADIR="\"$(dots)$(pkgdatadir)\"" \
 	-DPLUGINSDIR="\"$(dots)$(pkglibdir)\""
@@ -20,6 +21,9 @@ if WIN32
 AM_LDFLAGS       += -mwindows 
 aweather_SOURCES += resource.rc
 dots              = ..
+browser           = "open"
+else
+browser           = "xdg-open"
 endif
 
 .rc.o: ../data/aweather.ico
diff --git a/src/aweather-gui.c b/src/aweather-gui.c
index 42f65af..9cf4c8a 100644
--- a/src/aweather-gui.c
+++ b/src/aweather-gui.c
@@ -52,11 +52,13 @@ G_MODULE_EXPORT gboolean on_gui_key_press(GtkWidget *widget, GdkEventKey *event,
 G_MODULE_EXPORT void on_help_contents(GtkMenuItem *menu, AWeatherGui *self)
 {
 	GError *err = NULL;
-	const gchar *uri = "file://" HTMLDIR "/aweather.html";
-	gtk_show_uri(NULL, uri, GDK_CURRENT_TIME, &err);
-	if (err)
-		g_warning("Unable to open help page: %s - %s", uri, err->message);
-	g_error_free(err);
+	gchar *argv[] = {BROWSER, HTMLDIR "/aweather.html", NULL};
+	g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &err);
+	if (err) {
+		g_warning("Unable to open help page: %s - %s",
+				argv[1], err->message);
+		g_error_free(err);
+	}
 }
 
 G_MODULE_EXPORT void on_quit(GtkMenuItem *menu, AWeatherGui *self)