← Back to branch summary

~ubuntu-branches/ubuntu/precise/telepathy-glib/precise-201111172307

« back to all changes in this revision

Viewing changes to telepathy-glib/base-room-config.c

  • Committer: Ken VanDine
  • Date: 2011-11-17 20:53:21 UTC
  • mfrom: (1.6.34 upstream)
  • Revision ID: ken.vandine@canonical.com-20111117205321-l704j7kr1zgw5v9h
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
telepathy-glib/base-room-config.c
160
160
 * @TP_BASE_ROOM_CONFIG_PRIVATE: corresponds to #TpBaseRoomConfig:private
161
161
 * @TP_BASE_ROOM_CONFIG_PASSWORD_PROTECTED: corresponds to #TpBaseRoomConfig:password-protected
162
162
 * @TP_BASE_ROOM_CONFIG_PASSWORD: corresponds to #TpBaseRoomConfig:password
 
163
 * @TP_BASE_ROOM_CONFIG_PASSWORD_HINT: corresponds to #TpBaseRoomConfig:password-hint
163
164
 * @TP_NUM_BASE_ROOM_CONFIG_PROPERTIES: the number of configuration properties
164
165
 *  currently defined.
165
166
 *
187
188
    gboolean private;
188
189
    gboolean password_protected;
189
190
    gchar *password;
 
191
    gchar *password_hint;
190
192
 
191
193
    gboolean can_update_configuration;
192
194
    TpIntset *mutable_properties;
223
225
    PROP_PRIVATE,
224
226
    PROP_PASSWORD_PROTECTED,
225
227
    PROP_PASSWORD,
 
228
    PROP_PASSWORD_HINT,
226
229
 
227
230
    PROP_CAN_UPDATE_CONFIGURATION,
228
231
    PROP_MUTABLE_PROPERTIES,
313
316
      case PROP_PASSWORD:
314
317
        g_value_set_string (value, priv->password);
315
318
        break;
 
319
      case PROP_PASSWORD_HINT:
 
320
        g_value_set_string (value, priv->password_hint);
 
321
        break;
316
322
      case PROP_CAN_UPDATE_CONFIGURATION:
317
323
        g_value_set_boolean (value, priv->can_update_configuration);
318
324
        break;
419
425
CASE_BOOL (PRIVATE, private)
420
426
CASE_BOOL (PASSWORD_PROTECTED, password_protected)
421
427
CASE_STRING (PASSWORD, password)
 
428
CASE_STRING (PASSWORD_HINT, password_hint)
422
429
#undef CASE_BOOL
423
430
#undef CASE_STRING
424
431
 
503
510
  g_free (priv->title);
504
511
  g_free (priv->description);
505
512
  g_free (priv->password);
 
513
  g_free (priv->password_hint);
506
514
  tp_intset_destroy (priv->mutable_properties);
507
515
  tp_intset_destroy (priv->changed_properties);
508
516
 
609
617
      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
610
618
  g_object_class_install_property (object_class, PROP_PASSWORD, param_spec);
611
619
 
 
620
  param_spec = g_param_spec_string ("password-hint", "PasswordHint",
 
621
      "If PasswordProtected is True, a hint for the password. If the password"
 
622
      "password is unknown, or PasswordProtected is False, the empty string.",
 
623
      "",
 
624
      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
625
  g_object_class_install_property (object_class, PROP_PASSWORD_HINT, param_spec);
 
626
 
612
627
  param_spec = g_param_spec_boolean ("can-update-configuration",
613
628
      "CanUpdateConfiguration",
614
629
      "If True, the user may call UpdateConfiguration to change the values of "
671
686
  { "Private", "private", NULL },
672
687
  { "PasswordProtected", "password-protected", NULL },
673
688
  { "Password", "password", NULL },
 
689
  { "PasswordHint", "password-hint", NULL },
674
690
 
675
691
  /* Meta-data */
676
692
  { "CanUpdateConfiguration", "can-update-configuration", NULL },