glib r6438 - trunk/gio

[alexl svn gnome org]

Author: alexl
Date: Fri Feb  1 11:30:37 2008
New Revision: 6438
URL: http://svn.gnome.org/viewvc/glib?rev=6438&view=rev

Log:
Oops, fix last commit.



Modified:
   trunk/gio/gappinfo.c
   trunk/gio/gappinfo.h

Modified: trunk/gio/gappinfo.c
==============================================================================
--- trunk/gio/gappinfo.c	(original)
+++ trunk/gio/gappinfo.c	Fri Feb  1 11:30:37 2008
@@ -24,6 +24,7 @@
 #include "gappinfo.h"
 #include "glibintl.h"
 #include <gioerror.h>
+#include <gfile.h>
 
 #include "gioalias.h"
 
@@ -544,7 +545,7 @@
 gboolean
 g_app_info_launch_default_for_uri (const char *uri,
 				   GAppLaunchContext *launch_context,
-				   GError *error)
+				   GError **error)
 {
   GAppInfo *app_info;
   GFile *file;
@@ -561,7 +562,7 @@
    * affect the uri which we don't want (for instance for a
    * mailto: uri).
    */
-  l.data = uri;
+  l.data = (char *)uri;
   l.next = l.prev = NULL;
   res = g_app_info_launch_uris (app_info, &l,
 				launch_context, error);

Modified: trunk/gio/gappinfo.h
==============================================================================
--- trunk/gio/gappinfo.h	(original)
+++ trunk/gio/gappinfo.h	Fri Feb  1 11:30:37 2008
@@ -188,7 +188,7 @@
 
 gboolean g_app_info_launch_default_for_uri (const char *uri,
 					    GAppLaunchContext *launch_context,
-					    GError *error);
+					    GError **error);
 
 /**
  * GAppLaunchContext: