comparison: libpurple/account.c
libpurple/account.c
- branch
- soc.2013.gobjectification
- changeset 34590
- 9da48e98a77a
- parent 34589
- 428e92c79631
- child 34591
- 485b61b1bec0
equal
deleted
inserted
replaced
| 34589:428e92c79631 | 34590:9da48e98a77a |
|---|---|
| 72 * is permitted or denied. We should do this for 3.0.0. | 72 * is permitted or denied. We should do this for 3.0.0. |
| 73 * Or maybe use a GTree. | 73 * Or maybe use a GTree. |
| 74 */ | 74 */ |
| 75 GSList *permit; /**< Permit list. */ | 75 GSList *permit; /**< Permit list. */ |
| 76 GSList *deny; /**< Deny list. */ | 76 GSList *deny; /**< Deny list. */ |
| 77 PurpleAccountPrivacyType perm_deny; /**< The permit/deny setting. */ | 77 PurpleAccountPrivacyType privacy_type; /**< The permit/deny setting. */ |
| 78 | 78 |
| 79 GList *status_types; /**< Status types. */ | 79 GList *status_types; /**< Status types. */ |
| 80 | 80 |
| 81 PurplePresence *presence; /**< Presence. */ | 81 PurplePresence *presence; /**< Presence. */ |
| 82 PurpleLog *system_log; /**< The system log */ | 82 PurpleLog *system_log; /**< The system log */ |
| 912 PurpleAccountPrivate *priv; | 912 PurpleAccountPrivate *priv; |
| 913 | 913 |
| 914 g_return_if_fail(account != NULL); | 914 g_return_if_fail(account != NULL); |
| 915 | 915 |
| 916 priv = PURPLE_ACCOUNT_GET_PRIVATE(account); | 916 priv = PURPLE_ACCOUNT_GET_PRIVATE(account); |
| 917 priv->perm_deny = privacy_type; | 917 priv->privacy_type = privacy_type; |
| 918 } | 918 } |
| 919 | 919 |
| 920 void | 920 void |
| 921 purple_account_set_status_types(PurpleAccount *account, GList *status_types) | 921 purple_account_set_status_types(PurpleAccount *account, GList *status_types) |
| 922 { | 922 { |
| 1522 PurpleAccountPrivate *priv; | 1522 PurpleAccountPrivate *priv; |
| 1523 | 1523 |
| 1524 g_return_val_if_fail(account != NULL, PURPLE_ACCOUNT_PRIVACY_ALLOW_ALL); | 1524 g_return_val_if_fail(account != NULL, PURPLE_ACCOUNT_PRIVACY_ALLOW_ALL); |
| 1525 | 1525 |
| 1526 priv = PURPLE_ACCOUNT_GET_PRIVATE(account); | 1526 priv = PURPLE_ACCOUNT_GET_PRIVATE(account); |
| 1527 return priv->perm_deny; | 1527 return priv->privacy_type; |
| 1528 } | 1528 } |
| 1529 | 1529 |
| 1530 gboolean | 1530 gboolean |
| 1531 purple_account_privacy_permit_add(PurpleAccount *account, const char *who, | 1531 purple_account_privacy_permit_add(PurpleAccount *account, const char *who, |
| 1532 gboolean local_only) | 1532 gboolean local_only) |
| 2896 g_free, delete_setting); | 2896 g_free, delete_setting); |
| 2897 priv->ui_settings = g_hash_table_new_full(g_str_hash, g_str_equal, | 2897 priv->ui_settings = g_hash_table_new_full(g_str_hash, g_str_equal, |
| 2898 g_free, (GDestroyNotify)g_hash_table_destroy); | 2898 g_free, (GDestroyNotify)g_hash_table_destroy); |
| 2899 priv->system_log = NULL; | 2899 priv->system_log = NULL; |
| 2900 | 2900 |
| 2901 priv->perm_deny = PURPLE_ACCOUNT_PRIVACY_ALLOW_ALL; | 2901 priv->privacy_type = PURPLE_ACCOUNT_PRIVACY_ALLOW_ALL; |
| 2902 } | 2902 } |
| 2903 | 2903 |
| 2904 /* GObject dispose function */ | 2904 /* GObject dispose function */ |
| 2905 static void | 2905 static void |
| 2906 purple_account_dispose(GObject *object) | 2906 purple_account_dispose(GObject *object) |
