X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgmountoperation.c;h=a769e984fba7ff792fd1c6f3fb786d50141d0e7c;hb=147c398cd05d71fb172d3788b9dc576c67141811;hp=35927d410236f84be1ea9c25bd4acee54ce48c93;hpb=5e3c122e6c1fb35ed1a2cb0b76e62a519251fb33;p=platform%2Fupstream%2Fglib2.0.git diff --git a/gio/gmountoperation.c b/gio/gmountoperation.c index 35927d4..a769e98 100644 --- a/gio/gmountoperation.c +++ b/gio/gmountoperation.c @@ -26,10 +26,8 @@ #include "gmountoperation.h" #include "gioenumtypes.h" -#include "gio-marshal.h" #include "glibintl.h" -#include "gioalias.h" /** * SECTION:gmountoperation @@ -202,7 +200,7 @@ reply_non_handled_in_idle (gpointer data) GMountOperation *op = data; g_mount_operation_reply (op, G_MOUNT_OPERATION_UNHANDLED); - return FALSE; + return G_SOURCE_REMOVE; } static void @@ -277,7 +275,7 @@ g_mount_operation_class_init (GMountOperationClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GMountOperationClass, ask_password), NULL, NULL, - _gio_marshal_VOID__STRING_STRING_STRING_FLAGS, + NULL, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_ASK_PASSWORD_FLAGS); @@ -300,7 +298,7 @@ g_mount_operation_class_init (GMountOperationClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GMountOperationClass, ask_question), NULL, NULL, - _gio_marshal_VOID__STRING_BOXED, + NULL, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRV); @@ -345,7 +343,8 @@ g_mount_operation_class_init (GMountOperationClass *klass) * GMountOperation::show-processes: * @op: a #GMountOperation. * @message: string containing a message to display to the user. - * @processes: an array of #GPid for processes blocking the operation. + * @processes: (element-type GPid): an array of #GPid for processes + * blocking the operation. * @choices: an array of strings for each possible choice. * * Emitted when one or more processes are blocking an operation @@ -369,7 +368,7 @@ g_mount_operation_class_init (GMountOperationClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GMountOperationClass, show_processes), NULL, NULL, - _gio_marshal_VOID__STRING_BOXED_BOXED, + NULL, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_ARRAY, G_TYPE_STRV); @@ -484,7 +483,7 @@ g_mount_operation_new (void) } /** - * g_mount_operation_get_username + * g_mount_operation_get_username: * @op: a #GMountOperation. * * Get the user name from the mount operation. @@ -708,6 +707,3 @@ g_mount_operation_reply (GMountOperation *op, g_return_if_fail (G_IS_MOUNT_OPERATION (op)); g_signal_emit (op, signals[REPLY], 0, result); } - -#define __G_MOUNT_OPERATION_C__ -#include "gioaliasdef.c"