Oops, fix last commit.

svn path=/trunk/; revision=6438

diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index ff53c51..e5885e4 100644 (file)
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -24,6 +24,7 @@
 #include "gappinfo.h"
 #include "glibintl.h"
 #include <gioerror.h>
+#include <gfile.h>
 
 #include "gioalias.h"
 
@@ -544,7 +545,7 @@ g_app_info_should_show (GAppInfo *appinfo)
 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 @@ g_app_info_launch_default_for_uri (const char *uri,
    * 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);

diff --git a/gio/gappinfo.h b/gio/gappinfo.h
index 04ee9eb..b1872ba 100644 (file)
--- a/gio/gappinfo.h
+++ b/gio/gappinfo.h
@@ -188,7 +188,7 @@ GAppInfo *g_app_info_get_default_for_uri_scheme  (const char  *uri_scheme);
 
 gboolean g_app_info_launch_default_for_uri (const char *uri,
                                            GAppLaunchContext *launch_context,
-                                           GError *error);
+                                           GError **error);
 
 /**
  * GAppLaunchContext: