From d7f57ad7fed3c4ec76ccbe8da642569711017ba5 Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@src.gnome.org>
Date: Tue, 12 Dec 2000 00:27:42 +0000
Subject: Fix fucking CVS conflicts - Federico

svn path=/trunk/; revision=6928
---
 libical/src/libical/icalcomponent.c |  1 +
 libical/src/libical/icalerror.c     |  2 ++
 libical/src/libical/icallexer.l     |  3 ++-
 libical/src/libical/icalmemory.c    |  1 +
 libical/src/libical/icalmemory.h    |  2 ++
 libical/src/libical/icalparameter.c | 15 +++++----------
 libical/src/libical/icalparameter.h |  2 ++
 libical/src/libical/icalparser.c    |  8 ++------
 libical/src/libical/icalparser.h    |  1 +
 libical/src/libical/icalproperty.c  | 26 +-------------------------
 libical/src/libical/icaltime.c      |  3 +++
 libical/src/libical/icaltime.h      |  3 +++
 libical/src/libical/icaltypes.c     |  1 +
 libical/src/libical/icalvalue.c     |  4 +++-
 libical/src/libical/icalvalue.h     |  2 ++
 libical/src/libical/icalyacc.y      |  2 +-
 libical/src/test/copycluster.c      |  1 +
 libical/src/test/regression.c       |  1 +
 libical/src/test/storage.c          |  1 +
 libical/src/test/stow.c             |  1 +
 20 files changed, 36 insertions(+), 44 deletions(-)

(limited to 'libical/src')

diff --git a/libical/src/libical/icalcomponent.c b/libical/src/libical/icalcomponent.c
index 2b8ddb5137..e36faae8e7 100644
--- a/libical/src/libical/icalcomponent.c
+++ b/libical/src/libical/icalcomponent.c
@@ -4,6 +4,7 @@
   
   $Id$
 
+
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
 
  This program is free software; you can redistribute it and/or modify
diff --git a/libical/src/libical/icalerror.c b/libical/src/libical/icalerror.c
index de9ea4392b..76212afdae 100644
--- a/libical/src/libical/icalerror.c
+++ b/libical/src/libical/icalerror.c
@@ -4,6 +4,8 @@
   CREATOR: eric 16 May 1999
   
   $Id$
+  $Locker$
+    
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
 
diff --git a/libical/src/libical/icallexer.l b/libical/src/libical/icallexer.l
index 6f922ae428..4ac847b064 100644
--- a/libical/src/libical/icallexer.l
+++ b/libical/src/libical/icallexer.l
@@ -6,7 +6,8 @@
   
   DESCRIPTION:
   
-  $Id: icallexer.l,v 1.5 2000/12/11 23:01:19 federico Exp $
+  $Id: icallexer.l,v 1.6 2000/12/12 00:27:39 federico Exp $
+  $Locker:  $
 
   (C) COPYRIGHT 1999 Eric Busboom 
   http://www.softwarestudio.org
diff --git a/libical/src/libical/icalmemory.c b/libical/src/libical/icalmemory.c
index 97cefe65c6..297ead8826 100644
--- a/libical/src/libical/icalmemory.c
+++ b/libical/src/libical/icalmemory.c
@@ -4,6 +4,7 @@
   CREATOR: eric 30 June 1999
   
   $Id$
+  $Locker$
     
  The contents of this file are subject to the Mozilla Public License
  Version 1.0 (the "License"); you may not use this file except in
diff --git a/libical/src/libical/icalmemory.h b/libical/src/libical/icalmemory.h
index 678f018b52..63ede3f3ac 100644
--- a/libical/src/libical/icalmemory.h
+++ b/libical/src/libical/icalmemory.h
@@ -3,7 +3,9 @@
  FILE: icalmemory.h
  CREATOR: eric 30 June 1999
 
+
  $Id$
