Commit 1a07b922 authored by Behdad Esfahbod's avatar Behdad Esfahbod Committed by Behdad Esfahbod

Warning cleanup. A couple were actually bugs.

2006-02-03  Behdad Esfahbod  <behdad@gnome.org>

        * src/vte.c: Warning cleanup.  A couple were actually bugs.

        * src/vteapp.c: No need to run $SHELL by default.  Handled
        by vte.c now.  A bug was causing nothing to be run...
parent 5d005b24
2006-02-03 Behdad Esfahbod <behdad@gnome.org>
* src/vte.c: Warning cleanup. A couple were actually bugs.
* src/vteapp.c: No need to run $SHELL by default. Handled
by vte.c now. A bug was causing nothing to be run...
2006-02-03 Behdad Esfahbod <behdad@gnome.org>
* src/debug.c, src/debug.h, src/matcher.c: Add the debug
......
......@@ -696,8 +696,6 @@ static void
vte_terminal_scroll_region(VteTerminal *terminal,
long row, glong count, glong delta)
{
glong height;
if ((delta == 0) || (count == 0)) {
/* Shenanigans! */
return;
......@@ -1881,7 +1879,7 @@ vte_terminal_adjust_adjustments(VteTerminal *terminal, gboolean immediate)
if (terminal->adjustment->step_increment != 1) {
#ifdef VTE_DEBUG
if (_vte_debug_on(VTE_DEBUG_IO)) {
fprintf(stderr, "Changing step increment from %ld to %ld\n",
fprintf(stderr, "Changing step increment from %lf to %ld\n",
terminal->adjustment->step_increment,
terminal->row_count);
......@@ -7368,15 +7366,25 @@ vte_terminal_fork_command(VteTerminal *terminal,
}
}
if (terminal->pvt->shell == NULL) {
terminal->pvt->shell = "/bin/sh";
if (getenv ("SHELL")) {
terminal->pvt->shell = getenv ("SHELL");
#ifdef VTE_DEBUG
if (_vte_debug_on(VTE_DEBUG_MISC)) {
fprintf(stderr, "Using default shell (%s).\n",
terminal->pvt->shell);
}
if (_vte_debug_on(VTE_DEBUG_MISC)) {
fprintf(stderr, "Using $SHELL shell (%s).\n",
terminal->pvt->shell);
}
#endif
} else {
terminal->pvt->shell = "/bin/sh";
#ifdef VTE_DEBUG
if (_vte_debug_on(VTE_DEBUG_MISC)) {
fprintf(stderr, "Using default shell (%s).\n",
terminal->pvt->shell);
}
#endif
}
}
command = terminal->pvt->shell;return terminal->pvt->shell;
command = terminal->pvt->shell;
}
/* Start up the command and get the PTY of the master. */
......@@ -15977,7 +15985,6 @@ need_processing (VteTerminal *terminal)
static gboolean
display_timeout (gpointer data)
{
gboolean cont;
VteTerminal *terminal = data;
if (need_processing (terminal) &&
......@@ -15999,7 +16006,6 @@ display_timeout (gpointer data)
static gboolean
coalesce_timeout (gpointer data)
{
gboolean cont;
VteTerminal *terminal = data;
if (need_processing (terminal) &&
......
......@@ -404,7 +404,7 @@ main(int argc, char **argv)
const char *message = "Launching interactive shell...\r\n";
const char *font = NULL;
const char *terminal = NULL;
const char *command = getenv ("SHELL");
const char *command = NULL;
const char *working_directory = NULL;
char **argv2;
int opt;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment