diff options
Diffstat (limited to 'hardinfo2')
| -rwxr-xr-x | hardinfo2/configure | 2 | ||||
| -rw-r--r-- | hardinfo2/pixmaps/network-connections.png | bin | 946 -> 852 bytes | |||
| -rw-r--r-- | hardinfo2/syncmanager.c | 2 | ||||
| -rw-r--r-- | hardinfo2/util.c | 17 |
4 files changed, 14 insertions, 7 deletions
diff --git a/hardinfo2/configure b/hardinfo2/configure index e763b935..f9373062 100755 --- a/hardinfo2/configure +++ b/hardinfo2/configure @@ -135,7 +135,7 @@ fi # --------------------------------------------------------------------------- SOUP=-1 -MIN_VERSION="2.3.0.1" +MIN_VERSION="2.24" echo -n "Checking for libsoup version >= ${MIN_VERSION}... " for i in `which pkg-config`; do $i --errors-to-stdout libsoup-2.4 \ diff --git a/hardinfo2/pixmaps/network-connections.png b/hardinfo2/pixmaps/network-connections.png Binary files differindex 97f2143f..883a003b 100644 --- a/hardinfo2/pixmaps/network-connections.png +++ b/hardinfo2/pixmaps/network-connections.png diff --git a/hardinfo2/syncmanager.c b/hardinfo2/syncmanager.c index f44bc808..12b0465e 100644 --- a/hardinfo2/syncmanager.c +++ b/hardinfo2/syncmanager.c @@ -309,7 +309,7 @@ static gboolean _action_call_function(SyncDialog * sd, gpointer user_data) if (sna->entry->get_data) str_data = sna->entry->get_data(); - if (!_soup_xmlrpc_call_with_parameters("sync.callFunction", sna, + if (!_soup_xmlrpc_call_with_parameters("sync.callFunctionEx", sna, _action_call_function_got_response, VERSION, ARCH, sna->entry->name, diff --git a/hardinfo2/util.c b/hardinfo2/util.c index a0a4fe1a..924b9b45 100644 --- a/hardinfo2/util.c +++ b/hardinfo2/util.c @@ -461,10 +461,15 @@ void open_url(gchar * url) "opera", "konqueror", "netscape", "links -g", NULL }; - gint i; - - for (i = 0; browsers[i]; i++) { - gchar *cmdline = g_strdup_printf("%s '%s'", browsers[i], url); + gint i = 0; + gchar *browser = (gchar *)g_getenv("BROWSER"); + + if (!browser || *browser == '\0') { + browser = (gchar *)browsers[i++]; + } + + do { + gchar *cmdline = g_strdup_printf("%s '%s'", browser, url); if (g_spawn_command_line_async(cmdline, NULL)) { g_free(cmdline); @@ -472,7 +477,9 @@ void open_url(gchar * url) } g_free(cmdline); - } + + browser = (gchar *)browsers[i++]; + } while (browser); g_warning("Couldn't find a Web browser to open URL %s.", url); } |
