Re: [evolution-patches] Cleanups for evolution/widgets/table

[Kjartan Maraas <kmaraas broadpark no>]

tir, 29,.08.2006 kl. 22.53 +0200, skrev Kjartan Maraas:
> More of the same.
> 
> There's a check for eti->frozen_count > 0 added there that showed up as
> a CRITICAL warning some time back too and is filed in bugzilla as
> http://bugzilla.gnome.org/show_bug.cgi?id=323522 Not sure that is the
> right fix, but it's there all the same.
> 
And another rediff.

Cheers
Kjartan

? warnings
Index: e-cell-text.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-cell-text.c,v
retrieving revision 1.154
diff -r1.154 e-cell-text.c
586,587c586,587
< 		char *fixed_family = NULL;
< 		gint fixed_size;
---
> 		const char *fixed_family = NULL;
> 		gint fixed_size = 0;
1335c1335
< 	double ty, ly, text_width, text_height;
---
> 	double ty, ly, text_width = 0, text_height = 0;
Index: e-table-header-item.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-header-item.c,v
retrieving revision 1.137
diff -r1.137 e-table-header-item.c
978c978
< 					     GINT_TO_POINTER (column.column),
---
> 					     GINT_TO_POINTER ((int)column.column),
987c987
< 					     GINT_TO_POINTER (column.column),
---
> 					     GINT_TO_POINTER ((int)column.column),
1176c1176
< 				GINT_TO_POINTER (column.column),
---
> 				GINT_TO_POINTER ((int)column.column),
1189c1189
< 				GINT_TO_POINTER (column.column),
---
> 				GINT_TO_POINTER ((int)column.column),
1512c1512
< 	int col = GPOINTER_TO_INT (g_object_get_data(menu_item, "col-number"));
---
> 	int col = GPOINTER_TO_INT (g_object_get_data(G_OBJECT (menu_item), "col-number"));
1515c1515
< 	if (!gtk_check_menu_item_get_active(menu_item))
---
> 	if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menu_item)))
1525c1525
< 	if (!gtk_check_menu_item_get_active(menu_item))
---
> 	if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menu_item)))
1535c1535,1536
< 	GtkMenu *popup, *sub_menu;;
---
> 	GtkMenu *popup;
> 	GtkWidget *sub_menu;
1540c1541
< 	gboolean ascending;
---
> 	gboolean ascending = FALSE;
1555c1556
< 	gtk_widget_show (menu_item);
---
> 	gtk_widget_show (GTK_WIDGET (menu_item));
1558c1559
< 	gtk_menu_item_set_submenu (menu_item, sub_menu);
---
> 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), sub_menu);
1604c1605
< 		g_object_set_data (menu_item, "col-number", GINT_TO_POINTER (ncol));
---
> 		g_object_set_data (G_OBJECT (menu_item), "col-number", GINT_TO_POINTER (ncol));
Index: e-table-header-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-header-utils.c,v
retrieving revision 1.24
diff -r1.24 e-table-header-utils.c
353c353
< 		g_object_add_weak_pointer (G_OBJECT (g_label), &g_label);
---
> 		g_object_add_weak_pointer (G_OBJECT (g_label), (gpointer)&g_label);
Index: e-table-item.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-item.c,v
retrieving revision 1.248
diff -r1.248 e-table-item.c
35a36,37
> 
> #include <glib-object.h>
1112c1114,1115
< 	eti_unfreeze (eti);
---
> 	if (eti->frozen_count > 0)
> 		eti_unfreeze (eti);
1671c1674
< eti_tree_unfreeze (GtkWidget *widget,  GdkEvent *event, ETableItem *eti)
---
> eti_tree_unfreeze (GObject *object,  GdkEvent *event, ETableItem *eti)
1674,1675c1677,1678
< 	if (widget)
< 		g_object_set_data (widget, "freeze-cursor", 0);
---
> 	if (object)
> 		g_object_set_data (object, "freeze-cursor", NULL);
Index: e-tree-table-adapter.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-tree-table-adapter.c,v
retrieving revision 1.64
diff -r1.64 e-tree-table-adapter.c
749c749
< guint resort_model (ETreeTableAdapter *etta)
---
> static guint resort_model (ETreeTableAdapter *etta)
764c764
< 	g_idle_add (resort_model, etta);
---
> 	g_idle_add ((GSourceFunc)resort_model, etta);