Update the network backend to use inline files and remove the default

2008-02-22  Alexander Larsson  <alexl@redhat.com>

        * daemon/gvfsbackendnetwork.c:
	Update the network backend to use inline files and
	remove the default workgroup link. Also add dns-sd
	support (not used yet). (#509600)
	Patch from A. Walton



svn path=/trunk/; revision=1329

2 files changed, 398 insertions, 104 deletions

diff --git a/ChangeLog b/ChangeLog
index 52fe6fc3..cc382448 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-22  Alexander Larsson  <alexl@redhat.com>
+
+        * daemon/gvfsbackendnetwork.c:
+	Update the network backend to use inline files and
+	remove the default workgroup link. Also add dns-sd
+	support (not used yet). (#509600)
+	Patch from A. Walton
+
 2008-02-22  Carlos Garcia Campos  <carlosgc@gnome.org>
 
 	* daemon/gvfsbackendsftp.c: (handle_login), (do_mount):
diff --git a/daemon/gvfsbackendnetwork.c b/daemon/gvfsbackendnetwork.c
index 059bb377..4db99c1b 100644
--- a/daemon/gvfsbackendnetwork.c
+++ b/daemon/gvfsbackendnetwork.c
@@ -22,12 +22,6 @@
  *       Andrew Walton <awalton@svn.gnome.org> (port only)
  */
 
-/* 
-  TODO: 
-  Add DNS-SD when there's an appropriate backend.
-  Add file/directory monitor events (only really necessary after we add DNS-SD).
- */
-
 #include <config.h>
 
 #include <string.h>
@@ -49,27 +43,45 @@
 #define PATH_GCONF_GVFS_SMB_WORKGROUP "/system/smb/workgroup"
 #define DEFAULT_WORKGROUP_NAME "X-GNOME-DEFAULT-WORKGROUP"
 
+#define PATH_GCONF_GVFS_DNS_SD "/system/dns_sd/"
+#define PATH_GCONF_GVFS_DNS_SD_DISPLAY_LOCAL "/system/dns_sd/display_local"
+#define PATH_GCONF_GVFS_DNS_SD_EXTRA_DOMAINS "/system/dns_sd/extra_domains"
+
 typedef struct {
-  char *filename; 
+  char *file_name; 
   char *display_name;
   char *target_uri;
-  GFile *root;
   GIcon *icon;
 } NetworkFile;
 
 static NetworkFile root = { "/" };
 
+typedef enum {
+	NETWORK_LOCAL_DISABLED,
+	NETWORK_LOCAL_MERGED,
+	NETWORK_LOCAL_SEPARATE
+} NetworkLocalSetting;
+
 struct _GVfsBackendNetwork
 {
   GVfsBackend parent_instance;
   GVfsMonitor *root_monitor;
   GMountSpec *mount_spec;
-
   GList *files; /* list of NetworkFiles */
+  int idle_tag;
 
   /* SMB Stuff */
   gboolean have_smb;
-  char *current_workgroup; 
+  char *current_workgroup;
+
+  /* DNS-SD Stuff */
+  gboolean have_dnssd;
+  NetworkLocalSetting local_setting;
+  char *extra_domains;
+
+  /* Icons */
+  GIcon *workgroup_icon; /* GThemedIcon = "network-workgroup" */
+  GIcon *server_icon; /* GThemedIcon = "network-server" */
 };
 
 typedef struct _GVfsBackendNetwork GVfsBackendNetwork;
@@ -77,20 +89,19 @@ typedef struct _GVfsBackendNetwork GVfsBackendNetwork;
 G_DEFINE_TYPE (GVfsBackendNetwork, g_vfs_backend_network, G_VFS_TYPE_BACKEND);
 
 static NetworkFile *
-network_file_new (const char *filename, 
+network_file_new (const char *file_name, 
                   const char *display_name, 
                   const char *target_uri, 
-                  const char *icon)
+                  GIcon *icon)
 {
   NetworkFile *file;
   
-  file = g_slice_new (NetworkFile);
+  file = g_slice_new0 (NetworkFile);
 
-  file->filename = g_strdup (filename);
+  file->file_name = g_strdup (file_name);
   file->display_name = g_strdup (display_name);
   file->target_uri = g_strdup (target_uri);
-  file->icon = g_themed_icon_new (icon);
-  file->root = g_file_new_for_path ("/");
+  file->icon = g_object_ref (icon);
 
   return file;
 }
@@ -98,74 +109,324 @@ network_file_new (const char *filename,
 static void
 network_file_free (NetworkFile *file)
 {
-  g_free (file->filename);
+  g_free (file->file_name);
   g_free (file->display_name);
   g_free (file->target_uri);
  
   if (file->icon)
     g_object_unref (file->icon);
 
-  if (file->root)
-    g_object_unref (file->root);
-
   g_slice_free (NetworkFile, file);
 }
 
+static gboolean
+network_file_equal (NetworkFile *a,
+                    NetworkFile *b)
+{
+  if (!g_icon_equal (a->icon, b->icon))
+    return FALSE;
+
+  if ((a->file_name != NULL && b->file_name != NULL) &&
+      (a->file_name != NULL && b->file_name == NULL) ||
+      (a->file_name == NULL && b->file_name != NULL))
+    return FALSE;
+
+  if (strcmp (a->file_name, b->file_name) != 0)
+    return FALSE;
+
+  if ((a->display_name != NULL && b->display_name != NULL) &&
+      (a->display_name != NULL && b->display_name == NULL) ||
+      (a->display_name == NULL && b->display_name != NULL))
+    return FALSE;
+
+  if (strcmp (a->display_name, b->display_name) != 0)
+    return FALSE;
+
+  return TRUE;
+}
+
 static int
-sort_file_by_filename (NetworkFile *a, NetworkFile *b)
+sort_file_by_file_name (NetworkFile *a, NetworkFile *b)
 {
-  return strcmp (a->filename, b->filename);
+  return strcmp (a->file_name, b->file_name);
+}
+
+static NetworkLocalSetting
+parse_network_local_setting (const char *setting)
+{
+  if (setting == NULL)
+    return NETWORK_LOCAL_DISABLED;
+  if (strcmp (setting, "separate") == 0)
+    return NETWORK_LOCAL_SEPARATE;
+  if (strcmp (setting, "merged") == 0)
+    return NETWORK_LOCAL_MERGED;
+  return NETWORK_LOCAL_DISABLED;
+}
+
+static void
+update_from_files (GVfsBackendNetwork *backend,
+                   GList *files)
+{
+  GList *old_files;
+  GList *oldl, *newl;
+  char *file_name;
+  NetworkFile *old, *new;
+  int cmp;
+
+  old_files = backend->files;
+  backend->files = g_list_sort (files, (GCompareFunc)sort_file_by_file_name);
+
+  /* Generate change events */
+  oldl = old_files;
+  newl = backend->files;
+  while (oldl != NULL || newl != NULL)
+    {
+      if (oldl == NULL)
+        {
+          cmp = 1;
+          new = newl->data;
+          old = NULL;
+        }
+      else if (newl == NULL)
+        {
+          cmp = -1;
+          new = NULL;
+          old = oldl->data;
+        }
+      else
+        {
+          new = newl->data;
+          old = oldl->data;
+          cmp = sort_file_by_file_name(old, new);
+        }
+      
+      if (cmp == 0)
+        {
+          if (!network_file_equal (old, new))
+            {
+              file_name = g_strconcat ("/", new->file_name, NULL);
+              g_vfs_monitor_emit_event (backend->root_monitor,
+                                        G_FILE_MONITOR_EVENT_CHANGED,
+                                        file_name,
+                                        NULL);
+              g_free (file_name);
+            }
+          
+          oldl = oldl->next;
+          newl = newl->next;
+        }
+      else if (cmp < 0)
+        {
+          file_name = g_strconcat ("/", old->file_name, NULL);
+          g_vfs_monitor_emit_event (backend->root_monitor,
+                                    G_FILE_MONITOR_EVENT_DELETED,
+                                    file_name,
+                                    NULL);
+          g_free (file_name);
+          oldl = oldl->next;
+        }
+      else
+        {
+          file_name = g_strconcat ("/", new->file_name, NULL);
+          g_vfs_monitor_emit_event (backend->root_monitor,
+                                    G_FILE_MONITOR_EVENT_CREATED,
+                                    file_name,
+                                    NULL);
+          g_free (file_name);
+          newl = newl->next;
+        }
+    }
+
+  g_list_foreach (old_files, (GFunc)network_file_free, NULL);
 }
 
 static void
 recompute_files (GVfsBackendNetwork *backend)
 {
+  GFile *server_file;
+  GFileEnumerator *enumer;
+  GFileInfo *info;
+  GList *files;
   NetworkFile *file;
-  char *workgroup;
-  char *workgroup_name;
+  char *file_name, *link_uri;
 
-  g_list_foreach (backend->files, (GFunc)network_file_free, NULL);
+  files = NULL;
 
   if (backend->have_smb) 
     {
-      file = network_file_new ("smblink-root", _("Windows Network"), 
-			       "smb:///", "network-workgroup");
-      backend->files = g_list_prepend (backend->files, file);
+      char *workgroup;
+      
+      /* smb:/// root link */
+      file = network_file_new ("smb-root", _("Windows Network"), 
+                               "smb:///", backend->workgroup_icon);
+      files = g_list_prepend (files, file);
 
       if (backend->current_workgroup == NULL ||
-	  backend->current_workgroup[0] == 0)
+         backend->current_workgroup[0] == 0)
+        workgroup = g_strconcat ("smb://", DEFAULT_WORKGROUP_NAME, "/", NULL);  
+      else 
+        workgroup = g_strconcat ("smb://", backend->current_workgroup, "/", NULL);    
+
+      /* children of current workgroup */
+      server_file = g_file_new_for_uri (workgroup);
+      enumer = g_file_enumerate_children (server_file, 
+                                          "standard::name,standard::display-name", 
+                                          G_FILE_QUERY_INFO_NONE, 
+                                          NULL, NULL);
+      if (enumer != NULL)
         {
-          workgroup = g_strdup_printf("smb://%s/", DEFAULT_WORKGROUP_NAME);
-          workgroup_name = g_strdup (_("Default Workgroup"));
-        }
-      else
-	{
-          char *tmp_workgroup = g_strdup_printf("smb://%s/", backend->current_workgroup);
-          workgroup = g_uri_escape_string (tmp_workgroup, NULL, FALSE);
-          g_free(tmp_workgroup);
-          workgroup_name = g_strdup (backend->current_workgroup);
+          info = g_file_enumerator_next_file (enumer, NULL, NULL);
+          while (info != NULL)
+            {
+              file_name = g_strconcat("smb-server-", g_file_info_get_name (info), NULL);
+              link_uri = g_strconcat("smb://", g_file_info_get_name (info), "/", NULL);
+              file = network_file_new (file_name, 
+                                       g_file_info_get_display_name (info), 
+                                       link_uri, 
+                                       backend->server_icon);
+              files = g_list_prepend (files, file);
+
+              g_free(link_uri);
+              g_free(file_name);
+              g_object_unref(info);
+              info = g_file_enumerator_next_file (enumer, NULL, NULL);
+            }
         }
-      
-      file = network_file_new ("smblink-workgroup", workgroup_name, 
-                               workgroup, "network-workgroup");
-      
-      backend->files = g_list_prepend (backend->files, file);
+    
+      g_file_enumerator_close(enumer, NULL, NULL);
+      g_object_unref(enumer);
+      g_object_unref(server_file);
+
       g_free(workgroup);
-      g_free(workgroup_name);
     }
+
+  if (backend->have_dnssd)
+    {
+      if (backend->local_setting == NETWORK_LOCAL_MERGED)
+        {
+          /* "merged": add local domains to network:/// */
+          server_file = g_file_new_for_uri ("dns-sd://local/");
+          enumer = g_file_enumerate_children (server_file, 
+                                              "standard::name,standard::display-name", 
+                                              G_FILE_QUERY_INFO_NONE, 
+                                              NULL, NULL);
+        if (enumer != NULL)
+          {
+            info = g_file_enumerator_next_file (enumer, NULL, NULL);
+            while (info != NULL)
+              {
+                file_name = g_strconcat("dnssd-domain-", g_file_info_get_name (info), NULL);
+                link_uri = g_strconcat("dnssd://", g_file_info_get_name (info), NULL);
+                file = network_file_new (file_name, 
+                                         g_file_info_get_display_name (info), 
+                                         link_uri, 
+                                         backend->server_icon);
+                files = g_list_prepend (files, file);
+
+                g_free(link_uri);
+                g_free(file_name);
+                g_object_unref(info);
+                info = g_file_enumerator_next_file (enumer, NULL, NULL);
+              }
+           }
+    
+          g_file_enumerator_close(enumer, NULL, NULL);
+          g_object_unref(enumer);
+          g_object_unref(server_file);
+        }
+      else
+        {
+          /* "separate": a link to dns-sd://local/ */
+          file = network_file_new ("dnssd-local", _("Local network"), 
+				   "dns-sd://local/", backend->workgroup_icon);
+          files = g_list_prepend (files, file);   
+        }
+
+    /* If gconf setting "/system/dns_sd/extra_domains" is set to a list of domains:
+     * links to dns-sd://$domain/ */
+    if (backend->current_workgroup == NULL ||
+       backend->current_workgroup[0] == 0)
+      {
+        char **domains;
+        int i;
+        domains = g_strsplit (backend->extra_domains, ",", 0);
+        for (i=0; domains[i] != NULL; i++)
+          {
+            file_name = g_strconcat("dnssd-domain-", domains[i], NULL);
+            link_uri = g_strconcat("dns-sd://", domains[i], "/", NULL);
+            file = network_file_new (file_name,
+                                     domains[i],
+                                     link_uri,
+                                     backend->server_icon);
+            files = g_list_prepend (files, file);   
+            g_free(link_uri);
+            g_free(file_name);
+          }
+        g_strfreev (domains);
+      } 
+    } 
+
+  update_from_files (backend, files);
+}
+
+static gboolean
+idle_add_recompute (GVfsBackendNetwork *backend)
+{
+  backend->idle_tag = 0;
+
+  recompute_files (backend);
   
-  backend->files = g_list_sort (backend->files, 
-                                (GCompareFunc)sort_file_by_filename);
+  return FALSE;
 }
 
 static void
-notify_gconf_value_changed (GConfClient *client,
-                            guint        cnxn_id,
-                            GConfEntry  *entry,
-                            gpointer     data)
+notify_gconf_dnssd_domains_changed (GConfClient *client,
+				    guint        cnxn_id,
+				    GConfEntry  *entry,
+				    gpointer     data)
 {
   GVfsBackendNetwork *backend = G_VFS_BACKEND_NETWORK(data);
+  char *extra_domains;
+  extra_domains = gconf_client_get_string (client, 
+                                           PATH_GCONF_GVFS_DNS_SD_EXTRA_DOMAINS, NULL);
+
+  g_free(backend->extra_domains);
+  backend->extra_domains = extra_domains;
+
+  if (backend->idle_tag != 0)
+    g_source_remove (backend->idle_tag);
+  
+  backend->idle_tag = g_idle_add ((GSourceFunc)idle_add_recompute, backend);
+}
+
+static void
+notify_gconf_dnssd_display_local_changed (GConfClient *client,
+                                          guint        cnxn_id,
+                                          GConfEntry  *entry,
+                                          gpointer     data)
+{
+  GVfsBackendNetwork *backend = G_VFS_BACKEND_NETWORK(data);
+  char *display_local;
+ 
+  display_local = gconf_client_get_string (client, 
+                                           PATH_GCONF_GVFS_DNS_SD_DISPLAY_LOCAL, NULL);
+
+  backend->local_setting = parse_network_local_setting (display_local);
+  g_free(display_local);
 
+  if (backend->idle_tag != 0)
+    g_source_remove (backend->idle_tag);
+  
+  backend->idle_tag = g_idle_add ((GSourceFunc)idle_add_recompute, backend);
+}
+
+static void
+notify_gconf_smb_workgroup_changed (GConfClient *client,
+				    guint        cnxn_id,
+				    GConfEntry  *entry,
+				    gpointer     data)
+{
+  GVfsBackendNetwork *backend = G_VFS_BACKEND_NETWORK(data);
   char *current_workgroup;
 
   current_workgroup = gconf_client_get_string (client,
@@ -173,36 +434,38 @@ notify_gconf_value_changed (GConfClient *client,
 
   g_free(backend->current_workgroup);
   backend->current_workgroup = current_workgroup;
+
+  if (backend->idle_tag != 0)
+    g_source_remove (backend->idle_tag);
   
-  recompute_files (backend);
-  g_vfs_monitor_emit_event (backend->root_monitor, G_FILE_MONITOR_EVENT_CHANGED, 
-                            "/smblink-workgroup", NULL);
+  backend->idle_tag = g_idle_add ((GSourceFunc)idle_add_recompute, backend);
+
 }
 
 static NetworkFile *
 lookup_network_file (GVfsBackendNetwork *backend,
                      GVfsJob *job,
-                     const char *filename)
+                     const char *file_name)
 {
   GList *l;
   NetworkFile *file;
 
-  if (*filename != '/')
+  if (*file_name != '/')
     goto out;
 
-  while (*filename == '/')
-    filename++;
+  while (*file_name == '/')
+    file_name++;
 
-  if (*filename == 0)
+  if (*file_name == 0)
     return &root;
   
-  if (strchr (filename, '/') != NULL)
+  if (strchr (file_name, '/') != NULL)
     goto out;
   
   for (l = backend->files; l != NULL; l = l->next)
     {
       file = l->data;
-      if (strcmp (file->filename, filename) == 0)
+      if (strcmp (file->file_name, file_name) == 0)
         return file;
     }
 
@@ -219,30 +482,20 @@ static void
 file_info_from_file (NetworkFile *file,
                      GFileInfo *info)
 {
-  char *uri;
-  
-  g_file_info_set_name (info, file->filename);
+  g_return_if_fail (file != NULL || info != NULL);
+
+  g_file_info_set_name (info, file->file_name);
   g_file_info_set_display_name (info, file->display_name);
 
   if (file->icon) 
     g_file_info_set_icon (info, file->icon);
 
-  if (file->root)
-    {
-      uri = g_file_get_uri (file->root);
-      g_file_info_set_attribute_string(info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI, uri);
-      g_free (uri);
-    }
-
   g_file_info_set_file_type (info, G_FILE_TYPE_SHORTCUT);
   g_file_info_set_size(info, 0);
-  g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_READ, FALSE);
   g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, FALSE);
   g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE, FALSE);
   g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH, FALSE);
   g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_VIRTUAL, TRUE);
