Re: [evolution-patches] Cleanups for evolution/addressbook

[Kjartan Maraas <kmaraas broadpark no>]

tir, 29,.08.2006 kl. 18.32 +0200, skrev Kjartan Maraas:
> Same stuff as for the calendar code.
> 
Rediffed this too

Cheers
Kjartan

? addressbook.error
? warnings
Index: gui/component/addressbook-component.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook-component.c,v
retrieving revision 1.147
diff -u -p -r1.147 addressbook-component.c
--- gui/component/addressbook-component.c	17 Aug 2006 09:14:59 -0000	1.147
+++ gui/component/addressbook-component.c	19 Sep 2006 09:23:29 -0000
@@ -43,8 +43,6 @@
 
 #include "shell/e-component-view.h"
 
-#include "shell/e-component-view.h"
-
 #include <string.h>
 #include <bonobo/bonobo-i18n.h>
 #include <gtk/gtkimage.h>
Index: gui/contact-editor/e-contact-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/e-contact-editor.c,v
retrieving revision 1.264
diff -u -p -r1.264 e-contact-editor.c
--- gui/contact-editor/e-contact-editor.c	24 Jul 2006 13:06:10 -0000	1.264
+++ gui/contact-editor/e-contact-editor.c	19 Sep 2006 09:23:36 -0000
@@ -2265,7 +2265,7 @@ extract_simple_field (EContactEditor *ed
 		{
 			if (editor->image_set &&
 			    e_image_chooser_get_image_data (E_IMAGE_CHOOSER (widget),
-							    &photo.data.inlined.data, &photo.data.inlined.length)) {
+							    (char **)&photo.data.inlined.data, &photo.data.inlined.length)) {
 				GdkPixbuf *pixbuf, *new;
 				GdkPixbufLoader *loader = gdk_pixbuf_loader_new();
 				
@@ -2294,7 +2294,7 @@ extract_simple_field (EContactEditor *ed
 						new = gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_BILINEAR);
 						if (new) {
 							g_free(photo.data.inlined.data);
-							gdk_pixbuf_save_to_buffer (new, &photo.data.inlined.data, &photo.data.inlined.length, "jpeg", NULL, "quality", "100", NULL);
+							gdk_pixbuf_save_to_buffer (new, (gchar **)&photo.data.inlined.data, &photo.data.inlined.length, "jpeg", NULL, "quality", "100", NULL);
 							g_object_unref (new);
 						}
 						
Index: gui/contact-editor/e-contact-quick-add.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/e-contact-quick-add.c,v
retrieving revision 1.43
diff -u -p -r1.43 e-contact-quick-add.c
--- gui/contact-editor/e-contact-quick-add.c	13 Jun 2006 19:07:55 -0000	1.43
+++ gui/contact-editor/e-contact-quick-add.c	19 Sep 2006 09:23:36 -0000
@@ -325,7 +325,7 @@ build_quick_add_dialog (QuickAdd *qa)
 		qa->book = NULL;
 	}
 	qa->book = book ;
-	source_selected(qa->option_menu, e_source_option_menu_peek_selected (qa->option_menu), qa);
+	source_selected(qa->option_menu, e_source_option_menu_peek_selected ((ESourceOptionMenu *)qa->option_menu), qa);
 	g_signal_connect (qa->option_menu, "source_selected", G_CALLBACK (source_selected), qa);
 	
 	g_object_unref (source_list);	
Index: gui/widgets/e-addressbook-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-addressbook-view.c,v
retrieving revision 1.187
diff -u -p -r1.187 e-addressbook-view.c
--- gui/widgets/e-addressbook-view.c	21 Aug 2006 05:58:31 -0000	1.187
+++ gui/widgets/e-addressbook-view.c	19 Sep 2006 09:23:39 -0000
@@ -172,19 +172,21 @@ enum {
 	ESB_ANY,
 };
 
+#if 0
 static ESearchBarItem addressbook_search_option_items[] = {
 	{ N_("Name begins with"), ESB_FULL_NAME, ESB_ITEMTYPE_RADIO },
 	{ N_("Email begins with"), ESB_EMAIL, ESB_ITEMTYPE_RADIO },
 	{ N_("Any field contains"), ESB_ANY, ESB_ITEMTYPE_RADIO },
-	{ NULL, -1, NULL }
+	{ NULL, -1, 0 }
 };
+#endif
 
 static ESearchBarItem addressbook_search_items[] = {
 	E_FILTERBAR_ADVANCED,
-	{NULL, 0, NULL},
+	{NULL, 0, 0},
 	E_FILTERBAR_SAVE,
 	E_FILTERBAR_EDIT,
-	{NULL, -1, NULL}
+	{NULL, -1, 0}
 };
 
 GType
@@ -1624,7 +1626,6 @@ generate_viewoption_menu (EABSearchBarIt
 {
 	GtkWidget *menu, *menu_item;
 	gint i = 0;
-	GSList *l;
 
 	menu = gtk_menu_new ();
 
Index: gui/widgets/e-minicard.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-minicard.c,v
retrieving revision 1.130
diff -u -p -r1.130 e-minicard.c
--- gui/widgets/e-minicard.c	18 Sep 2006 17:16:25 -0000	1.130
+++ gui/widgets/e-minicard.c	19 Sep 2006 09:23:41 -0000
@@ -41,6 +41,7 @@
 #include "e-contact-editor.h"
 #include <e-util/e-html-utils.h>
 #include <e-util/e-icon-factory.h>
+#include <e-util/e-html-utils.h>
 #include <libebook/e-destination.h>
 #include "a11y/addressbook/ea-addressbook.h"
 
@@ -838,7 +839,7 @@ add_email_field (EMinicard *e_minicard, 
 	GnomeCanvasItem *new_item;
 	GnomeCanvasGroup *group;
 	EMinicardField *minicard_field;
-	char *name;
+	const char *name;
 	char *string;
 	GList *l, *le;
 	int count =0;
Index: gui/widgets/eab-gui-util.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/eab-gui-util.c,v
retrieving revision 1.56
diff -u -p -r1.56 eab-gui-util.c
--- gui/widgets/eab-gui-util.c	12 Sep 2006 11:35:34 -0000	1.56
+++ gui/widgets/eab-gui-util.c	19 Sep 2006 09:23:42 -0000
@@ -528,7 +528,7 @@ eab_contact_save (char *title, EContact 
 
 	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (filesel), g_get_home_dir ());
 	gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (filesel), file);
-	gtk_file_chooser_set_local_only (filesel, FALSE);
+	gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (filesel), FALSE);
 	
 	info->filesel = filesel;
 	info->vcard = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30);
@@ -581,7 +581,7 @@ eab_contact_list_save (char *title, GLis
 					       GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
 					       NULL);
 	gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_ACCEPT);
