gvfs r1240 - in trunk: . daemon hal

[alexl svn gnome org]

Author: alexl
Date: Fri Feb  8 15:05:14 2008
New Revision: 1240
URL: http://svn.gnome.org/viewvc/gvfs?rev=1240&view=rev

Log:
2008-02-08  Alexander Larsson  <alexl redhat com>

        * daemon/gvfsbackendcomputer.c:
	Add "filesystem" to computer:
	
        * hal/ghalmount.c:
	Remove spew




Modified:
   trunk/ChangeLog
   trunk/daemon/gvfsbackendcomputer.c
   trunk/hal/ghalmount.c

Modified: trunk/daemon/gvfsbackendcomputer.c
==============================================================================
--- trunk/daemon/gvfsbackendcomputer.c	(original)
+++ trunk/daemon/gvfsbackendcomputer.c	Fri Feb  8 15:05:14 2008
@@ -459,6 +459,15 @@
       g_free (basename);
       file->filename = filename;
     }
+  
+  file = g_slice_new0 (ComputerFile);
+  file->filename = g_strdup ("root.link");
+  file->display_name = g_strdup (_("Filesystem"));
+  file->icon = g_themed_icon_new ("drive-harddisk");
+  file->root = g_file_new_for_path ("/");
+  file->prio = 0;
+  
+  files = g_list_prepend (files, file);
 
   files = g_list_sort (files, (GCompareFunc)sort_file_by_filename);
 
@@ -817,8 +826,8 @@
 
 static void
 unmount_mount_cb (GObject *source_object,
-		  GAsyncResult *res,
-		  gpointer user_data)
+                  GAsyncResult *res,
+                  gpointer user_data)
 {
   GVfsJobMountMountable *job = user_data;
   GError *error;

Modified: trunk/hal/ghalmount.c
==============================================================================
--- trunk/hal/ghalmount.c	(original)
+++ trunk/hal/ghalmount.c	Fri Feb  8 15:05:14 2008
@@ -227,7 +227,6 @@
   icon = g_file_icon_new (icon_file);
   g_object_unref (icon_file);
 
-  g_print ("Found new cdrom icon %p\n", icon);
   g_hal_mount_override_icon (data->mount, icon);
   g_object_unref (icon);
   
@@ -475,8 +474,6 @@
   char *old_name;
   GIcon *old_icon;
 
-  g_print ("update from hal %s, emit_changed: %d\n", m->name, emit_changed);
-  
   old_name = g_strdup (m->name);
   old_icon = m->icon != NULL ? g_object_ref (m->icon) : NULL;
 
@@ -485,12 +482,6 @@
     g_object_unref (m->icon);
   do_update_from_hal (m);
 
-  g_print ("new icon type = %s\n",
-           g_type_name_from_instance (m->icon));
-  if (m->override_icon)
-    g_print ("new override icon type = %s\n",
-             g_type_name_from_instance (m->override_icon));
-  
   if (emit_changed)
     {
       if (old_name == NULL || 
@@ -498,7 +489,6 @@
           strcmp (old_name, m->name) != 0 ||
           (! g_icon_equal (old_icon, m->icon)))
         {
-          g_print ("emitting changed\n");
           g_signal_emit_by_name (m, "changed");
           if (m->volume_monitor != NULL)
             g_signal_emit_by_name (m->volume_monitor, "mount_changed", m);