summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac2
-rw-r--r--mate-terminal.172
-rw-r--r--src/skey/md4.c2
-rw-r--r--src/terminal-accels.c5
-rw-r--r--src/terminal-app.c5
-rw-r--r--src/terminal-encoding.c2
-rw-r--r--src/terminal-gsettings.c2
-rw-r--r--src/terminal-gsettings.h2
-rw-r--r--src/terminal-options.c2
-rw-r--r--src/terminal-profile.c1
-rw-r--r--src/terminal-util.c6
-rw-r--r--src/terminal-window.c11
12 files changed, 62 insertions, 50 deletions
diff --git a/configure.ac b/configure.ac
index ae2716c..ac8a6b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ AC_CONFIG_SRCDIR([src/terminal.c])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-xz check-news])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([no])])
diff --git a/mate-terminal.1 b/mate-terminal.1
index 14526c3..b16c082 100644
--- a/mate-terminal.1
+++ b/mate-terminal.1
@@ -1,13 +1,13 @@
-.TH "mate-terminal" "1"
+.\" mate-terminal manual page
+.TH "MATE-TERMINAL" 1 "12 February 2014" "MATE Desktop Environment"
+.\" Please adjust this date whenever revising the manpage.
+.\"
.SH "NAME"
-mate-terminal \(em is a terminal emulation application.
+mate-terminal \- The MATE Terminal Emulator
.SH "SYNOPSIS"
-.PP
\fBmate-terminal\fR [\fB-e, \-\-command\fI=STRING\fR\fP] [\fB\-\-window-with-profile\fI=PROFILENAME\fR\fP] [\fB\-\-tab-with-profile\fI=PROFILENAME\fR\fP] [\fB\-\-window-with-profile-internal-id\fI=PROFILEID\fR\fP] [\fB\-\-tab-with-profile-internal-id\fI=PROFILEID\fR\fP] [\fB\-\-role\fI=ROLE\fR\fP] [\fB\-\-show-menubar\fP] [\fB\-\-hide-menubar\fP] [\fB\-\-geometry\fI=GEOMETRY\fR\fP] [\fB\-\-disable-factory\fP] [\fB-t, \-\-title\fI=TITLE\fR\fP] [\fB\-\-working-directory\fI=DIRNAME\fR\fP] [\fB-?, \-\-help\fP]
.SH "DESCRIPTION"
-.PP
-MATE Terminal is a terminal emulation application that you can
-use to perform the following actions:
+.SS MATE Terminal is a terminal emulation application that you can use to perform the following actions:
.PP
Access a UNIX shell in the MATE environment.
.PP
@@ -29,47 +29,73 @@ MATE Terminal accepts all of the escape sequences that the VT102
and VT220 terminals use for functions such as positioning the cursor
and clearing the screen.
.SH "OPTIONS"
-.IP "\fB-e, \-\-command=\fISTRING\fR\fP" 10
+.IP "\fB\-e, \-\-command=\fISTRING\fR\fP" 7
Execute the argument to this option inside the terminal.
-.IP "\fB\-\-window-with-profile=\fIPROFILENAME\fR\fP" 10
+.IP "\fB\-\-window-with-profile=\fIPROFILENAME\fR\fP"
Open a new window containing a tab with the given profile.
More than one of these options can be provided.
-.IP "\fB\-\-tab-with-profile=\fIPROFILENAME\fR\fP" 10
+.IP "\fB\-\-tab-with-profile=\fIPROFILENAME\fR\fP"
Open a tab in the window with the given profile. More than
one of these options can be provided, to open
several tabs .
-.IP "\fB\-\-window-with-profile-internal-id=\fIPROFILEID\fR\fP" 10
+.IP "\fB\-\-window-with-profile-internal-id=\fIPROFILEID\fR\fP"
Open a new window containing a tab with the given profile
ID. Used internally to save sessions.
-.IP "\fB\-\-tab-with-profile-internal-id=\fIPROFILEID\fR\fP" 10
+.IP "\fB\-\-tab-with-profile-internal-id=\fIPROFILEID\fR\fP"
Open a tab in the window with the given profile ID.
Used internally to save sessions.
-.IP "\fB\-\-role=\fIROLE\fR\fP" 10
+.IP "\fB\-\-tab\fP"
+.br
+Open a new tab in the last-opened window with the default profile.
+.IP "\fB\-\-window\fP"
+Open a new window containing a tab with the default profile.
+.IP "\fB\-\-role=\fIROLE\fR\fP"
Set the role for the last-specified window; applies to only
one window; can be specified once for each window you create
from the command line.
-.IP "\fB\-\-show-menubar\fP" 10
+.IP "\fB\-\-active\fP"
+Set the last specified tab as the active one in its window.
+.IP "\fB\-\-show-menubar\fP"
Turn on the menu bar for the last-specified window; applies
to only one window; can be specified once for each window you
create from the command line.
-.IP "\fB\-\-hide-menubar\fP" 10
+.IP "\fB\-\-hide-menubar\fP"
Turn off the menu bar for the last-specified window; applies
to only one window; can be specified once for each window you
create from the command line.
-.IP "\fB\-\-geometry=\fIGEOMETRY\fR\fP" 10
+.IP "\fB\-\-maximize\fP"
+Open a new maximized terminal window.
+.IP "\fB\-\-fullscreen\fP"
+Open a new fullscreen terminal window.
+.IP "\fB\-\-geometry=\fIGEOMETRY\fR\fP"
X geometry specification (see "X" man page), can be
specified once per window to be opened.
-.IP "\fB\-\-disable-factory\fP" 10
+.IP "\fB\-\-disable-factory\fP"
Do not register with the activation name server, do not
re-use an active terminal.
-.IP "\fB-t, \-\-title=\fITITLE\fR\fP" 10
+.IP "\fB\-t, \-\-title=\fITITLE\fR\fP"
Set the terminal's title to \fITITLE\fR.
-.IP "\fB\-\-working-directory=\fIDIRNAME\fR\fP" 10
+.IP "\fB\-\-working-directory=\fIDIRNAME\fR\fP"
Set the terminal's working directory to \fIDIRNAME\fR.
-.IP "\fB-?, \-\-help\fP" 10
+.IP "\fB\-\-zoom=\fIZOOM\fR\fP"
+Set the terminal's zoom factor (1.0 = normal size)
+.IP "\fB\-?, \-h \-\-help\fP"
Show help message.
+.IP "\fB\-\-help\-terminal\fP"
+Print terminal options.
+.IP "\fB\-\-help\-window-options\fP"
+Print window options.
+.IP "\fB\-\-help\-all\fP"
+Show all help options.
+.SH "BUGS"
+.SS Should you encounter any bugs, they may be reported at:
+http://github.com/mate-desktop/mate-terminal/issues
.SH "AUTHOR"
-.PP
-This manual page was written by Christian Marillat [email protected] for
-the \fBDebian GNU/Linux\fP system (but may be used by others).
-.\" created by instant / docbook-to-man, Fri 18 Jan 2013, 14:42
+.SS This manual page was originally written by for the Debian GNU/Linux system by:
+Christian Marillat <[email protected]> (2013)
+.SS It has been updated for the MATE Desktop Environment by:
+Adam Erdman <[email protected]> (2014)
+.SH "SEE ALSO"
+.SS
+MATE Terminal documentation can be found from the "Help" menu, or by pressing the F1 key.
+Further information may also be available at: http://wiki.mate-desktop.org/docs
diff --git a/src/skey/md4.c b/src/skey/md4.c
index 9061581..2335240 100644
--- a/src/skey/md4.c
+++ b/src/skey/md4.c
@@ -169,7 +169,7 @@ void MD4Final(unsigned char* digest, MD4_CTX *ctx)
if (digest!=NULL)
memcpy(digest, ctx->buf, 16);
- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
+ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
}
/* The three core functions */
diff --git a/src/terminal-accels.c b/src/terminal-accels.c
index 9dad3fc..fec1296 100644
--- a/src/terminal-accels.c
+++ b/src/terminal-accels.c
@@ -335,7 +335,7 @@ enum
};
static void keys_change_notify (GSettings *settings,
- gchar *key,
+ const gchar *key,
gpointer user_data);
static void accel_changed_callback (GtkAccelGroup *accel_group,
@@ -473,7 +473,7 @@ update_model_foreach (GtkTreeModel *model,
static void
keys_change_notify (GSettings *settings,
- gchar *key,
+ const gchar *key,
gpointer user_data)
{
GVariant *val;
@@ -663,7 +663,6 @@ static gboolean
sync_idle_cb (gpointer data)
{
GSettings *changeset;
- GError *error = NULL;
_terminal_debug_print (TERMINAL_DEBUG_ACCELS,
"GSettings sync handler\n");
diff --git a/src/terminal-app.c b/src/terminal-app.c
index 91b3d02..caf3533 100644
--- a/src/terminal-app.c
+++ b/src/terminal-app.c
@@ -364,7 +364,6 @@ terminal_app_get_profile_liststore (TerminalApp *app,
GtkListStore *store;
GtkTreeIter iter;
GList *profiles, *l;
- TerminalProfile *default_profile;
store = gtk_list_store_new (NUM_COLUMNS, TERMINAL_TYPE_PROFILE);
@@ -375,7 +374,6 @@ terminal_app_get_profile_liststore (TerminalApp *app,
selected_profile = NULL;
profiles = terminal_app_get_profile_list (app);
- default_profile = terminal_app_get_default_profile (app);
for (l = profiles; l != NULL; l = l->next)
{
@@ -976,7 +974,6 @@ terminal_app_enable_mnemonics_notify_cb (GSettings *settings,
gpointer user_data)
{
TerminalApp *app = TERMINAL_APP (user_data);
- GVariant *settings_value;
gboolean enable;
enable = g_settings_get_boolean (settings, key);
@@ -1311,8 +1308,6 @@ G_DEFINE_TYPE (TerminalApp, terminal_app, G_TYPE_OBJECT)
static void
terminal_app_init (TerminalApp *app)
{
- GError *error = NULL;
-
global_app = app;
gtk_window_set_default_icon_name (MATE_TERMINAL_ICON_NAME);
diff --git a/src/terminal-encoding.c b/src/terminal-encoding.c
index 549af80..9ca8310 100644
--- a/src/terminal-encoding.c
+++ b/src/terminal-encoding.c
@@ -289,7 +289,7 @@ update_active_encodings_gsettings (void)
{
GSList *list, *l;
GArray *strings;
- gchar *id_string;
+ const gchar *id_string;
GSettings *settings;
list = terminal_app_get_active_encodings (terminal_app_get ());
diff --git a/src/terminal-gsettings.c b/src/terminal-gsettings.c
index 8cbd35e..fdd0163 100644
--- a/src/terminal-gsettings.c
+++ b/src/terminal-gsettings.c
@@ -96,7 +96,7 @@ terminal_gsettings_remove_all_from_strv (GSettings *settings,
/* convert a gchar ** to GList (taken from libmatekbd code) */
GSList*
-terminal_gsettings_strv_to_gslist (gchar **array)
+terminal_gsettings_strv_to_gslist (const gchar *const *array)
{
GSList *list = NULL;
gint i;
diff --git a/src/terminal-gsettings.h b/src/terminal-gsettings.h
index 1e7c363..1611c86 100644
--- a/src/terminal-gsettings.h
+++ b/src/terminal-gsettings.h
@@ -41,7 +41,7 @@ gboolean terminal_gsettings_remove_all_from_strv (GSettings *sett
const gchar *key,
const gchar *value);
-GSList* terminal_gsettings_strv_to_gslist (gchar **array);
+GSList* terminal_gsettings_strv_to_gslist (const gchar *const *array);
G_END_DECLS
diff --git a/src/terminal-options.c b/src/terminal-options.c
index 71a4cd8..6881b67 100644
--- a/src/terminal-options.c
+++ b/src/terminal-options.c
@@ -1019,7 +1019,7 @@ get_goption_context (TerminalOptions *options)
G_OPTION_FLAG_NO_ARG,
G_OPTION_ARG_CALLBACK,
option_maximize_callback,
- N_("Maximise the window"),
+ N_("Maximize the window"),
NULL
},
{
diff --git a/src/terminal-profile.c b/src/terminal-profile.c
index bc836f1..67ab041 100644
--- a/src/terminal-profile.c
+++ b/src/terminal-profile.c
@@ -814,7 +814,6 @@ terminal_profile_save (TerminalProfile *profile)
TerminalProfilePrivate *priv = profile->priv;
GSettings *changeset;
GSList *l;
- GError *error = NULL;
priv->save_idle_id = 0;
changeset = g_settings_new_with_path (CONF_PROFILE_SCHEMA,
diff --git a/src/terminal-util.c b/src/terminal-util.c
index a909a53..c847595 100644
--- a/src/terminal-util.c
+++ b/src/terminal-util.c
@@ -47,6 +47,8 @@
#if GTK_CHECK_VERSION(3, 0, 0)
#define GDK_WINDOW_XWINDOW GDK_WINDOW_XID
#define GDK_DRAWABLE_XID GDK_WINDOW_XID
+#else
+ #define gdk_error_trap_pop_ignored gdk_error_trap_pop
#endif
void
@@ -609,7 +611,7 @@ setup_ignore_host_env (GHashTable *env_table,
GSList *ignore;
gchar **ignore_strv = g_settings_get_strv (settings, "ignore-hosts");
- ignore = terminal_gsettings_strv_to_gslist (ignore_strv);
+ ignore = terminal_gsettings_strv_to_gslist ((const gchar *const *)ignore_strv);
if (ignore)
{
GString *buf = g_string_sized_new (64);
@@ -1205,7 +1207,7 @@ terminal_util_x11_window_is_minimized (GdkWindow *window)
gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_STATE"),
0, G_MAXLONG, False, XA_ATOM, &type, &format, &nitems,
&bytes_after, &data);
- gdk_error_trap_pop ();
+ gdk_error_trap_pop_ignored ();
if (type != None)
{
diff --git a/src/terminal-window.c b/src/terminal-window.c
index 33ac03c..43333bf 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -1178,12 +1178,10 @@ handle_tab_droped_on_desktop (GtkNotebook *source_notebook,
gint y,
gpointer data)
{
- TerminalScreen *screen;
TerminalWindow *source_window;
TerminalWindow *new_window;
TerminalWindowPrivate *new_priv;
- screen = terminal_screen_container_get_screen (TERMINAL_SCREEN_CONTAINER (container));
source_window = TERMINAL_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (source_notebook)));
g_return_val_if_fail (TERMINAL_IS_WINDOW (source_window), NULL);
@@ -2525,7 +2523,6 @@ close_button_clicked_cb (GtkWidget *tab_label,
{
GtkWidget *toplevel;
TerminalWindow *window;
- TerminalWindowPrivate *priv;
TerminalScreen *screen;
toplevel = gtk_widget_get_toplevel (screen_container);
@@ -2536,7 +2533,6 @@ close_button_clicked_cb (GtkWidget *tab_label,
return;
window = TERMINAL_WINDOW (toplevel);
- priv = window->priv;
screen = terminal_screen_container_get_screen (TERMINAL_SCREEN_CONTAINER (screen_container));
if (confirm_close_window_or_tab (window, screen))
@@ -2891,7 +2887,6 @@ notebook_page_selected_callback (GtkWidget *notebook,
TerminalWindowPrivate *priv = window->priv;
GtkWidget *widget;
TerminalScreen *screen;
- TerminalProfile *profile;
int old_grid_width, old_grid_height;
#if !GTK_CHECK_VERSION (2, 90, 6)
GtkWidget *page_widget;
@@ -2937,8 +2932,6 @@ notebook_page_selected_callback (GtkWidget *notebook,
/* Make sure that the widget is no longer hidden due to the workaround */
gtk_widget_show (widget);
- profile = terminal_screen_get_profile (screen);
-
priv->active_screen = screen;
/* Override menubar setting if it wasn't restored from session */
@@ -3856,7 +3849,7 @@ terminal_next_or_previous_profile_cb (GtkAction *action,
TerminalWindow *window)
{
TerminalWindowPrivate *priv = window->priv;
- TerminalProfile *active_profile, *new_profile;
+ TerminalProfile *active_profile, *new_profile = NULL;
GList *profiles, *p;
const char *name;
@@ -4022,7 +4015,6 @@ tabs_next_or_previous_tab_cb (GtkAction *action,
{
TerminalWindowPrivate *priv = window->priv;
GtkNotebookClass *klass;
- GtkBindingSet *binding_set;
const char *name;
guint keyval = 0;
@@ -4037,7 +4029,6 @@ tabs_next_or_previous_tab_cb (GtkAction *action,
}
klass = GTK_NOTEBOOK_GET_CLASS (GTK_NOTEBOOK (priv->notebook));
- binding_set = gtk_binding_set_by_class (klass);
gtk_binding_set_activate (gtk_binding_set_by_class (klass),
keyval,
GDK_CONTROL_MASK,
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-29 22:11:51 +0000