From 563d8ca4e5e6e50b38c1c95aecc334f044af21d7 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Fri, 9 Dec 2011 00:12:57 +0200 Subject: [PATCH] core cleanup: remove struct sipe_account_data The purple fields in the data structure were only used in one function that was only called from one purple wrapper. By merging it into the calling wrapper the purple gc and account became directly accessible thus removing the need for sipe_account_data. "It's dead Jim..." --- src/api/core-depurple.h | 4 ---- src/core/sipe-core-private.h | 8 -------- src/core/sipe-core.c | 3 --- src/core/sipe.c | 24 +++--------------------- src/core/sipe.h | 7 ------- src/purple/purple-plugin.c | 1 - 6 files changed, 3 insertions(+), 44 deletions(-) diff --git a/src/api/core-depurple.h b/src/api/core-depurple.h index d04fd766..6e4247c0 100644 --- a/src/api/core-depurple.h +++ b/src/api/core-depurple.h @@ -23,11 +23,7 @@ /* * This is a temporary file for the core de-purple transition period */ -struct sipe_core_public; - GList *sipe_buddy_menu(PurpleBuddy *buddy); -void sipe_purple_setup(struct sipe_core_public *sipe_public, - PurpleConnection *gc); /* Convenience macros */ #define PURPLE_BUDDY_TO_SIPE_CORE_PRIVATE ((struct sipe_core_private *)buddy->account->gc->proto_data) diff --git a/src/core/sipe-core-private.h b/src/core/sipe-core-private.h index a2be311e..65afb16a 100644 --- a/src/core/sipe-core-private.h +++ b/src/core/sipe-core-private.h @@ -35,7 +35,6 @@ struct sipe_svc; * * This part contains the information only needed by the core */ -struct sipe_account_data; /* to be removed... */ struct sipe_core_private { /** * The public part is the first item, i.e. a pointer to the @@ -135,9 +134,6 @@ struct sipe_core_private { /* TLS-DSK: Certificates & Web services */ struct sipe_certificate *certificate; struct sipe_svc *svc; - - /* the original data structure*/ - struct sipe_account_data *temporary; }; /** @@ -178,10 +174,6 @@ struct sipe_core_private { #define SIPE_CORE_PRIVATE ((struct sipe_core_private *)sipe_public) #define SIPE_CORE_PUBLIC ((struct sipe_core_public *)sipe_private) -/* Transition macros */ -#define SIPE_ACCOUNT_DATA SIPE_CORE_PRIVATE->temporary -#define SIPE_ACCOUNT_DATA_PRIVATE sipe_private->temporary - /** * sipe-core internal functions */ diff --git a/src/core/sipe-core.c b/src/core/sipe-core.c index 9c2b7838..11dfecd9 100644 --- a/src/core/sipe-core.c +++ b/src/core/sipe-core.c @@ -207,7 +207,6 @@ struct sipe_core_public *sipe_core_allocate(const gchar *signin_name, const gchar **errmsg) { struct sipe_core_private *sipe_private; - struct sipe_account_data *sip; gchar **user_domain; SIPE_DEBUG_INFO("sipe_core_allocate: signin_name '%s'", signin_name); @@ -264,7 +263,6 @@ struct sipe_core_public *sipe_core_allocate(const gchar *signin_name, } sipe_private = g_new0(struct sipe_core_private, 1); - sipe_private->temporary = sip = g_new0(struct sipe_account_data, 1); SIPE_CORE_PRIVATE_FLAG_UNSET(SUBSCRIBED_BUDDIES); SIPE_CORE_PRIVATE_FLAG_UNSET(INITIAL_PUBLISH); sipe_private->username = g_strdup(signin_name); @@ -403,7 +401,6 @@ void sipe_core_deallocate(struct sipe_core_public *sipe_public) sipe_media_relay_list_free(sipe_private->media_relays); #endif - g_free(SIPE_ACCOUNT_DATA_PRIVATE); g_free(sipe_private); } diff --git a/src/core/sipe.c b/src/core/sipe.c index a0f1a47c..0001cdf1 100644 --- a/src/core/sipe.c +++ b/src/core/sipe.c @@ -73,15 +73,6 @@ #include "sipe.h" -/* temporary function */ -void sipe_purple_setup(struct sipe_core_public *sipe_public, - PurpleConnection *gc) -{ - struct sipe_account_data *sip = SIPE_ACCOUNT_DATA; - sip->gc = gc; - sip->account = purple_connection_get_account(gc); -} - /** for Access levels menu */ #define INDENT_FMT " %s" @@ -546,12 +537,9 @@ sipe_ask_access_domain_cb(PurpleConnection *gc, PurpleRequestFields *fields) index); } -static void -sipe_ask_access_domain(struct sipe_core_private *sipe_private) +static void sipe_buddy_menu_access_level_add_domain_cb(PurpleBuddy *buddy) { - struct sipe_account_data *sip = SIPE_ACCOUNT_DATA_PRIVATE; - PurpleAccount *account = sip->account; - PurpleConnection *gc = sip->gc; + PurpleConnection *gc = purple_account_get_connection(buddy->account); PurpleRequestFields *fields; PurpleRequestFieldGroup *g; PurpleRequestField *f; @@ -579,13 +567,7 @@ sipe_ask_access_domain(struct sipe_core_private *sipe_private) _("Add new domain"), NULL, fields, _("Add"), G_CALLBACK(sipe_ask_access_domain_cb), _("Cancel"), NULL, - account, NULL, NULL, gc); -} - -static void -sipe_buddy_menu_access_level_add_domain_cb(PurpleBuddy *buddy) -{ - sipe_ask_access_domain(PURPLE_BUDDY_TO_SIPE_CORE_PRIVATE); + buddy->account, NULL, NULL, gc); } /* diff --git a/src/core/sipe.h b/src/core/sipe.h index 765d9ad4..8e630527 100644 --- a/src/core/sipe.h +++ b/src/core/sipe.h @@ -34,15 +34,8 @@ */ /* Forward declarations */ -struct _PurpleAccount; -struct _PurpleConnection; struct sipe_core_private; -struct sipe_account_data { - struct _PurpleConnection *gc; - struct _PurpleAccount *account; -}; - /** * THE BIG SPLIT - temporary interfaces * diff --git a/src/purple/purple-plugin.c b/src/purple/purple-plugin.c index ae39f509..42dabc93 100644 --- a/src/purple/purple-plugin.c +++ b/src/purple/purple-plugin.c @@ -321,7 +321,6 @@ static void sipe_purple_login(PurpleAccount *account) SIPE_CORE_FLAG_SET(SSO); gc->proto_data = sipe_public; - sipe_purple_setup(sipe_public, gc); gc->flags |= PURPLE_CONNECTION_HTML | PURPLE_CONNECTION_FORMATTING_WBFO | PURPLE_CONNECTION_NO_BGCOLOR | PURPLE_CONNECTION_NO_FONTSIZE | PURPLE_CONNECTION_NO_URLDESC | PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY; purple_connection_set_display_name(gc, sipe_public->sip_name); -- 2.11.4.GIT