[Goodies-commits] r6428 - in sion/trunk: . src

[Enrico Troeger]

Author: enrico
Date: 2009-01-10 16:41:32 +0000 (Sat, 10 Jan 2009)
New Revision: 6428

Modified:
   sion/trunk/ChangeLog
   sion/trunk/src/bookmarkeditdialog.c
Log:
Fix "This bookmark already exists" warning when editing an existing bookmark (patch by Colin Leroy, thanks).

Modified: sion/trunk/ChangeLog
===================================================================
--- sion/trunk/ChangeLog	2009-01-10 15:25:20 UTC (rev 6427)
+++ sion/trunk/ChangeLog	2009-01-10 16:41:32 UTC (rev 6428)
@@ -1,3 +1,10 @@
+2009-01-10  Enrico Tröger  <enrico(at)xfce(dot)org>
+
+ * src/bookmarkeditdialog.c:
+   Fix "This bookmark already exists" warning when editing an existing
+   bookmark (patch by Colin Leroy, thanks).
+
+
 2009-01-06  Enrico Tröger  <enrico(at)xfce(dot)org>
 
  * src/bookmarkdialog.c, src/bookmarkeditdialog.c,

Modified: sion/trunk/src/bookmarkeditdialog.c
===================================================================
--- sion/trunk/src/bookmarkeditdialog.c	2009-01-10 15:25:20 UTC (rev 6427)
+++ sion/trunk/src/bookmarkeditdialog.c	2009-01-10 16:41:32 UTC (rev 6428)
@@ -202,6 +202,8 @@
 					for (i = 0; i < bml->len && ! error; i++)
 					{
 						bm = g_ptr_array_index(bml, i);
+						if (bm == priv->bookmark_init)
+							continue;
 						if (sion_str_equal(tmp, sion_bookmark_get_name(bm)))
 						{
 							error = TRUE;