Moved the GList to maintain the list of proxies, into the proxyDialog

2005-08-10  Sankar P  <psankar@novell.com>

	* proxy.c :
	Moved the GList to maintain the list of proxies,
	into the proxyDialog structure.
	Fixes #312352, #312309

	* proxy.h :
	Added free_proxy_list declaration to avoid compiler warning

svn path=/trunk/; revision=30069

3 files changed, 48 insertions, 37 deletions

diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index 78e6dd60e5..ca53b8e031 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,13 @@
+2005-08-10  Sankar P  <psankar@novell.com>
+
+	* proxy.c : 
+	Moved the GList to maintain the list of proxies, 
+	into the proxyDialog structure.
+	Fixes #312352, #312309
+
+	* proxy.h :
+	Added free_proxy_list declaration to avoid compiler warning
+	
 2005-08-10  Vivek Jain <jvivek@novell.com>
 	
 	* share-folder-common.c:(org_gnome_shared_folder_factory)
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 28506d73a9..0b0fcc4004 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -104,8 +104,12 @@ struct _proxyDialogPrivate {
 	GtkWidget *options;
 	GtkWidget *private;
         char *help_section;
+
+	GList *proxy_list;
 };
 
+//static void free_proxy_handler (proxyHandler *handler);
+
 static void
 proxy_dialog_dispose (GObject *object)
 {
@@ -137,10 +141,11 @@ free_proxy_handler (proxyHandler *handler)
 void
 free_proxy_list (GList *proxy_list)
 {
-	g_list_foreach (proxy_list, (GFunc) free_proxy_handler, NULL);
-	g_list_free (proxy_list);
-	proxy_list = NULL;
-
+	if (proxy_list) {
+		g_list_foreach (proxy_list, (GFunc) free_proxy_handler, NULL);
+		g_list_free (proxy_list);
+		proxy_list = NULL;
+	}
 }
 
 static void
@@ -156,6 +161,7 @@ proxy_dialog_finalize (GObject *object)
 		g_object_unref (priv->proxy_name_selector);
 
 	if (priv) {
+		free_proxy_list (priv->proxy_list);
 		g_free (priv->help_section);
 		g_object_unref (priv->xml_tab);
 		g_object_unref (prd->priv);
@@ -214,6 +220,8 @@ proxy_dialog_init (GObject *object)
 	priv->options = NULL;
 	priv->private = NULL;
 	priv->help_section = NULL;
+
+	priv->proxy_list = NULL;
 }
 
 GType
@@ -351,7 +359,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog)
 					}
 
 					/*check whether already exists*/
-					existing_list = g_object_get_data ( (GObject*)account, "proxy_list");
+					existing_list = priv->proxy_list;
 
 					for (;existing_list; existing_list = g_list_next(existing_list)) {
 						new_proxy = (proxyHandler *) existing_list->data;
@@ -379,7 +387,8 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog)
 					new_proxy->uniqueid = NULL;
 					new_proxy->flags =  E_GW_PROXY_NEW;
 					new_proxy->permissions = proxy_get_permissions_from_dialog (account);
-					g_object_set_data_full ((GObject *) account, "proxy_list", g_list_append (g_object_get_data ((GObject*) account,"proxy_list"), new_proxy), (GDestroyNotify) free_proxy_list);
+				
+					priv->proxy_list = g_list_append (priv->proxy_list, new_proxy);
 				}
 			}
 			break;
@@ -497,20 +506,14 @@ proxy_abort (GtkWidget *button, EConfigHookItemFactoryData *data)
 	EMConfigTargetAccount *target_account;
 	EAccount *account;
 	proxyDialog *prd = NULL;
-	GList *proxy_list;
 
 	target_account = (EMConfigTargetAccount *)data->config->target;
 	account = target_account->account;
 	prd = g_object_get_data ((GObject *)account, "prd");    
-	proxy_list = (GList *) g_object_get_data ((GObject *) account, "proxy_dialog");
 	
-	if (prd == NULL || proxy_list == NULL)
+	if (prd == NULL)
 		return;
 
-	g_list_foreach (proxy_list, (GFunc) free_proxy_handler, NULL);
-	g_list_free (proxy_list);
-	proxy_list = NULL;
-
 	g_object_unref (prd);
 	prd = NULL;
 }
@@ -520,21 +523,19 @@ proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data)
 	EAccount *account;
 	EMConfigTargetAccount *target_account;
 	proxyDialogPrivate *priv;
-	GList *l, *proxy_list;
+	GList *list_iter;
 	proxyHandler *aclInstance;
 	proxyDialog *prd = NULL;
 
 	target_account = (EMConfigTargetAccount *)data->config->target;
 	account = target_account->account;
 	prd = g_object_get_data ((GObject *)account, "prd");    
