[gnome-db] [PATCH] - libgnomedb/gnome-db-grid.c

[Stephane Wirtel <stephane wirtel brutele be>]

Hi Rodrigo !!


This patch removes some warnings from gnome-db-grid.c

matrixise

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libgnomedb/ChangeLog,v
retrieving revision 1.270
diff -u -r1.270 ChangeLog
--- ChangeLog	17 Dec 2003 15:35:41 -0000	1.270
+++ ChangeLog	17 Dec 2003 19:52:25 -0000
@@ -1,5 +1,12 @@
 2003-12-17  Stephane Wirtel <stephane wirtel brutele be>
 
+	* libgnomedb/gnome-db-grid.c (tree_view_row_activated_cb, 
+	popup_button_pressed_cb): add a cast GTK_TREE_VIEW, G_CALLBACK, 
+	and change g_return_if_fail to g_return_val_if_fail in 
+	popup_button_pressed_cb.
+	
+2003-12-17  Stephane Wirtel <stephane wirtel brutele be>
+
 	* libgnomedb/gnome-db-grid.[ch] (gnome_db_grid_get_column_title,
 	gnome_db_grid_set_column_title): new API functions.
 
Index: libgnomedb/gnome-db-grid.c
===================================================================
RCS file: /cvs/gnome/libgnomedb/libgnomedb/gnome-db-grid.c,v
retrieving revision 1.50
diff -u -r1.50 gnome-db-grid.c
--- libgnomedb/gnome-db-grid.c	17 Dec 2003 15:35:42 -0000	1.50
+++ libgnomedb/gnome-db-grid.c	17 Dec 2003 19:52:27 -0000
@@ -365,23 +365,23 @@
 	GtkWidget *menu;
 	GnomeDbGrid *grid = (GnomeDbGrid *) user_data;
 
-	g_return_if_fail (GNOME_DB_IS_GRID (grid));
+	g_return_val_if_fail (GNOME_DB_IS_GRID (grid), FALSE);
 
 	if (event->button != 3)
 		return FALSE;
 
 	/* create the menu */
 	menu = gtk_menu_new ();
-	add_popup_menu_item (GTK_MENU (menu), _("Select All"), FALSE, menu_select_all_cb, grid);
-	add_popup_menu_item (GTK_MENU (menu), _("Clear selection"), FALSE, menu_unselect_all_cb, grid);
-	add_popup_menu_item (GTK_MENU (menu), _("Show columns"), FALSE, menu_show_columns_cb, grid);
-	add_popup_menu_item (GTK_MENU (menu), _("Hide columns"), FALSE, menu_hide_columns_cb, grid);
+	add_popup_menu_item (GTK_MENU (menu), _("Select All"), FALSE, G_CALLBACK (menu_select_all_cb), grid);
+	add_popup_menu_item (GTK_MENU (menu), _("Clear selection"), FALSE, G_CALLBACK (menu_unselect_all_cb), grid);
+	add_popup_menu_item (GTK_MENU (menu), _("Show columns"), FALSE, G_CALLBACK (menu_show_columns_cb), grid);
+	add_popup_menu_item (GTK_MENU (menu), _("Hide columns"), FALSE, G_CALLBACK (menu_hide_columns_cb), grid);
 #ifdef BUILD_WITH_GNOME
-	add_popup_menu_item (GTK_MENU (menu), GTK_STOCK_SAVE_AS, TRUE, menu_save_as_cb, grid);
+	add_popup_menu_item (GTK_MENU (menu), GTK_STOCK_SAVE_AS, TRUE, G_CALLBACK (menu_save_as_cb), grid);
 #endif
 #if 0
-	add_popup_menu_item (GTK_MENU (menu), _("Describe"), menu_describe_cb, grid);
-	add_popup_menu_item (GTK_MENU (menu), _("View detail..."), menu_view_detail_cb, grid);
+	add_popup_menu_item (GTK_MENU (menu), _("Describe"), G_CALLBACK (menu_describe_cb), grid);
+	add_popup_menu_item (GTK_MENU (menu), _("View detail..."), G_CALLBACK (menu_view_detail_cb), grid);
 #endif
 
 	/* allow listeners to add their custom menu items */
@@ -451,10 +451,10 @@
 
 	g_return_if_fail (GNOME_DB_IS_GRID (grid));
 
-	if (!gtk_tree_model_get_iter (gtk_tree_view_get_model (grid->priv->tree_view), &iter, path))
+	if (!gtk_tree_model_get_iter (gtk_tree_view_get_model (GTK_TREE_VIEW (grid->priv->tree_view)), &iter, path))
 		return;
 
-	gtk_tree_model_get (gtk_tree_view_get_model (grid->priv->tree_view), &iter, 0, &info, -1);
+	gtk_tree_model_get (gtk_tree_view_get_model (GTK_TREE_VIEW (grid->priv->tree_view)), &iter, 0, &info, -1);
 	if (!info)
 		return;