? warnings
? addressbook-file/Makefile
? addressbook-file/Makefile.in
? addressbook-file/org-gnome-addressbook-file.eplug
? default-mailer/Makefile
? default-mailer/Makefile.in
? default-mailer/apps-evolution-mail-prompts-checkdefault-2.6.schemas
? default-mailer/org-gnome-default-mailer.eplug
? default-mailer/org-gnome-default-mailer.error
? default-source/Makefile
? default-source/Makefile.in
? default-source/org-gnome-default-source.eplug
? exchange-operations/Makefile
? exchange-operations/Makefile.in
? exchange-operations/org-gnome-exchange-operations.eplug
? exchange-operations/org-gnome-exchange-operations.error
? groupwise-account-setup/Makefile
? groupwise-account-setup/Makefile.in
? groupwise-account-setup/org-gnome-gw-account-setup.eplug
? groupwise-features/Makefile
? groupwise-features/Makefile.in
? groupwise-features/org-gnome-groupwise-features.eplug
? hula-account-setup/Makefile
? hula-account-setup/Makefile.in
? hula-account-setup/org-gnome-evolution-hula-account-setup.eplug
? ipod-sync/Makefile
? ipod-sync/Makefile.in
? itip-formatter/org-gnome-itip-formatter.error
? mail-account-disable/Makefile
? mail-account-disable/Makefile.in
? mail-account-disable/org-gnome-mail-account-disable.eplug
? mail-remote/Makefile
? mail-remote/Makefile.in
? mailing-list-actions/org-gnome-mailing-list-actions.error
? mark-all-read/Makefile
? mark-all-read/Makefile.in
? mark-all-read/org-gnome-mark-all-read.eplug
? mono/Makefile
? mono/Makefile.in
? new-mail-notify/Makefile
? new-mail-notify/Makefile.in
? new-mail-notify/org-gnome-new-mail-notify.eplug
? print-message/Makefile
? print-message/Makefile.in
? print-message/org-gnome-print-message.eplug
? profiler/Makefile
? profiler/Makefile.in
? publish-calendar/Makefile
? publish-calendar/Makefile.in
? publish-calendar/org-gnome-publish-calendar.eplug
? sa-junk-plugin/Makefile
? sa-junk-plugin/Makefile.in
? sa-junk-plugin/org-gnome-sa-junk-plugin.eplug
Index: audio-inline/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/audio-inline/ChangeLog,v
retrieving revision 1.11
diff -u -p -r1.11 ChangeLog
--- audio-inline/ChangeLog	18 Dec 2005 08:29:39 -0000	1.11
+++ audio-inline/ChangeLog	9 Jan 2006 10:03:18 -0000
@@ -1,3 +1,8 @@
+2006-01-09  Kjartan Maraas <kmaraas@gnome.org>
+
+	* audio-inline.c: (org_gnome_audio_inline_add_button):
+	s/volatile static/static volatile/g. Remove unused var.
+
 2005-12-18  Tor Lillqvist  <tml@novell.com>
 
 	* audio-inline.c: Use g_ascii_strcasecmp() instead of
@@ -50,4 +55,4 @@
 
 2004-10-25  Radek Doulik  <rodo@ximian.com>
 
-	* audio-inline.c: imported audio inline plugin
\ No newline at end of file
+	* audio-inline.c: imported audio inline plugin
Index: audio-inline/audio-inline.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/audio-inline/audio-inline.c,v
retrieving revision 1.6
diff -u -p -r1.6 audio-inline.c
--- audio-inline/audio-inline.c	18 Dec 2005 08:29:39 -0000	1.6
+++ audio-inline/audio-inline.c	9 Jan 2006 10:03:18 -0000
@@ -31,7 +31,7 @@
 
 void org_gnome_audio_inline_format (void *ep, EMFormatHookTarget *t);
 
