Use the new gs_unref_keyfile define

tingping/wmclass
Alexander Larsson 2015-01-12 15:31:48 +01:00
parent 3b1893aaaf
commit 038342cec5
2 changed files with 2 additions and 6 deletions

View File

@ -30,8 +30,6 @@ usage_error (GOptionContext *context, const char *message, GError **error)
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, message); g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, message);
} }
#define _gs_unref_keyfile __attribute__ ((cleanup(gs_local_keyfile_unref)))
gboolean gboolean
xdg_app_builtin_build (int argc, char **argv, GCancellable *cancellable, GError **error) xdg_app_builtin_build (int argc, char **argv, GCancellable *cancellable, GError **error)
{ {
@ -53,7 +51,7 @@ xdg_app_builtin_build (int argc, char **argv, GCancellable *cancellable, GError
gs_free char *default_command = NULL; gs_free char *default_command = NULL;
gs_free char *runtime_ref = NULL; gs_free char *runtime_ref = NULL;
gs_free char *app_ref = NULL; gs_free char *app_ref = NULL;
_gs_unref_keyfile GKeyFile *metakey = NULL; gs_unref_keyfile GKeyFile *metakey = NULL;
gs_free_error GError *my_error = NULL; gs_free_error GError *my_error = NULL;
gs_free_error GError *my_error2 = NULL; gs_free_error GError *my_error2 = NULL;
gs_unref_ptrarray GPtrArray *argv_array = NULL; gs_unref_ptrarray GPtrArray *argv_array = NULL;

View File

@ -32,8 +32,6 @@ usage_error (GOptionContext *context, const char *message, GError **error)
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, message); g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, message);
} }
#define _gs_unref_keyfile __attribute__ ((cleanup(gs_local_keyfile_unref)))
static char * static char *
extract_unix_path_from_dbus_addres (const char *address) extract_unix_path_from_dbus_addres (const char *address)
{ {
@ -151,7 +149,7 @@ xdg_app_builtin_run (int argc, char **argv, GCancellable *cancellable, GError **
gs_free char *default_command = NULL; gs_free char *default_command = NULL;
gs_free char *runtime_ref = NULL; gs_free char *runtime_ref = NULL;
gs_free char *app_ref = NULL; gs_free char *app_ref = NULL;
_gs_unref_keyfile GKeyFile *metakey = NULL; gs_unref_keyfile GKeyFile *metakey = NULL;
gs_free_error GError *my_error = NULL; gs_free_error GError *my_error = NULL;
gs_free_error GError *my_error2 = NULL; gs_free_error GError *my_error2 = NULL;
gs_unref_ptrarray GPtrArray *argv_array = NULL; gs_unref_ptrarray GPtrArray *argv_array = NULL;