gnome-utils r7891 - in trunk/baobab: . src

[marzocca svn gnome org]

Author: marzocca
Date: Wed Apr 30 20:38:17 2008
New Revision: 7891
URL: http://svn.gnome.org/viewvc/gnome-utils?rev=7891&view=rev

Log:
Gio migration

Modified:
   trunk/baobab/ChangeLog
   trunk/baobab/src/baobab-prefs.c
   trunk/baobab/src/baobab.c
   trunk/baobab/src/callbacks.c
   trunk/baobab/src/callbacks.h

Modified: trunk/baobab/src/baobab-prefs.c
==============================================================================
--- trunk/baobab/src/baobab-prefs.c	(original)
+++ trunk/baobab/src/baobab-prefs.c	Wed Apr 30 20:38:17 2008
@@ -27,7 +27,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
-#include <libgnomevfs/gnome-vfs.h>
 #include <glibtop/mountlist.h>
 #include <glibtop/fsusage.h>
 #include "baobab.h"
@@ -270,8 +269,8 @@
 		glibtop_get_fsusage (&fsusage, mountentry->mountdir);
 		fstotal = fsusage.blocks * fsusage.block_size;
 		fsavail = fsusage.bfree * fsusage.block_size;
-		total = gnome_vfs_format_file_size_for_display(fstotal);
-		avail = gnome_vfs_format_file_size_for_display(fsavail);
+		total = g_format_size_for_display(fstotal);
+		avail = g_format_size_for_display(fsavail);
 		gtk_list_store_append (model_props, &iter);
 			gtk_list_store_set (model_props, &iter,
 					    COL_CHECK, TRUE,

Modified: trunk/baobab/src/baobab.c
==============================================================================
--- trunk/baobab/src/baobab.c	(original)
+++ trunk/baobab/src/baobab.c	Wed Apr 30 20:38:17 2008
@@ -45,8 +45,8 @@
 
 #include "gedit-spinner.h"
 
-static GnomeVFSMonitorHandle *handle_mtab;
-static GnomeVFSMonitorHandle *handle_home;
+static GVolumeMonitor 	 *monitor_vol;
+static GFileMonitor	 *monitor_home;
 
 static void check_UTF (GString *);
 
@@ -632,26 +632,28 @@
 
 	baobab_create_statusbar ();
 
-	/* start VFS monitoring */
-	handle_home = NULL;
+	/* start monitoring */
+	GError	*error = NULL;
+	GFile	*file;
+	monitor_home = NULL;
 
-	volmonitor = gnome_vfs_get_volume_monitor ();
-	g_signal_connect (volmonitor, "volume_mounted",
-			  G_CALLBACK (volume_changed), NULL);
-	g_signal_connect (volmonitor, "volume_unmounted",
+	monitor_vol = g_volume_monitor_get ();
+	g_signal_connect (monitor_vol, "volume_changed",
 			  G_CALLBACK (volume_changed), NULL);
 
-	result = gnome_vfs_monitor_add (&handle_home,
-					g_get_home_dir (),
-					GNOME_VFS_MONITOR_DIRECTORY,
-					contents_changed_cb, NULL);
-
-	if (result != GNOME_VFS_OK) {
-		message (_("Could not initialize GNOME VFS monitoring"),
+	file = g_file_new_for_path (g_get_home_dir ());
+	monitor_home = g_file_monitor_directory (file, 0, NULL, NULL);
+	g_object_unref (file);
+		
+	if (!monitor_home) {
+		message (_("Could not initialize monitoring"),
 			 _("Changes to your home folder will not be monitored."),
 			 GTK_MESSAGE_WARNING, NULL);
-		g_print ("homedir:%s\n",
-			 gnome_vfs_result_to_string (result));
+		g_print ("homedir:%s\n", error->message);
+		g_error_free (error);
+	}
+	else {
+	g_signal_connect (monitor_home, "changed", G_CALLBACK (contents_changed_cb), NULL);
 	}
 }
 
@@ -661,10 +663,10 @@
 	g_free (baobab.label_scan);
 	g_string_free (baobab.last_scan_command, TRUE);
 
-	if (handle_mtab)
-		gnome_vfs_monitor_cancel (handle_mtab);
-	if (handle_home)
-		gnome_vfs_monitor_cancel (handle_home);
+	if (monitor_vol)
+		g_object_unref (monitor_vol);
+	if (monitor_home)
+		g_file_monitor_cancel (monitor_home);
 
 	g_free (baobab.selected_path);
 

Modified: trunk/baobab/src/callbacks.c
==============================================================================
--- trunk/baobab/src/callbacks.c	(original)
+++ trunk/baobab/src/callbacks.c	Wed Apr 30 20:38:17 2008
@@ -27,9 +27,6 @@
 #include <string.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libgnomevfs/gnome-vfs.h>
-#include <libgnomevfs/gnome-vfs-mime.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
 #include <gconf/gconf-client.h>
 #include <gio/gio.h>
 
@@ -285,8 +282,9 @@
 }
 
 void
-volume_changed (GnomeVFSVolumeMonitor *volume_monitor,
-		GnomeVFSVolume *volume)
+volume_changed (GVolumeMonitor *volume_monitor,
+                GVolume        *volume,
+                gpointer        user_data)
 {
 	/* filesystem has changed (mounted or unmounted device) */
 	baobab_get_filesystem (&g_fs);
@@ -295,11 +293,12 @@
 }
 
 void
-contents_changed_cb (GnomeVFSMonitorHandle *handle,
-		     const gchar *monitor_uri,
-		     const gchar *info_uri,
-		     GnomeVFSMonitorEventType event_type,
-		     gpointer user_data)
+contents_changed_cb (GFileMonitor      *file_monitor,
+              	     GFile             *child,
+              	     GFile             *other_file,
+              	     GFileMonitorEvent  event_type,
+              	     gpointer           user_data)
+
 {
 	gchar *excluding;
 
@@ -309,7 +308,7 @@
 	if (baobab.CONTENTS_CHANGED_DELAYED)
 		return;
 
-	excluding = g_path_get_basename (info_uri);
+	excluding = g_file_get_basename (child);
 	if (strcmp (excluding, ".recently-used") == 0   ||
 	    strcmp (excluding, ".gnome2_private") == 0  ||
 	    strcmp (excluding, ".xsession-errors") == 0 ||

Modified: trunk/baobab/src/callbacks.h
==============================================================================
--- trunk/baobab/src/callbacks.h	(original)
+++ trunk/baobab/src/callbacks.h	Wed Apr 30 20:38:17 2008
@@ -24,9 +24,6 @@
 #define __BAOBAB_CALLBACKS_H__
 
 #include <gtk/gtk.h>
-#include <libgnomevfs/gnome-vfs.h>
-#include <libgnomevfs/gnome-vfs-mime.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
 #include "baobab-ringschart.h"
 
 void on_about_activate (GtkMenuItem *menuitem, gpointer user_data);
@@ -49,13 +46,15 @@
 void graph_map_cb (GtkMenuItem *pmenu, gchar * path_to_string);
 void trash_dir_cb (GtkMenuItem *pmenu, gpointer dummy);
 void list_all_cb (GtkMenuItem *pmenu, gpointer dummy);
-void contents_changed_cb (GnomeVFSMonitorHandle *handle,
-			  const gchar *monitor_uri,
-			  const gchar *info_uri,
-			  GnomeVFSMonitorEventType event_type,
-			  gpointer user_data);
+void contents_changed_cb (GFileMonitor      *file_monitor,
+              	          GFile             *child,
+              	          GFile             *other_file,
+              	          GFileMonitorEvent  event_type,
+              	          gpointer           user_data);
 void on_pref_menu (GtkMenuItem *menuitem, gpointer user_data);
-void volume_changed (GnomeVFSVolumeMonitor *volume_monitor, GnomeVFSVolume *volume);
+void volume_changed (GVolumeMonitor *volume_monitor,
+                     GVolume        *volume,
+                     gpointer        user_data);
 void on_graph_close_btn_clicked (GtkButton * button, gpointer user_data);
 void on_graph_zoom_in_clicked (GtkToolButton *toolbutton, gpointer user_data);
 void on_graph_zoom_out_clicked (GtkToolButton *toolbutton, gpointer user_data);