From 5975107d8f678c862d5206e9d41a567e6a64080f Mon Sep 17 00:00:00 2001 From: Jussi Laako Date: Tue, 12 Feb 2013 16:51:42 +0200 Subject: [PATCH] dbus: rename interfaces to avoid conflict identityinfo: don't pass owner or ACL if not set - leave it to deamon --- libsignon-glib/Makefile.am | 18 +++++++++--------- ...gle.code.AccountsSSO.gSingleSignOn.AuthService.xml} | 3 +-- ...gle.code.AccountsSSO.gSingleSignOn.AuthSession.xml} | 4 +--- ...google.code.AccountsSSO.gSingleSignOn.Identity.xml} | 4 +--- libsignon-glib/signon-identity-info.c | 1 - libsignon-glib/signon-identity.c | 11 ----------- libsignon-glib/signon-internals.h | 4 ++-- 7 files changed, 14 insertions(+), 31 deletions(-) rename libsignon-glib/interfaces/{com.google.code.AccountsSSO.SingleSignOn.AuthService.xml => com.google.code.AccountsSSO.gSingleSignOn.AuthService.xml} (90%) rename libsignon-glib/interfaces/{com.google.code.AccountsSSO.SingleSignOn.AuthSession.xml => com.google.code.AccountsSSO.gSingleSignOn.AuthSession.xml} (77%) rename libsignon-glib/interfaces/{com.google.code.AccountsSSO.SingleSignOn.Identity.xml => com.google.code.AccountsSSO.gSingleSignOn.Identity.xml} (86%) diff --git a/libsignon-glib/Makefile.am b/libsignon-glib/Makefile.am index 67c3782..3aeeba8 100644 --- a/libsignon-glib/Makefile.am +++ b/libsignon-glib/Makefile.am @@ -33,9 +33,9 @@ BUILT_SOURCES = \ CLEANFILES = \ $(BUILT_SOURCES) \ - sso-auth-service-gen-doc-com.google.code.AccountsSSO.SingleSignOn.AuthService.xml \ - sso-auth-session-gen-doc-com.google.code.AccountsSSO.SingleSignOn.AuthSession.xml \ - sso-identity-gen-doc-com.google.code.AccountsSSO.SingleSignOn.Identity.xml + sso-auth-service-gen-doc-com.google.code.AccountsSSO.gSingleSignOn.AuthService.xml \ + sso-auth-session-gen-doc-com.google.code.AccountsSSO.gSingleSignOn.AuthSession.xml \ + sso-identity-gen-doc-com.google.code.AccountsSSO.gSingleSignOn.Identity.xml libsignon_glib_la_SOURCES = \ signon-auth-service.h \ @@ -82,25 +82,25 @@ libsignon_glib_headers_with_enums = \ # default is /usr/share/dbus-1/interfaces DBUS_INTERFACES_DIR = interfaces -sso-auth-service-gen.h sso-auth-service-gen.c: $(DBUS_INTERFACES_DIR)/com.google.code.AccountsSSO.SingleSignOn.AuthService.xml +sso-auth-service-gen.h sso-auth-service-gen.c: $(DBUS_INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.AuthService.xml $(AM_V_GEN)gdbus-codegen \ --generate-c-code sso-auth-service-gen \ --generate-docbook sso-auth-service-gen-doc \ - --annotate "com.google.code.AccountsSSO.SingleSignOn.AuthService" org.gtk.GDBus.C.Name SsoAuthService \ + --annotate "com.google.code.AccountsSSO.gSingleSignOn.AuthService" org.gtk.GDBus.C.Name SsoAuthService \ $< -sso-auth-session-gen.h sso-auth-session-gen.c: $(DBUS_INTERFACES_DIR)/com.google.code.AccountsSSO.SingleSignOn.AuthSession.xml +sso-auth-session-gen.h sso-auth-session-gen.c: $(DBUS_INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.AuthSession.xml $(AM_V_GEN)gdbus-codegen \ --generate-c-code sso-auth-session-gen \ --generate-docbook sso-auth-session-gen-doc \ - --annotate "com.google.code.AccountsSSO.SingleSignOn.AuthSession" org.gtk.GDBus.C.Name SsoAuthSession \ + --annotate "com.google.code.AccountsSSO.gSingleSignOn.AuthSession" org.gtk.GDBus.C.Name SsoAuthSession \ $< -sso-identity-gen.h sso-identity-gen.c: $(DBUS_INTERFACES_DIR)/com.google.code.AccountsSSO.SingleSignOn.Identity.xml +sso-identity-gen.h sso-identity-gen.c: $(DBUS_INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.Identity.xml $(AM_V_GEN)gdbus-codegen \ --generate-c-code sso-identity-gen \ --generate-docbook sso-identity-gen-doc \ - --annotate "com.google.code.AccountsSSO.SingleSignOn.Identity" org.gtk.GDBus.C.Name SsoIdentity \ + --annotate "com.google.code.AccountsSSO.gSingleSignOn.Identity" org.gtk.GDBus.C.Name SsoIdentity \ $< signon-marshal.h: signon-marshal.list Makefile diff --git a/libsignon-glib/interfaces/com.google.code.AccountsSSO.SingleSignOn.AuthService.xml b/libsignon-glib/interfaces/com.google.code.AccountsSSO.gSingleSignOn.AuthService.xml similarity index 90% rename from libsignon-glib/interfaces/com.google.code.AccountsSSO.SingleSignOn.AuthService.xml rename to libsignon-glib/interfaces/com.google.code.AccountsSSO.gSingleSignOn.AuthService.xml index 88465c3..7d85456 100644 --- a/libsignon-glib/interfaces/com.google.code.AccountsSSO.SingleSignOn.AuthService.xml +++ b/libsignon-glib/interfaces/com.google.code.AccountsSSO.gSingleSignOn.AuthService.xml @@ -1,6 +1,6 @@ - + @@ -21,7 +21,6 @@ - diff --git a/libsignon-glib/interfaces/com.google.code.AccountsSSO.SingleSignOn.AuthSession.xml b/libsignon-glib/interfaces/com.google.code.AccountsSSO.gSingleSignOn.AuthSession.xml similarity index 77% rename from libsignon-glib/interfaces/com.google.code.AccountsSSO.SingleSignOn.AuthSession.xml rename to libsignon-glib/interfaces/com.google.code.AccountsSSO.gSingleSignOn.AuthSession.xml index 62aa6c1..7047757 100644 --- a/libsignon-glib/interfaces/com.google.code.AccountsSSO.SingleSignOn.AuthSession.xml +++ b/libsignon-glib/interfaces/com.google.code.AccountsSSO.gSingleSignOn.AuthSession.xml @@ -1,6 +1,6 @@ - + @@ -13,9 +13,7 @@ - - diff --git a/libsignon-glib/interfaces/com.google.code.AccountsSSO.SingleSignOn.Identity.xml b/libsignon-glib/interfaces/com.google.code.AccountsSSO.gSingleSignOn.Identity.xml similarity index 86% rename from libsignon-glib/interfaces/com.google.code.AccountsSSO.SingleSignOn.Identity.xml rename to libsignon-glib/interfaces/com.google.code.AccountsSSO.gSingleSignOn.Identity.xml index 55d4fb7..8e265de 100644 --- a/libsignon-glib/interfaces/com.google.code.AccountsSSO.SingleSignOn.Identity.xml +++ b/libsignon-glib/interfaces/com.google.code.AccountsSSO.gSingleSignOn.Identity.xml @@ -1,6 +1,6 @@ - + @@ -20,7 +20,6 @@ - @@ -34,7 +33,6 @@ - diff --git a/libsignon-glib/signon-identity-info.c b/libsignon-glib/signon-identity-info.c index 5839736..bce8979 100644 --- a/libsignon-glib/signon-identity-info.c +++ b/libsignon-glib/signon-identity-info.c @@ -273,7 +273,6 @@ SignonIdentityInfo *signon_identity_info_new () info->methods = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify)g_strfreev); info->store_secret = FALSE; - info->owner = signon_security_context_new (); return info; } diff --git a/libsignon-glib/signon-identity.c b/libsignon-glib/signon-identity.c index 295e015..3b2179e 100644 --- a/libsignon-glib/signon-identity.c +++ b/libsignon-glib/signon-identity.c @@ -795,22 +795,11 @@ void signon_identity_store_credentials_with_args(SignonIdentity *self, { signon_identity_info_set_owner (info, owner); } - else - { - signon_identity_info_set_owner_from_values (info, "", ""); - DEBUG ("created empty owner context"); - } if (access_control_list) { signon_identity_info_set_access_control_list (info, access_control_list); } - else - { - signon_identity_info_access_control_list_append (info, - signon_security_context_new_from_values ("*", "*")); - DEBUG ("created wildcard access control list"); - } signon_identity_info_set_identity_type (info, type); signon_identity_store_credentials_with_info (self, info, cb, user_data); diff --git a/libsignon-glib/signon-internals.h b/libsignon-glib/signon-internals.h index 566a8cb..a907fe3 100644 --- a/libsignon-glib/signon-internals.h +++ b/libsignon-glib/signon-internals.h @@ -43,10 +43,10 @@ /* * Common DBUS definitions * */ -#define SIGNOND_SERVICE_PREFIX "com.google.code.AccountsSSO.SingleSignOn" +#define SIGNOND_SERVICE_PREFIX "com.google.code.AccountsSSO.gSingleSignOn" #define SIGNOND_SERVICE SIGNOND_SERVICE_PREFIX -#define SIGNOND_DAEMON_OBJECTPATH "/com/google/code/AccountsSSO/SingleSignOn" +#define SIGNOND_DAEMON_OBJECTPATH "/com/google/code/AccountsSSO/gSingleSignOn" #define SIGNOND_DAEMON_INTERFACE SIGNOND_SERVICE_PREFIX ".AuthService" #define SIGNOND_IDENTITY_INTERFACE SIGNOND_SERVICE_PREFIX ".Identity" #define SIGNOND_AUTH_SESSION_INTERFACE SIGNOND_SERVICE_PREFIX ".AuthSession" -- 2.7.4