aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-05-30 03:49:21 +0800
committerChristian Persch <chpe@src.gnome.org>2006-05-30 03:49:21 +0800
commit93ad37350052d823fa8a565b4cca602f99e3b797 (patch)
tree85abfbe496c16f60eaacaf544ca3a1ffa76df329 /lib
parentf8657fac124a526ac558a31656b149a26b05da31 (diff)
downloadgsoc2013-epiphany-93ad37350052d823fa8a565b4cca602f99e3b797.tar
gsoc2013-epiphany-93ad37350052d823fa8a565b4cca602f99e3b797.tar.gz
gsoc2013-epiphany-93ad37350052d823fa8a565b4cca602f99e3b797.tar.bz2
gsoc2013-epiphany-93ad37350052d823fa8a565b4cca602f99e3b797.tar.lz
gsoc2013-epiphany-93ad37350052d823fa8a565b4cca602f99e3b797.tar.xz
gsoc2013-epiphany-93ad37350052d823fa8a565b4cca602f99e3b797.tar.zst
gsoc2013-epiphany-93ad37350052d823fa8a565b4cca602f99e3b797.zip
Fix launching of desktop files.
2006-05-29 Christian Persch <chpe@cvs.gnome.org> * lib/ephy-file-helpers.c: (ephy_file_launch_application), (launch_desktop_item): Fix launching of desktop files.
Diffstat (limited to 'lib')
-rw-r--r--lib/ephy-file-helpers.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c
index c8548bf94..ef34c9b99 100644
--- a/lib/ephy-file-helpers.c
+++ b/lib/ephy-file-helpers.c
@@ -801,6 +801,7 @@ ephy_file_launch_application (GnomeVFSMimeApplication *application,
uris = g_list_prepend (NULL, uri);
+ /* FIXME multihead! */
screen = gdk_screen_get_default ();
envp = my_gdk_spawn_make_environment_for_screen (screen, NULL);
@@ -892,10 +893,15 @@ launch_desktop_item (const char *desktop_file,
GError **error)
{
GnomeDesktopItem *item = NULL;
+ GdkScreen *screen;
GList *uris = NULL;
char *canonical;
int ret = -1;
- char *envp[2] = { EPHY_UUID_ENVSTRING, NULL };
+ char **envp;
+
+ /* FIXME multihead! */
+ screen = gdk_screen_get_default ();
+ envp = my_gdk_spawn_make_environment_for_screen (screen, NULL);
item = gnome_desktop_item_new_from_file (desktop_file, 0, NULL);
if (item == NULL) return FALSE;
@@ -911,6 +917,7 @@ launch_desktop_item (const char *desktop_file,
g_list_foreach (uris, (GFunc) g_free, NULL);
g_list_free (uris);
+ g_strfreev (envp);
gnome_desktop_item_unref (item);
return ret;