Mercurial > pidgin.yaz
changeset 14877:c01f62c83647
[gaim-migrate @ 17646]
Fix things to work with the last commit.
committer: Tailor Script <tailor@pidgin.im>
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Wed, 01 Nov 2006 05:53:09 +0000 |
| parents | 70623f0d5cdc |
| children | 14b132352449 |
| files | console/gntconv.c console/gntdebug.c console/libgnt/gntkeys.c console/libgnt/gntkeys.h console/libgnt/gnttextview.h console/libgnt/gnttree.h |
| diffstat | 6 files changed, 18 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/console/gntconv.c Wed Nov 01 03:38:23 2006 +0000 +++ b/console/gntconv.c Wed Nov 01 05:53:09 2006 +0000 @@ -128,13 +128,13 @@ } else if (key[0] == 27) { - if (strcmp(key+1, GNT_KEY_DOWN) == 0) + if (strcmp(key, GNT_KEY_DOWN) == 0) gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), 1); - else if (strcmp(key+1, GNT_KEY_UP) == 0) + else if (strcmp(key, GNT_KEY_UP) == 0) gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), -1); - else if (strcmp(key+1, GNT_KEY_PGDOWN) == 0) + else if (strcmp(key, GNT_KEY_PGDOWN) == 0) gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), ggconv->tv->priv.height - 2); - else if (strcmp(key+1, GNT_KEY_PGUP) == 0) + else if (strcmp(key, GNT_KEY_PGUP) == 0) gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), -(ggconv->tv->priv.height - 2)); else return FALSE;
--- a/console/gntdebug.c Wed Nov 01 03:38:23 2006 +0000 +++ b/console/gntdebug.c Wed Nov 01 05:53:09 2006 +0000 @@ -51,13 +51,13 @@ { if (key[0] == 27) { - if (strcmp(key+1, GNT_KEY_DOWN) == 0) + if (strcmp(key, GNT_KEY_DOWN) == 0) gnt_text_view_scroll(view, 1); - else if (strcmp(key+1, GNT_KEY_UP) == 0) + else if (strcmp(key, GNT_KEY_UP) == 0) gnt_text_view_scroll(view, -1); - else if (strcmp(key+1, GNT_KEY_PGDOWN) == 0) + else if (strcmp(key, GNT_KEY_PGDOWN) == 0) gnt_text_view_scroll(view, wid->priv.height - 2); - else if (strcmp(key+1, GNT_KEY_PGUP) == 0) + else if (strcmp(key, GNT_KEY_PGUP) == 0) gnt_text_view_scroll(view, -(wid->priv.height - 2)); else return FALSE;
--- a/console/libgnt/gntkeys.c Wed Nov 01 03:38:23 2006 +0000 +++ b/console/libgnt/gntkeys.c Wed Nov 01 05:53:09 2006 +0000 @@ -1,5 +1,6 @@ #include "gntkeys.h" +#include <stdlib.h> #include <string.h> const char *term;
--- a/console/libgnt/gntkeys.h Wed Nov 01 03:38:23 2006 +0000 +++ b/console/libgnt/gntkeys.h Wed Nov 01 05:53:09 2006 +0000 @@ -71,4 +71,13 @@ */ void gnt_keys_refine(char *text); + +/* A lot of commonly used variable names are defined in <term.h>. + * #undef them to make life easier for everyone. */ + +#undef columns +#undef lines +#undef buttons +#undef newline + #endif
--- a/console/libgnt/gnttextview.h Wed Nov 01 03:38:23 2006 +0000 +++ b/console/libgnt/gnttextview.h Wed Nov 01 05:53:09 2006 +0000 @@ -6,10 +6,6 @@ #include "gntcolors.h" #include "gntkeys.h" -#ifdef lines -#undef lines -#endif - #define GNT_TYPE_TEXTVIEW (gnt_text_view_get_gtype()) #define GNT_TEXT_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_TEXTVIEW, GntTextView)) #define GNT_TEXT_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_TEXTVIEW, GntTextViewClass))
--- a/console/libgnt/gnttree.h Wed Nov 01 03:38:23 2006 +0000 +++ b/console/libgnt/gnttree.h Wed Nov 01 05:53:09 2006 +0000 @@ -7,10 +7,6 @@ #include "gntkeys.h" #include "gnttextview.h" -#ifdef columns -#undef columns -#endif - #define GNT_TYPE_TREE (gnt_tree_get_gtype()) #define GNT_TREE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_TREE, GntTree)) #define GNT_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_TREE, GntTreeClass))