Refactored, code cleanups. Don't make the bookmark properties window

2006-01-24  Christian Persch  <chpe@cvs.gnome.org>

	* src/bookmarks/ephy-bookmark-properties.c:
	(ephy_bookmark_properties_set_bookmark),
	(bookmark_properties_close_cb), (bookmark_properties_response_cb),
	(update_entry), (update_window_title), (combo_changed_cb),
	(title_entry_changed_cb), (location_entry_changed_cb),
	(set_window_icon), (ephy_bookmark_properties_init),
	(ephy_bookmark_properties_constructor),
	(ephy_bookmark_properties_set_property),
	(ephy_bookmark_properties_get_property),
	(ephy_bookmark_properties_class_init),
	(ephy_bookmark_properties_get_type),
	(ephy_bookmark_properties_new):
	* src/bookmarks/ephy-bookmark-properties.h:

	Refactored, code cleanups. Don't make the bookmark properties
	window transient.

	* src/bookmarks/ephy-bookmarks-editor.c: (cmd_bookmark_properties):
	* src/bookmarks/ephy-bookmarks-ui.c:
	(activate_bookmark_properties), (activate_bookmark_open_tab),
	(activate_bookmark_open_window), (selected_bookmark_action),
	(erase_bookmarks_menu), (tree_changed_cb), (node_added_cb),
	(node_changed_cb), (node_removed_cb),
	(ephy_bookmarks_ui_attach_window), (properties_dialog_destroy_cb),
	(add_bookmark), (duplicate_bookmark_response_cb),
	(ephy_bookmarks_ui_add_bookmark), (add_topic_changed_cb),
	(add_topic_response_cb), (ephy_bookmarks_ui_add_topic),
	(ephy_bookmarks_ui_show_bookmark):
	* src/bookmarks/ephy-bookmarks-ui.h:

	Cleanups. Make the New Topic dialogue modal to the bookmark properties
	window. Change some strings, don't unnecessarily use markup when
	constructing a message dialog.

2006-01-24  Christian Persch  <chpe@cvs.gnome.org>

1 files changed, 22 insertions, 18 deletions

diff --git a/src/bookmarks/ephy-bookmark-properties.h b/src/bookmarks/ephy-bookmark-properties.h
index 887323049..afc3db7cf 100644
--- a/src/bookmarks/ephy-bookmark-properties.h
+++ b/src/bookmarks/ephy-bookmark-properties.h
@@ -1,5 +1,7 @@
 /*
  *  Copyright (C) 2002 Marco Pesenti Gritti <mpeseng@tin.it>
+ *  Copyright (C) 2005, 2006 Peter A. Harvey
+ *  Copyright (C) 2006 Christian Persch
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -27,35 +29,37 @@
 
 G_BEGIN_DECLS
 
-#define EPHY_TYPE_BOOKMARK_PROPERTIES         (ephy_bookmark_properties_get_type ())
-#define EPHY_BOOKMARK_PROPERTIES(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_BOOKMARK_PROPERTIES, EphyBookmarkProperties))
-#define EPHY_BOOKMARK_PROPERTIES_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_BOOKMARK_PROPERTIES, EphyBookmarkPropertiesClass))
-#define EPHY_IS_BOOKMARK_PROPERTIES(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_BOOKMARK_PROPERTIES))
-#define EPHY_IS_BOOKMARK_PROPERTIES_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_BOOKMARK_PROPERTIES))
-#define EPHY_BOOKMARK_PROPERTIES_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_BOOKMARK_PROPERTIES, EphyBookmarkPropertiesClass))
+#define EPHY_TYPE_BOOKMARK_PROPERTIES		(ephy_bookmark_properties_get_type ())
+#define EPHY_BOOKMARK_PROPERTIES(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_BOOKMARK_PROPERTIES, EphyBookmarkProperties))
+#define EPHY_BOOKMARK_PROPERTIES_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_BOOKMARK_PROPERTIES, EphyBookmarkPropertiesClass))
+#define EPHY_IS_BOOKMARK_PROPERTIES(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_BOOKMARK_PROPERTIES))
+#define EPHY_IS_BOOKMARK_PROPERTIES_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_BOOKMARK_PROPERTIES))
+#define EPHY_BOOKMARK_PROPERTIES_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_BOOKMARK_PROPERTIES, EphyBookmarkPropertiesClass))
 
-typedef struct _EphyBookmarkPropertiesPrivate EphyBookmarkPropertiesPrivate;
+typedef struct _EphyBookmarkProperties		EphyBookmarkProperties;
+typedef struct _EphyBookmarkPropertiesPrivate	EphyBookmarkPropertiesPrivate;
+typedef struct _EphyBookmarkPropertiesClass	EphyBookmarkPropertiesClass;
 
-typedef struct
+struct _EphyBookmarkProperties
 {
-	GtkDialog parent;
+	GtkDialog parent_instance;
 
 	/*< private >*/
 	EphyBookmarkPropertiesPrivate *priv;
-} EphyBookmarkProperties;
+};
 
-typedef struct
+struct _EphyBookmarkPropertiesClass
 {
-	GtkDialogClass parent;
-} EphyBookmarkPropertiesClass;
+	GtkDialogClass parent_class;
+};
 
-GType		     ephy_bookmark_properties_get_type        (void);
+GType		 ephy_bookmark_properties_get_type	(void);
 
-GtkWidget	    *ephy_bookmark_properties_new             (EphyBookmarks *bookmarks,
-							       EphyNode *bookmark,
-							       gboolean creating);
+GtkWidget	*ephy_bookmark_properties_new		(EphyBookmarks *bookmarks,
+							 EphyNode *bookmark,
+							 gboolean creating);
 
-EphyNode            *ephy_bookmark_properties_get_node        (EphyBookmarkProperties *properties);
+EphyNode	*ephy_bookmark_properties_get_node	(EphyBookmarkProperties *properties);
 
 G_END_DECLS