...
 
Commits (2)
  • Niels De Graef's avatar
    gck: Use G_PARAM_STATIC_STRINGS · d4be523b
    Niels De Graef authored
    This prevents some unnecessary string copies, resulting in less memory
    used and some unnecessary performance overhead being removed. Well, a
    little bit at least.
    d4be523b
  • Niels De Graef's avatar
    gcr: Use G_PARAM_STATIC_STRINGS · 89d77981
    Niels De Graef authored
    This prevents some unnecessary string copies, resulting in less memory
    used and some unnecessary performance overhead being removed. Well, a
    little bit at least.
    89d77981
......@@ -666,7 +666,8 @@ gck_enumerator_class_init (GckEnumeratorClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_INTERACTION,
g_param_spec_object ("interaction", "Interaction", "Interaction asking for pins",
G_TYPE_TLS_INTERACTION, G_PARAM_READWRITE));
G_TYPE_TLS_INTERACTION,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* GckEnumerator:object-type: (skip)
......@@ -676,7 +677,8 @@ gck_enumerator_class_init (GckEnumeratorClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_OBJECT_TYPE,
g_param_spec_gtype ("object-type", "Object Type", "Type of objects created",
GCK_TYPE_OBJECT, G_PARAM_READWRITE));
GCK_TYPE_OBJECT,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* GckEnumerator:chained:
......@@ -685,8 +687,9 @@ gck_enumerator_class_init (GckEnumeratorClass *klass)
* has enumerated all its objects.
*/
g_object_class_install_property (gobject_class, PROP_CHAINED,
g_param_spec_object ("chained", "Chained", "Chained enumerator",
GCK_TYPE_ENUMERATOR, G_PARAM_READWRITE));
g_param_spec_object ("chained", "Chained", "Chained enumerator",
GCK_TYPE_ENUMERATOR,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
static void
......
......@@ -156,7 +156,7 @@ _gck_interaction_class_init (GckInteractionClass *klass)
g_object_class_install_property (object_class, PROP_MODULE,
g_param_spec_object ("module", "Module", "PKCS11 Module",
GCK_TYPE_MODULE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
GCK_TYPE_MODULE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
}
GTlsInteraction *
......
......@@ -225,7 +225,8 @@ gck_module_class_init (GckModuleClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_PATH,
g_param_spec_string ("path", "Module Path", "Path to the PKCS11 Module",
NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
/**
* GckModule:functions:
......@@ -236,7 +237,7 @@ gck_module_class_init (GckModuleClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_FUNCTIONS,
g_param_spec_pointer ("functions", "Function List", "PKCS11 Function List",
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
/**
* GckModule::authenticate-slot:
......
......@@ -169,7 +169,8 @@ gck_object_class_init (GckObjectClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_MODULE,
g_param_spec_object ("module", "Module", "PKCS11 Module",
GCK_TYPE_MODULE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
GCK_TYPE_MODULE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
/**
* GckObject:handle:
......@@ -178,7 +179,8 @@ gck_object_class_init (GckObjectClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_HANDLE,
g_param_spec_ulong ("handle", "Object Handle", "PKCS11 Object Handle",
0, G_MAXULONG, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
0, G_MAXULONG, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
/**
* GckObject:session:
......@@ -191,7 +193,8 @@ gck_object_class_init (GckObjectClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_SESSION,
g_param_spec_object ("session", "session", "PKCS11 Session to make calls on",
GCK_TYPE_SESSION, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
GCK_TYPE_SESSION,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
}
/* ----------------------------------------------------------------------------
......
......@@ -168,7 +168,7 @@ gck_password_class_init (GckPasswordClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_MODULE,
g_param_spec_object ("module", "Module", "PKCS11 Module",
GCK_TYPE_MODULE, G_PARAM_READABLE));
GCK_TYPE_MODULE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* GckPassword:token:
......@@ -178,7 +178,7 @@ gck_password_class_init (GckPasswordClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_TOKEN,
g_param_spec_object ("token", "Token", "PKCS11 Token",
GCK_TYPE_SLOT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
GCK_TYPE_SLOT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
/**
* GckPassword:key:
......@@ -188,7 +188,7 @@ gck_password_class_init (GckPasswordClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_KEY,
g_param_spec_object ("key", "Object", "PKCS11 Key Object",
GCK_TYPE_OBJECT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
GCK_TYPE_OBJECT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
}
/**
......
......@@ -286,8 +286,9 @@ gck_session_class_init (GckSessionClass *klass)
* The GckModule that this session is opened on.
*/
g_object_class_install_property (gobject_class, PROP_MODULE,
g_param_spec_object ("module", "Module", "PKCS11 Module",
GCK_TYPE_MODULE, G_PARAM_READABLE));
g_param_spec_object ("module", "Module", "PKCS11 Module",
GCK_TYPE_MODULE,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* GckSession:handle:
......@@ -296,7 +297,8 @@ gck_session_class_init (GckSessionClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_HANDLE,
g_param_spec_ulong ("handle", "Session Handle", "PKCS11 Session Handle",
0, G_MAXULONG, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
0, G_MAXULONG, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
/**
* GckSession:slot:
......@@ -305,7 +307,8 @@ gck_session_class_init (GckSessionClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_SLOT,
g_param_spec_object ("slot", "Slot that this session uses", "PKCS11 Slot",
GCK_TYPE_SLOT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
GCK_TYPE_SLOT,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
/**
* GckSession:options:
......@@ -315,7 +318,7 @@ gck_session_class_init (GckSessionClass *klass)
g_object_class_install_property (gobject_class, PROP_OPTIONS,
g_param_spec_flags ("options", "Session Options", "Session Options",
GCK_TYPE_SESSION_OPTIONS, GCK_SESSION_READ_ONLY,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
/**
* GckSession:interaction:
......@@ -326,7 +329,8 @@ gck_session_class_init (GckSessionClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_INTERACTION,
g_param_spec_object ("interaction", "Interaction", "Interaction asking for pins",
G_TYPE_TLS_INTERACTION, G_PARAM_READWRITE));
G_TYPE_TLS_INTERACTION,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* GckSession:opening-flags:
......@@ -334,8 +338,9 @@ gck_session_class_init (GckSessionClass *klass)
* Raw PKCS\#11 flags used to open the PKCS\#11 session.
*/
g_object_class_install_property (gobject_class, PROP_OPENING_FLAGS,
g_param_spec_ulong ("opening-flags", "Opening flags", "PKCS#11 open session flags",
0, G_MAXULONG, 0, G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
g_param_spec_ulong ("opening-flags", "Opening flags", "PKCS#11 open session flags",
0, G_MAXULONG, 0,
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
/**
* GckSession:app-data:
......@@ -343,8 +348,8 @@ gck_session_class_init (GckSessionClass *klass)
* Raw PKCS\#11 application data used to open the PKCS\#11 session.
*/
g_object_class_install_property (gobject_class, PROP_APP_DATA,
g_param_spec_pointer ("app-data", "App data", "PKCS#11 application data",
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
g_param_spec_pointer ("app-data", "App data", "PKCS#11 application data",
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
/**
* GckSession::discard-handle:
......
......@@ -138,7 +138,8 @@ gck_slot_class_init (GckSlotClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_MODULE,
g_param_spec_object ("module", "Module", "PKCS11 Module",
GCK_TYPE_MODULE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
GCK_TYPE_MODULE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
/**
* GckSlot:handle:
......@@ -147,7 +148,8 @@ gck_slot_class_init (GckSlotClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_HANDLE,
g_param_spec_ulong ("handle", "Handle", "PKCS11 Slot ID",
0, G_MAXULONG, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
0, G_MAXULONG, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
}
/* ----------------------------------------------------------------------------
......
......@@ -457,9 +457,10 @@ gcr_certificate_chain_class_init (GcrCertificateChainClass *klass)
* The certificate chain status. See #GcrCertificateChainStatus
*/
g_object_class_install_property (gobject_class, PROP_STATUS,
g_param_spec_enum ("status", "Status", "Status of certificate chain",
GCR_TYPE_CERTIFICATE_CHAIN_STATUS,
GCR_CERTIFICATE_CHAIN_UNKNOWN, G_PARAM_READABLE));
g_param_spec_enum ("status", "Status", "Status of certificate chain",
GCR_TYPE_CERTIFICATE_CHAIN_STATUS,
GCR_CERTIFICATE_CHAIN_UNKNOWN,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* GcrCertificateChain:length:
......@@ -467,8 +468,9 @@ gcr_certificate_chain_class_init (GcrCertificateChainClass *klass)
* The length of the certificate chain.
*/
g_object_class_install_property (gobject_class, PROP_LENGTH,
g_param_spec_uint ("length", "Length", "Length of certificate chain",
0, G_MAXUINT, 0, G_PARAM_READABLE));
g_param_spec_uint ("length", "Length", "Length of certificate chain",
0, G_MAXUINT, 0,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
Q_ORIGINAL_CERT = g_quark_from_static_string ("gcr-certificate-chain-original-cert");
Q_OPERATION_DATA = g_quark_from_static_string ("gcr-certificate-chain-operation-data");
......
......@@ -205,8 +205,9 @@ gcr_certificate_request_class_init (GcrCertificateRequestClass *klass)
* The private key that this certificate request is for.
*/
g_object_class_install_property (gobject_class, PROP_PRIVATE_KEY,
g_param_spec_object ("private-key", "Private key", "Private key for request",
GCK_TYPE_OBJECT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_param_spec_object ("private-key", "Private key", "Private key for request",
GCK_TYPE_OBJECT,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
/**
* GcrCertificateRequest:format:
......@@ -214,9 +215,9 @@ gcr_certificate_request_class_init (GcrCertificateRequestClass *klass)
* The format of the certificate request.
*/
g_object_class_install_property (gobject_class, PROP_FORMAT,
g_param_spec_enum ("format", "Format", "Format of certificate request",
GCR_TYPE_CERTIFICATE_REQUEST_FORMAT, GCR_CERTIFICATE_REQUEST_PKCS10,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_param_spec_enum ("format", "Format", "Format of certificate request",
GCR_TYPE_CERTIFICATE_REQUEST_FORMAT, GCR_CERTIFICATE_REQUEST_PKCS10,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
}
/**
......
......@@ -267,7 +267,7 @@ gcr_certificate_default_init (GcrCertificateIface *iface)
*/
g_object_interface_install_property (iface,
g_param_spec_string ("label", "Label", "Certificate label",
"", G_PARAM_READABLE));
"", G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* GcrCertificate:description:
......@@ -276,7 +276,7 @@ gcr_certificate_default_init (GcrCertificateIface *iface)
*/
g_object_interface_install_property (iface,
g_param_spec_string ("description", "Description", "Description of object being rendered",
"", G_PARAM_READABLE));
"", G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* GcrCertificate:markup:
......@@ -285,7 +285,7 @@ gcr_certificate_default_init (GcrCertificateIface *iface)
*/
g_object_interface_install_property (iface,
g_param_spec_string ("markup", "Markup", "Markup which describes object being rendered",
"", G_PARAM_READABLE));
"", G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* GcrCertificate:icon:
......@@ -294,7 +294,7 @@ gcr_certificate_default_init (GcrCertificateIface *iface)
*/
g_object_interface_install_property (iface,
g_param_spec_object ("icon", "Icon", "Icon for the object being rendered",
G_TYPE_ICON, G_PARAM_READABLE));
G_TYPE_ICON, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* GcrCertificate:subject:
......@@ -303,7 +303,7 @@ gcr_certificate_default_init (GcrCertificateIface *iface)
*/
g_object_interface_install_property (iface,
g_param_spec_string ("subject", "Subject", "Common name of subject",
"", G_PARAM_READABLE));
"", G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* GcrCertificate:issuer:
......@@ -312,7 +312,7 @@ gcr_certificate_default_init (GcrCertificateIface *iface)
*/
g_object_interface_install_property (iface,
g_param_spec_string ("issuer", "Issuer", "Common name of issuer",
"", G_PARAM_READABLE));
"", G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* GcrCertificate:expiry:
......@@ -321,7 +321,7 @@ gcr_certificate_default_init (GcrCertificateIface *iface)
*/
g_object_interface_install_property (iface,
g_param_spec_boxed ("expiry", "Expiry", "Certificate expiry",
G_TYPE_DATE, G_PARAM_READABLE));
G_TYPE_DATE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_once_init_leave (&initialized, 1);
}
......
......@@ -241,12 +241,14 @@ _gcr_gnupg_importer_class_init (GcrGnupgImporterClass *klass)
g_object_class_override_property (gobject_class, PROP_URI, "uri");
g_object_class_install_property (gobject_class, PROP_IMPORTED,
g_param_spec_boxed ("imported", "Imported", "Fingerprints of imported keys",
G_TYPE_STRV, G_PARAM_READABLE));
g_param_spec_boxed ("imported", "Imported", "Fingerprints of imported keys",
G_TYPE_STRV,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_DIRECTORY,
g_param_spec_string ("directory", "Directory", "Directory to import keys to",
NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_param_spec_string ("directory", "Directory", "Directory to import keys to",
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
gck_builder_add_ulong (&builder, CKA_CLASS, CKO_GCR_GNUPG_RECORDS);
gcr_importer_register (GCR_TYPE_GNUPG_IMPORTER, gck_builder_end (&builder));
......
......@@ -175,7 +175,7 @@ _gcr_gnupg_key_class_init (GcrGnupgKeyClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_PUBLIC_RECORDS,
g_param_spec_boxed ("public-records", "Public Records", "Public Key Colon Records",
G_TYPE_PTR_ARRAY, G_PARAM_READWRITE));
G_TYPE_PTR_ARRAY, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* GcrGnupgKey:secret-records:
......@@ -185,7 +185,7 @@ _gcr_gnupg_key_class_init (GcrGnupgKeyClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_SECRET_RECORDS,
g_param_spec_boxed ("secret-records", "Secret Records", "Secret Key Colon Records",
G_TYPE_PTR_ARRAY, G_PARAM_READWRITE));
G_TYPE_PTR_ARRAY, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* GcrGnupgKey:keyid:
......@@ -194,7 +194,7 @@ _gcr_gnupg_key_class_init (GcrGnupgKeyClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_KEYID,
g_param_spec_string ("keyid", "Key ID", "Key identifier",
"", G_PARAM_READABLE));
"", G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* GcrGnupgKey:label:
......@@ -203,7 +203,7 @@ _gcr_gnupg_key_class_init (GcrGnupgKeyClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_LABEL,
g_param_spec_string ("label", "Label", "Key label",
"", G_PARAM_READABLE));
"", G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* GcrGnupgKey::description:
......@@ -212,7 +212,7 @@ _gcr_gnupg_key_class_init (GcrGnupgKeyClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_DESCRIPTION,
g_param_spec_string ("description", "Description", "Description of object type",
"", G_PARAM_READABLE));
"", G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* GcrGnupgKey:markup:
......@@ -221,7 +221,7 @@ _gcr_gnupg_key_class_init (GcrGnupgKeyClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_MARKUP,
g_param_spec_string ("markup", "Markup", "Markup which describes key",
"", G_PARAM_READABLE));
"", G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* GcrGnupgKey:short-keyid:
......@@ -230,7 +230,7 @@ _gcr_gnupg_key_class_init (GcrGnupgKeyClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_SHORT_KEYID,
g_param_spec_string ("short-keyid", "Short Key ID", "Display key identifier",
"", G_PARAM_READABLE));
"", G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* GcrGnupgKey:icon:
......@@ -239,7 +239,7 @@ _gcr_gnupg_key_class_init (GcrGnupgKeyClass *klass)
*/
g_object_class_install_property (gobject_class, PROP_ICON,
g_param_spec_object ("icon", "Icon", "Icon for this key",
G_TYPE_ICON, G_PARAM_READABLE));
G_TYPE_ICON, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
}
/**
......
......@@ -231,8 +231,9 @@ _gcr_gnupg_process_class_init (GcrGnupgProcessClass *klass)
* ~/.gnupg/ directory.
*/
g_object_class_install_property (gobject_class, PROP_DIRECTORY,
g_param_spec_string ("directory", "Directory", "Gnupg Directory",
NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_param_spec_string ("directory", "Directory", "Gnupg Directory",
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
/**
* GcrGnupgProcess:executable:
......@@ -240,8 +241,9 @@ _gcr_gnupg_process_class_init (GcrGnupgProcessClass *klass)
* Path to the gnupg executable, or %NULL for default.
*/
g_object_class_install_property (gobject_class, PROP_EXECUTABLE,
g_param_spec_string ("executable", "Executable", "Gnupg Executable",
GPG_EXECUTABLE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_param_spec_string ("executable", "Executable", "Gnupg Executable",
GPG_EXECUTABLE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
/**
* GcrGnupgProcess:input-stream:
......@@ -249,8 +251,9 @@ _gcr_gnupg_process_class_init (GcrGnupgProcessClass *klass)
* Input for gnupg, or %NULL for no input.
*/
g_object_class_install_property (gobject_class, PROP_INPUT_STREAM,
g_param_spec_object ("input-stream", "Input Stream", "Input Stream",
G_TYPE_INPUT_STREAM, G_PARAM_READWRITE));
g_param_spec_object ("input-stream", "Input Stream", "Input Stream",
G_TYPE_INPUT_STREAM,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* GcrGnupgProcess:output-stream:
......@@ -258,8 +261,9 @@ _gcr_gnupg_process_class_init (GcrGnupgProcessClass *klass)
* Output from gnupg, or %NULL for ignored output.
*/
g_object_class_install_property (gobject_class, PROP_OUTPUT_STREAM,
g_param_spec_object ("output-stream", "Output Stream", "Output Stream",
G_TYPE_OUTPUT_STREAM, G_PARAM_READWRITE));
g_param_spec_object ("output-stream", "Output Stream", "Output Stream",
G_TYPE_OUTPUT_STREAM,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* GcrGnupgProcess:attribute-stream:
......@@ -267,8 +271,9 @@ _gcr_gnupg_process_class_init (GcrGnupgProcessClass *klass)
* Output of attribute data from gnupg, or %NULL for ignored attributes.
*/
g_object_class_install_property (gobject_class, PROP_ATTRIBUTE_STREAM,
g_param_spec_object ("attribute-stream", "Attribute Stream", "Attribute Stream",
G_TYPE_OUTPUT_STREAM, G_PARAM_READWRITE));
g_param_spec_object ("attribute-stream", "Attribute Stream", "Attribute Stream",
G_TYPE_OUTPUT_STREAM,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* GcrGnupgProcess::error-line:
......
......@@ -96,8 +96,9 @@ gcr_importer_default_init (GcrImporterIface *iface)
* The label for the importer.
*/
g_object_interface_install_property (iface,
g_param_spec_string ("label", "Label", "The label for the importer",
"", G_PARAM_READABLE));
g_param_spec_string ("label", "Label", "The label for the importer",
"",
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* GcrImporter:icon:
......@@ -105,8 +106,9 @@ gcr_importer_default_init (GcrImporterIface *iface)
* The icon for the importer.
*/
g_object_interface_install_property (iface,
g_param_spec_object ("icon", "Icon", "The icon for the importer",
G_TYPE_ICON, G_PARAM_READABLE));
g_param_spec_object ("icon", "Icon", "The icon for the importer",
G_TYPE_ICON,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
* GcrImporter:interaction:
......@@ -114,9 +116,10 @@ gcr_importer_default_init (GcrImporterIface *iface)
* The interaction for the importer.
*/
g_object_interface_install_property (iface,
g_param_spec_object ("interaction", "Interaction",
"Interaction for prompts",
G_TYPE_TLS_INTERACTION, G_PARAM_READWRITE));
g_param_spec_object ("interaction", "Interaction",
"Interaction for prompts",
G_TYPE_TLS_INTERACTION,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* GcrImporter:uri:
......@@ -124,8 +127,9 @@ gcr_importer_default_init (GcrImporterIface *iface)
* The URI of the location imported to.
*/
g_object_interface_install_property (iface,
g_param_spec_string ("uri", "URI", "URI of location",
NULL, G_PARAM_READABLE));
g_param_spec_string ("uri", "URI", "URI of location",
NULL,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_once_init_leave (&initialized, 1);
}
......
......@@ -714,16 +714,18 @@ _gcr_pkcs11_importer_class_init (GcrPkcs11ImporterClass *klass)
g_object_class_override_property (gobject_class, PROP_URI, "uri");
g_object_class_install_property (gobject_class, PROP_SLOT,
g_param_spec_object ("slot", "Slot", "PKCS#11 slot to import data into",
GCK_TYPE_SLOT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_param_spec_object ("slot", "Slot", "PKCS#11 slot to import data into",
GCK_TYPE_SLOT,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_IMPORTED,
g_param_spec_boxed ("imported", "Imported", "Imported objects",
GCK_TYPE_LIST, G_PARAM_READABLE));
g_param_spec_boxed ("imported", "Imported", "Imported objects",
GCK_TYPE_LIST,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_QUEUED,
g_param_spec_pointer ("queued", "Queued", "Queued attributes",
G_PARAM_READABLE));
g_param_spec_pointer ("queued", "Queued", "Queued attributes",
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
gck_builder_add_ulong (&builder, CKA_CLASS, CKO_CERTIFICATE);
gck_builder_add_ulong (&builder, CKA_CERTIFICATE_TYPE, CKC_X_509);
......
......@@ -561,8 +561,9 @@ gcr_system_prompt_class_init (GcrSystemPromptClass *klass)
* for the default prompter.
*/
g_object_class_install_property (gobject_class, PROP_BUS_NAME,
g_param_spec_string ("bus-name", "Bus name", "Prompter bus name",
NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_param_spec_string ("bus-name", "Bus name", "Prompter bus name",
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
/**
* GcrSystemPrompt:timeout-seconds:
......@@ -570,8 +571,9 @@ gcr_system_prompt_class_init (GcrSystemPromptClass *klass)
* The timeout in seconds to wait when opening the prompt.
*/
g_object_class_install_property (gobject_class, PROP_TIMEOUT_SECONDS,
g_param_spec_int ("timeout-seconds", "Timeout seconds", "Timeout (in seconds) for opening prompt",
-1, G_MAXINT, -1, G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
g_param_spec_int ("timeout-seconds", "Timeout seconds", "Timeout (in seconds) for opening prompt",
-1, G_MAXINT, -1,
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
/**
* GcrSystemPrompt:secret-exchange:
......@@ -580,8 +582,9 @@ gcr_system_prompt_class_init (GcrSystemPromptClass *klass)
* secret exchange will be used if this is not set.
*/
g_object_class_install_property (gobject_class, PROP_SECRET_EXCHANGE,
g_param_spec_object ("secret-exchange", "Secret exchange", "Secret exchange for passing passwords",
GCR_TYPE_SECRET_EXCHANGE, G_PARAM_READWRITE));
g_param_spec_object ("secret-exchange", "Secret exchange", "Secret exchange for passing passwords",
GCR_TYPE_SECRET_EXCHANGE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_override_property (gobject_class, PROP_TITLE, "title");
g_object_class_override_property (gobject_class, PROP_MESSAGE, "message");
......