anjuta r4403 - in trunk: . plugins/build-basic-autotools plugins/valgrind

[sgranjoux svn gnome org]

Author: sgranjoux
Date: Mon Nov 24 18:08:25 2008
New Revision: 4403
URL: http://svn.gnome.org/viewvc/anjuta?rev=4403&view=rev

Log:
	* plugins/build-basic-autotools/plugin.c:
	Removed deprecated funcs.

	* plugins/valgrind/vgrule-list.c,
	plugins/valgrind/vgactions.c:
	Removed deprecated funcs.


Modified:
   trunk/ChangeLog
   trunk/plugins/build-basic-autotools/plugin.c
   trunk/plugins/valgrind/vgactions.c
   trunk/plugins/valgrind/vgrule-list.c

Modified: trunk/plugins/build-basic-autotools/plugin.c
==============================================================================
--- trunk/plugins/build-basic-autotools/plugin.c	(original)
+++ trunk/plugins/build-basic-autotools/plugin.c	Mon Nov 24 18:08:25 2008
@@ -1776,7 +1776,7 @@
 {
 	if (plugin->current_editor_filename)
 	{
-		gchar *dirname = g_dirname (plugin->current_editor_filename);
+		gchar *dirname = g_path_get_dirname (plugin->current_editor_filename);
 		
 		build_build_file_or_dir (plugin, dirname, NULL, NULL, NULL);
 		
@@ -1789,7 +1789,7 @@
 {
 	if (plugin->current_editor_filename)
 	{
-		gchar *dirname = g_dirname (plugin->current_editor_filename);
+		gchar *dirname = g_path_get_dirname (plugin->current_editor_filename);
 		
 		build_install_dir (plugin, dirname, NULL);
 		
@@ -1802,7 +1802,7 @@
 {
 	if (plugin->current_editor_filename)
 	{
-		gchar *dirname = g_dirname (plugin->current_editor_filename);
+		gchar *dirname = g_path_get_dirname (plugin->current_editor_filename);
 		
 		build_clean_dir (plugin, dirname, NULL);
 		
@@ -2242,11 +2242,11 @@
 		gchar *dirname;
 		gchar *build_dirname;
 
-		dirname = g_dirname (bb_plugin->current_editor_filename);
+		dirname = g_path_get_dirname (bb_plugin->current_editor_filename);
 		build_dirname = build_dir_from_source (bb_plugin, dirname);
 		
-		module = escape_label (g_basename (dirname));
-		filename = escape_label (g_basename (bb_plugin->current_editor_filename));
+		module = escape_label (g_path_get_basename (dirname));
+		filename = escape_label (g_path_get_basename (bb_plugin->current_editor_filename));
 		has_makefile = directory_has_makefile (build_dirname);
 		g_free (build_dirname);
 		g_free (dirname);

Modified: trunk/plugins/valgrind/vgactions.c
==============================================================================
--- trunk/plugins/valgrind/vgactions.c	(original)
+++ trunk/plugins/valgrind/vgactions.c	Mon Nov 24 18:08:25 2008
@@ -299,7 +299,7 @@
 	vg_tool_view_disconnect (VG_TOOL_VIEW (priv->view));
 	
 	if (priv->gio) {
-		g_io_channel_close (priv->gio);
+		g_io_channel_shutdown (priv->gio, TRUE, NULL);
 		g_io_channel_unref (priv->gio);
 		priv->watch_id = 0;
 		priv->gio = NULL;

Modified: trunk/plugins/valgrind/vgrule-list.c
==============================================================================
--- trunk/plugins/valgrind/vgrule-list.c	(original)
+++ trunk/plugins/valgrind/vgrule-list.c	Mon Nov 24 18:08:25 2008
@@ -458,7 +458,7 @@
 	VgRuleList *list = (VgRuleList *) obj;
 	
 	if (list->gio != NULL) {
-		g_io_channel_close (list->gio);
+		g_io_channel_shutdown (list->gio, TRUE, NULL);
 		g_io_channel_unref (list->gio);
 		list->load_id = 0;
 		list->gio = NULL;
@@ -505,7 +505,7 @@
 	vg_rule_parser_free (list->parser);
 	list->parser = NULL;
 	
-	g_io_channel_close (list->gio);
+	g_io_channel_shutdown (list->gio, TRUE, NULL);
 	g_io_channel_unref (list->gio);
 	list->load_id = 0;
 	list->gio = NULL;
@@ -570,7 +570,7 @@
 		if (list->load_id != 0) {
 			/* this means the file is currently being loaded. ugh */
 			vg_rule_parser_free (list->parser);
-			g_io_channel_close (list->gio);
+			g_io_channel_shutdown (list->gio, TRUE, NULL);
 			g_io_channel_unref (list->gio);
 			list->load_id = 0;
 			list->gio = NULL;