summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mate-dictionary/data/mate-dictionary.117
-rw-r--r--mate-dictionary/src/gdict-app.c9
-rw-r--r--mate-dictionary/src/gdict-app.h1
3 files changed, 11 insertions, 16 deletions
diff --git a/mate-dictionary/data/mate-dictionary.1 b/mate-dictionary/data/mate-dictionary.1
index 59b7d969..0d83bc51 100644
--- a/mate-dictionary/data/mate-dictionary.1
+++ b/mate-dictionary/data/mate-dictionary.1
@@ -1,7 +1,8 @@
-.\" mate-dictionary.1 - a online dictionary client
+.\" mate-dictionary.1 - an online dictionary client
+.\" Copyright 2015 MATE developers
.\" Copyright 2005 Emmanuele Bassi
.\" Copyright 2001 Jochen Voss
-.TH mate-dictionary 1 "Jan 2 2005" "mate-utils 2.13.4"
+.TH mate-dictionary 1 "Jul 11 2015" "mate-utils 1.10.2"
.SH NAME
mate-dictionary \- Look up words on dictionaries
.SH SYNOPSIS
@@ -29,21 +30,25 @@ online help.
.BI \-\-look\-up " word"
Looks up the specified word using the pre-defined dictionary source.
.TP
+.BI \-\-match " word"
+Matches one or more words using the pre-defined dictionary source.
+.TP
.BI \-s " source\fR or " \-\-source " source"
Uses the specified source for looking up words. This does not affect the
global settings.
.TP
-.BR \-l " or " \-\-list\-sources
-Lists all the sources available.
-.TP
.BR \-n " or " \-\-no\-window
Using this switch with the \-\-look\-up will print the definitions found
on the console without launching the GUI.
.TP
+.BI \-D " database\fR or " \-\-database " database"
+Use the specified database for looking up words. This does not affect the
+global settings.
+.TP
.B \-\-help
Display help information.
.SH CONFIGURATION
-All the configuration is handled using Gsettings.
+All the configuration is handled using GSettings.
.SH AUTHOR
.B MATE Dictionary
was originally written by Spiros Papadimitriou (<[email protected]>), Mike
diff --git a/mate-dictionary/src/gdict-app.c b/mate-dictionary/src/gdict-app.c
index 78fc0912..57cf8030 100644
--- a/mate-dictionary/src/gdict-app.c
+++ b/mate-dictionary/src/gdict-app.c
@@ -326,10 +326,8 @@ gdict_init (int *argc, char ***argv)
gchar **lookup_words = NULL;
gchar **match_words = NULL;
gchar *database = NULL;
- gchar *strategy = NULL;
gchar *source_name = NULL;
gboolean no_window = FALSE;
- gboolean list_sources = FALSE;
const GOptionEntry gdict_app_goptions[] =
{
@@ -339,14 +337,10 @@ gdict_init (int *argc, char ***argv)
N_("Words to match"), N_("word") },
{ "source", 's', 0, G_OPTION_ARG_STRING, &source_name,
N_("Dictionary source to use"), N_("source") },
- { "list-sources", 'l', 0, G_OPTION_ARG_NONE, &list_sources,
- N_("Show available dictionary sources"), NULL },
{ "no-window", 'n', 0, G_OPTION_ARG_NONE, &no_window,
N_("Print result to the console"), NULL },
{ "database", 'D', 0, G_OPTION_ARG_STRING, &database,
N_("Database to use"), N_("db") },
- { "strategy", 'S', 0, G_OPTION_ARG_STRING, &strategy,
- N_("Strategy to use"), N_("strat") },
{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &lookup_words,
N_("Words to look up"), N_("word") },
{ NULL },
@@ -422,9 +416,6 @@ gdict_init (int *argc, char ***argv)
if (no_window)
singleton->no_window = TRUE;
-
- if (list_sources)
- singleton->list_sources = TRUE;
}
void
diff --git a/mate-dictionary/src/gdict-app.h b/mate-dictionary/src/gdict-app.h
index 2307c9f7..f91bc908 100644
--- a/mate-dictionary/src/gdict-app.h
+++ b/mate-dictionary/src/gdict-app.h
@@ -52,7 +52,6 @@ struct _GdictApp
gchar *database;
gchar *source_name;
gboolean no_window;
- gboolean list_sources;
GdictSourceLoader *loader;