[anjal] Fix warnings.

[Srinivasa Ragavan <sragavan src gnome org>]

commit 1ec256c826a6410707c9af7904ab24becdf58f6f
Author: Srinivasa Ragavan <sragavan novell com>
Date:   Fri May 29 17:10:00 2009 +0530

    Fix warnings.
---
 src/em-tree-store.c |  103 +++++++++++++++++++++++++--------------------------
 src/em-tree-store.h |    2 +
 2 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/src/em-tree-store.c b/src/em-tree-store.c
index a60ce99..9dfb6e2 100644
--- a/src/em-tree-store.c
+++ b/src/em-tree-store.c
@@ -100,11 +100,13 @@ emts_node_alloc(struct _EMTreeStorePrivate *p)
 	return node;
 }
 
+#ifdef NOT_USED
 static EMTreeNode *
 emts_leaf_alloc(struct _EMTreeStorePrivate *p)
 {
 	return emts_node_alloc(p);
 }
+#endif
 
 static void
 emts_node_free(struct _EMTreeStorePrivate *p, EMTreeNode *node)
@@ -121,13 +123,13 @@ emts_node_free(struct _EMTreeStorePrivate *p, EMTreeNode *node)
 static int
 emts_node_count (EMTreeNode *node)
 {
-	EMTreeNode *child, *nchild;
+	EMTreeNode *child;
 	int  count = 0;
 	
 	if (node_has_children(node)) {
 		child = (EMTreeNode *)node->children.head;
 	
-		while (child && child != &node->children.tail ) {
+		while (child && child != (EMTreeNode *)&node->children.tail ) {
 			count += emts_node_count(child);
 			count++;
 			child = child->next;
@@ -231,7 +233,7 @@ emts_get_value(GtkTreeModel *tree_model, GtkTreeIter  *iter, gint column, GValue
 	 EMTreeNode *node;
 	 struct _emts_folder *f;
 	 struct _EMTreeStorePrivate *p = _PRIVATE(tree_model);
-	 gboolean sel = g_object_get_data (tree_model, "sel") != NULL; 
+	 gboolean sel = g_object_get_data ((GObject *)tree_model, "sel") != NULL; 
 	 f = (struct _emts_folder *)p->folders.head;
 	/*EMTreeStore *emts = (EMTreeStore *)tree_model;*/
 	g_return_if_fail(iter != NULL);
@@ -276,13 +278,12 @@ emts_get_value(GtkTreeModel *tree_model, GtkTreeIter  *iter, gint column, GValue
 			g_value_set_string(value, camel_message_info_subject(node->info));
 			break;
 		case EMTS_COL_UNREAD: 
-			 g_value_set_boolean(value, emts_thread_unread(tree_model, node));
+			 g_value_set_boolean(value, emts_thread_unread((EMTreeStore *)tree_model, node));
 			break;			
 		case EMTS_COL_FROM: {
 			 char **str, *newstr = NULL;
-			 char *frn;
 			 int cnt = emts_node_count(node);
-			 gboolean unread = emts_thread_unread(tree_model, node);
+			 gboolean unread = emts_thread_unread((EMTreeStore *)tree_model, node);
 			 
 			 str  = g_strsplit (camel_message_info_from(node->info), "<", 2);
 			 if (cnt)
@@ -322,9 +323,9 @@ emts_get_value(GtkTreeModel *tree_model, GtkTreeIter  *iter, gint column, GValue
 			 
 			 /* We don't bother to fetch the preview of latest message, if not idenfied. Its ok.*/
 			 if (lnode && lnode->info)
-				 preview = camel_message_info_preview (lnode->info);
+				 preview = (char *)camel_message_info_preview (lnode->info);
 			 if ((!preview || !*preview )&& node->info)
-				 preview = camel_message_info_preview (node->info);
+				 preview = (char *)camel_message_info_preview (node->info);
 			 /* FIXME: This should be done at the backend/camel. Doing here is expensive, but just ok for 0.001 release*/
 			 if (preview && *preview)
 				  nline = strchr (preview, '\n') != NULL;
@@ -340,7 +341,7 @@ emts_get_value(GtkTreeModel *tree_model, GtkTreeIter  *iter, gint column, GValue
 		case EMTS_COL_DATE: {
 //			g_value_set_ulong(value, (unsigned long)camel_message_info_date_sent(node->info));
 			 char *uid= NULL;
-			 g_value_set_ulong(value, (unsigned long)emts_thread_time(tree_model, node, &uid));
+			 g_value_set_ulong(value, (unsigned long)emts_thread_time((EMTreeStore *)tree_model, node, &uid));
 			 if (!node->latest_uid)
 				  node->latest_uid = uid;
 			break;
@@ -553,6 +554,7 @@ emts_id_equal(void *a, void *b)
 	return ((CamelSummaryMessageID *)a)->id.id == ((CamelSummaryMessageID *)b)->id.id;
 }
 
+#ifdef NOT_USED
 static int
 sort_cb (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data)
 {
@@ -566,6 +568,7 @@ sort_cb (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data
 	return t1-t2;
 
 }
+#endif
 
 static void
 emts_init(EMTreeStore *emts)
@@ -747,7 +750,7 @@ emts_insert_info_incr(EMTreeStore *emts, CamelMessageInfo *mi, struct _emts_fold
 	match->latest_uid = mi->uid;
 	camel_message_info_ref(mi);
 	mid = camel_message_info_message_id(mi);
-	match->msg_ref = mid;
+	match->msg_ref = (CamelSummaryMessageID *)mid;
 	if (mid
 	    && g_hash_table_lookup(p->id_table, mid) == NULL)
 		g_hash_table_insert(p->id_table, (void *)mid, match);
@@ -789,7 +792,7 @@ emts_insert_info_incr(EMTreeStore *emts, CamelMessageInfo *mi, struct _emts_fold
 		}
 	} else {
 		//e_dlist_remove((EDListNode *)match);
-		em_tree_insert_sorted_with_data (&emts->root->children, (EDListNode *)match, emts->func, emts);
+		em_tree_insert_sorted_with_data (&emts->root->children, (EDListNode *)match, (GFunc)emts->func, emts);
 	}
 
 	iter.user_data = match;
@@ -932,16 +935,16 @@ emts_sort_view (EMTreeStore *emts, struct _emts_folder *f)
 {
 	 GPtrArray *nodes;
 	 int i;
-	 EMTreeNode *node = emts->root->children.head;
+	 EMTreeNode *node = (EMTreeNode *)emts->root->children.head;
 	 
 	 nodes = g_ptr_array_new ();
 	 i=0;
-	 while (node && node != &emts->root->children.tail) {
+	 while (node && node != (EMTreeNode *)&emts->root->children.tail) {
 		  g_ptr_array_add (nodes, node);
 		  node = node->next;
 	 }
 
-	 g_ptr_array_sort_with_data (nodes, emts->func , emts);
+	 g_ptr_array_sort_with_data (nodes, (GCompareDataFunc)emts->func , emts);
 	 emts->root->children.head = NULL;
 	 emts->root->children.tail = NULL;
 	 emts->root->children.tailpred = NULL;
@@ -955,8 +958,7 @@ void
 em_tree_store_resort (EMTreeStore *emts)
 {
 	struct _EMTreeStorePrivate *p = _PRIVATE(emts);
-	struct _emts_folder *f, *n;
-	int i;
+	struct _emts_folder *f;
 
 	f = (struct _emts_folder *)p->folders.head;
 	emts_sort_view (emts,f);
@@ -968,14 +970,14 @@ em_tree_insert_sorted_with_data (EDList *list,
 				 GFunc func,
 				 gpointer user_data)
 {
-	EMTreeNode *current_node = (EDListNode *) data;
-	gint cmp;
+	EMTreeNode *current_node = (EMTreeNode *) data;
+	gint cmp = 1;
 	EDListNode *head = list->head, *node;
 	
-	g_return_val_if_fail (func != NULL, list);
+	g_return_if_fail ((gpointer)func != NULL);
 
-	if (list->head == &list->tail) {
-		 e_dlist_addtail(list, current_node);
+	if (list->head == (EDListNode *)&list->tail) {
+		 e_dlist_addtail(list, (EDListNode *)current_node);
 		 return;
 	}
 
@@ -983,28 +985,28 @@ em_tree_insert_sorted_with_data (EDList *list,
 
 	//cmp = ((GCompareDataFunc) func) (&current_node, &node, user_data);
 
-	while (node && (node != &list->tail) && (cmp > 0)) {
+	while (node && (node != (EDListNode *)&list->tail) && (cmp > 0)) {
 		cmp = ((GCompareDataFunc) func) (&current_node, &node, user_data);
 		node = node->next;
 	}
 	
-	if (node == &list->tail) {
-		 e_dlist_addtail(list, current_node);
+	if (node == (EDListNode *)&list->tail) {
+		 e_dlist_addtail(list, (EDListNode *)current_node);
 		 return;
 	}
 
 	if (node == list->head) {
-		 e_dlist_addhead (list, current_node);
+		 e_dlist_addhead (list, (EDListNode *)current_node);
 		 return;
 	}
 	
 	if (node->prev) {
-		node->prev->next = current_node;
-		current_node->prev = node->prev;
+		node->prev->next = (EDListNode *)current_node;
+		current_node->prev = (EMTreeNode *)node->prev;
 	}
 
-	current_node->next = node;
-	node->prev = current_node;
+	current_node->next = (EMTreeNode *)node;
+	node->prev = (EDListNode *)current_node;
 }
 
 static gboolean
@@ -1186,8 +1188,6 @@ em_tree_store_search_folder (EMTreeStore *emts, CamelFolder *folder, const char
 void
 em_tree_store_set_folders(EMTreeStore *emts, GPtrArray *folders, const char *expr)
 {
-	struct _EMTreeStorePrivate *p = _PRIVATE(emts);
-	CamelMessageInfo *mi;
 	int i;
 	
 	printf("tree store new = %p\n", emts);
@@ -1216,7 +1216,6 @@ int em_tree_store_get_iter(EMTreeStore *emts, GtkTreeIter *iter, const char *uid
 {
 	struct _EMTreeStorePrivate *p = _PRIVATE(emts);
 	struct _emts_folder *f;
-	int i;
 
 	f = (struct _emts_folder *)p->folders.head;
  
@@ -1230,25 +1229,25 @@ static time_t
 emts_thread_time (EMTreeStore *emts, EMTreeNode *node, char **ret_uid)
 {
 
-	 EMTreeNode *n, next;
+	 EMTreeNode *n;
 	 time_t dsent = 0;
 
 	 if (node->info) {
 		  dsent  = camel_message_info_date_sent (node->info);
-		  *ret_uid = node->info->uid;
+		  *ret_uid = (char *)node->info->uid;
 	 }
-	 n = node->children.head;
-	 while (n && n != &node->children.tail) {
+	 n = (EMTreeNode *)node->children.head;
+	 while (n && n != (EMTreeNode *)&node->children.tail) {
 		  if (!node_has_children(n)) {
 			   
 			   if (camel_message_info_date_sent(n->info) > dsent) {
 					dsent = camel_message_info_date_sent(n->info);
-					*ret_uid = n->info->uid;
+					*ret_uid = (char *)n->info->uid;
 			   }
 			   n = n->next;
 		  } else {
 			   char *child_uid = NULL;
-			   time_t child_time = emts_thread_time (emts, n->children.head, &child_uid);
+			   time_t child_time = emts_thread_time (emts, (EMTreeNode *)n->children.head, &child_uid);
 			   
 			   if (child_time > dsent) {
 					dsent = child_time;
@@ -1256,7 +1255,7 @@ emts_thread_time (EMTreeStore *emts, EMTreeNode *node, char **ret_uid)
 			   }
 			   if (camel_message_info_date_sent(n->info) > dsent) {
 					dsent = camel_message_info_date_sent(n->info);
-					*ret_uid = n->info->uid;
+					*ret_uid = (char *)n->info->uid;
 			   }
 			   n = n->next;
 		  }
@@ -1269,20 +1268,20 @@ static gboolean
 emts_thread_unread (EMTreeStore *emts, EMTreeNode *node)
 {
 
-	 EMTreeNode *n, next;
+	 EMTreeNode *n;
 	 gboolean unread = FALSE;
 
 	 if (node->info) {
 		  unread = (camel_message_info_flags (node->info) & CAMEL_MESSAGE_SEEN) ? FALSE: TRUE;;
 	 }
 	 
-	 n = node->children.head;
-	 while (n && n != &node->children.tail && !unread) {
+	 n = (EMTreeNode *)node->children.head;
+	 while (n && n != (EMTreeNode *)&node->children.tail && !unread) {
 		  unread = (camel_message_info_flags (n->info) & CAMEL_MESSAGE_SEEN) ? FALSE : TRUE;
 		  if (unread)
 			   break;
 		  if (node_has_children(n)) {			   
-			   unread = emts_thread_unread (emts, n->children.head);
+			   unread = emts_thread_unread (emts, (EMTreeNode *)n->children.head);
 			   if (unread)
 					break;
 		  }
@@ -1326,15 +1325,15 @@ sort_dsent (EMTreeNode **n1, EMTreeNode **n2, EMTreeStore *emts)
 static void
 emts_child_tree (EMTreeStore *emts, EMTreeNode *node, GPtrArray *array)
 {
-	 EMTreeNode *n, next;
+	 EMTreeNode *n;
 
 	 if (node->info)
 		  g_ptr_array_add (array, node);
 			   
-	 n = node->children.head;
-	 while (n && n != &node->children.tail) {
+	 n = (EMTreeNode *)node->children.head;
+	 while (n && n != (EMTreeNode *)&node->children.tail) {
 		  if (node_has_children(n))
-			   emts_child_tree (emts, n->children.head, array);
+			   emts_child_tree (emts, (EMTreeNode *)n->children.head, array);
 		  if (n->info)
 			   g_ptr_array_add (array, n);
 		  n = n->next;
@@ -1346,14 +1345,14 @@ emts_child_tree (EMTreeStore *emts, EMTreeNode *node, GPtrArray *array)
 GPtrArray *
 em_tree_store_get_child_sorted_tree (EMTreeStore  *emts, GtkTreeIter *iter)
 {
-	 EMTreeNode *node = (EMTreeNode *) iter->user_data, *tnode;;
+	 EMTreeNode *node = (EMTreeNode *) iter->user_data;
 	 GPtrArray *nodes = g_ptr_array_new ();
 	 int i;
 	 
 	 emts_child_tree (emts, node, nodes);
-	 g_ptr_array_sort_with_data (nodes, sort_dsent, emts);
+	 g_ptr_array_sort_with_data (nodes, (GCompareDataFunc)sort_dsent, emts);
 	 for (i=0; i<nodes->len; i++) {
-		  nodes->pdata[i] = camel_message_info_uid (((EMTreeNode *)nodes->pdata[i])->info);
+		  nodes->pdata[i] = (gpointer)camel_message_info_uid (((EMTreeNode *)nodes->pdata[i])->info);
 	 }
 
 	 return nodes;
@@ -1362,7 +1361,7 @@ em_tree_store_get_child_sorted_tree (EMTreeStore  *emts, GtkTreeIter *iter)
 GPtrArray *
 em_tree_store_get_child_infos (EMTreeStore  *emts, GtkTreeIter *iter)
 {
-	 EMTreeNode *node = (EMTreeNode *) iter->user_data, *tnode;;
+	 EMTreeNode *node = (EMTreeNode *) iter->user_data;
 	 GPtrArray *nodes = g_ptr_array_new ();
 	 int i;
 	 
@@ -1394,7 +1393,7 @@ em_tree_store_get_info_from_path_string (EMTreeStore  *emts, const char *path)
 {
 	 GtkTreeIter iter;
 	 EMTreeNode *node;
-	 gtk_tree_model_get_iter_from_string (emts, &iter, path);
+	 gtk_tree_model_get_iter_from_string ((GtkTreeModel *)emts, &iter, path);
 	 node = iter.user_data;
 
 	 return node->info;
diff --git a/src/em-tree-store.h b/src/em-tree-store.h
index 4bbecd0..1070287 100644
--- a/src/em-tree-store.h
+++ b/src/em-tree-store.h
@@ -115,4 +115,6 @@ int em_tree_store_get_iter(EMTreeStore *emts, GtkTreeIter *iter, const char *uid
 const CamelMessageInfo * em_tree_store_get_info_from_iter (EMTreeStore  *emts, GtkTreeIter *iter);
 GPtrArray * em_tree_store_get_child_infos (EMTreeStore  *emts, GtkTreeIter *iter);
 void em_tree_store_search_folder (EMTreeStore *emts, CamelFolder *folder, const char *expr, gboolean prune);
+void em_tree_insert_sorted_with_data (EDList *list, gpointer data, GFunc func,gpointer user_data);
+
 #endif /* _EM_TREE_STORE_H */