[Gaim-commits] SF.net SVN: gaim: [17646] trunk/console

[<sa...@us...>]

Revision: 17646
          http://svn.sourceforge.net/gaim/?rev=17646&view=rev
Author:   sadrul
Date:     2006-10-31 21:53:09 -0800 (Tue, 31 Oct 2006)

Log Message:
-----------
Fix things to work with the last commit.

Modified Paths:
--------------
    trunk/console/gntconv.c
    trunk/console/gntdebug.c
    trunk/console/libgnt/gntkeys.c
    trunk/console/libgnt/gntkeys.h
    trunk/console/libgnt/gnttextview.h
    trunk/console/libgnt/gnttree.h

Modified: trunk/console/gntconv.c
===================================================================
--- trunk/console/gntconv.c	2006-11-01 03:38:23 UTC (rev 17645)
+++ trunk/console/gntconv.c	2006-11-01 05:53:09 UTC (rev 17646)
@@ -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;

Modified: trunk/console/gntdebug.c
===================================================================
--- trunk/console/gntdebug.c	2006-11-01 03:38:23 UTC (rev 17645)
+++ trunk/console/gntdebug.c	2006-11-01 05:53:09 UTC (rev 17646)
@@ -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;

Modified: trunk/console/libgnt/gntkeys.c
===================================================================
--- trunk/console/libgnt/gntkeys.c	2006-11-01 03:38:23 UTC (rev 17645)
+++ trunk/console/libgnt/gntkeys.c	2006-11-01 05:53:09 UTC (rev 17646)
@@ -1,5 +1,6 @@
 #include "gntkeys.h"
 
+#include <stdlib.h>
 #include <string.h>
 
 const char *term;

Modified: trunk/console/libgnt/gntkeys.h
===================================================================
--- trunk/console/libgnt/gntkeys.h	2006-11-01 03:38:23 UTC (rev 17645)
+++ trunk/console/libgnt/gntkeys.h	2006-11-01 05:53:09 UTC (rev 17646)
@@ -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

Modified: trunk/console/libgnt/gnttextview.h
===================================================================
--- trunk/console/libgnt/gnttextview.h	2006-11-01 03:38:23 UTC (rev 17645)
+++ trunk/console/libgnt/gnttextview.h	2006-11-01 05:53:09 UTC (rev 17646)
@@ -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))

Modified: trunk/console/libgnt/gnttree.h
===================================================================
--- trunk/console/libgnt/gnttree.h	2006-11-01 03:38:23 UTC (rev 17645)
+++ trunk/console/libgnt/gnttree.h	2006-11-01 05:53:09 UTC (rev 17646)
@@ -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))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.