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
This commit is contained in:
Chris Wilson 2007-04-30 11:30:47 +00:00 committed by Chris Wilson
parent 788b109b39
commit 3dd3293d87
2 changed files with 9 additions and 1 deletions

View File

@ -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> 2007-04-29 Emmanuele Bassi <ebassi@gnome.org>
* glib/gbookmarkfile.c: * glib/gbookmarkfile.c:

View File

@ -47,6 +47,7 @@
#include "gmarkup.h" #include "gmarkup.h"
#include "gmem.h" #include "gmem.h"
#include "gmessages.h" #include "gmessages.h"
#include "gshell.h"
#include "gslice.h" #include "gslice.h"
#include "gstdio.h" #include "gstdio.h"
#include "gstring.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); command_line = g_shell_unquote (ai->exec, &unquote_error);
if (unquote_error) if (unquote_error)
{ {
g_propagate_error (unquote_error, error); g_propagate_error (error, unquote_error);
return FALSE; return FALSE;
} }