luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-30 20:33:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix GApplication for the G_TYPE_VARIANT change

Browse Source
This commit is contained in:
Christian Persch 2010-06-17 21:40:47 +02:00
parent daee48a0af
commit 10e430bcc0
2 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
gio/gapplication.c
View File

@ -1003,11 +1003,11 @@ g_application_get_property (GObject *object,
break; break;
case PROP_ARGV: case PROP_ARGV:
g_value_set_boxed (value, app->priv->argv); g_value_set_variant (value, app->priv->argv);
break; break;
case PROP_PLATFORM_DATA: case PROP_PLATFORM_DATA:
g_value_set_boxed (value, app->priv->platform_data); g_value_set_variant (value, app->priv->platform_data);
break; break;
default: default:
@ -1039,21 +1039,11 @@ g_application_set_property (GObject *object,
break; break;
case PROP_ARGV: case PROP_ARGV:
{ app->priv->argv = g_value_dup_variant (value);
GVariant *argv = g_value_get_boxed (value);
g_return_if_fail (argv == NULL ||
g_variant_is_of_type (argv, G_VARIANT_TYPE ("aay")));
app->priv->argv = argv;
}
break; break;
case PROP_PLATFORM_DATA: case PROP_PLATFORM_DATA:
{ app->priv->platform_data = g_value_dup_variant (value);
GVariant *platform_data = g_value_get_boxed (value);
g_return_if_fail (platform_data == NULL ||
g_variant_is_of_type (platform_data, G_VARIANT_TYPE ("a{sv}")));
app->priv->platform_data = platform_data;
}
break; break;
default: default:
@ -1154,7 +1144,7 @@ g_application_class_init (GApplicationClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GApplicationClass, quit_with_data), G_STRUCT_OFFSET (GApplicationClass, quit_with_data),
g_signal_accumulator_true_handled, NULL, g_signal_accumulator_true_handled, NULL,
_gio_marshal_BOOLEAN__BOXED, _gio_marshal_BOOLEAN__VARIANT,
G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN, 1,
G_TYPE_VARIANT); G_TYPE_VARIANT);
@ -1176,7 +1166,7 @@ g_application_class_init (GApplicationClass *klass)
G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE | G_SIGNAL_DETAILED, G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE | G_SIGNAL_DETAILED,
G_STRUCT_OFFSET (GApplicationClass, action_with_data), G_STRUCT_OFFSET (GApplicationClass, action_with_data),
NULL, NULL, NULL, NULL,
_gio_marshal_VOID__STRING_BOXED, _gio_marshal_VOID__STRING_VARIANT,
G_TYPE_NONE, 2, G_TYPE_NONE, 2,
G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_VARIANT); G_TYPE_VARIANT);
@ -1200,7 +1190,7 @@ g_application_class_init (GApplicationClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GApplicationClass, prepare_activation), G_STRUCT_OFFSET (GApplicationClass, prepare_activation),
NULL, NULL, NULL, NULL,
_gio_marshal_VOID__BOXED_BOXED, _gio_marshal_VOID__VARIANT_VARIANT,
G_TYPE_NONE, 2, G_TYPE_NONE, 2,
G_TYPE_VARIANT, G_TYPE_VARIANT,
G_TYPE_VARIANT); G_TYPE_VARIANT);
@ -1231,13 +1221,14 @@ g_application_class_init (GApplicationClass *klass)
*/ */
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_ARGV, PROP_ARGV,
g_param_spec_boxed ("argv", g_param_spec_variant ("argv",
P_("Argument vector"), P_("Argument vector"),
P_("System argument vector with type signature aay"), P_("System argument vector with type signature aay"),
G_TYPE_VARIANT, G_VARIANT_TYPE ("aay"),
G_PARAM_READWRITE | NULL,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS)); G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS));
/** /**
* GApplication:platform-data: * GApplication:platform-data:
@ -1248,13 +1239,14 @@ g_application_class_init (GApplicationClass *klass)
*/ */
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_PLATFORM_DATA, PROP_PLATFORM_DATA,
g_param_spec_boxed ("platform-data", g_param_spec_variant ("platform-data",
P_("Platform data"), P_("Platform data"),
P_("Environmental data, must have type signature a{sv}"), P_("Environmental data, must have type signature a{sv}"),
G_TYPE_VARIANT, G_VARIANT_TYPE ("a{sv}"),
G_PARAM_READWRITE | NULL,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS)); G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS));
/** /**
* GApplication:default-quit: * GApplication:default-quit:

5
gio/gio-marshal.list
View File

@ -1,16 +1,17 @@
VOID:STRING,STRING,STRING,FLAGS VOID:STRING,STRING,STRING,FLAGS
VOID:STRING,BOXED VOID:STRING,BOXED
VOID:STRING,VARIANT
VOID:BOOLEAN,POINTER VOID:BOOLEAN,POINTER
VOID:OBJECT,OBJECT,ENUM VOID:OBJECT,OBJECT,ENUM
BOOLEAN:OBJECT,OBJECT BOOLEAN:OBJECT,OBJECT
VOID:STRING,BOXED,BOXED VOID:STRING,BOXED,BOXED
BOOL:POINTER,INT BOOL:POINTER,INT
BOOL:UINT BOOL:UINT
BOOL:BOXED BOOL:VARIANT
BOOL:VOID BOOL:VOID
VOID:STRING,STRING,BOXED VOID:STRING,STRING,BOXED
VOID:BOOL,BOXED VOID:BOOL,BOXED
VOID:BOXED,BOXED VOID:VARIANT,VARIANT
VOID:INT VOID:INT
VOID:STRING,INT VOID:STRING,INT
VOID:STRING,UINT VOID:STRING,UINT