diff options
| author | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-08-01 08:39:56 +0100 |
|---|---|---|
| committer | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-08-20 11:44:24 +0100 |
| commit | cde70cc9640c0a42311844ba77b3ae49a63487c2 (patch) | |
| tree | 1c50a740984b11714f6aa725d864038e455e215e | |
| parent | 6a7fa83fc55186a831e49b3c8a800e8b10781c98 (diff) | |
| download | telepathy-account-widgets-cde70cc9640c0a42311844ba77b3ae49a63487c2.tar.gz | |
Save the UOA provider name in the pkg-config file
https://bugzilla.gnome.org/show_bug.cgi?id=699492
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | telepathy-account-widgets-uninstalled.pc.in | 2 | ||||
| -rw-r--r-- | tp-account-widgets/tpaw-keyring.c | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 8d88b333..587bba7d 100644 --- a/configure.ac +++ b/configure.ac @@ -141,9 +141,13 @@ PKG_CHECK_MODULES(TPAW, gtk+-3.0 >= $GTK_REQUIRED ]) -AC_DEFINE(EMPATHY_UOA_PROVIDER, - "im.telepathy.Account.Storage.UOA", +# ----------------------------------------------------------- +# UOA configuration bits +# ----------------------------------------------------------- +TPAW_UOA_PROVIDER="im.telepathy.Account.Storage.UOA" +AC_DEFINE_UNQUOTED(TPAW_UOA_PROVIDER, "$TPAW_UOA_PROVIDER", [Name of provider for accounts imported from libaccounts]) +AC_SUBST(TPAW_UOA_PROVIDER) # ----------------------------------------------------------- # Enable debug diff --git a/telepathy-account-widgets-uninstalled.pc.in b/telepathy-account-widgets-uninstalled.pc.in index b40c6740..b6546bfa 100644 --- a/telepathy-account-widgets-uninstalled.pc.in +++ b/telepathy-account-widgets-uninstalled.pc.in @@ -3,6 +3,8 @@ exec_prefix= abs_top_srcdir=@abs_top_srcdir@ abs_top_builddir=@abs_top_builddir@ +uoa_provider=@TPAW_UOA_PROVIDER@ + Name: telepathy-account-widgets (uninstalled copy) Description: Widgets and utility functions for configuring Telepathy accounts Version: @VERSION@ diff --git a/tp-account-widgets/tpaw-keyring.c b/tp-account-widgets/tpaw-keyring.c index 533b0da7..9f96458f 100644 --- a/tp-account-widgets/tpaw-keyring.c +++ b/tp-account-widgets/tpaw-keyring.c @@ -274,7 +274,7 @@ tpaw_keyring_get_account_password_async (TpAccount *account, const gchar *provider; provider = tp_account_get_storage_provider (account); - if (!tp_strdiff (provider, EMPATHY_UOA_PROVIDER)) + if (!tp_strdiff (provider, TPAW_UOA_PROVIDER)) { uoa_get_account_password (account, simple); g_object_unref (simple); @@ -574,7 +574,7 @@ tpaw_keyring_set_account_password_async (TpAccount *account, const gchar *provider; provider = tp_account_get_storage_provider (account); - if (!tp_strdiff (provider, EMPATHY_UOA_PROVIDER)) + if (!tp_strdiff (provider, TPAW_UOA_PROVIDER)) { uoa_set_account_password (account, password, remember, simple); g_object_unref (simple); @@ -693,7 +693,7 @@ tpaw_keyring_delete_account_password_async (TpAccount *account, const gchar *provider; provider = tp_account_get_storage_provider (account); - if (!tp_strdiff (provider, EMPATHY_UOA_PROVIDER)) + if (!tp_strdiff (provider, TPAW_UOA_PROVIDER)) { /* I see no other way to forget the stored password than overwriting * with an empty one. */ |