[Xfce4-commits] <orage:master> 4.8.3.5 Fixed Bug 9248 provided libical bugs SSPM_UNKNOWN_MINOR_TYPE

[Juha]

Updating branch refs/heads/master
         to 6b2bf978cb111b8702abf17c099d195afb13544a (commit)
       from 02558f98881c8d526c92beedde466be7ba9aa25b (commit)

commit 6b2bf978cb111b8702abf17c099d195afb13544a
Author: Juha <juha at xfce.org>
Date:   Mon Jan 28 13:46:10 2013 +0200

    4.8.3.5 Fixed Bug 9248 provided libical bugs SSPM_UNKNOWN_MINOR_TYPE
    
    Should use SSPM_UNKNOWN_MAJOR_TYPE instead of SSPM_UNKNOWN_MINOR_TYPE.

 configure.in.in            |    2 +-
 libical/src/libical/sspm.c |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 7d8824d..36b9a3e 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <juha at xfce.org>
 dnl
 
 dnl Version information
-m4_define([orage_version], [4.8.3.4-git])
+m4_define([orage_version], [4.8.3.5-git])
 
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([xfce_minimum_version], [4.6.0])
diff --git a/libical/src/libical/sspm.c b/libical/src/libical/sspm.c
index 571e596..9455499 100644
--- a/libical/src/libical/sspm.c
+++ b/libical/src/libical/sspm.c
@@ -443,7 +443,7 @@ enum sspm_major_type sspm_find_major_content_type(char* type)
 
     char* ltype = sspm_lowercase(type);
 
-    for (i=0; major_content_type_map[i].type !=  SSPM_UNKNOWN_MINOR_TYPE; i++){
+    for (i=0; major_content_type_map[i].type !=  SSPM_UNKNOWN_MAJOR_TYPE; i++){
 	if(strncmp(ltype, major_content_type_map[i].str,
 		   strlen(major_content_type_map[i].str))==0){
 	    free(ltype);
@@ -451,7 +451,7 @@ enum sspm_major_type sspm_find_major_content_type(char* type)
 	}
     }
     free(ltype);
-    return major_content_type_map[i].type; /* Should return SSPM_UNKNOWN_MINOR_TYPE */
+    return major_content_type_map[i].type; /* Should return SSPM_UNKNOWN_MAJOR_TYPE */
 }
 
 enum sspm_minor_type sspm_find_minor_content_type(char* type)
@@ -483,7 +483,7 @@ char* sspm_major_type_string(enum sspm_major_type type)
 {
     int i;
 
-    for (i=0; major_content_type_map[i].type !=  SSPM_UNKNOWN_MINOR_TYPE; 
+    for (i=0; major_content_type_map[i].type !=  SSPM_UNKNOWN_MAJOR_TYPE; 
 	 i++){
 
 	if(type == major_content_type_map[i].type){
@@ -491,7 +491,7 @@ char* sspm_major_type_string(enum sspm_major_type type)
 	}
     }
     
-    return major_content_type_map[i].str; /* Should return SSPM_UNKNOWN_MINOR_TYPE */
+    return major_content_type_map[i].str; /* Should return SSPM_UNKNOWN_MAJOR_TYPE */
 }
 
 char* sspm_minor_type_string(enum sspm_minor_type type)