+ $Locker$
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of either: 
diff --git a/libical/src/libical/icalparameter.c b/libical/src/libical/icalparameter.c
index cee4259099..abb6b53987 100644
--- a/libical/src/libical/icalparameter.c
+++ b/libical/src/libical/icalparameter.c
@@ -4,6 +4,8 @@
   CREATOR: eric 09 May 1999
   
   $Id$
+  $Locker$
+    
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
 
@@ -134,14 +136,9 @@ icalparameter_new_clone(icalparameter* param)
     return new;
 }
 
-#if 0
-
-<<<<<<< icalparameter.c
-=======
 #if 1
 /* The following code is meant to replace most of the case-switch
    statements, but it is still a work in progress */
->>>>>>> 1.1.1.5
 struct param_string_map {
 	icalparameter_kind kind;
 	int val; /* Actually, union of several types of enums */
@@ -651,7 +648,8 @@ icalparameter* icalparameter_new_from_string(icalparameter_kind kind, char* val)
 
 	case ICAL_X_PARAMETER:
 	{
-		param = icalparameter_new_x(val);
+		param = icalparameter_new(ICAL_FBTYPE_PARAMETER);
+		icalparameter_set_xvalue(param,val);
 	    break;
 	}
 
@@ -729,10 +727,7 @@ icalparameter_as_ical_string (icalparameter* parameter)
     buf_ptr = buf;
     impl = (struct icalparameter_impl*)parameter;
 
-    if (impl->kind == ICAL_X_PARAMETER)
-        kind_string = impl->x_name;
-    else
-        kind_string = icalenum_parameter_kind_to_string(impl->kind);
+    kind_string = icalenum_parameter_kind_to_string(impl->kind);
 
     if (impl->kind == ICAL_NO_PARAMETER || 
 	impl->kind == ICAL_ANY_PARAMETER || 
diff --git a/libical/src/libical/icalparameter.h b/libical/src/libical/icalparameter.h
index 7e1da4e1fe..2666e1a126 100644
--- a/libical/src/libical/icalparameter.h
+++ b/libical/src/libical/icalparameter.h
@@ -5,6 +5,8 @@
 
 
   $Id$
+  $Locker$
+
   
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
diff --git a/libical/src/libical/icalparser.c b/libical/src/libical/icalparser.c
index 1de5945e7b..e7960eacae 100644
--- a/libical/src/libical/icalparser.c
+++ b/libical/src/libical/icalparser.c
@@ -4,6 +4,7 @@
   CREATOR: eric 04 August 1999
   
   $Id$
+  $Locker$
     
  The contents of this file are subject to the Mozilla Public License
  Version 1.0 (the "License"); you may not use this file except in
@@ -734,15 +735,10 @@ icalcomponent* icalparser_add_line(icalparser* parser,
 		break;
 	    }
 
-	    if (name[0] == 'X' && name[1] == '-')
-	        kind = ICAL_X_PARAMETER;
-	    else
-	        kind = icalenum_string_to_parameter_kind(name);
+	    kind = icalenum_string_to_parameter_kind(name);
 
 	    if (kind != ICAL_NO_PARAMETER){
 		param = icalparameter_new_from_string(kind,pvalue);
-		if (kind == ICAL_X_PARAMETER)
-		    icalparameter_set_xname (param, name);
 	    } else {
 		/* Error. Failed to parse the parameter*/
 		/* 'tail' defined above */
diff --git a/libical/src/libical/icalparser.h b/libical/src/libical/icalparser.h
index 7940bc8cca..673d514f65 100644
--- a/libical/src/libical/icalparser.h
+++ b/libical/src/libical/icalparser.h
@@ -5,6 +5,7 @@
   
   $Id$
 
+
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
 
  This program is free software; you can redistribute it and/or modify
diff --git a/libical/src/libical/icalproperty.c b/libical/src/libical/icalproperty.c
index 84d6605160..4631ffc3b3 100644
--- a/libical/src/libical/icalproperty.c
+++ b/libical/src/libical/icalproperty.c
@@ -6,6 +6,7 @@
   
   $Id$
 
+
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
 
  This program is free software; you can redistribute it and/or modify
@@ -392,33 +393,9 @@ icalproperty_set_parameter (icalproperty* prop,icalparameter* parameter)
 void
 icalproperty_remove_parameter (icalproperty* prop, icalparameter_kind kind)
 {
-<<<<<<< icalproperty.c
-    struct icalproperty_impl *p = (struct icalproperty_impl*)prop;
-    icalparameter *param;
-    pvl_elem elem;
-=======
     pvl_elem p;     
     struct icalproperty_impl *impl = (struct icalproperty_impl*)prop;
->>>>>>> 1.1.1.5
-
-<<<<<<< icalproperty.c
-    icalerror_check_arg_rv((prop!=0),"prop");
 
-    /* This routine is now implemented, so disregard the following
-       assertion. */
-    /*    assert(0); */
-
-    elem = pvl_head (p->parameters);
-    while (elem != NULL) {
-        param = (icalparameter *)pvl_data (elem);
-        if (icalparameter_isa (param) == kind) {
-            pvl_remove (p->parameters, elem);
-            icalparameter_free (param);
-            break;
-        }
-        elem = pvl_next (elem);
-    }
-=======
     icalerror_check_arg_rv((prop!=0),"prop");
     
     for(p=pvl_head(impl->parameters);p != 0; p = pvl_next(p)){
@@ -429,7 +406,6 @@ icalproperty_remove_parameter (icalproperty* prop, icalparameter_kind kind)
             break;
         }
     }                       
->>>>>>> 1.1.1.5
 }
 
 
diff --git a/libical/src/libical/icaltime.c b/libical/src/libical/icaltime.c
index 2fc965e1a8..f43602a721 100644
--- a/libical/src/libical/icaltime.c
+++ b/libical/src/libical/icaltime.c
@@ -4,6 +4,7 @@
   CREATOR: eric 02 June 2000
   
   $Id$
+  $Locker$
     
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
 
@@ -222,6 +223,7 @@ int icaltime_compare(struct icaltimetype a,struct icaltimetype b)
     }
 
 }
