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

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

Revision: 16369
Author:   sadrul
Date:     2006-06-28 12:12:38 -0700 (Wed, 28 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16369&view=rev

Log Message:
-----------
Get rid of a whole lot of compile warnings.

Modified Paths:
--------------
    trunk/console/libgnt/Makefile
    trunk/console/libgnt/gnt.h
    trunk/console/libgnt/gntbox.c
    trunk/console/libgnt/gntbutton.c
    trunk/console/libgnt/gntentry.c
    trunk/console/libgnt/gntlabel.c
    trunk/console/libgnt/gntmain.c
    trunk/console/libgnt/gnttextview.c
    trunk/console/libgnt/gnttree.c
    trunk/console/libgnt/gntwidget.h
Modified: trunk/console/libgnt/Makefile
===================================================================
--- trunk/console/libgnt/Makefile	2006-06-28 18:50:33 UTC (rev 16368)
+++ trunk/console/libgnt/Makefile	2006-06-28 19:12:38 UTC (rev 16369)
@@ -55,7 +55,7 @@
 gntmain.o: gntmain.c $(HEADERS)
 
 libgnt: $(OBJECTS)
-	$(CC) --shared -o libgnt.so $(OBJECTS)
+	$(CC) --shared -o libgnt.so $(OBJECTS) $(LDFLAGS)
 
 clean:
 	rm -f *.o

Modified: trunk/console/libgnt/gnt.h
===================================================================
--- trunk/console/libgnt/gnt.h	2006-06-28 18:50:33 UTC (rev 16368)
+++ trunk/console/libgnt/gnt.h	2006-06-28 19:12:38 UTC (rev 16369)
@@ -11,4 +11,6 @@
 
 void gnt_screen_release(GntWidget *widget);
 
-void gnt_scree_update(GntWidget *widget);
+void gnt_screen_update(GntWidget *widget);
+
+void gnt_screen_take_focus(GntWidget *widget);

Modified: trunk/console/libgnt/gntbox.c
===================================================================
--- trunk/console/libgnt/gntbox.c	2006-06-28 18:50:33 UTC (rev 16368)
+++ trunk/console/libgnt/gntbox.c	2006-06-28 19:12:38 UTC (rev 16369)
@@ -1,5 +1,7 @@
 #include "gntbox.h"
 
+#include <string.h>
+
 enum
 {
 	SIGS = 1,
@@ -238,7 +240,6 @@
 static void
 gnt_box_lost_focus(GntWidget *widget)
 {
-	GntBox *box = GNT_BOX(widget);
 	GntWidget *p = widget;
 
 	while (p->parent)
@@ -277,8 +278,6 @@
 static void
 gnt_box_class_init(GntBoxClass *klass)
 {
-	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
-
 	parent_class = GNT_WIDGET_CLASS(klass);
 	parent_class->destroy = gnt_box_destroy;
 	parent_class->draw = gnt_box_draw;

Modified: trunk/console/libgnt/gntbutton.c
===================================================================
--- trunk/console/libgnt/gntbutton.c	2006-06-28 18:50:33 UTC (rev 16368)
+++ trunk/console/libgnt/gntbutton.c	2006-06-28 19:12:38 UTC (rev 16369)
@@ -1,3 +1,5 @@
+#include <string.h>
+
 #include "gntbutton.h"
 
 enum
@@ -54,8 +56,6 @@
 static void
 gnt_button_class_init(GntWidgetClass *klass)
 {
-	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
-
 	parent_class = GNT_WIDGET_CLASS(klass);
 	parent_class->draw = gnt_button_draw;
 	parent_class->map = gnt_button_map;

Modified: trunk/console/libgnt/gntentry.c
===================================================================
--- trunk/console/libgnt/gntentry.c	2006-06-28 18:50:33 UTC (rev 16368)
+++ trunk/console/libgnt/gntentry.c	2006-06-28 19:12:38 UTC (rev 16369)
@@ -1,4 +1,6 @@
+#include <ctype.h>
 #include <string.h>
+
 #include "gntentry.h"
 
 enum
@@ -28,8 +30,6 @@
 static void
 gnt_entry_size_request(GntWidget *widget)
 {
-	GntEntry *entry = GNT_ENTRY(widget);
-
 	if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED))
 	{
 		widget->priv.height = 1;
@@ -150,8 +150,6 @@
 static void
 gnt_entry_class_init(GntEntryClass *klass)
 {
-	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
-
 	parent_class = GNT_WIDGET_CLASS(klass);
 	parent_class->destroy = gnt_entry_destroy;
 	parent_class->draw = gnt_entry_draw;

Modified: trunk/console/libgnt/gntlabel.c
===================================================================
--- trunk/console/libgnt/gntlabel.c	2006-06-28 18:50:33 UTC (rev 16368)
+++ trunk/console/libgnt/gntlabel.c	2006-06-28 19:12:38 UTC (rev 16369)
@@ -58,8 +58,6 @@
 static void
 gnt_label_class_init(GntLabelClass *klass)
 {
-	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
-
 	parent_class = GNT_WIDGET_CLASS(klass);
 	parent_class->destroy = gnt_label_destroy;
 	parent_class->draw = gnt_label_draw;

Modified: trunk/console/libgnt/gntmain.c
===================================================================
--- trunk/console/libgnt/gntmain.c	2006-06-28 18:50:33 UTC (rev 16368)
+++ trunk/console/libgnt/gntmain.c	2006-06-28 19:12:38 UTC (rev 16369)
@@ -1,9 +1,13 @@
 #include "gnt.h"
+#include "gntbox.h"
 #include "gntkeys.h"
 #include "gntcolors.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <locale.h>
+#include <unistd.h>
+#include <string.h>
 
 static GList *focus_list;
 static int max_x;
@@ -248,7 +252,7 @@
 			widget = widget->parent;
 	}
 	
-	gnt_box_sync_children(widget);
+	gnt_box_sync_children(GNT_BOX(widget));
 	node = g_hash_table_lookup(nodes, widget);
 
 	win = dupwin(widget->window);

Modified: trunk/console/libgnt/gnttextview.c
===================================================================
--- trunk/console/libgnt/gnttextview.c	2006-06-28 18:50:33 UTC (rev 16368)
+++ trunk/console/libgnt/gnttextview.c	2006-06-28 19:12:38 UTC (rev 16369)
@@ -50,8 +50,6 @@
 static void
 gnt_text_view_class_init(GntTextViewClass *klass)
 {
-	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
-
 	parent_class = GNT_WIDGET_CLASS(klass);
 	parent_class->destroy = gnt_text_view_destroy;
 	parent_class->draw = gnt_text_view_draw;

Modified: trunk/console/libgnt/gnttree.c
===================================================================
--- trunk/console/libgnt/gnttree.c	2006-06-28 18:50:33 UTC (rev 16368)
+++ trunk/console/libgnt/gnttree.c	2006-06-28 19:12:38 UTC (rev 16369)
@@ -47,7 +47,7 @@
 get_next(GntTreeRow *row)
 {
 	if (row == NULL)
-		return;
+		return NULL;
 	return _get_next(row, !row->collapsed);
 }
 
@@ -229,7 +229,6 @@
 gnt_tree_draw(GntWidget *widget)
 {
 	GntTree *tree = GNT_TREE(widget);
-	int bottom;
 
 	scrollok(widget->window, TRUE);
 	wsetscrreg(widget->window, 0, widget->priv.height - 1);
@@ -330,8 +329,6 @@
 static void
 gnt_tree_class_init(GntTreeClass *klass)
 {
-	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
-
 	parent_class = GNT_WIDGET_CLASS(klass);
 	parent_class->destroy = gnt_tree_destroy;
 	parent_class->draw = gnt_tree_draw;
@@ -432,7 +429,8 @@
 	GntWidget *widget = GNT_WIDGET(tree);
 	int ret = widget->priv.height;
 	if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_BORDER))
-		widget->priv.height -= 2;
+		ret -= 2;
+	return ret;
 }
 
 void gnt_tree_scroll(GntTree *tree, int count)

Modified: trunk/console/libgnt/gntwidget.h
===================================================================
--- trunk/console/libgnt/gntwidget.h	2006-06-28 18:50:33 UTC (rev 16368)
+++ trunk/console/libgnt/gntwidget.h	2006-06-28 19:12:38 UTC (rev 16369)
@@ -117,6 +117,7 @@
  * Applications should just call gnt_widget_draw instead of this. */
 void gnt_widget_queue_update(GntWidget *widget);
 
+void gnt_widget_set_take_focus(GntWidget *widget, gboolean set);
 G_END_DECLS
 
 #endif /* GNT_WIDGET_H */


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