Make this place a bit more quiet

svn path=/trunk/; revision=31328

3 files changed, 15 insertions, 16 deletions

diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index 865926cb65..f7190e454a 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -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-10  Simon Zheng  <simon.zheng@sun.com>
 
 	* itip-view.c: use e_utf8_strftime() in evolution-data-server/
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 4d88964174..a3baaad25e 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -447,6 +447,7 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 
 		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 *part, GSList **part_list)
 	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 (FormatItipPObject *pitip)
 									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 (FormatItipPObject *pitip)
 					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, ItipViewResponse response, gpointer data)
 
         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, ItipViewResponse response, gpointer data)
                 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 *icalcomp)
 		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, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
                 CamelFolder *folder;
                 CamelURL *url;
                 char *uri;
+		/* *l is already declared in this function */
                 GSList *groups, *l;
                 ESource *source = NULL;
                 gboolean found = FALSE;
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index d490c96308..21afa00568 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -50,7 +50,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;
@@ -775,10 +775,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;
@@ -822,11 +820,9 @@ recur_toggled_cb (GtkWidget *widget, gpointer data)
 {
 	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);
 }
 
@@ -1448,7 +1444,6 @@ itip_view_add_upper_info_item (ItipView *view, ItipViewInfoItemType type, const
 guint
 itip_view_add_upper_info_item_printf (ItipView *view, ItipViewInfoItemType type, const char *format, ...)
 {
-	ItipViewPrivate *priv;
 	va_list args;
 	char *message;
 	guint id;
@@ -1456,8 +1451,6 @@ itip_view_add_upper_info_item_printf (ItipView *view, ItipViewInfoItemType type,
 	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);
@@ -1546,7 +1539,6 @@ itip_view_add_lower_info_item (ItipView *view, ItipViewInfoItemType type, const
 guint
 itip_view_add_lower_info_item_printf (ItipView *view, ItipViewInfoItemType type, const char *format, ...)
 {
-	ItipViewPrivate *priv;
 	va_list args;
 	char *message;
 	guint id;
@@ -1554,8 +1546,6 @@ itip_view_add_lower_info_item_printf (ItipView *view, ItipViewInfoItemType type,
 	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);