-	l = g_object_get_data ( (GObject *)account, "proxy_list") ;
-
-	if (prd == NULL || l == NULL)
-		return;
-	
 	priv = prd->priv;
-	for (;l; l = g_list_next (l)) {
-		aclInstance = (proxyHandler *) l->data;
+	list_iter = priv->proxy_list;
+	if (prd == NULL || list_iter == NULL)
+		return;
+	for (;list_iter; list_iter = g_list_next (list_iter)) {
+		aclInstance = (proxyHandler *) list_iter->data;
 
 		/* Handle case where the structure is new and deleted*/
 		if ( !((aclInstance->flags & E_GW_PROXY_NEW) && (aclInstance->flags & E_GW_PROXY_DELETED))) {
@@ -553,11 +554,6 @@ proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data)
 		}
 	}
 
-	proxy_list = (GList *) g_object_get_data ((GObject *) account, "proxy_dialog");
-	g_list_foreach (proxy_list, (GFunc) free_proxy_handler, NULL);
-	g_list_free (proxy_list);
-	proxy_list = NULL;
-
 	g_object_unref (prd);
 	prd = NULL;
 }
@@ -594,7 +590,7 @@ proxy_update_tree_view (EAccount *account)
 	proxyDialog *prd = NULL;
     	GtkTreeIter iter;
 	GdkPixbuf *broken_image = NULL;
-	GList *l;
+	GList *list_iter;
 	proxyHandler *aclInstance;
 	gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", E_ICON_SIZE_DIALOG);
 	proxyDialogPrivate *priv;
@@ -604,10 +600,10 @@ proxy_update_tree_view (EAccount *account)
 	broken_image = gdk_pixbuf_new_from_file (file_name, NULL);
 	
 	gtk_tree_store_clear (priv->store);
-	l = g_object_get_data ( (GObject *)account, "proxy_list") ;
+	list_iter = priv->proxy_list;
 
-	for (;l; l = g_list_next(l)) {        
-	        aclInstance = (proxyHandler *) l->data;
+	for (;list_iter; list_iter = g_list_next(list_iter)) {        
+	        aclInstance = (proxyHandler *) list_iter->data;
 
 		if(! (aclInstance->flags & E_GW_PROXY_DELETED )) {
 			gtk_tree_store_append (priv->store, &iter, NULL);
@@ -624,7 +620,6 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 {
 	EMConfigTargetAccount *target_account;
 	EAccount *account;
-	GList *proxy_list = NULL;
 	GtkButton *addProxy, *removeProxy, *editProxy;
 	proxyDialog *prd;
 	proxyDialogPrivate *priv;
@@ -657,10 +652,9 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 			
 			prd->cnc = proxy_get_cnc(account);
 			
-			if (e_gw_connection_get_proxy_access_list(prd->cnc, &proxy_list)!= E_GW_CONNECTION_STATUS_OK) 
+			priv->proxy_list = NULL;
+			if (e_gw_connection_get_proxy_access_list(prd->cnc, &priv->proxy_list)!= E_GW_CONNECTION_STATUS_OK) 
 				return NULL;
-			
-			g_object_set_data_full ((GObject *) account, "proxy_list", proxy_list, (GDestroyNotify) free_proxy_list);
 			proxy_update_tree_view (account);
 		} else {
 			GtkWidget *label;
@@ -736,11 +730,17 @@ proxy_edit_ok (GtkWidget *button, EAccount *account)
 static proxyHandler * 
 proxy_get_item_from_list (EAccount *account, char *account_name)
 {
-	GList *l = g_object_get_data ((GObject *)account, "proxy_list");
+	proxyDialogPrivate *priv;
+	proxyDialog *prd = NULL;
+	GList *list_iter;
 	proxyHandler *iter;
+	
+	prd = g_object_get_data ((GObject *)account, "prd");    
+	priv = prd->priv;
+	list_iter = priv->proxy_list;
 
-	for (;l; l = g_list_next(l)) {        
-	        iter = (proxyHandler *) l->data;
+	for (;list_iter; list_iter = g_list_next(list_iter)) {        
+	        iter = (proxyHandler *) list_iter->data;
 
 		if ( g_str_equal (iter->proxy_email,account_name))
 			return iter;
diff --git a/plugins/groupwise-features/proxy.h b/plugins/groupwise-features/proxy.h
index 38e2f744b8..fb2f6c6453 100644
--- a/plugins/groupwise-features/proxy.h
+++ b/plugins/groupwise-features/proxy.h
@@ -64,3 +64,4 @@ void proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data);
 static void proxy_setup_meta_tree_view (EAccount *account);
 static proxyHandler *proxy_get_item_from_list (EAccount *account, char *account_name);
 static void proxy_load_edit_dialog (EAccount *account, proxyHandler *edited);
+void free_proxy_list (GList *proxy_list);