aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ephy-file-helpers.c
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@src.gnome.org>2008-09-05 07:23:03 +0800
committerCosimo Cecchi <cosimoc@src.gnome.org>2008-09-05 07:23:03 +0800
commitc445dfd01935d073d73cb6f1d758a7e08d7d25fe (patch)
tree016a17344c5b6dfea7e45941a00e47e972dd0da0 /lib/ephy-file-helpers.c
parent27896c9da1c67ad4da2112fcfd4fa9e5ecd028a0 (diff)
downloadgsoc2013-epiphany-c445dfd01935d073d73cb6f1d758a7e08d7d25fe.tar
gsoc2013-epiphany-c445dfd01935d073d73cb6f1d758a7e08d7d25fe.tar.gz
gsoc2013-epiphany-c445dfd01935d073d73cb6f1d758a7e08d7d25fe.tar.bz2
gsoc2013-epiphany-c445dfd01935d073d73cb6f1d758a7e08d7d25fe.tar.lz
gsoc2013-epiphany-c445dfd01935d073d73cb6f1d758a7e08d7d25fe.tar.xz
gsoc2013-epiphany-c445dfd01935d073d73cb6f1d758a7e08d7d25fe.tar.zst
gsoc2013-epiphany-c445dfd01935d073d73cb6f1d758a7e08d7d25fe.zip
Drop usage of EelAppLaunchContext; replace it with GdkAppLaunchContext.
Bug #550883. svn path=/trunk/; revision=8457
Diffstat (limited to 'lib/ephy-file-helpers.c')
-rw-r--r--lib/ephy-file-helpers.c24
1 files changed, 13 insertions, 11 deletions
diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c
index ad7f65c39..b3ba240dd 100644
--- a/lib/ephy-file-helpers.c
+++ b/lib/ephy-file-helpers.c
@@ -27,7 +27,6 @@
#include "ephy-prefs.h"
#include "eel-gconf-extensions.h"
-#include "eel-app-launch-context.h"
#include "ephy-debug.h"
#include "ephy-string.h"
@@ -35,6 +34,7 @@
#include <glib/gi18n.h>
#include <gio/gio.h>
#include <gio/gdesktopappinfo.h>
+#include <gdk/gdk.h>
#include <libgnome/gnome-init.h>
#include <libxml/xmlreader.h>
@@ -600,11 +600,12 @@ ephy_file_launch_application (GAppInfo *app,
guint32 user_time,
GtkWidget *widget)
{
- GAppLaunchContext *context;
+ GdkAppLaunchContext *context;
GdkDisplay *display;
GdkScreen *screen;
+ gboolean res;
- context = G_APP_LAUNCH_CONTEXT (eel_app_launch_context_new ());
+ context = gdk_app_launch_context_new ();
if (widget)
{
display = gtk_widget_get_display (widget);
@@ -616,14 +617,15 @@ ephy_file_launch_application (GAppInfo *app,
screen = gdk_screen_get_default ();
}
- eel_app_launch_context_set_display (EEL_APP_LAUNCH_CONTEXT (context),
- display);
- eel_app_launch_context_set_screen (EEL_APP_LAUNCH_CONTEXT (context),
- screen);
- eel_app_launch_context_set_timestamp (EEL_APP_LAUNCH_CONTEXT (context),
- user_time);
-
- return g_app_info_launch (app, files, context, NULL);
+ gdk_app_launch_context_set_display (context, display);
+ gdk_app_launch_context_set_screen (context, screen);
+ gdk_app_launch_context_set_timestamp (context, user_time);
+
+ res = g_app_info_launch (app, files,
+ G_APP_LAUNCH_CONTEXT (context), NULL);
+ g_object_unref (context);
+
+ return res;
}
gboolean