-volatile static int org_gnome_audio_class_id_counter = 0;
+static volatile int org_gnome_audio_class_id_counter = 0;
 
 struct _org_gnome_audio_inline_pobject {
 	EMFormatHTMLPObject object;
@@ -252,7 +252,6 @@ static void
 org_gnome_audio_inline_add_button (GtkWidget *box, char *icon_name, GCallback cb, gpointer data)
 {
 	GtkWidget *icon, *button;
-	GdkPixbuf *pixbuf;
 
 	icon = e_icon_factory_get_image (icon_name, E_ICON_SIZE_LARGE_TOOLBAR);
 	gtk_widget_show (icon);
Index: exchange-operations/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/ChangeLog,v
retrieving revision 1.77
diff -u -p -r1.77 ChangeLog
--- exchange-operations/ChangeLog	6 Jan 2006 06:49:24 -0000	1.77
+++ exchange-operations/ChangeLog	9 Jan 2006 10:03:18 -0000
@@ -1,3 +1,13 @@
+2006-01-09  Kjartan Maraas <kmaraas@gnome.org>
+
+	* exchange-account-setup.c: (org_gnome_exchange_settings),
+	(print_error): Remove unused code.
+	* exchange-delegates.c: (delegates_apply): Same here.
+	* exchange-folder-size-display.c: (exchange_folder_size_display):
+	Same here.
+	* exchange-folder.c: (unsubscribe_dialog_ab_response): Fix some
+	whitespace issues and one unused var.
+
 2006-01-06  Simon Zheng <simon.zheng@sun.com>
 
 	* exchange-account-setup.c:
Index: exchange-operations/exchange-account-setup.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-account-setup.c,v
retrieving revision 1.28
diff -u -p -r1.28 exchange-account-setup.c
--- exchange-operations/exchange-account-setup.c	6 Jan 2006 06:49:25 -0000	1.28
+++ exchange-operations/exchange-account-setup.c	9 Jan 2006 10:03:18 -0000
@@ -192,8 +192,10 @@ org_gnome_exchange_settings(EPlugin *epl
 	GtkFrame *frm_auth;
 	GtkVBox *vbox_auth;
 	GtkTable *tbl_auth;
+#ifdef HAVE_KRB5
 	GtkLabel *lbl_chpass;
 	GtkButton *btn_chpass;
+#endif
 	GtkLabel *lbl_dass;
 	GtkButton *btn_dass;
 	
@@ -371,27 +373,15 @@ org_gnome_exchange_settings(EPlugin *epl
 static void
 print_error (const char *owa_url, E2kAutoconfigResult result)
 {
-	char *old, *new;
-
 	switch (result) {
 
 		case E2K_AUTOCONFIG_CANT_CONNECT:
-			if (!strncmp (owa_url, "http:", 5)) {
-				old = "http";
-				new = "https";
-			} else {
-				old = "https";
-				new = "http";
-			}
-
 			e_error_run (NULL, ERROR_DOMAIN ":account-connect-error", "", NULL);
-			
 			break;
 
 		case E2K_AUTOCONFIG_CANT_RESOLVE:
-
 			e_error_run (NULL, ERROR_DOMAIN ":account-resolve-error", "", NULL);
-				break;
+			break;
 
 		case E2K_AUTOCONFIG_AUTH_ERROR:
 		case E2K_AUTOCONFIG_AUTH_ERROR_TRY_NTLM:
Index: exchange-operations/exchange-delegates.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-delegates.c,v
retrieving revision 1.3
diff -u -p -r1.3 exchange-delegates.c
--- exchange-operations/exchange-delegates.c	25 Jul 2005 06:12:03 -0000	1.3
+++ exchange-operations/exchange-delegates.c	9 Jan 2006 10:03:18 -0000
@@ -645,7 +645,8 @@ delegates_apply (ExchangeDelegates *dele
 	GByteArray *entryid_dup;
 	char *error = NULL;
 	E2kProperties *props;
-	int i, status;
+	int i;
+	E2kGlobalCatalogStatus status;
 
 	if (!delegates->loaded_folders)
 		return;
@@ -681,11 +682,8 @@ delegates_apply (ExchangeDelegates *dele
 	}
 
 	if ((delegates->removed_users || delegates->added_users) && !delegates->self_dn) {
-		E2kGlobalCatalog *gc;
-		E2kGlobalCatalogStatus status;
 		E2kGlobalCatalogEntry *entry;
 
-		gc = exchange_account_get_global_catalog (delegates->account);
 		status = e2k_global_catalog_lookup (
 			gc, NULL, /* FIXME: cancellable */
 			E2K_GLOBAL_CATALOG_LOOKUP_BY_LEGACY_EXCHANGE_DN,
Index: exchange-operations/exchange-folder-size-display.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-folder-size-display.c,v
retrieving revision 1.8
diff -u -p -r1.8 exchange-folder-size-display.c
--- exchange-operations/exchange-folder-size-display.c	24 Aug 2005 09:43:41 -0000	1.8
+++ exchange-operations/exchange-folder-size-display.c	9 Jan 2006 10:03:18 -0000
@@ -114,7 +114,6 @@ exchange_folder_size_display (GtkListSto
         GtkWidget *dialog, *table;
 	GList *l;
 	char *col_name;
-        int response;
 
 	printf ("exchange_folder_size_display called\n");
         g_return_if_fail (GTK_IS_WIDGET (parent));
@@ -151,6 +150,6 @@ exchange_folder_size_display (GtkListSto
                                      column);
         gtk_tree_view_set_model (GTK_TREE_VIEW (table),
                                  GTK_TREE_MODEL (model));
-	response = gtk_dialog_run (GTK_DIALOG (dialog));
+	gtk_dialog_run (GTK_DIALOG (dialog));
         gtk_widget_destroy (dialog);
 }
Index: exchange-operations/exchange-folder.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-folder.c,v
retrieving revision 1.16
diff -u -p -r1.16 exchange-folder.c
--- exchange-operations/exchange-folder.c	2 Jan 2006 09:52:58 -0000	1.16
+++ exchange-operations/exchange-folder.c	9 Jan 2006 10:03:18 -0000
@@ -335,12 +335,9 @@ unsubscribe_dialog_ab_response (GtkDialo
 		gchar *path = NULL;
 		gchar *uri = NULL;
 		const char *source_uid = NULL;
-		GConfClient *client;
 		ESourceGroup *source_group = NULL;
 		ESource *source = NULL;
 		EABPopupTargetSource *target = data;
-
-		client = gconf_client_get_default ();
 
 		account = exchange_operations_get_exchange_account ();
 
Index: groupwise-features/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/ChangeLog,v
retrieving revision 1.47
diff -u -p -r1.47 ChangeLog
--- groupwise-features/ChangeLog	6 Jan 2006 06:57:13 -0000	1.47
+++ groupwise-features/ChangeLog	9 Jan 2006 10:03:19 -0000
@@ -1,3 +1,13 @@
+2006-01-09  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* install-shared.c: (accept_clicked), (org_gnome_popup_wizard):
+	Don't put spaces before semi-colons.
+	* junk-settings.c: (junk_settings_construct): Remove unused stuff
+	* proxy.c: (org_gnome_proxy), (proxy_page_changed_cb): Callbacks
+	should return gbooleans
+	* send-options.c: (e_send_options_copy_general_opts),
+	(add_send_options_to_source): Remove unused code.
+
 2006-01-06  Simon Zheng <simon.zheng@sun.com>
 
 	* junk-mail-settings.c:
Index: groupwise-features/install-shared.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/install-shared.c,v
retrieving revision 1.6
diff -u -p -r1.6 install-shared.c
--- groupwise-features/install-shared.c	30 Sep 2005 12:30:21 -0000	1.6
+++ groupwise-features/install-shared.c	9 Jan 2006 10:03:19 -0000
@@ -154,7 +154,7 @@ accept_clicked(GnomeDruidPage *page, Gtk
 {
 	EMFolderTreeModel *model;
 	EMFolderTree *folder_tree;
-	GtkWidget *dialog ;
+	GtkWidget *dialog;
 	struct AcceptData *accept_data; 
 	char *uri;
 
@@ -186,18 +186,15 @@ org_gnome_popup_wizard (EPlugin *ep, EME
 	GtkWidget *window;
 	GnomeDruid *wizard;
 	GnomeDruidPageEdge *title_page;
-	CamelMimeMessage *msg = (CamelMimeMessage *) target->message ;
-	CamelStreamMem *content ;
+	CamelMimeMessage *msg = (CamelMimeMessage *) target->message;
+	CamelStreamMem *content;
 	CamelDataWrapper *dw;
-	CamelMimePart *mime_part ;
-	char *notification;
 	char *start_message;
 
 	if (!msg)
-		return ;
+		return;
 
-	mime_part = CAMEL_MIME_PART(msg) ;
-	if ((notification = (char *)camel_medium_get_header (CAMEL_MEDIUM(msg),"X-notification")) == NULL
+	if (((char *)camel_medium_get_header (CAMEL_MEDIUM(msg),"X-notification")) == NULL
 	    || (from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message)) == NULL
 	    || !camel_internet_address_get(from_addr, 0, &name, &email)
 	    || (dw = camel_medium_get_content_object (CAMEL_MEDIUM (msg))) == NULL) {
@@ -210,7 +207,7 @@ org_gnome_popup_wizard (EPlugin *ep, EME
 		}
 
 		content = (CamelStreamMem *)camel_stream_mem_new();
-		camel_data_wrapper_write_to_stream(dw, (CamelStream *)content) ;
+		camel_data_wrapper_write_to_stream(dw, (CamelStream *)content);
 		camel_stream_write((CamelStream *)content, "", 1);
 
 		from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message);
Index: groupwise-features/junk-settings.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/junk-settings.c,v
retrieving revision 1.3
diff -u -p -r1.3 junk-settings.c
--- groupwise-features/junk-settings.c	17 Dec 2005 18:45:07 -0000	1.3
+++ groupwise-features/junk-settings.c	9 Jan 2006 10:03:19 -0000
@@ -375,7 +375,6 @@ static void 
 junk_settings_construct (JunkSettings *js)
 {
 	GladeXML *xml;
-	GtkWidget *box;
 	char *gladefile;
 
 	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
@@ -408,7 +407,6 @@ junk_settings_construct (JunkSettings *j
 
 	js->entry = GTK_ENTRY (glade_xml_get_widget (js->xml, "entry4"));
 		/*TODO:connect entry and label*/
-	box = GTK_WIDGET (glade_xml_get_widget (js->xml, "hbox227"));
 	gtk_widget_show ((GtkWidget *) js->entry);
 
 	js->scrolled_window = GTK_WIDGET (glade_xml_get_widget (js->xml,"scrolledwindow4"));
Index: groupwise-features/proxy.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/proxy.c,v
retrieving revision 1.16
diff -u -p -r1.16 proxy.c
--- groupwise-features/proxy.c	6 Jan 2006 06:57:13 -0000	1.16
+++ groupwise-features/proxy.c	9 Jan 2006 10:03:19 -0000
@@ -76,7 +76,7 @@
 
 static GObjectClass *parent_class = NULL;
 
-static int proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EAccount *account);
+static gboolean proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EAccount *account);
 
 struct _proxyDialogPrivate {
 	/* Glade XML data for the Add/Edit Proxy dialog*/
@@ -707,7 +707,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHo
 		gtk_notebook_append_page ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog, gtk_label_new("Proxy"));
 		g_signal_connect ((GtkNotebook *)(data->parent), "switch-page", G_CALLBACK (proxy_page_changed_cb), account);
 		pag_num = gtk_notebook_page_num ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog);
-		g_object_set_data ((GObject *) account, "proxy_tab_num", pag_num);
+		g_object_set_data ((GObject *) account, "proxy_tab_num", GINT_TO_POINTER (pag_num));
 		gtk_widget_show_all (priv->tab_dialog);
 	}  else if (!g_strrstr (e_account_get_string(account, E_ACCOUNT_SOURCE_URL), "groupwise://")) {
 		prd = g_object_get_data ((GObject *) account, "prd");
@@ -727,7 +727,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHo
 	return NULL;
 }
 
-static int
+static gboolean
 proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EAccount *account)
 {
 	proxyDialog *prd;
@@ -736,16 +736,16 @@ proxy_page_changed_cb (GtkNotebook *note
 	prd = g_object_get_data ((GObject *) account, "prd");
 
 	if (!prd || !prd->priv)
-		return;
+		return TRUE;
 	
 	priv = prd->priv;
 
-	if (num == g_object_get_data ((GObject *) account, "proxy_tab_num") && account->enabled) {
+	if (g_object_get_data ((GObject *) account, "proxy_tab_num") && account->enabled) {
 		if (e_gw_connection_get_proxy_access_list(prd->cnc, &priv->proxy_list)!= E_GW_CONNECTION_STATUS_OK) 
-				return NULL;
+				return FALSE;
 		proxy_update_tree_view (account);	
 	}
-	return TRUE;
+	return FALSE;
 }
 
 static void
Index: groupwise-features/send-options.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/send-options.c,v
retrieving revision 1.4
diff -u -p -r1.4 send-options.c
--- groupwise-features/send-options.c	6 Jan 2006 06:57:13 -0000	1.4
+++ groupwise-features/send-options.c	9 Jan 2006 10:03:19 -0000
@@ -250,10 +250,6 @@ send_options_finalize ()
 static void 
 e_send_options_copy_general_opts (ESendOptionsGeneral *gopts, EGwSendOptionsGeneral *ggopts)
 {
-	time_t temp;
-
-	temp = time (NULL);
-
 	ggopts->priority = gopts->priority;
 
 	ggopts->reply_enabled = gopts->reply_enabled;
@@ -498,7 +494,7 @@ add_send_options_to_source (EGwSendOptio
 	ESource *csource, *tsource;
 	ESourceList *list;
 	EGwSendOptionsGeneral *gopts;
-	EGwSendOptionsStatusTracking *topts, *mopts, *copts;
+	EGwSendOptionsStatusTracking *topts, *copts;
 
 	list = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources");
 	csource = get_source (list);
@@ -507,7 +503,6 @@ add_send_options_to_source (EGwSendOptio
 	tsource = get_source (list);
 	
 	gopts = e_gw_sendoptions_get_general_options (n_opts);
-	mopts = e_gw_sendoptions_get_status_tracking_options (n_opts, "mail");
 	copts = e_gw_sendoptions_get_status_tracking_options (n_opts, "calendar");
 	topts = e_gw_sendoptions_get_status_tracking_options (n_opts, "task");
 
Index: hula-account-setup/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/hula-account-setup/ChangeLog,v
retrieving revision 1.4
diff -u -p -r1.4 ChangeLog
--- hula-account-setup/ChangeLog	6 Jan 2006 06:59:44 -0000	1.4
+++ hula-account-setup/ChangeLog	9 Jan 2006 10:03:19 -0000
@@ -1,3 +1,10 @@
+2006-01-09  Kjartan Maraas <kmaraas@gnome.org>
+
+	* camel-hula-listener.c: (is_hula_caldav_account), (add_esource),
+	(modify_esource), (account_added), (account_removed),
+	(account_changed): Try to fix caldav and normal account setup. This
+	definitely needs review.
+
 2006-01-06  Simon Zheng <simon.zheng@sun.com>
 
 	* camel-hula-listener.c:
Index: hula-account-setup/camel-hula-listener.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/hula-account-setup/camel-hula-listener.c,v
retrieving revision 1.3
diff -u -p -r1.3 camel-hula-listener.c
--- hula-account-setup/camel-hula-listener.c	6 Jan 2006 06:59:44 -0000	1.3
+++ hula-account-setup/camel-hula-listener.c	9 Jan 2006 10:03:19 -0000
@@ -50,7 +50,7 @@ struct _HulaAccountInfo {
 typedef struct _HulaAccountInfo HulaAccountInfo;
 
 #define HULA_CALDAV_URI_PREFIX "caldav://"
-#define HULA_PREFIX_LENGTH 9
+#define HULA_CALDAV_PREFIX_LENGTH 9
 #define HULA_URI_PREFIX "hula://"
 #define HULA_PREFIX_LENGTH 7
 #define PARENT_TYPE G_TYPE_OBJECT
@@ -130,6 +130,16 @@ is_hula_account (EAccount *account)
 	}
 }
 
+static gboolean
+is_hula_caldav_account (EAccount *account)
+{
+        if (account->source->url != NULL) {
+                return (strncmp (account->source->url,  HULA_CALDAV_URI_PREFIX, HULA_CALDAV_PREFIX_LENGTH ) == 0);
+        } else {
+                return FALSE;
+        }
+}
+
 /* looks up for an existing hula account info in the hula_accounts list based on uid */
 
 static HulaAccountInfo* 
@@ -170,7 +180,7 @@ add_esource (const char *conf_key, const
 	char *source_selection_key;
 	char *relative_uri;
 	const char *cal_port = "8081";
-	const char *use_ssl = "";
+	/* const char *use_ssl = ""; */
 	/* offline_sync to come soon */ 
 	
 	/* TODO use_ssl = camel_url_get_param (url, "use_ssl"); */
@@ -293,7 +303,7 @@ remove_esource (const char *conf_key, co
 	
 }
 
-/* looks up for e-source with having same info as old_account_info and changes its values passed in new values */
+/* looks for e-source with the same info as old_account_info and changes its values to the values passed in */
 
 static void 
 modify_esource (const char* conf_key, HulaAccountInfo *old_account_info, const char* new_group_name, CamelURL *new_url)
@@ -307,18 +317,13 @@ modify_esource (const char* conf_key, Hu
 	CamelURL *url;
 	gboolean found_group;
       	GConfClient* client;
-	const char *address;
-	const char *cal_port;
 	char *new_relative_uri;
-	const char *new_address;
 	
 	url = camel_url_new (old_account_info->source_url, NULL);
-	address = url->host; 
-	if (!address || strlen (address) ==0)
+	if (!url->host || strlen (url->host) ==0)
 		return;
-	new_address = new_url->host;
-	
-	old_relative_uri = g_strdup_printf ("%s@%s:%s/dav/%s/calendar/Personal", url->user, url->host, cal_port, url->user);
+
+	old_relative_uri = g_strdup_printf ("%s@%s:%d/dav/%s/calendar/Personal", url->user, url->host, url->port, url->user);
 	client = gconf_client_get_default ();
         list = e_source_list_new_for_gconf (client, conf_key);
 	groups = e_source_list_peek_groups (list); 
@@ -340,7 +345,7 @@ modify_esource (const char* conf_key, Hu
 				
 				if (strcmp (e_source_peek_relative_uri (source), old_relative_uri) == 0) {
 					
-					new_relative_uri = g_strdup_printf ("%s@%s:%s/dav/%s/calendar/Personal", url->user, url->host, cal_port, url->user);
+					new_relative_uri = g_strdup_printf ("%s@%s:%d/dav/%s/calendar/Personal", new_url->user, new_url->host, new_url->port, new_url->user);
 					e_source_group_set_name (group, new_group_name);
 					e_source_set_relative_uri (source, new_relative_uri);
 					e_source_set_property (source, "username", new_url->user);
@@ -414,7 +419,7 @@ account_added (EAccountList *account_lis
 	EAccount *parent;
 	CamelURL *parent_url;
 
-	if (!is_hula_account (account))
+	if (!is_hula_account (account) || !is_hula_caldav_account (account))
 		return;
 	
 	info = g_new0 (HulaAccountInfo, 1);
@@ -439,7 +444,7 @@ account_removed (EAccountList *account_l
 {
        	HulaAccountInfo *info;
 	
-	if (!is_hula_account (account))
+	if (!is_hula_account (account) || !is_hula_caldav_account (account))
 		return;
 	
 	info = lookup_account_info (account->uid);
@@ -466,6 +471,8 @@ account_changed (EAccountList *account_l
 	const char *old_address, *new_address;
 	
 	is_hula = is_hula_account (account);
+	if (is_hula == FALSE)
+		is_hula = is_hula_caldav_account (account);
 	
 	existing_account_info = lookup_account_info (account->uid);
        
@@ -474,12 +481,12 @@ account_changed (EAccountList *account_l
 		if (!account->enabled)
 			return;
 
-		/* some account of other type is changed to hula*/
+		/* some account of other type is changed to hula */
 		account_added (account_listener, account);
 
-	} else if ( existing_account_info != NULL && !is_hula) {
+	} else if (existing_account_info != NULL && !is_hula) {
 
-		/*hula account is changed to some other type */
+		/* hula account is changed to some other type */
 		remove_calendar_sources (existing_account_info);
 		hula_accounts = g_list_remove (hula_accounts, existing_account_info);
 		g_free (existing_account_info->uid);
@@ -494,7 +501,7 @@ account_changed (EAccountList *account_l
 			return;
 		}
 		
-		/* some info of hula account is changed . update the sources with new info if required */
+		/* some info of hula account is changed. update the sources with new info if required */
 		old_url = camel_url_new (existing_account_info->source_url, NULL);
 		old_address = old_url->host; 
 		old_caldav_port = camel_url_get_param (old_url, "caldav_port");
Index: itip-formatter/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/itip-formatter/ChangeLog,v
retrieving revision 1.69
diff -u -p -r1.69 ChangeLog
--- itip-formatter/ChangeLog	6 Jan 2006 15:08:38 -0000	1.69
+++ itip-formatter/ChangeLog	9 Jan 2006 10:03:19 -0000
@@ -1,3 +1,12 @@
+2006-01-09  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* itip-formatter.c: (find_cal_opened_cb), (message_foreach_part),
+	(update_attendee_status), (view_response_cb), (check_is_instance),
+	(format_itip_object): Add some comments and remove unused code.
+	* itip-view.c: (itip_view_class_init), (recur_toggled_cb),
+	(itip_view_add_upper_info_item_printf),
+	(itip_view_add_lower_info_item_printf): Remove more cruft.
+
 2006-01-06  Andre Klapper <a9016009@gmx.de>
 
 	* evolution/plugins/itip-formatter/itip-formatter.c:
Index: itip-formatter/itip-formatter.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/itip-formatter/itip-formatter.c,v
retrieving revision 1.60
diff -u -p -r1.60 itip-formatter.c
--- itip-formatter/itip-formatter.c	6 Jan 2006 15:08:38 -0000	1.60
+++ itip-formatter/itip-formatter.c	9 Jan 2006 10:03:19 -0000
@@ -447,6 +447,7 @@ find_cal_opened_cb (ECal *ecal, ECalenda
 
 		if ((pitip->method == ICAL_METHOD_PUBLISH || pitip->method ==  ICAL_METHOD_REQUEST) 
 		    && !pitip->current_ecal) {
+			/* Reuse already declared one or rename? */
 			ESource *source = NULL;
 			char *uid;
 
@@ -682,6 +683,7 @@ message_foreach_part (CamelMimePart *par
 	if (CAMEL_IS_MULTIPART (containee)) {
 		parts = camel_multipart_get_number (CAMEL_MULTIPART (containee));
 		for (i = 0; go && i < parts; i++) {
+			/* Reuse already declared *parts? */
 			CamelMimePart *part = camel_multipart_get_part (CAMEL_MULTIPART (containee), i);
 			
 			message_foreach_part (part, part_list);
@@ -964,6 +966,7 @@ update_attendee_status (FormatItipPObjec
 									itip_strip_mailto (a->delfrom),
 									itip_strip_mailto (a->value), NULL);
 						if (response == GTK_RESPONSE_YES) {
+							/* Already declared in this function */
 							icalproperty *prop = find_attendee (icalcomp, itip_strip_mailto (a->value));
 							icalcomponent_add_property (icalcomp,icalproperty_new_clone (prop));
 							e_cal_component_rescan (comp);
@@ -992,6 +995,7 @@ update_attendee_status (FormatItipPObjec
 					goto cleanup;
 				} else {
 					if (a->status == ICAL_PARTSTAT_DELEGATED) {
+						/* *prop already declared in this function */
 						icalproperty *prop, *new_prop;
 
 						prop = find_attendee (icalcomp, itip_strip_mailto (a->value));
@@ -1413,9 +1417,7 @@ view_response_cb (GtkWidget *widget, Iti
 
         if (itip_view_get_rsvp (ITIP_VIEW (pitip->view)) && status) {
                 ECalComponent *comp = NULL;
-                ECalComponentVType vtype;
                 icalcomponent *ical_comp;
-                icalproperty *prop;
                 icalvalue *value;
                 const char *attendee, *comment;
                 GSList *l, *list = NULL;
@@ -1425,8 +1427,6 @@ view_response_cb (GtkWidget *widget, Iti
                 if (comp == NULL)
                         return;
 		
-                vtype = e_cal_component_get_vtype (comp);
-
                 if (pitip->my_address == NULL)
                         find_my_address (pitip, pitip->ical_comp, NULL);
                 g_assert (pitip->my_address != NULL);
@@ -1504,7 +1504,6 @@ check_is_instance (icalcomponent *icalco
 		x_name = icalproperty_get_x_name (icalprop);
 		if (!strcmp (x_name, "X-GW-RECURRENCE-KEY")) {
 			return TRUE;
-			break;
 		}
 		icalprop = icalcomponent_get_next_property (icalcomp, ICAL_X_PROPERTY);
 	}
@@ -1776,6 +1775,7 @@ format_itip_object (EMFormatHTML *efh, G
                 CamelFolder *folder;
                 CamelURL *url;
                 char *uri;
+		/* *l is already declared in this function */
                 GSList *groups, *l;
                 ESource *source = NULL;
                 gboolean found = FALSE;
Index: itip-formatter/itip-view.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/itip-formatter/itip-view.c,v
retrieving revision 1.22
diff -u -p -r1.22 itip-view.c
--- itip-formatter/itip-view.c	6 Jan 2006 15:08:38 -0000	1.22
+++ itip-formatter/itip-view.c	9 Jan 2006 10:03:19 -0000
@@ -49,7 +49,7 @@
 
 #define MEETING_ICON "stock_new-meeting"
 
-G_DEFINE_TYPE (ItipView, itip_view, GTK_TYPE_HBOX);
+G_DEFINE_TYPE (ItipView, itip_view, GTK_TYPE_HBOX)
 
 typedef struct  {
 	ItipViewInfoItemType type;
@@ -774,10 +774,8 @@ itip_view_destroy (GtkObject *object) 
 static void
 itip_view_class_init (ItipViewClass *klass)
 {
-	GObjectClass *object_class;
 	GtkObjectClass *gtkobject_class;
 	
-	object_class = G_OBJECT_CLASS (klass);
 	gtkobject_class = GTK_OBJECT_CLASS (klass);
 	
 	gtkobject_class->destroy = itip_view_destroy;
@@ -821,11 +819,9 @@ recur_toggled_cb (GtkWidget *widget, gpo
 {
 	ItipView *view = data;
 	ItipViewPrivate *priv;
-	gboolean is_recur;
 	
 	priv = view->priv;
 	
-	is_recur = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->recur_check));
 	itip_view_set_mode (view, priv->mode);
 }
 
@@ -1447,7 +1443,6 @@ itip_view_add_upper_info_item (ItipView 
 guint
 itip_view_add_upper_info_item_printf (ItipView *view, ItipViewInfoItemType type, const char *format, ...)
 {
-	ItipViewPrivate *priv;
 	va_list args;
 	char *message;
 	guint id;
@@ -1455,8 +1450,6 @@ itip_view_add_upper_info_item_printf (It
 	g_return_val_if_fail (view != NULL, 0);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), 0);	
 	
-	priv = view->priv;
-
 	va_start (args, format);
 	message = g_strdup_vprintf (format, args);
 	va_end (args);
@@ -1545,7 +1538,6 @@ itip_view_add_lower_info_item (ItipView 
 guint
 itip_view_add_lower_info_item_printf (ItipView *view, ItipViewInfoItemType type, const char *format, ...)
 {
-	ItipViewPrivate *priv;
 	va_list args;
 	char *message;
 	guint id;
@@ -1553,8 +1545,6 @@ itip_view_add_lower_info_item_printf (It
 	g_return_val_if_fail (view != NULL, 0);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), 0);	
 	
-	priv = view->priv;
-
 	va_start (args, format);
 	message = g_strdup_vprintf (format, args);
 	va_end (args);
Index: plugin-manager/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/plugin-manager/ChangeLog,v
retrieving revision 1.13
diff -u -p -r1.13 ChangeLog
--- plugin-manager/ChangeLog	31 Dec 2005 14:22:48 -0000	1.13
+++ plugin-manager/ChangeLog	9 Jan 2006 10:03:19 -0000
@@ -1,3 +1,7 @@
+2006-01-09  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* plugin-manager.c: (eppm_enable_toggled): Remove unused var.
+
 2005-12-30  Andre Klapper <a9016009@gmx.de>
 
 	* evolution/plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml:
Index: plugin-manager/plugin-manager.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/plugin-manager/plugin-manager.c,v
retrieving revision 1.2
diff -u -p -r1.2 plugin-manager.c
--- plugin-manager/plugin-manager.c	4 Aug 2005 04:32:43 -0000	1.2
+++ plugin-manager/plugin-manager.c	9 Jan 2006 10:03:19 -0000
@@ -132,13 +132,11 @@ eppm_selection_changed(GtkTreeSelection 
 static void
 eppm_enable_toggled(GtkCellRendererToggle *renderer, char *arg1, Manager *m)
 {
-	GtkTreeSelection *selection;
 	GtkTreePath *path;
 	GtkTreeIter iter;
 	EPlugin *plugin;
 
 	path = gtk_tree_path_new_from_string(arg1);
-	selection = gtk_tree_view_get_selection(m->tree);
 	if (gtk_tree_model_get_iter((GtkTreeModel *)m->model, &iter, path)) {
 		gtk_tree_model_get((GtkTreeModel *)m->model, &iter, 2, &plugin, -1);
 		e_plugin_enable(plugin, !plugin->enabled);
Index: publish-calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/publish-calendar/ChangeLog,v
retrieving revision 1.6
diff -u -p -r1.6 ChangeLog
--- publish-calendar/ChangeLog	4 Jan 2006 02:34:44 -0000	1.6
+++ publish-calendar/ChangeLog	9 Jan 2006 10:03:19 -0000
@@ -1,3 +1,7 @@
+2006-01-09  Kjartan Maraas <kmaraas@gnome.org>
+
+	* publish-format-fb.c: Add missing include.
+
 2006-01-04  Tor Lillqvist  <tml@novell.com>
 
 	* Makefile.am: Use EVOLUTION_PLUGINDIR as the macro name for the
Index: publish-calendar/publish-format-fb.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/publish-calendar/publish-format-fb.c,v
retrieving revision 1.1
diff -u -p -r1.1 publish-format-fb.c
--- publish-calendar/publish-format-fb.c	19 Dec 2005 10:08:10 -0000	1.1
+++ publish-calendar/publish-format-fb.c	9 Jan 2006 10:03:19 -0000
@@ -27,6 +27,7 @@
 #include <libedataserver/e-source-list.h>
 #include <libecal/e-cal.h>
 #include <libecal/e-cal-util.h>
+#include <libecal/e-cal-time-util.h>
 #include <calendar/common/authentication.h>
 #include "publish-format-fb.h"
 
Index: sa-junk-plugin/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/sa-junk-plugin/ChangeLog,v
retrieving revision 1.6
diff -u -p -r1.6 ChangeLog
--- sa-junk-plugin/ChangeLog	4 Jan 2006 09:06:01 -0000	1.6
+++ sa-junk-plugin/ChangeLog	9 Jan 2006 10:03:19 -0000
@@ -1,3 +1,7 @@
+2006-01-09  Kjartan Maraas <kmaraas@gnome.org>
+
+	* em-junk-filter.c: (em_junk_sa_run_spamd): Remove unused var.
+
 2005-01-04  Shi Pu  <shi.pu@sun.com>
 
 	See bug **  325210
Index: sa-junk-plugin/em-junk-filter.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/sa-junk-plugin/em-junk-filter.c,v
retrieving revision 1.7
diff -u -p -r1.7 em-junk-filter.c
--- sa-junk-plugin/em-junk-filter.c	4 Jan 2006 09:06:01 -0000	1.7
+++ sa-junk-plugin/em-junk-filter.c	9 Jan 2006 10:03:19 -0000
@@ -324,7 +324,6 @@ em_junk_sa_run_spamd (char *binary)
 	d(fprintf (stderr, "trying to run %s with socket path %s\n", binary, em_junk_sa_get_socket_path ()));
 			
 	if (!pipe_to_sa_full (NULL, NULL, argv, -1, 0, NULL)) {
-		int i;
 		struct timespec time_req;
 		struct stat stat_buf;
 
Index: save-calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/save-calendar/ChangeLog,v
retrieving revision 1.25
diff -u -p -r1.25 ChangeLog
--- save-calendar/ChangeLog	31 Dec 2005 14:23:55 -0000	1.25
+++ save-calendar/ChangeLog	9 Jan 2006 10:03:20 -0000
@@ -1,3 +1,10 @@
+2006-01-09  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* csv-format.c: (string_needsquotes):
+	* save-calendar.c: (ask_destination_and_save): Fix confusion
+	between = and ==. Silences the compiler, but someone has to check
+	if this really is correct.
+
 2005-12-30  Andre Klapper <a9016009@gmx.de>
 
 	* csv-format.c: fixed two strings for consistency.
Index: save-calendar/csv-format.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/save-calendar/csv-format.c,v
retrieving revision 1.13
diff -u -p -r1.13 csv-format.c
--- save-calendar/csv-format.c	30 Dec 2005 04:46:09 -0000	1.13
+++ save-calendar/csv-format.c	9 Jan 2006 10:03:20 -0000
@@ -229,15 +229,15 @@ string_needsquotes (const char *value, C
 
 	if (!needquotes) {
 		gint len = strlen (config->delimiter);
-		if ((len == 2) && (config->delimiter[1] = ' ')) {
+		if ((len == 2) && (config->delimiter[1] == ' ')) {
 			needquotes = strchr (value, config->delimiter[0])?TRUE:FALSE;
 			if (!needquotes) {
-				gint len = strlen (config->newline);
-				if ((len == 2) && (config->newline[1] = ' ')) {
+				len = strlen (config->newline);
+				if ((len == 2) && (config->newline[1] == ' ')) {
 					needquotes = strchr (value, config->newline[0])?TRUE:FALSE;
 					if (!needquotes) {
-						gint len = strlen (config->quote);
-						if ((len == 2) && (config->quote[1] = ' ')) {
+						len = strlen (config->quote);
+						if ((len == 2) && (config->quote[1] == ' ')) {
 							needquotes = strchr 
 								(value, config->quote[0])?TRUE:FALSE;
 						}
Index: save-calendar/save-calendar.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/save-calendar/save-calendar.c,v
retrieving revision 1.9
diff -u -p -r1.9 save-calendar.c
--- save-calendar/save-calendar.c	11 Nov 2005 09:08:25 -0000	1.9
+++ save-calendar/save-calendar.c	9 Jan 2006 10:03:20 -0000
@@ -139,8 +139,7 @@ ask_destination_and_save (EPlugin *ep, E
 			renderer, "text", DEST_NAME_COLUMN, NULL);
 
 	while (format_handlers) {
-		FormatHandler *handler = format_handlers->data;
-
+		handler = format_handlers->data;
 		gtk_list_store_append (store, &iter);
 		gtk_list_store_set (store, &iter, DEST_NAME_COLUMN, 
 			handler->combo_label, -1);
Index: startup-wizard/startup-wizard.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/startup-wizard/startup-wizard.c,v
retrieving revision 1.4
diff -u -p -r1.4 startup-wizard.c
--- startup-wizard/startup-wizard.c	13 Jul 2005 05:47:39 -0000	1.4
+++ startup-wizard/startup-wizard.c	9 Jan 2006 10:03:20 -0000
@@ -147,6 +147,7 @@ startup_wizard_importer_page (EPlugin *e
 	for (l = import_importers; l; l = l->next) {
 		EImportImporter *eii = l->data;
 		char *str;
+		/* *label already declared */
 		GtkWidget *w, *label;
 
 		w = e_import_get_widget(import, (EImportTarget *)import_target, eii);
