epiphany r8456 - in branches/gnome-2-24: lib lib/egg src

[cosimoc svn gnome org]

Author: cosimoc
Date: Thu Sep  4 23:21:05 2008
New Revision: 8456
URL: http://svn.gnome.org/viewvc/epiphany?rev=8456&view=rev

Log:
Drop usage of EelAppLaunchContext; replace it with GdkAppLaunchContext.
Bug #550883.


Removed:
   branches/gnome-2-24/lib/egg/eel-app-launch-context.c
   branches/gnome-2-24/lib/egg/eel-app-launch-context.h
Modified:
   branches/gnome-2-24/lib/egg/Makefile.am
   branches/gnome-2-24/lib/ephy-file-helpers.c
   branches/gnome-2-24/src/window-commands.c

Modified: branches/gnome-2-24/lib/egg/Makefile.am
==============================================================================
--- branches/gnome-2-24/lib/egg/Makefile.am	(original)
+++ branches/gnome-2-24/lib/egg/Makefile.am	Thu Sep  4 23:21:05 2008
@@ -2,15 +2,13 @@
 	eggtreemultidnd.c \
 	egg-editable-toolbar.c \
 	egg-toolbars-model.c \
-	egg-toolbar-editor.c \
-	eel-app-launch-context.c
+	egg-toolbar-editor.c
 
 EGGHEADERS = \
 	eggtreemultidnd.h \
 	egg-editable-toolbar.h \
 	egg-toolbars-model.h \
-	egg-toolbar-editor.h \
-	eel-app-launch-context.h
+	egg-toolbar-editor.h
 
 noinst_HEADERS = \
 	$(EGGHEADERS) \

Modified: branches/gnome-2-24/lib/ephy-file-helpers.c
==============================================================================
--- branches/gnome-2-24/lib/ephy-file-helpers.c	(original)
+++ branches/gnome-2-24/lib/ephy-file-helpers.c	Thu Sep  4 23:21:05 2008
@@ -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 @@
 			      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 @@
 		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

Modified: branches/gnome-2-24/src/window-commands.c
==============================================================================
--- branches/gnome-2-24/src/window-commands.c	(original)
+++ branches/gnome-2-24/src/window-commands.c	Thu Sep  4 23:21:05 2008
@@ -50,7 +50,6 @@
 #include "ephy-link.h"
 #include "ephy-stock-icons.h"
 #include "ephy-string.h"
-#include "eel-app-launch-context.h"
 #include "pdm-dialog.h"
 
 #include <string.h>