evolution r35527 - in trunk: calendar calendar/gui mail plugins/email-custom-header plugins/save-calendar

[mbarnes svn gnome org]

Author: mbarnes
Date: Thu May 22 18:00:17 2008
New Revision: 35527
URL: http://svn.gnome.org/viewvc/evolution?rev=35527&view=rev

Log:
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.



Modified:
   trunk/calendar/ChangeLog
   trunk/calendar/gui/e-select-names-renderer.c
   trunk/mail/ChangeLog
   trunk/mail/em-format-html.c
   trunk/mail/message-list.c
   trunk/plugins/email-custom-header/ChangeLog
   trunk/plugins/email-custom-header/email-custom-header.c
   trunk/plugins/save-calendar/ChangeLog
   trunk/plugins/save-calendar/csv-format.c
   trunk/plugins/save-calendar/rdf-format.c

Modified: trunk/calendar/gui/e-select-names-renderer.c
==============================================================================
--- trunk/calendar/gui/e-select-names-renderer.c	(original)
+++ trunk/calendar/gui/e-select-names-renderer.c	Thu May 22 18:00:17 2008
@@ -81,15 +81,6 @@
 	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)

Modified: trunk/mail/em-format-html.c
==============================================================================
--- trunk/mail/em-format-html.c	(original)
+++ trunk/mail/em-format-html.c	Thu May 22 18:00:17 2008
@@ -950,7 +950,7 @@
 		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;

Modified: trunk/mail/message-list.c
==============================================================================
--- trunk/mail/message-list.c	(original)
+++ trunk/mail/message-list.c	Thu May 22 18:00:17 2008
@@ -1147,26 +1147,6 @@
 	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)
 {

Modified: trunk/plugins/email-custom-header/email-custom-header.c
==============================================================================
--- trunk/plugins/email-custom-header/email-custom-header.c	(original)
+++ trunk/plugins/email-custom-header/email-custom-header.c	Thu May 22 18:00:17 2008
@@ -507,7 +507,6 @@
 
 {
 	GtkUIManager  *manager;
-	GtkhtmlEditor *editor;
 	GtkWidget     *menuitem;
 	CustomHeaderOptionsDialog *dialog = NULL;
 	EmailCustomHeaderWindow *new_email_custom_header_window = NULL;

Modified: trunk/plugins/save-calendar/csv-format.c
==============================================================================
--- trunk/plugins/save-calendar/csv-format.c	(original)
+++ trunk/plugins/save-calendar/csv-format.c	Thu May 22 18:00:17 2008
@@ -410,7 +410,7 @@
 			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);

Modified: trunk/plugins/save-calendar/rdf-format.c
==============================================================================
--- trunk/plugins/save-calendar/rdf-format.c	(original)
+++ trunk/plugins/save-calendar/rdf-format.c	Thu May 22 18:00:17 2008
@@ -268,7 +268,7 @@
 			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);