Fix "incompatible pointer type" warnings (#360619).

2007-03-29  Matthew Barnes  <mbarnes@redhat.com>

	* calendar/gui/e-day-view.c:
	* calendar/gui/e-week-view.c:
	* calendar/gui/tasks-control.c:
	* composer/e-msg-composer-select-file.c:
	* mail/em-account-editor.c:
	* mail/em-folder-view.c:
	* mail/em-format-html-display.c:
	* mail/em-format-html.c:
	* mail/em-format.h:
	* mail/em-mailer-prefs.c:
	* mail/em-vfolder-rule.c:
	* mail/mail-ops.c:
	* mail/mail-send-recv.c:
	* mail/message-list.c:
	* plugins/bbdb/gaimbuddies.c:
	* plugins/itip-formatter/itip-formatter.c:
	* plugins/save-calendar/save-calendar.c:
	* shell/e-shell-window.c:
	* widgets/misc/e-icon-entry.c:
	* widgets/table/e-table-header-utils.c:
	* widgets/table/e-table-item.c:
	* widgets/table/e-tree-header-item.c:
	* widgets/table/e-tree-table-adapter.c:
	Fix "incompatible pointer type" warnings (#360619).


svn path=/trunk/; revision=33339

5 files changed, 20 insertions, 11 deletions

diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog
index 9601d05e64..ee46792ce3 100644
--- a/widgets/table/ChangeLog
+++ b/widgets/table/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-29  Matthew Barnes  <mbarnes@redhat.com>
+
+	* e-table-header-utils.c:
+	* e-table-item.c:
+	* e-tree-header-item.c:
+	* e-tree-table-adapter.c:
+	Fix "incompatible pointer type" warnings (#360619).
+
 2007-03-20  Matthew Barnes  <mbarnes@redhat.com>
 
 	* e-cell-checkbox.c:
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 707d2baaa4..596fbbcb73 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -1491,10 +1491,10 @@ static EPopupMenu ethi_context_menu [] = {
 static void
 sort_by_id (GtkWidget *menu_item, ETableHeaderItem *ethi)
 {
-	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"));
 	ETableCol *ecol;
 
-	if (!gtk_check_menu_item_get_active(menu_item))
+	if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menu_item)))
 		return;
 	
 	ecol = e_table_header_get_column (ethi->full_header, col);
@@ -1504,7 +1504,7 @@ sort_by_id (GtkWidget *menu_item, ETableHeaderItem *ethi)
 static void
 popup_custom (GtkWidget *menu_item, EthiHeaderInfo *info)
 {
-	if (!gtk_check_menu_item_get_active(menu_item))
+	if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menu_item)))
 		return;
 
 	ethi_popup_customize_view(menu_item, info);
@@ -1514,9 +1514,9 @@ ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event)
 {
 	EthiHeaderInfo *info = g_new(EthiHeaderInfo, 1);
 	ETableCol *col;
-	GtkMenu *popup, *sub_menu;
+	GtkMenu *popup;
 	int ncol, sort_count, sort_col;
-	GtkWidget *menu_item;
+	GtkWidget *menu_item, *sub_menu;
 	GSList *group = NULL;
 	ETableSortColumn column;
 	gboolean ascending;
@@ -1537,7 +1537,7 @@ ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event)
 	gtk_widget_show (menu_item);
 	sub_menu = gtk_menu_new ();
 	gtk_widget_show (sub_menu);
-	gtk_menu_item_set_submenu (menu_item, sub_menu);
+	gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), sub_menu);
 	gtk_menu_shell_prepend (GTK_MENU_SHELL (popup), menu_item);
 
 	sort_count = e_table_sort_info_sorting_get_count(ethi->sort_info);
@@ -1583,7 +1583,7 @@ ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event)
 		
 		if (ncol == sort_col)
 			gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), TRUE);
-		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));
 		g_signal_connect (menu_item, "activate", G_CALLBACK (sort_by_id), ethi);
 	}
 	
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index 2aa05cffc4..b31f81eef1 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -350,7 +350,7 @@ e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol,
 		gtk_widget_ensure_style (window);
 		gtk_widget_ensure_style (button);
 		g_label = GTK_BIN(button)->child;
-		g_object_add_weak_pointer (G_OBJECT (g_label), &g_label);
+		g_object_add_weak_pointer (G_OBJECT (g_label), (gpointer *) &g_label);
 		gtk_widget_ensure_style (g_label);
 	}
 
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 221abb2044..72a3decfca 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -1672,7 +1672,7 @@ eti_tree_unfreeze (GtkWidget *widget,  GdkEvent *event, ETableItem *eti)
 {
 
 	if (widget)
-		g_object_set_data (widget, "freeze-cursor", 0);
+		g_object_set_data (G_OBJECT (widget), "freeze-cursor", 0);
 
 	return FALSE;
 }
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index 3a24fa38bc..212fbedf89 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -746,7 +746,8 @@ etta_proxy_no_change (ETreeModel *etm, ETreeTableAdapter *etta)
 	e_table_model_no_change(E_TABLE_MODEL(etta));
 }
 
-guint resort_model (ETreeTableAdapter *etta)
+static gboolean
+resort_model (ETreeTableAdapter *etta)
 {
 	etta_sort_info_changed (NULL, etta);
 	return FALSE;
@@ -761,7 +762,7 @@ etta_proxy_node_changed (ETreeModel *etm, ETreePath path, ETreeTableAdapter *ett
 	/* FIXME: Really it shouldnt be required. But a lot of thread
 	 * which were supposed to be present in the list is way below
 	 */
-	g_idle_add (resort_model, etta);
+	g_idle_add ((GSourceFunc) resort_model, etta);
 }
 
 static void