aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-06-06 01:03:04 +0800
committerChristian Persch <chpe@src.gnome.org>2006-06-06 01:03:04 +0800
commit18be052adab8c1ddbd00730be0a4e2431d32074a (patch)
tree5897560430eb5b579b3f32edbc6269e40c4161ae
parente8952022f58a69c01033bb0a4bc8131ea0604878 (diff)
downloadgsoc2013-epiphany-18be052adab8c1ddbd00730be0a4e2431d32074a.tar
gsoc2013-epiphany-18be052adab8c1ddbd00730be0a4e2431d32074a.tar.gz
gsoc2013-epiphany-18be052adab8c1ddbd00730be0a4e2431d32074a.tar.bz2
gsoc2013-epiphany-18be052adab8c1ddbd00730be0a4e2431d32074a.tar.lz
gsoc2013-epiphany-18be052adab8c1ddbd00730be0a4e2431d32074a.tar.xz
gsoc2013-epiphany-18be052adab8c1ddbd00730be0a4e2431d32074a.tar.zst
gsoc2013-epiphany-18be052adab8c1ddbd00730be0a4e2431d32074a.zip
Don't crash on error from zeroconf bookmarks. Fixes bug #343922.
2006-06-04 Christian Persch <chpe@cvs.gnome.org> * src/bookmarks/ephy-bookmarks.c: (resolve_cb): Don't crash on error from zeroconf bookmarks. Fixes bug #343922.
-rw-r--r--ChangeLog6
-rw-r--r--src/bookmarks/ephy-bookmarks.c20
2 files changed, 16 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 82f3cba4c..b5e7846bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-04 Christian Persch <chpe@cvs.gnome.org>
+
+ * src/bookmarks/ephy-bookmarks.c: (resolve_cb):
+
+ Don't crash on error from zeroconf bookmarks. Fixes bug #343922.
+
2006-06-05 Wouter Bolsterlee <uws+gnome@xs4all.nl>
* lib/widgets/ephy-location-entry.c: (keyword_match):
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");