From 1a45b7e5011183eb804ac1737a20800a868e187d Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Thu, 24 May 2012 16:13:11 -0400 Subject: [PATCH] explicitly depend on at least vte 0.28 --- README.rst | 2 +- termite.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/README.rst b/README.rst index fe80500..63b11b1 100644 --- a/README.rst +++ b/README.rst @@ -8,7 +8,7 @@ Configuration is done at compile-time via ``config.h``. DEPENDENCIES ============ -Either vte (default) or vte3. You can use vte3 by building with ``make GTK3=1``. +A vte version >= 0.28. You can use vte3 by building with ``make GTK3=1``. KEYBINDINGS =========== diff --git a/termite.c b/termite.c index 74e7f1c..8a39989 100644 --- a/termite.c +++ b/termite.c @@ -25,7 +25,6 @@ static gboolean key_press_cb(GtkWidget *vte, GdkEventKey *event) { } #ifdef CLICKABLE_URL -#if VTE_CHECK_VERSION(0, 24, 0) static void get_vte_padding(VteTerminal *vte, int *w, int *h) { GtkBorder *border = NULL; @@ -39,9 +38,6 @@ static void get_vte_padding(VteTerminal *vte, int *w, int *h) { gtk_border_free(border); } } -#else -#define get_vte_padding vte_terminal_get_padding -#endif static char *check_match(VteTerminal *vte, int event_x, int event_y) { int xpad, ypad, tag; @@ -95,11 +91,7 @@ int main(int argc, char **argv) { if (argc > 1) { command_argv = &argv[1]; } else { -#if VTE_CHECK_VERSION(0, 28, 0) default_argv[0] = vte_get_user_shell(); -#else - default_argv[0] = g_strdup(g_getenv("SHELL")); -#endif if (!default_argv[0]) default_argv[0] = "/bin/sh"; command_argv = default_argv; }