From 18be052adab8c1ddbd00730be0a4e2431d32074a Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Mon, 5 Jun 2006 17:03:04 +0000 Subject: Don't crash on error from zeroconf bookmarks. Fixes bug #343922. 2006-06-04 Christian Persch * src/bookmarks/ephy-bookmarks.c: (resolve_cb): Don't crash on error from zeroconf bookmarks. Fixes bug #343922. --- src/bookmarks/ephy-bookmarks.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/bookmarks') diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c index cebc802dc..6d141bcc8 100644 --- a/src/bookmarks/ephy-bookmarks.c +++ b/src/bookmarks/ephy-bookmarks.c @@ -842,16 +842,6 @@ resolve_cb (GnomeVFSDNSSDResolveHandle *handle, gboolean was_immutable; guint i; - /* Find the protocol */ - for (i = 0; i < G_N_ELEMENTS (zeroconf_protos); ++i) - { - char proto[20]; - - g_snprintf (proto, sizeof (proto), "_%s._tcp", zeroconf_protos[i]); - if (strcmp (service->type, proto) == 0) break; - } - if (i == G_N_ELEMENTS (zeroconf_protos)) return; - was_immutable = ephy_node_db_is_immutable (priv->db); ephy_node_db_set_immutable (priv->db, FALSE); @@ -867,6 +857,16 @@ resolve_cb (GnomeVFSDNSSDResolveHandle *handle, return; } + /* Find the protocol */ + for (i = 0; i < G_N_ELEMENTS (zeroconf_protos); ++i) + { + char proto[20]; + + g_snprintf (proto, sizeof (proto), "_%s._tcp", zeroconf_protos[i]); + if (strcmp (service->type, proto) == 0) break; + } + if (i == G_N_ELEMENTS (zeroconf_protos)) return; + if (text != NULL) { path = g_hash_table_lookup (text, "path"); -- cgit v1.2.3