* completely remove '--xquery', re-indent mu-config.c

NEWS

@@ -7,6 +7,7 @@
    - wildcard searches for all fields (except for path/maildir)
    - search for attachment file names (with 'a:'/'attach:') -- also works with
      wildcards
+   - remove --xquery completely; use --output=xquery instead
  
 ** Release 0.9.5 <2011-04-25 Mon>
 

man/mu-find.1

@@ -326,9 +326,6 @@ Note, if you specify a sortfield, by default, messages are sorted in
 descending order (e.g., from lowest to highest). This is usually a good
 choice, but for dates it may be more useful to sort in the opposite direction.
 
-.TP
-\fB\-\-xquery\fR
-
 .TP
 \fB\-k\fR, \fB\-\-summary\-len\fR=\fI<len>\fR
 output a summary based on up to \fI\len\fR lines of the message. The default

src/mu-cmd-find.c

@@ -218,17 +218,6 @@ query_params_valid (MuConfig *opts)
 {
 	const gchar *xpath;
 	
-	if (opts->linksdir) 
-		if (opts->xquery) {
-			g_warning ("invalid option for --linksdir");
-			return FALSE;
-		}
-
-	if (opts->xquery) {
-		g_warning ("--xquery is obsolete; use --format=xquery instead");
-		return FALSE;
-	}
-	
 	xpath = mu_runtime_path (MU_RUNTIME_PATH_XAPIANDB);
 	
 	if (mu_util_check_dir (xpath, TRUE, FALSE))

src/mu-cmd-index.c

@@ -85,7 +85,7 @@ check_index_or_cleanup_params (MuConfig *opts)
 		return FALSE;
 	}
 		
-	if (opts->linksdir || opts->xquery) {
+	if (opts->linksdir) {
 		g_warning ("invalid option(s) for command");
 		return FALSE;
 	}

src/mu-config.c

@@ -1,3 +1,5 @@
+/* -*-mode: c; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-*/
+
 /*
 ** Copyright (C) 2008-2011 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 **
@@ -163,9 +165,6 @@ config_options_group_find (MuConfig *opts)
 		{"format", 'o', 0, G_OPTION_ARG_STRING, &opts->formatstr,
 		 "output format ('plain'(*), 'links', 'xml',"
 		 "'json', 'sexp', 'xquery')", NULL},				
-				{"xquery", 0, 0, G_OPTION_ARG_NONE, &opts->xquery,
-				 "obsolete, use --format=xquery instead", NULL},
-				
 		{NULL, 0, 0, 0, NULL, NULL, NULL}
 	};
 

src/mu-config.h

@@ -91,9 +91,6 @@ struct _MuConfig {
 	int		max_msg_size;   /* maximum size for message files */
 	
 	/* options for querying  */
-	gboolean         xquery;        /* (obsolete) give the Xapian
-					   query instead of search
-					   results */
 	char		*fields;	/* fields to show in output */	
 	char	        *sortfield;	/* field to sort by (string) */
 	gboolean	 descending;	/* sort descending? */