[anjal] Fix warnings in m-s-s

[Srinivasa Ragavan <sragavan src gnome org>]

commit 2375b69aba3be3793dbc4b1692b41f94e9c3a469
Author: Srinivasa Ragavan <sragavan novell com>
Date:   Fri May 29 08:18:09 2009 +0530

    Fix warnings in m-s-s
---
 src/mail-sqlite-store.c |   35 +++++++++++++++--------------------
 1 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/mail-sqlite-store.c b/src/mail-sqlite-store.c
index a8b4ae2..594f843 100644
--- a/src/mail-sqlite-store.c
+++ b/src/mail-sqlite-store.c
@@ -28,7 +28,7 @@
 #include <gtk/gtk.h>
 
 #include "mail-sqlite-store.h"
-
+#include <e-util/e-util.h>
 #include <sqlite3.h>
 
 #include <camel/camel-db.h>
@@ -88,8 +88,9 @@ static gboolean          mail_sqlite_store_iter_parent     (GtkTreeModel      *t
                                                            GtkTreeIter       *child);
 
 static gint mail_sqlite_store_count_rows 	(sqlite3 *sqlite, gchar *table);
+#ifdef NOT_USED
 static gint mail_sqlite_store_fetch_n_columns (sqlite3 *sqlite, gchar *table);
-
+#endif
 
 static GObjectClass *parent_class = NULL;
 
@@ -218,7 +219,6 @@ mail_sqlite_store_get_iter (GtkTreeModel *tree_model,
 {
 	MailSqliteStore		*self;
 	MailSqliteStorePrivate *priv;
-	GPtrArray				*data;
 	gint				  *indices, depth;
 
 	g_assert (MAIL_IS_SQLITE_STORE (tree_model));
@@ -252,18 +252,17 @@ mail_sqlite_store_get_path (GtkTreeModel *tree_model,
 	MailSqliteStore        *self;
 	MailSqliteStorePrivate *priv;
 	GtkTreePath           *path;
-	gint				   pos;
 
 	g_return_val_if_fail (MAIL_IS_SQLITE_STORE (tree_model), NULL);
 	g_return_val_if_fail (iter != NULL, NULL);
-	g_return_val_if_fail (iter->user_data != -1, NULL);
+	g_return_val_if_fail ((int)iter->user_data != -1, NULL);
 
 	self = MAIL_SQLITE_STORE (tree_model);
 	priv = MAIL_SQLITE_STORE_GET_PRIVATE (self);
 	g_assert (priv);
 
 	path = gtk_tree_path_new ();
-	gtk_tree_path_append_index (path, iter->user_data);
+	gtk_tree_path_append_index (path, (int)iter->user_data);
 
 	return path;
 }
@@ -338,11 +337,10 @@ mail_sqlite_store_get_value (GtkTreeModel *tree_model,
 {
 	MailSqliteStore		*self;
 	MailSqliteStorePrivate *priv;
-	GPtrArray				*data;
 	MailSqliteRecord *precord;
 	guint pos = (int)iter->user_data;
 	g_return_if_fail (MAIL_IS_SQLITE_STORE (tree_model));
-	g_return_if_fail (iter != NULL || iter->user_data != -1);
+	g_return_if_fail (iter != NULL || (int)iter->user_data != -1);
 	g_return_if_fail (column < MAIL_SQLITE_STORE (tree_model)->n_columns);
 
 	self = MAIL_SQLITE_STORE (tree_model);
@@ -390,13 +388,14 @@ mail_sqlite_store_get_value (GtkTreeModel *tree_model,
 				if (priv->dcache->pdata[priv->pos] == NULL) {
 					char **txt;
 					record = g_slice_alloc (sizeof(MailSqliteRecord));
-					record->uid = g_strdup(sqlite3_column_text (priv->stmt, 0));
-					txt  = g_strsplit (sqlite3_column_text (priv->stmt, 1), "<", 2);
+					record->uid = g_strdup((char *)sqlite3_column_text (priv->stmt, 0));
+					txt  = g_strsplit ((char *)sqlite3_column_text (priv->stmt, 1), "<", 2);
 					record->from = g_strdup (*txt);
 					g_strfreev (txt);
 					record->subject = g_strdup_printf("%s",sqlite3_column_text (priv->stmt, 2));
 					record->date =sqlite3_column_int (priv->stmt, 3) ?  filter_date(sqlite3_column_int(priv->stmt, 3)) : NULL;
-					record->flags = filter_date(sqlite3_column_int(priv->stmt, 4));					
+					/* FIXME: Verify this flags conversion */
+					record->flags = sqlite3_column_int(priv->stmt, 4);					
 					priv->dcache->pdata[priv->pos] = record;
 				}
 
@@ -439,11 +438,9 @@ mail_sqlite_store_iter_next (GtkTreeModel *tree_model,
 {
 	MailSqliteStore		  *self;
 	MailSqliteStorePrivate *priv;
-	GPtrArray             *data = NULL;
-	int ret;
 
 	g_return_val_if_fail (MAIL_IS_SQLITE_STORE (tree_model), FALSE);
-	if (iter == NULL || iter->user_data == -1)
+	if (iter == NULL || (int)iter->user_data == -1)
 	  return FALSE;
 
 	self = MAIL_SQLITE_STORE (tree_model);
@@ -470,9 +467,6 @@ mail_sqlite_store_iter_children (GtkTreeModel *tree_model,
 {
 	MailSqliteStore		*self;
 	MailSqliteStorePrivate *priv;
-	GPtrArray				*data;
-	gchar				 *key;
-	int ret;
 
 	g_return_val_if_fail (MAIL_IS_SQLITE_STORE (tree_model), FALSE);
 
@@ -509,7 +503,7 @@ mail_sqlite_store_iter_n_children (GtkTreeModel *tree_model,
 	MailSqliteStorePrivate *priv;
 
 	g_return_val_if_fail (MAIL_IS_SQLITE_STORE (tree_model), -1);
-	g_return_val_if_fail (iter == NULL || iter->user_data != -1, -1);
+	g_return_val_if_fail (iter == NULL || (int)iter->user_data != -1, -1);
 
 	self = MAIL_SQLITE_STORE (tree_model);
 	priv = MAIL_SQLITE_STORE_GET_PRIVATE (self);
@@ -531,8 +525,7 @@ mail_sqlite_store_iter_nth_child (GtkTreeModel *tree_model,
 {
 	MailSqliteStore		*self;
 	MailSqliteStorePrivate *priv;
-	GPtrArray				*data;
-	int res = 0;
+
 	g_return_val_if_fail (MAIL_IS_SQLITE_STORE (tree_model), FALSE);
 
 	self = MAIL_SQLITE_STORE (tree_model);
@@ -644,6 +637,7 @@ mail_sqlite_store_count_rows (sqlite3 *sqlite, gchar *table)
 	return count;
 }
 
+#ifdef NOT_USED
 static gint
 mail_sqlite_store_fetch_n_columns_cb (gpointer   user_data,
                                gint	      n_columns,
@@ -675,3 +669,4 @@ mail_sqlite_store_fetch_n_columns (sqlite3 *sqlite, gchar *table)
 	n += 1; /* oid */
 	return n;
 }
+#endif