-	gtk_file_chooser_set_local_only (filesel, FALSE);
+	gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (filesel), FALSE);
 #else
 	filesel = gtk_file_selection_new(title);
 #endif
@@ -651,6 +651,7 @@ struct ContactCopyProcess_ {
 	ContactCopyDone done_cb;
 };
 
+#if 0
 static void
 contact_deleted_cb (EBook* book, EBookStatus status, gpointer user_data)
 {
@@ -658,6 +659,7 @@ contact_deleted_cb (EBook* book, EBookSt
 		eab_error_dialog (_("Error removing contact"), status);
 	}
 }
+#endif
 
 static void
 do_delete (gpointer data, gpointer user_data)
Index: util/eab-book-util.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/util/eab-book-util.c,v
retrieving revision 1.13
diff -u -p -r1.13 eab-book-util.c
--- util/eab-book-util.c	27 Jan 2006 15:41:52 -0000	1.13
+++ util/eab-book-util.c	19 Sep 2006 09:23:44 -0000
@@ -53,14 +53,14 @@ eab_get_config_database ()
 static char*
 escape (const char *str)
 {
-	GString *s = g_string_new ("");
+	GString *s = g_string_new (NULL);
 	const char *p = str;
 
 	while (*p) {
 		if (*p == '\\')
-			g_string_append (s, "\\\\");
+			g_string_append_len (s, "\\\\", 2);
 		else if (*p == '"')
-			g_string_append (s, "\\\"");
+			g_string_append_len (s, "\\\"", 2);
 		else
 			g_string_append_c (s, *p);
 
@@ -208,7 +208,7 @@ GList*
 eab_contact_list_from_string (const char *str)
 {
 	GList *contacts = NULL;
-	GString *gstr = g_string_new ("");
+	GString *gstr = g_string_new (NULL);
 	char *str_stripped;
 	char *p = (char*)str;
 	char *q;