evolution-data-server r8616 - in trunk: . libedataserver

[msuman svn gnome org]

Author: msuman
Date: Fri Apr  4 11:13:31 2008
New Revision: 8616
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8616&view=rev

Log:
Fixed a few compiler warnings (bug #473880)

Modified:
   trunk/ChangeLog
   trunk/libedataserver/e-data-server-util.c

Modified: trunk/libedataserver/e-data-server-util.c
==============================================================================
--- trunk/libedataserver/e-data-server-util.c	(original)
+++ trunk/libedataserver/e-data-server-util.c	Fri Apr  4 11:13:31 2008
@@ -115,8 +115,7 @@
 const gchar *
 e_util_utf8_strstrcase (const gchar *haystack, const gchar *needle)
 {
-        gunichar *nuni;
-        gunichar unival;
+        gunichar *nuni, unival;
         gint nlen;
         const gchar *o, *p;
 
@@ -136,7 +135,7 @@
 
 	o = haystack;
         for (p = e_util_unicode_get_utf8 (o, &unival); p && unival; p = e_util_unicode_get_utf8 (p, &unival)) {
-                gint sc;
+                gunichar sc;
                 sc = g_unichar_tolower (unival);
                 /* We have valid stripped char */
                 if (sc == nuni[0]) {
@@ -221,7 +220,7 @@
 
         nlen = 0;
         for (p = e_util_unicode_get_utf8 (needle, &unival); p && unival; p = e_util_unicode_get_utf8 (p, &unival)) {
-                gint sc;
+                gunichar sc;
                 sc = stripped_char (unival);
                 if (sc) {
                        nuni[nlen++] = sc;
@@ -234,7 +233,7 @@
 
         o = haystack;
         for (p = e_util_unicode_get_utf8 (o, &unival); p && unival; p = e_util_unicode_get_utf8 (p, &unival)) {
-                gint sc;
+                gunichar sc;
                 sc = stripped_char (unival);
                 if (sc) {
                         /* We have valid stripped char */