** Fix a bunch of compiler warnings.

2008-05-22  Matthew Barnes  <mbarnes@redhat.com>

	** Fix a bunch of compiler warnings.

	* calendar/gui/e-select-names-renderer.c
	(e_select_names_renderer_focus_out_event):
	Remove this function.  Looks like it hasn't been used in years.

	* mail/em-format-html.c (efh_message_external):
	Fix a typo in checking for an empty 'mode' string.

	* mail/message-list.c (subtree_size):
	Remove this function.  Looks like it hasn't been used in years.

	* plugins/email-custom-header/email-custom-header.c
	(action_email_custom_header_cb):
	Remove unused 'editor' variable.

	* plugins/save-calendar/csv-format.c (do_save_calendar_csv):
	* plugins/save-calendar/rdf-format.c (do_save_calendar_rdf):
	Remove pointless address check of a local variable.


svn path=/trunk/; revision=35527

10 files changed, 28 insertions, 33 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e6cf38cca7..b64e4bf7e3 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,11 @@
 2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
 
+	* gui/e-select-names-renderer.c
+	(e_select_names_renderer_focus_out_event):
+	Remove this unused function.
+
+2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
+
 	** Fixes part of bug #534360
 
 	* conduits/calendar/calendar-conduit.c:
diff --git a/calendar/gui/e-select-names-renderer.c b/calendar/gui/e-select-names-renderer.c
index df0a1ef57f..789d185c8d 100644
--- a/calendar/gui/e-select-names-renderer.c
+++ b/calendar/gui/e-select-names-renderer.c
@@ -81,15 +81,6 @@ e_select_names_renderer_editing_done (GtkCellEditable *editable, ESelectNamesRen
 	cell->priv->editable = NULL;
 }
 
-static gboolean
-e_select_names_renderer_focus_out_event (GtkWidget *entry, GdkEvent  *event, ESelectNamesRenderer *cell)
-{
-	e_select_names_renderer_editing_done (GTK_CELL_EDITABLE (cell->priv->editable), cell);
-
-	/* entry needs focus-out-event */
-	return FALSE;
-}
-
 static GtkCellEditable *
 e_select_names_renderer_start_editing (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, const gchar *path,
 		    GdkRectangle *bg_area, GdkRectangle *cell_area, GtkCellRendererState flags)
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 361675de7c..e623ff080d 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,13 @@
 2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
 
+	* em-format-html.c (efh_message_external):
+	Fix a typo in checking for an empty 'mode' string.
+
+	* message-list.c (subtree_size):
+	Remove this function.  Looks like it hasn't been used in years.
+
+2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
+
 	** Fixes part of bug #534360
 
 	* em-account-prefs.h:
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 467d84c0e6..dc656d56f1 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -950,7 +950,7 @@ efh_message_external(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part
 		else
 			path = g_strdup_printf("/%s", *name=='/'?name+1:name);
 
-		if (mode && &mode)
+		if (mode && *mode)
 			sprintf(ftype, ";type=%c",  *mode);
 		else
 			ftype[0] = 0;
diff --git a/mail/message-list.c b/mail/message-list.c
index 76586d6606..b23cc1c160 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -1147,26 +1147,6 @@ subtree_unread(MessageList *ml, ETreePath node)
 	return FALSE;
 }
 
-static int
-subtree_size(MessageList *ml, ETreePath node)
-{
-	CamelMessageInfo *info;
-	int size = 0;
-	ETreePath child;
-
-	while (node) {
-		info = e_tree_memory_node_get_data((ETreeMemory *)ml->model, node);
-		g_return_val_if_fail (info != NULL, 0);
-
-		size += camel_message_info_size(info);
-		if ((child = e_tree_model_node_get_first_child (E_TREE_MODEL (ml->model), node)))
-			size += subtree_size(ml, child);
-
-		node = e_tree_model_node_get_next (ml->model, node);
-	}
-	return size;
-}
-
 static time_t
 subtree_latest(MessageList *ml, ETreePath node, int sent)
 {
diff --git a/plugins/email-custom-header/ChangeLog b/plugins/email-custom-header/ChangeLog
index 3991f87a74..22da48eb0c 100644
--- a/plugins/email-custom-header/ChangeLog
+++ b/plugins/email-custom-header/ChangeLog
@@ -1,5 +1,10 @@
 2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
 
+	* email-custom-header.c (action_email_custom_header_cb):
+	Remove unused 'editor' variable.
+
+2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
+
 	** Fixes part of bug #534360
 
 	* email-custom-header.h:
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index 6c7d7c8e6e..3d7fab9763 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -507,7 +507,6 @@ static void action_email_custom_header_cb (GtkAction *action, EMsgComposer *comp
 
 {
 	GtkUIManager  *manager;
-	GtkhtmlEditor *editor;
 	GtkWidget     *menuitem;
 	CustomHeaderOptionsDialog *dialog = NULL;
 	EmailCustomHeaderWindow *new_email_custom_header_window = NULL;
diff --git a/plugins/save-calendar/ChangeLog b/plugins/save-calendar/ChangeLog
index 3488ec9432..2d84be32d4 100644
--- a/plugins/save-calendar/ChangeLog
+++ b/plugins/save-calendar/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
+
+	* csv-format.c (do_save_calendar_csv):
+	* rdf-format.c (do_save_calendar_rdf):
+	Remove pointless address check of a local variable.
+
 2008-04-17  Milan Crha  <mcrha@redhat.com>
 
 	** Part of fix for bug #526739
diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c
index 4709b18305..5fae1846fd 100644
--- a/plugins/save-calendar/csv-format.c
+++ b/plugins/save-calendar/csv-format.c
@@ -410,7 +410,7 @@ do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource
 			line = add_string_to_csv (line, temp_constchar, config);
 
 			e_cal_component_get_summary (comp, &temp_comptext);
-			line = add_string_to_csv (line, &temp_comptext?temp_comptext.value:NULL, config);
+			line = add_string_to_csv (line, temp_comptext.value, config);
 
 			e_cal_component_get_description_list (comp, &temp_list);
 			line = add_list_to_csv (line, temp_list, config, ECALCOMPONENTTEXT);
diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c
index 6963c4bf10..58b81459a0 100644
--- a/plugins/save-calendar/rdf-format.c
+++ b/plugins/save-calendar/rdf-format.c
@@ -268,7 +268,7 @@ do_save_calendar_rdf (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource
 			add_string_to_rdf (node, "uid",temp_constchar);
 
 			e_cal_component_get_summary (comp, &temp_comptext);
-			add_string_to_rdf (node, "summary",&temp_comptext?temp_comptext.value:NULL);
+			add_string_to_rdf (node, "summary", temp_comptext.value);
 
 			e_cal_component_get_description_list (comp, &temp_list);
 			add_list_to_rdf (node, "description", temp_list, ECALCOMPONENTTEXT);