Merge branch 'master' of github.com:sugarlabs/sugar-toolkit-gtk3

This commit is contained in:
Pootle daemon 2013-08-16 00:32:36 -04:00
commit df1186f512
2 changed files with 7 additions and 1 deletions

View File

@ -30,6 +30,7 @@
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
// This function is wrapped by getattrs/setattrs // This function is wrapped by getattrs/setattrs
static int _ioctl_attrs(char *file, __u32 *attrs, int ioctlnum, char *verb) static int _ioctl_attrs(char *file, __u32 *attrs, int ioctlnum, char *verb)

View File

@ -762,7 +762,7 @@ xdg_mime_mime_type_subclass (const char *mime,
/** /**
* sugar_mime_list_mime_parents: * sugar_mime_list_mime_parents:
* *
* Return value: (array zero-terminated=1) (transfer full): * Return value: (transfer container):
**/ **/
char ** char **
xdg_mime_list_mime_parents (const char *mime) xdg_mime_list_mime_parents (const char *mime)
@ -788,6 +788,11 @@ xdg_mime_list_mime_parents (const char *mime)
return result; return result;
} }
/**
* sugar_mime_get_mime_parents:
*
* Return value: (transfer none):
**/
const char ** const char **
xdg_mime_get_mime_parents (const char *mime) xdg_mime_get_mime_parents (const char *mime)
{ {