lib: replace deprecated n_q_search_messages with status returning version

[notmuch] / notmuch-tag.c

diff --git a/notmuch-tag.c b/notmuch-tag.c
index c020cb6f40b8ad3677aac9fa6104ef3d4aba78b6..9c03754d58568a04f9a7971d2296ab014c19f054 100644 (file)
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
@@ -121,7 +121,7 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,
     /* tagging is not interested in any special sort order */
     notmuch_query_set_sort (query, NOTMUCH_SORT_UNSORTED);
 
-    status = notmuch_query_search_messages_st (query, &messages);
+    status = notmuch_query_search_messages (query, &messages);
     if (print_status_query ("notmuch tag", query, status))
        return status;
 
@@ -237,10 +237,6 @@ notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[])
            fprintf (stderr, "Can't specify both cmdline and stdin!\n");
            return EXIT_FAILURE;
        }
-       if (remove_all) {
-           fprintf (stderr, "Can't specify both --remove-all and --batch\n");
-           return EXIT_FAILURE;
-       }
     } else {
        tag_ops = tag_op_list_create (config);
        if (tag_ops == NULL) {