+
 int
 icaltime_compare_date_only (struct icaltimetype a, struct icaltimetype b)
 {
@@ -406,3 +408,4 @@ struct icaldurationtype  icaltime_subtract(struct icaltimetype t1,
 
 
 }
+
diff --git a/libical/src/libical/icaltime.h b/libical/src/libical/icaltime.h
index 1402f65d4e..64617e578d 100644
--- a/libical/src/libical/icaltime.h
+++ b/libical/src/libical/icaltime.h
@@ -3,7 +3,9 @@
  FILE: icaltime.h
  CREATOR: eric 02 June 2000
 
+
  $Id$
+ $Locker$
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
 
@@ -75,6 +77,7 @@ int icaltime_compare(struct icaltimetype a,struct icaltimetype b);
 
 int icaltime_compare_date_only(struct icaltimetype a, struct icaltimetype b);
 
+
 short icaltime_days_in_month(short month,short year);
 
 /* Routines for handling timezones */
diff --git a/libical/src/libical/icaltypes.c b/libical/src/libical/icaltypes.c
index dedde8d866..16d0ebf1b8 100644
--- a/libical/src/libical/icaltypes.c
+++ b/libical/src/libical/icaltypes.c
@@ -4,6 +4,7 @@
   CREATOR: eric 16 May 1999
   
   $Id$
+  $Locker$
     
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
diff --git a/libical/src/libical/icalvalue.c b/libical/src/libical/icalvalue.c
index a1ebb64e30..de08ecb8a1 100644
--- a/libical/src/libical/icalvalue.c
+++ b/libical/src/libical/icalvalue.c
@@ -5,6 +5,7 @@
   
   $Id$
 
+
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
 
  This program is free software; you can redistribute it and/or modify
@@ -676,9 +677,9 @@ char* icalvalue_recur_as_ical_string(icalvalue* value)
 	    for(i=0; i< limit  && array[i] != ICAL_RECURRENCE_ARRAY_MAX;
 		i++){
 		if (j == 3) { /* BYDAY */
-		    short pos = icalrecurrencetype_day_position(array[i]);
 		    short dow = icalrecurrencetype_day_day_of_week(array[i]);
 		    const char *daystr = icalrecur_weekday_to_string(dow);
+		    short pos = icalrecurrencetype_day_position(array[i]);  
 		    
 		    if (pos == 0)
 			icalmemory_append_string(&str,&str_p,&buf_sz,daystr);
@@ -686,6 +687,7 @@ char* icalvalue_recur_as_ical_string(icalvalue* value)
 			sprintf(temp,"%d%s",pos,daystr);
 			icalmemory_append_string(&str,&str_p,&buf_sz,temp);
 		    }                  
+		    
 		} else {
 		    sprintf(temp,"%d",array[i]);
 		    icalmemory_append_string(&str,&str_p,&buf_sz, temp);
diff --git a/libical/src/libical/icalvalue.h b/libical/src/libical/icalvalue.h
index 828e0c7ff5..86a33306a4 100644
--- a/libical/src/libical/icalvalue.h
+++ b/libical/src/libical/icalvalue.h
@@ -5,6 +5,8 @@
 
 
   $Id$
+  $Locker$
+
   
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
diff --git a/libical/src/libical/icalyacc.y b/libical/src/libical/icalyacc.y
index d4d7c94b51..0512d6b585 100644
--- a/libical/src/libical/icalyacc.y
+++ b/libical/src/libical/icalyacc.y
@@ -6,7 +6,7 @@
   
   DESCRIPTION:
   
-  $Id: icalyacc.y,v 1.9 2000/12/11 23:01:22 federico Exp $
+  $Id: icalyacc.y,v 1.10 2000/12/12 00:27:40 federico Exp $
   $Locker:  $
 
   (C) COPYRIGHT 1999 Eric Busboom 
diff --git a/libical/src/test/copycluster.c b/libical/src/test/copycluster.c
index 0d6722fc94..11e648d861 100644
--- a/libical/src/test/copycluster.c
+++ b/libical/src/test/copycluster.c
@@ -4,6 +4,7 @@
   CREATOR: eric 15 January 2000
   
   $Id$
+  $Locker$
     
  (C) COPYRIGHT 2000 Eric Busboom
  http://www.softwarestudio.org
diff --git a/libical/src/test/regression.c b/libical/src/test/regression.c
index 1d66ee4fc5..b14e8aa6f8 100644
--- a/libical/src/test/regression.c
+++ b/libical/src/test/regression.c
@@ -6,6 +6,7 @@
   DESCRIPTION:
   
   $Id$
+  $Locker$
 
   (C) COPYRIGHT 1999 Eric Busboom 
   http://www.softwarestudio.org
diff --git a/libical/src/test/storage.c b/libical/src/test/storage.c
index b8eb48c30f..8251babefe 100644
--- a/libical/src/test/storage.c
+++ b/libical/src/test/storage.c
@@ -6,6 +6,7 @@
   DESCRIPTION:
   
   $Id$
+  $Locker$
 
   (C) COPYRIGHT 1999 Eric Busboom 
   http://www.softwarestudio.org
diff --git a/libical/src/test/stow.c b/libical/src/test/stow.c
index 6c285afc77..a305d161fe 100644
--- a/libical/src/test/stow.c
+++ b/libical/src/test/stow.c
@@ -4,6 +4,7 @@
   CREATOR: eric 29 April 2000
   
   $Id$
+  $Locker$
     
  (C) COPYRIGHT 2000 Eric Busboom
  http://www.softwarestudio.org
-- 
cgit v1.2.3