-  /* little bit of stuff here to make looking up network links faster for those who 
-   * who know about the STANDARD_TARGET_URI attrib. */
   g_file_info_set_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI, 
                                     file->target_uri);
 }
@@ -251,16 +504,15 @@ file_info_from_file (NetworkFile *file,
 static gboolean
 try_enumerate (GVfsBackend *backend,
                GVfsJobEnumerate *job,
-               const char *filename,
+               const char *file_name,
                GFileAttributeMatcher *attribute_matcher,
                GFileQueryInfoFlags flags)
 {
   NetworkFile *file;
   GList *l;
   GFileInfo *info;
-
   file = lookup_network_file (G_VFS_BACKEND_NETWORK (backend),
-			      G_VFS_JOB (job), filename);
+			      G_VFS_JOB (job), file_name);
   
   if (file != &root)
     {
@@ -291,7 +543,7 @@ try_enumerate (GVfsBackend *backend,
 static gboolean
 try_query_info (GVfsBackend *backend,
                 GVfsJobQueryInfo *job,
-                const char *filename,
+                const char *file_name,
                 GFileQueryInfoFlags flags,
                 GFileInfo *info,
                 GFileAttributeMatcher *matcher)
@@ -299,7 +551,7 @@ try_query_info (GVfsBackend *backend,
   NetworkFile *file;
 
   file = lookup_network_file (G_VFS_BACKEND_NETWORK (backend), 
-                              G_VFS_JOB (job), filename);
+                              G_VFS_JOB (job), file_name);
 
   if (file == &root)
     {
@@ -314,7 +566,6 @@ try_query_info (GVfsBackend *backend,
       g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE, FALSE);
       g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH, FALSE);
       g_file_info_set_content_type (info, "inode/directory");
-
       g_vfs_job_succeeded (G_VFS_JOB (job));
     }
   else if (file != NULL)
@@ -346,7 +597,7 @@ try_mount (GVfsBackend *backend,
 static gboolean
 try_create_monitor (GVfsBackend *backend,
                     GVfsJobCreateMonitor *job,
-                    const char *filename,
+                    const char *file_name,
                     GFileMonitorFlags flags)
 {
   NetworkFile *file;
@@ -354,7 +605,7 @@ try_create_monitor (GVfsBackend *backend,
 
   network_backend = G_VFS_BACKEND_NETWORK (backend);
 
-  file = lookup_network_file (network_backend, G_VFS_JOB (job), filename);
+  file = lookup_network_file (network_backend, G_VFS_JOB (job), file_name);
 
   if (file != &root)
     {
@@ -375,41 +626,73 @@ g_vfs_backend_network_init (GVfsBackendNetwork *network_backend)
 {
   GVfsBackend *backend = G_VFS_BACKEND (network_backend);
   GMountSpec *mount_spec;
-  char *current_workgroup;
   GConfClient *gconf_client;
+  char *display_local, *extra_domains;
+  char *current_workgroup;
   const char * const* supported_vfs;
   int i;
 
-  gconf_client = gconf_client_get_default ();
+  supported_vfs = g_vfs_get_supported_uri_schemes (g_vfs_get_default ());
 
-  gconf_client_add_dir (gconf_client, PATH_GCONF_GVFS_SMB, 
-                        GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
+  network_backend->have_smb = FALSE;
+  for (i=0; supported_vfs[i]!=NULL; i++)
+    {
+      if (strcmp(supported_vfs[i], "smb") == 0)
+	network_backend->have_smb = TRUE;
 
-  current_workgroup = gconf_client_get_string (gconf_client, 
-                                               PATH_GCONF_GVFS_SMB_WORKGROUP, NULL);
+      if (strcmp(supported_vfs[i], "dnssd") == 0)
+        network_backend->have_dnssd = TRUE;
+    }
 
-  if (current_workgroup == NULL ||
-      current_workgroup[0] == 0) 
-    /* it's okay if current_workgroup is null here, 
-     * it's checked before the NetworkFile is added anyway. */
-    network_backend->current_workgroup = NULL;
-  else 
-    network_backend->current_workgroup = current_workgroup;
+  gconf_client = gconf_client_get_default ();
 
-  gconf_client_notify_add (gconf_client, PATH_GCONF_GVFS_SMB_WORKGROUP, 
-                           notify_gconf_value_changed, backend, NULL, NULL);
+  if (network_backend->have_smb) 
+    {
+      gconf_client_add_dir (gconf_client, PATH_GCONF_GVFS_SMB, 
+                            GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
 
-  g_object_unref (gconf_client);
+      current_workgroup = gconf_client_get_string (gconf_client, 
+                                                   PATH_GCONF_GVFS_SMB_WORKGROUP, NULL);
 
-  supported_vfs = g_vfs_get_supported_uri_schemes (g_vfs_get_default ());
+      if (current_workgroup == NULL ||
+          current_workgroup[0] == 0) 
+        /* it's okay if current_workgroup is null here, 
+         * it's checked before the NetworkFile is added anyway. */
+        network_backend->current_workgroup = NULL;
+      else 
+        network_backend->current_workgroup = current_workgroup;
 
-  network_backend->have_smb = FALSE;
-  for (i=0; supported_vfs[i]!=NULL; i++)
+      gconf_client_notify_add (gconf_client, PATH_GCONF_GVFS_SMB_WORKGROUP, 
+                               notify_gconf_smb_workgroup_changed, network_backend, NULL, NULL);
+
+     }
+
+  if (network_backend->have_dnssd) 
     {
-      if (strcmp(supported_vfs[i], "smb") == 0 )
-	network_backend->have_smb = TRUE;
+      gconf_client_add_dir (gconf_client, PATH_GCONF_GVFS_DNS_SD, 
+                            GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
+
+      display_local = gconf_client_get_string (gconf_client, 
+                                               PATH_GCONF_GVFS_DNS_SD_DISPLAY_LOCAL, NULL);
+      extra_domains = gconf_client_get_string (gconf_client, 
+                                               PATH_GCONF_GVFS_DNS_SD_EXTRA_DOMAINS, NULL);
+      
+      if (display_local != NULL && display_local[0] != 0)
+         network_backend->local_setting = parse_network_local_setting (display_local);
+
+      g_free(display_local);
+      network_backend->extra_domains = extra_domains;
+
+      gconf_client_notify_add (gconf_client, PATH_GCONF_GVFS_DNS_SD_EXTRA_DOMAINS, 
+                               notify_gconf_dnssd_domains_changed, network_backend, NULL, NULL);
+     
+      gconf_client_notify_add (gconf_client, PATH_GCONF_GVFS_DNS_SD_DISPLAY_LOCAL, 
+                               notify_gconf_dnssd_display_local_changed, network_backend, NULL, NULL);
+
     }
 
+  g_object_unref (gconf_client);
+
   g_vfs_backend_set_display_name (backend, _("Network"));
   g_vfs_backend_set_stable_name (backend, _("Network"));
   g_vfs_backend_set_icon_name (backend, "network-workgroup");
@@ -418,18 +701,21 @@ g_vfs_backend_network_init (GVfsBackendNetwork *network_backend)
   mount_spec = g_mount_spec_new ("network");
   g_vfs_backend_set_mount_spec (backend, mount_spec);
   network_backend->mount_spec = mount_spec;
+
+  network_backend->workgroup_icon = g_themed_icon_new ("network-workgroup");
+  network_backend->server_icon = g_themed_icon_new ("network-server");
 }
 
 static void
 g_vfs_backend_network_finalize (GObject *object)
 {
   GVfsBackendNetwork *backend;
-
   backend = G_VFS_BACKEND_NETWORK (object);
 
   g_mount_spec_unref (backend->mount_spec);
-
   g_object_unref (backend->root_monitor);
+  g_object_unref (backend->workgroup_icon);
+  g_object_unref (backend->server_icon);
   
   if (G_OBJECT_CLASS (g_vfs_backend_network_parent_class)->finalize)
     (*G_OBJECT_CLASS (g_vfs_backend_network_parent_class)->finalize) (object);