[Commits] callbacks.c 1.12 1.13 contactwindow.c 1.9 1.10 printing.c 1.4 1.5 utils.c 1.7 1.8 utils.h 1.7 1.8

[miras at claws-mail.org]

Update of /home/claws-mail/contacts/src
In directory claws-mail:/tmp/cvs-serv9755/src

Modified Files:
	callbacks.c contactwindow.c printing.c utils.c utils.h 
Log Message:
2011-11-28 [mir]	0.6.0cvs30

	* configure.ac
	* plugins/ldap/ldap-plugin.c
	* plugins/xml/xml-plugin.c
	* src/callbacks.c
	* src/contactwindow.c
	* src/printing.c
	* src/utils.c
	* src/utils.h
	* xmllib/parser.c
	    - code cleaning to loose compile time
	      warnings and optimizer errors. 

Index: utils.h
===================================================================
RCS file: /home/claws-mail/contacts/src/utils.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- utils.h	28 Nov 2011 07:34:50 -0000	1.7
+++ utils.h	28 Nov 2011 21:45:28 -0000	1.8
@@ -126,11 +126,11 @@
 Contact* contact_new();
 void contact_data_print(gpointer key, gpointer value, gpointer data);
 //gboolean contact_compare(Contact* a, Contact* b, gboolean is_and);
-GSList* contact_diff(Contact* a, Contact* b);
+GSList* contact_diff(const Contact* a, const Contact* b);
 gboolean contact_compare_attrib(Contact* a, Contact* b, const AttribDef* compare);
 gboolean compare_attrib(const AttribDef* a, const AttribDef* b, gint type);
 void contact_free(gpointer contact);
-void contact_dump(Contact* contact, FILE* f);
+void contact_dump(const Contact* contact, FILE* f);
 gboolean email_equal(Email* a, Email* b);
 gint email_sort(gconstpointer a, gconstpointer b);
 void email_free(gpointer email);

Index: contactwindow.c
===================================================================
RCS file: /home/claws-mail/contacts/src/contactwindow.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- contactwindow.c	28 Nov 2011 17:52:14 -0000	1.9
+++ contactwindow.c	28 Nov 2011 21:45:28 -0000	1.10
@@ -251,7 +251,7 @@
 			else
 				new_data = NULL;
 			if (xor(tmp, new_data)) {
-				swap_data(contact->data, cw->data[i]->key, new_data);
+				swap_data(contact->data, (gpointer) cw->data[i]->key, (gpointer) new_data);
 				changed = TRUE;
 			}
 			g_free(tmp);
@@ -1049,7 +1049,7 @@
 						term = "cn";
 					else
 						term = data[i]->key;
-					swap_data(contact->data, term, value);
+					swap_data(contact->data, term, (gpointer) value);
 				}
 			}
 		}

Index: utils.c
===================================================================
RCS file: /home/claws-mail/contacts/src/utils.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- utils.c	28 Nov 2011 07:34:50 -0000	1.7
+++ utils.c	28 Nov 2011 21:45:28 -0000	1.8
@@ -771,7 +771,7 @@
 */
 
 gboolean compare_attrib(const AttribDef* a, const AttribDef* b, gint type) {
-	gboolean result;
+	gboolean result = FALSE;
 	gint res;
 	AttribType ctype;
 	
@@ -781,7 +781,7 @@
 		ctype = a->type;
 		
 	if (a->type != ctype || b->type != ctype)
-		return FALSE;
+		return result;
 
 	switch (ctype) {
 		case ATTRIB_TYPE_BOOLEAN:
@@ -969,7 +969,7 @@
 	g_free(val);
 }
 
-void contact_dump(Contact* contact, FILE* f) {
+void contact_dump(const Contact* contact, FILE* f) {
 	GSList* cur;
 	
 	if (f)
@@ -1168,7 +1168,7 @@
 static void hash_print(gpointer key, gpointer value, gpointer data) {
 	FILE* f = (FILE *) data;
 	AttribDef* attr = (AttribDef *) value;
-	const gchar* type;
+	const gchar* type = NULL;
 	
 	switch (attr->type) {
 		case ATTRIB_TYPE_INT: type = "INT"; break;
@@ -1891,7 +1891,7 @@
 	return 0;
 }
 */
-GSList* contact_diff(Contact* a, Contact* b) {
+GSList* contact_diff(const Contact* a, const Contact* b) {
 	GSList* diff = NULL;
 	GHashTableIter iter;
 	gpointer key1, key2, val1, val2;

Index: printing.c
===================================================================
RCS file: /home/claws-mail/contacts/src/printing.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- printing.c	28 Nov 2011 07:34:50 -0000	1.4
+++ printing.c	28 Nov 2011 21:45:28 -0000	1.5
@@ -62,7 +62,7 @@
 
 static void contact_get_data(gpointer key, gpointer value, gpointer data) {
 	PrintData* pd = (PrintData *) data;
-	gchar *k, *v;
+	gchar *k = NULL, *v = NULL;
 	void* val = NULL;
 	gboolean bool;
 	gchar ch;

Index: callbacks.c
===================================================================
RCS file: /home/claws-mail/contacts/src/callbacks.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- callbacks.c	28 Nov 2011 17:52:14 -0000	1.12
+++ callbacks.c	28 Nov 2011 21:45:28 -0000	1.13
@@ -1173,7 +1173,7 @@
 							  Plugin* plugin,
 							  AddressBook* address_book) {
 	GSList *cur, *extra;
-	GtkWidget *widget, *hbox, *vbox, *label;
+	GtkWidget *widget = NULL, *hbox, *vbox, *label = NULL;
 	gboolean new;
 	
 	if (address_book->extra_config) {
@@ -1348,7 +1348,7 @@
 	GtkWidget* file_btn;
 	AddressBook* book;
 	GtkWidget* input[GTK_ENTRIES] = {NULL, NULL, NULL, NULL};
-	GtkWidget *hbox, *vbox, *label = NULL, *frame, *notebook;
+	GtkWidget *hbox, *vbox, *label = NULL, *frame, *notebook = NULL;
 	int i;
 	gboolean response = FALSE;
 	gboolean use_button = FALSE;