From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 30 Apr 2007 11:30:47 +0000 (+0000)
Subject: Include the gshell.h header file (to define g_shell_[un]quote) and correct
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=3dd3293d87a3b600f81677ff5594e2b90886423a;p=dana%2Fcg-glib.git

Include the gshell.h header file (to define g_shell_[un]quote) and correct

2007-04-30  Chris Wilson  <chris@chris-wilson.co.uk>

    * glib/gbookmarkfile.c (g_bookmark_file_get_app_info):
    Include the gshell.h header file (to define g_shell_[un]quote)
    and correct the order of the arguments to g_propagate_error(), as
    spotted by gcc.


svn path=/trunk/; revision=5467
---

diff --git a/ChangeLog b/ChangeLog
index 2dc77f1b..d4e32e72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-30  Chris Wilson  <chris@chris-wilson.co.uk>
+
+	* glib/gbookmarkfile.c (g_bookmark_file_get_app_info):
+	Include the gshell.h header file (to define g_shell_[un]quote)
+	and correct the order of the arguments to g_propagate_error(), as
+	spotted by gcc.
+
 2007-04-29  Emmanuele Bassi  <ebassi@gnome.org>
 
 	* glib/gbookmarkfile.c:
diff --git a/glib/gbookmarkfile.c b/glib/gbookmarkfile.c
index 6f9f99b9..de4a5e05 100644
--- a/glib/gbookmarkfile.c
+++ b/glib/gbookmarkfile.c
@@ -47,6 +47,7 @@
 #include "gmarkup.h"
 #include "gmem.h"
 #include "gmessages.h"
+#include "gshell.h"
 #include "gslice.h"
 #include "gstdio.h"
 #include "gstring.h"
@@ -3391,7 +3392,7 @@ g_bookmark_file_get_app_info (GBookmarkFile  *bookmark,
       command_line = g_shell_unquote (ai->exec, &unquote_error);
       if (unquote_error)
         {
-          g_propagate_error (unquote_error, error);
+          g_propagate_error (error, unquote_error);
           return FALSE;
         }