src/bookmarks/ephy-bookmarks-ui.c

2006-01-22  Peter Harvey  <peter.a.harvey@gmail.com>

	* src/bookmarks/ephy-bookmarks-ui.c

	Reverted change which made 'add bookmark' and 'edit bookmark'
	use-cases have exactly the same dialog.

2 files changed, 18 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 065579e24..f5a2e06fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-22  Peter Harvey  <peter.a.harvey@gmail.com>
+
+	* src/bookmarks/ephy-bookmarks-ui.c
+	
+	Reverted change which made 'add bookmark' and 'edit bookmark'
+	use-cases have exactly the same dialog.
+
 2006-01-25  Christian Persch  <chpe@cvs.gnome.org>
 
 	* src/ephy-main.c: (main):
diff --git a/src/bookmarks/ephy-bookmarks-ui.c b/src/bookmarks/ephy-bookmarks-ui.c
index ce9e511b4..0449606b8 100644
--- a/src/bookmarks/ephy-bookmarks-ui.c
+++ b/src/bookmarks/ephy-bookmarks-ui.c
@@ -424,6 +424,7 @@ add_bookmark (const char *location,
 {
 	EphyBookmarks *bookmarks;
 	EphyNode *bookmark;
+	GtkWidget *dialog;
 	
 	bookmarks = ephy_shell_get_bookmarks (ephy_shell_get_default ());
 	bookmark = ephy_bookmarks_add (bookmarks, title, location);
@@ -432,8 +433,16 @@ add_bookmark (const char *location,
 	{
 		properties_dialogs = g_hash_table_new (g_direct_hash, g_direct_equal);
 	}
-
-	ephy_bookmarks_ui_show_bookmark (bookmark);
+	
+	dialog = ephy_bookmark_properties_new (bookmarks, bookmark, TRUE);
+	
+	g_signal_connect (dialog, "destroy",
+			  G_CALLBACK (properties_dialog_destroy_cb), bookmarks);
+	g_hash_table_insert (properties_dialogs,
+			     bookmark, dialog);
+	
+	gtk_window_present_with_time (GTK_WINDOW (dialog),
+				      gtk_get_current_event_time ());
 }
 
 static void