diff options
author | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2016-03-31 16:53:36 -0300 |
---|---|---|
committer | Robert Tari <robert@tari.in> | 2021-07-05 02:28:32 +0200 |
commit | 30b0ba7facf333209ea60db9f3b5820dc0f4d5f3 (patch) | |
tree | bf0e9bd431af493e44fa484229c654d0d71c0873 /src/myself.cpp | |
parent | 6df38ca1d68d1eb2fed2aca024ea938fb00d306c (diff) | |
download | ayatana-indicator-datetime-30b0ba7facf333209ea60db9f3b5820dc0f4d5f3.tar.gz ayatana-indicator-datetime-30b0ba7facf333209ea60db9f3b5820dc0f4d5f3.tar.bz2 ayatana-indicator-datetime-30b0ba7facf333209ea60db9f3b5820dc0f4d5f3.zip |
Update code as requested by reviewer.
Diffstat (limited to 'src/myself.cpp')
-rw-r--r-- | src/myself.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/myself.cpp b/src/myself.cpp index 04c2126..0debfe4 100644 --- a/src/myself.cpp +++ b/src/myself.cpp @@ -41,8 +41,7 @@ Myself::Myself() bool Myself::isMyEmail(const std::string &email) { - auto emails = m_emails.get(); - return (std::find(emails.begin(), emails.end(), email) != emails.end()); + return m_emails.get().count(email) > 0; } void Myself::on_accounts_changed(AgManager *, guint, Myself *self) @@ -52,15 +51,19 @@ void Myself::on_accounts_changed(AgManager *, guint, Myself *self) void Myself::reloadEmails() { - std::vector<std::string> emails; + std::set<std::string> emails; auto manager = m_accounts_manager.get(); auto ids = ag_manager_list(manager); for (auto l=ids; l!=nullptr; l=l->next) { auto acc = ag_manager_get_account(manager, GPOINTER_TO_UINT(l->data)); - auto account_name = ag_account_get_display_name(acc); - emails.push_back(account_name); + if (acc) { + auto account_name = ag_account_get_display_name(acc); + if (account_name != nullptr) + emails.insert(account_name); + g_object_unref(acc); + } } ag_manager_list_free(ids); |