desktop-data-model r7255 - in trunk: ddm engine

[otaylor svn gnome org]

Author: otaylor
Date: Wed Feb 20 20:35:38 2008
New Revision: 7255
URL: http://svn.gnome.org/viewvc/desktop-data-model?rev=7255&view=rev

Log:
hippo-condition-parser.c: Remove usage of C99 structure-member assignments so it will compile with MSVC
hippo-connection.c: Add a HAVE_LOUDMOUTH_12 conditional for new error constants. (Will require an configure.ac update for Linux build)
hippo-disk-cache.c: Fix no-sqlite build

Modified:
   trunk/ddm/ddm-condition-parser.c
   trunk/engine/hippo-connection.c
   trunk/engine/hippo-disk-cache.c

Modified: trunk/ddm/ddm-condition-parser.c
==============================================================================
--- trunk/ddm/ddm-condition-parser.c	(original)
+++ trunk/ddm/ddm-condition-parser.c	Wed Feb 20 20:35:38 2008
@@ -60,32 +60,32 @@
  * and split them apart into three tokens.
  */
 static const GScannerConfig scanner_config = {
-    .cset_skip_characters = " \t\n",
-    .cset_identifier_first = G_CSET_A_2_Z G_CSET_a_2_z "_",
-    .cset_identifier_nth = G_CSET_A_2_Z G_CSET_a_2_z "0123456789_",
-    .cpair_comment_single = NULL,
-    .case_sensitive = TRUE,
-    .skip_comment_multi = TRUE, /* C style comments */
-    .skip_comment_single = FALSE,
-    .scan_comment_multi = TRUE,
-    .scan_identifier = TRUE,
-    .scan_identifier_1char = TRUE,
-    .scan_identifier_NULL = FALSE,
-    .scan_symbols = TRUE,
-    .scan_binary = FALSE,
-    .scan_octal = TRUE,
-    .scan_float = FALSE,
-    .scan_hex = TRUE,
-    .scan_hex_dollar = FALSE,
-    .scan_string_sq = TRUE,
-    .scan_string_dq = TRUE,
-    .numbers_2_int = TRUE,
-    .int_2_float = FALSE,
-    .identifier_2_string = FALSE,
-    .char_2_token = TRUE,
-    .symbol_2_token = TRUE,
-    .scope_0_fallback = FALSE,
-    .store_int64 = TRUE
+    " \t\n",                                 /* cset_skip_characters */
+    G_CSET_A_2_Z G_CSET_a_2_z "_",           /* cset_identifier_first */
+    G_CSET_A_2_Z G_CSET_a_2_z "0123456789_", /* cset_identifier_nth */
+    NULL,                                    /* cpair_comment_single */
+    TRUE,  /*case_sensitive */
+    TRUE,  /* skip_comment_multi (C style comments) */
+    FALSE, /* skip_comment_single */
+    TRUE,  /* scan_comment_multi */
+    TRUE,  /* scan_identifier */ 
+    TRUE,  /* scan_identifier_1char */
+    FALSE, /* scan_identifier_NULL */ 
+    TRUE,  /* scan_symbols */
+    FALSE, /* scan_binary */
+    TRUE,  /* scan_octal */
+    FALSE, /* scan_float */
+    TRUE,  /* scan_hex */
+    FALSE, /* scan_hex_dollar */
+    TRUE,  /* scan_string_sq */
+    TRUE,  /* scan_string_dq */
+    TRUE,  /* numbers_2_int */
+    FALSE, /* int_2_float */
+    FALSE, /* identifier_2_string */
+    TRUE,  /* char_2_token */
+    TRUE,  /* symbol_2_token */
+    FALSE, /* scope_0_fallback */
+    TRUE   /* store_int64 */
 };
 
 typedef enum {

Modified: trunk/engine/hippo-connection.c
==============================================================================
--- trunk/engine/hippo-connection.c	(original)
+++ trunk/engine/hippo-connection.c	Wed Feb 20 20:35:38 2008
@@ -2622,12 +2622,14 @@
     case LM_DISCONNECT_REASON_UNKNOWN:
         return "UNKNOWN";
         break;
+#ifdef HAVE_LOUDMOUTH_12
     case LM_DISCONNECT_REASON_RESOURCE_CONFLICT:
         return "RESOURCE_CONFLICT";
         break;
     case LM_DISCONNECT_REASON_INVALID_XML:
         return "INVALID_XML";
         break;
+#endif /* HAVE_LOUDMOUTH_12 */
     }
     return "WHAT THE?";
 }
@@ -3689,3 +3691,4 @@
     return found;
 }
 
+

Modified: trunk/engine/hippo-disk-cache.c
==============================================================================
--- trunk/engine/hippo-disk-cache.c	(original)
+++ trunk/engine/hippo-disk-cache.c	Wed Feb 20 20:35:38 2008
@@ -72,6 +72,8 @@
 }
 
 
+#ifdef HAVE_SQLITE
+
 static char *
 make_db_name(HippoDiskCache *cache)
 {
@@ -924,6 +926,8 @@
     return g_strconcat(qname->uri, "#", qname->name, NULL);
 }
 
+#endif /* HAVE_SQLITE */
+
 void
 _hippo_disk_cache_do_query(HippoDiskCache *cache,
                            DDMDataQuery *query)