From cffa75855c0712c01143e4787d4099025120c277 Mon Sep 17 00:00:00 2001
From: Stefan Becker <chemobejk@gmail.com>
Date: Thu, 8 Dec 2011 16:20:19 +0200
Subject: [PATCH] core cleanup: move out regcallid field

Renamed it to register_callid.
---
 src/core/sip-transport.c     | 7 +++----
 src/core/sipe-core-private.h | 1 +
 src/core/sipe-core.c         | 6 +++---
 src/core/sipe.h              | 1 -
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/core/sip-transport.c b/src/core/sip-transport.c
index d9435648..8a5c760e 100644
--- a/src/core/sip-transport.c
+++ b/src/core/sip-transport.c
@@ -644,7 +644,6 @@ struct transaction *sip_transport_request_timeout(struct sipe_core_private *sipe
 						  TransCallback timeout_callback)
 {
 	struct sip_transport *transport = sipe_private->transport;
-	struct sipe_account_data *sip = SIPE_ACCOUNT_DATA_PRIVATE;
 	char *buf;
 	struct sipmsg *msg;
 	gchar *ourtag    = dialog && dialog->ourtag    ? g_strdup(dialog->ourtag)    : NULL;
@@ -675,11 +674,11 @@ struct transaction *sip_transport_request_timeout(struct sipe_core_private *sipe
 	}
 
 	if (sipe_strequal(method, "REGISTER")) {
-		if (sip->regcallid) {
+		if (sipe_private->register_callid) {
 			g_free(callid);
-			callid = g_strdup(sip->regcallid);
+			callid = g_strdup(sipe_private->register_callid);
 		} else {
-			sip->regcallid = g_strdup(callid);
+			sipe_private->register_callid = g_strdup(callid);
 		}
 		cseq = ++transport->cseq;
 	}
diff --git a/src/core/sipe-core-private.h b/src/core/sipe-core-private.h
index 41d439a9..8388b22c 100644
--- a/src/core/sipe-core-private.h
+++ b/src/core/sipe-core-private.h
@@ -54,6 +54,7 @@ struct sipe_core_private {
 
 	/* SIPE protocol information */
 	gchar *contact;
+	gchar *register_callid;
 	gchar *epid;
 	gchar *focus_factory_uri;
 	GSList *sessions;
diff --git a/src/core/sipe-core.c b/src/core/sipe-core.c
index 30beed2f..61b1891c 100644
--- a/src/core/sipe-core.c
+++ b/src/core/sipe-core.c
@@ -312,9 +312,9 @@ void sipe_core_connection_cleanup(struct sipe_core_private *sipe_private)
 	if (sipe_private->contact)
 		g_free(sipe_private->contact);
 	sipe_private->contact = NULL;
-	if (sip->regcallid)
-		g_free(sip->regcallid);
-	sip->regcallid = NULL;
+	if (sipe_private->register_callid)
+		g_free(sipe_private->register_callid);
+	sipe_private->register_callid = NULL;
 
 	if (sipe_private->focus_factory_uri)
 		g_free(sipe_private->focus_factory_uri);
diff --git a/src/core/sipe.h b/src/core/sipe.h
index 135cbb73..09bd380d 100644
--- a/src/core/sipe.h
+++ b/src/core/sipe.h
@@ -63,7 +63,6 @@ struct sipe_account_data {
 	time_t idle_switch;
 	GSList *containers; /* MS-PRES containers */
 	struct _PurpleAccount *account;
-	gchar *regcallid;
 };
 
 /**
-- 
2.11.4.GIT