dia r4271 - in trunk: . lib

[hans svn gnome org]

Author: hans
Date: Sun Feb  8 22:57:07 2009
New Revision: 4271
URL: http://svn.gnome.org/viewvc/dia?rev=4271&view=rev

Log:
2009-02-08  Hans Breuer  <hans breuer org>

	* lib/makefile.msc : add -DG_DISABLE_DEPRECATED
	* lib/filter.c lib/font.c lib/paper.c lib/widgets.c : 
	s/g_strcasecmp/g_ascii_strcasecmp/



Modified:
   trunk/ChangeLog
   trunk/lib/filter.c
   trunk/lib/font.c
   trunk/lib/makefile.msc
   trunk/lib/paper.c
   trunk/lib/widgets.c

Modified: trunk/lib/filter.c
==============================================================================
--- trunk/lib/filter.c	(original)
+++ trunk/lib/filter.c	Sun Feb  8 22:57:07 2009
@@ -36,7 +36,7 @@
 {
   const DiaExportFilter *fa = a, *fb = b;
 
-  return g_strcasecmp(_(fa->description), _(fb->description));
+  return g_ascii_strcasecmp(_(fa->description), _(fb->description));
 }
 
 void
@@ -95,7 +95,7 @@
     gint i;
 
     for (i = 0; ef->extensions[i] != NULL; i++) {
-      if (!g_strcasecmp(ef->extensions[i], ext) && ef->unique_name)
+      if (!g_ascii_strcasecmp(ef->extensions[i], ext) && ef->unique_name)
 	res = g_list_append (res, (char *)ef->unique_name);
     }
   }
@@ -153,7 +153,7 @@
 	++no_guess;
         continue;
       }
-      if (!g_strcasecmp(ef->extensions[i], ext))
+      if (!g_ascii_strcasecmp(ef->extensions[i], ext))
 	return ef;
     }
   }
@@ -171,7 +171,7 @@
   for (tmp = export_filters; tmp != NULL; tmp = tmp->next) {
     DiaExportFilter *ef = tmp->data;
     if (ef->unique_name != NULL) {
-      if (!g_strcasecmp(ef->unique_name, name)) {
+      if (!g_ascii_strcasecmp(ef->unique_name, name)) {
 	if (filter) 
 	  g_warning(_("Multiple export filters with unique name %s"), name);
 	filter = ef;
@@ -186,7 +186,7 @@
 {
   const DiaImportFilter *fa = a, *fb = b;
 
-  return g_strcasecmp(_(fa->description), _(fb->description));
+  return g_ascii_strcasecmp(_(fa->description), _(fb->description));
 }
 
 void
@@ -262,7 +262,7 @@
         ++no_guess;
         continue;
       }
-      if (!g_strcasecmp(ifilter->extensions[i], ext))
+      if (!g_ascii_strcasecmp(ifilter->extensions[i], ext))
 	return ifilter;
     }
   }

Modified: trunk/lib/font.c
==============================================================================
--- trunk/lib/font.c	(original)
+++ trunk/lib/font.c	Sun Feb  8 22:57:07 2009
@@ -965,7 +965,7 @@
   family = dia_font_get_family (font);
   style = dia_font_get_style (font);
   for (i = 0; i < G_N_ELEMENTS(legacy_fonts); i++) {
-    if (0 == g_strcasecmp (legacy_fonts[i].newname, family)) {
+    if (0 == g_ascii_strcasecmp (legacy_fonts[i].newname, family)) {
       /* match weight and slant */
       DiaFontStyle st = legacy_fonts[i].style;
       if ((DIA_FONT_STYLE_GET_SLANT(style) | DIA_FONT_STYLE_GET_WEIGHT(style))

Modified: trunk/lib/makefile.msc
==============================================================================
--- trunk/lib/makefile.msc	(original)
+++ trunk/lib/makefile.msc	Sun Feb  8 22:57:07 2009
@@ -9,7 +9,7 @@
 
 PKG_CFLAGS = -FImsvc_recommended_pragmas.h \
 	-I.. \
-	-DGTK_DISABLE_DEPRECATED \
+	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
 	$(GTK2_CFLAGS) \
 	$(LIBXML2_CFLAGS) \
 	$(ZLIB_CFLAGS) \

Modified: trunk/lib/paper.c
==============================================================================
--- trunk/lib/paper.c	(original)
+++ trunk/lib/paper.c	Sun Feb  8 22:57:07 2009
@@ -63,8 +63,8 @@
 
   if (name == NULL) return -1;
   for (i = 0; paper_metrics[i].paper != NULL; i++) {
-    if (!g_strncasecmp(paper_metrics[i].paper, name, 
-		       strlen(paper_metrics[i].paper)))
+    if (!g_ascii_strncasecmp(paper_metrics[i].paper, name, 
+		             strlen(paper_metrics[i].paper)))
       break;
   }
   if (paper_metrics[i].paper == NULL)

Modified: trunk/lib/widgets.c
==============================================================================
--- trunk/lib/widgets.c	(original)
+++ trunk/lib/widgets.c	Sun Feb  8 22:57:07 2009
@@ -383,7 +383,7 @@
 {
   const gchar *n1 = pango_font_family_get_name(PANGO_FONT_FAMILY(*(void**)p1));
   const gchar *n2 = pango_font_family_get_name(PANGO_FONT_FAMILY(*(void**)p2));
-  return g_strcasecmp(n1, n2);
+  return g_ascii_strcasecmp(n1, n2);
 }
 
 static gchar*
@@ -504,7 +504,7 @@
 			       &families, &n_families);
   /* Doing it the slow way until I find a better way */
   for (i = 0; i < n_families; i++) {
-    if (!(g_strcasecmp(pango_font_family_get_name(families[i]), fontname))) {
+    if (!(g_ascii_strcasecmp(pango_font_family_get_name(families[i]), fontname))) {
       PangoFontFamily *fam = families[i];
       g_free(families);
       return fam;
@@ -1230,7 +1230,7 @@
   int state;
   gchar *entryname = dia_dynamic_menu_get_entry(DIA_DYNAMIC_MENU(as->omenu));
 
-  state = (entryname != NULL) && (0 != g_strcasecmp(entryname, "None"));
+  state = (entryname != NULL) && (0 != g_ascii_strcasecmp(entryname, "None"));
   g_free(entryname);
 
   gtk_widget_set_sensitive(GTK_WIDGET(as->sizelabel), state);
@@ -1667,7 +1667,7 @@
     int i;
 
     for (i = 0; units[i].name != NULL; i++)
-      if (!g_strcasecmp(units[i].unit, extra)) {
+      if (!g_ascii_strcasecmp(units[i].unit, extra)) {
 	factor = units[i].factor / units[self->unit_num].factor;
 	break;
       }
@@ -1853,7 +1853,7 @@
       int i = 0;
       for (tmp = ddm->default_entries; tmp != NULL;
 	   tmp = g_list_next(tmp), i++) {
-	if (!g_strcasecmp(tmp->data, name))
+	if (!g_ascii_strcasecmp(tmp->data, name))
 	  gtk_option_menu_set_history(GTK_OPTION_MENU(ddm), i);
       }
       /* Not there after all? */
@@ -2000,7 +2000,7 @@
   gboolean existed;
 
   for (tmp = ddm->default_entries; tmp != NULL; tmp = g_list_next(tmp)) {
-    if (!g_strcasecmp(tmp->data, entry))
+    if (!g_ascii_strcasecmp(tmp->data, entry))
       return 0;
   }
   existed = persistent_list_add(ddm->persistent_name, entry);