hook gvariant vectors up to kdbus

[platform/upstream/glib.git] / gio / gtlspassword.c

diff --git a/gio/gtlspassword.c b/gio/gtlspassword.c
index ad55ad4..57e60ac 100644 (file)
--- a/gio/gtlspassword.c
+++ b/gio/gtlspassword.c
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Stef Walter <stefw@collabora.co.uk>
  */
@@ -65,13 +63,12 @@ struct _GTlsPasswordPrivate
   gchar *warning;
 };
 
-G_DEFINE_TYPE (GTlsPassword, g_tls_password, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GTlsPassword, g_tls_password, G_TYPE_OBJECT)
 
 static void
 g_tls_password_init (GTlsPassword *password)
 {
-  password->priv = G_TYPE_INSTANCE_GET_PRIVATE (password, G_TYPE_TLS_PASSWORD,
-                                               GTlsPasswordPrivate);
+  password->priv = g_tls_password_get_instance_private (password);
 }
 
 static const guchar *
@@ -195,8 +192,6 @@ g_tls_password_class_init (GTlsPasswordClass *klass)
   gobject_class->set_property = g_tls_password_set_property;
   gobject_class->finalize = g_tls_password_finalize;
 
-  g_type_class_add_private (klass, sizeof (GTlsPasswordPrivate));
-
   g_object_class_install_property (gobject_class, PROP_FLAGS,
                                   g_param_spec_flags ("flags",
                                                       P_("Flags"),
@@ -210,7 +205,7 @@ g_tls_password_class_init (GTlsPasswordClass *klass)
                                   g_param_spec_string ("description",
                                                        P_("Description"),
                                                        P_("Description of what the password is for"),
-                                                       "",
+                                                       NULL,
                                                        G_PARAM_READWRITE |
                                                        G_PARAM_STATIC_STRINGS));
 
@@ -218,7 +213,7 @@ g_tls_password_class_init (GTlsPasswordClass *klass)
                                   g_param_spec_string ("warning",
                                                        P_("Warning"),
                                                        P_("Warning about the password"),
-                                                       "",
+                                                       NULL,
                                                        G_PARAM_READWRITE |
                                                        G_PARAM_STATIC_STRINGS));
 
@@ -332,7 +327,7 @@ g_tls_password_set_value_full (GTlsPassword   *password,
  *
  * Get flags about the password.
  *
- * Return value: The flags about the password.
+ * Returns: The flags about the password.
  *
  * Since: 2.30
  */
@@ -369,7 +364,7 @@ g_tls_password_set_flags (GTlsPassword      *password,
  *
  * Get a description string about what the password will be used for.
  *
- * Return value: The description of the password.
+ * Returns: The description of the password.
  *
  * Since: 2.30
  */
@@ -412,7 +407,7 @@ g_tls_password_set_description (GTlsPassword      *password,
  * representation of the password flags returned from
  * g_tls_password_get_flags().
  *
- * Return value: The warning.
+ * Returns: The warning.
  *
  * Since: 2.30
  */