Add support for PROGNAME_{BROWSER,HTMLAPP} for now
This commit is contained in:
parent
d45f740b81
commit
3e7116b396
|
@ -38,14 +38,22 @@
|
||||||
#include <System.h>
|
#include <System.h>
|
||||||
#include "Desktop.h"
|
#include "Desktop.h"
|
||||||
|
|
||||||
|
|
||||||
|
/* constants */
|
||||||
|
#ifndef PROGNAME_BROWSER
|
||||||
|
# define PROGNAME_BROWSER "browser"
|
||||||
|
#endif
|
||||||
|
#ifndef PROGNAME_HTMLAPP
|
||||||
|
# define PROGNAME_HTMLAPP "htmlapp"
|
||||||
|
#endif
|
||||||
#ifndef PREFIX
|
#ifndef PREFIX
|
||||||
# define PREFIX "/usr/local"
|
# define PREFIX "/usr/local"
|
||||||
#endif
|
#endif
|
||||||
#ifndef BINDIR
|
#ifndef BINDIR
|
||||||
# define BINDIR PREFIX "/bin"
|
# define BINDIR PREFIX "/bin"
|
||||||
#endif
|
#endif
|
||||||
#ifndef DATADIR
|
#ifndef DATADIR
|
||||||
# define DATADIR PREFIX "/share"
|
# define DATADIR PREFIX "/share"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -787,7 +795,7 @@ static int _open_directory(MimeHandler * handler, String const * filename)
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
String const * directory;
|
String const * directory;
|
||||||
/* XXX open with the default file manager instead */
|
/* XXX open with the default file manager instead */
|
||||||
char * argv[] = { BINDIR "/browser", "--", NULL, NULL };
|
char * argv[] = { BINDIR "/" PROGNAME_BROWSER, "--", NULL, NULL };
|
||||||
const unsigned int flags = 0;
|
const unsigned int flags = 0;
|
||||||
GError * error = NULL;
|
GError * error = NULL;
|
||||||
|
|
||||||
|
@ -814,7 +822,7 @@ static int _open_url(MimeHandler * handler, String const * filename)
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
String const * url;
|
String const * url;
|
||||||
/* XXX open with the default web browser instead */
|
/* XXX open with the default web browser instead */
|
||||||
char * argv[] = { BINDIR "/htmlapp", "--", NULL, NULL };
|
char * argv[] = { BINDIR "/" PROGNAME_HTMLAPP, "--", NULL, NULL };
|
||||||
const unsigned int flags = 0;
|
const unsigned int flags = 0;
|
||||||
GError * error = NULL;
|
GError * error = NULL;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user