Saving progress. Lots of changes. Things are a bit broken at the moment.

svn path=/branches/kill-bonobo/; revision=36260

1 files changed, 77 insertions, 72 deletions

diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
index 2303d6b06f..af5d50a78f 100644
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ b/addressbook/gui/widgets/e-addressbook-view.h
@@ -17,8 +17,8 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-#ifndef __EAB_VIEW_H__
-#define __EAB_VIEW_H__
+#ifndef EAB_VIEW_H
+#define EAB_VIEW_H
 
 #include <gtk/gtk.h>
 #include <bonobo/bonobo-ui-component.h>
@@ -26,29 +26,33 @@
 #include <libebook/e-book.h>
 #include "e-addressbook-model.h"
 #include "eab-contact-display.h"
-#include "widgets/menus/gal-view-menus.h"
 #include "misc/e-search-bar.h"
 #include "misc/e-filter-bar.h"
 
+/* Standard GObject macros */
+#define E_TYPE_AB_VIEW \
+	(eab_view_get_type ())
+#define EAB_VIEW(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_AB_VIEW, EABView))
+#define EAB_VIEW_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_AB_VIEW, EABViewClass))
+#define E_IS_ADDRESSBOOK_VIEW(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_AB_VIEW))
+#define E_IS_ADDRESSBOOK_VIEW_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((obj), E_TYPE_AB_VIEW))
+#define E_ADDRESSBOOK_VIEW_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_AB_VIEW, EABViewClass))
+
 G_BEGIN_DECLS
 
 struct _EABMenu;
 struct _EABMenuTargetSelect;
 
-/* EABView - A card displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define E_TYPE_AB_VIEW                          (eab_view_get_type ())
-#define EAB_VIEW(obj)                           (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_AB_VIEW, EABView))
-#define EAB_VIEW_CLASS(klass)                   (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_AB_VIEW, EABViewClass))
-#define E_IS_ADDRESSBOOK_VIEW(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_AB_VIEW))
-#define E_IS_ADDRESSBOOK_VIEW_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_AB_VIEW))
-
 typedef enum {
 	EAB_VIEW_NONE, /* initialized to this */
 	EAB_VIEW_MINICARD,
@@ -56,11 +60,10 @@ typedef enum {
 } EABViewType;
 
 
-typedef struct _EABView       EABView;
-typedef struct _EABViewClass  EABViewClass;
+typedef struct _EABView EABView;
+typedef struct _EABViewClass EABViewClass;
 
-struct _EABView
-{
+struct _EABView {
 	GtkVBox parent;
 
 	/* item specific fields */
@@ -87,7 +90,7 @@ struct _EABView
 
 	/* Menus handler and the view instance */
 	GalViewInstance *view_instance;
-	GalViewMenus *view_menus;
+	/*GalViewMenus *view_menus;*/
 	GalView *current_view;
 	BonoboUIComponent *uic;
 
@@ -98,64 +101,66 @@ struct _EABView
 	FilterRule  *search_rule;
 };
 
-struct _EABViewClass
-{
+struct _EABViewClass {
 	GtkVBoxClass parent_class;
 
-	/*
-	 * Signals
-	 */
+	/* Signals */
 	void (*status_message)        (EABView *view, const gchar *message);
 	void (*search_result)         (EABView *view, EBookViewStatus status);
 	void (*folder_bar_message)    (EABView *view, const gchar *message);
 	void (*command_state_change)  (EABView *view);
 };
 
-GtkWidget *eab_view_new                 (void);
-GType      eab_view_get_type            (void);
-
-void       eab_view_show_contact_preview (EABView *view, gboolean show);
-
-void       eab_view_setup_menus         (EABView  *view,
-					 BonoboUIComponent *uic);
-void       eab_view_discard_menus       (EABView  *view);
-
-RuleContext *eab_view_peek_search_context (EABView *view);
-FilterRule  *eab_view_peek_search_rule    (EABView *view);
-
-void       eab_view_save_as             (EABView  *view, gboolean all);
-void       eab_view_view                (EABView  *view);
-void       eab_view_send                (EABView  *view);
-void       eab_view_send_to             (EABView  *view);
-void       eab_view_print               (EABView  *view,
-                                         GtkPrintOperationAction action);
-void       eab_view_delete_selection    (EABView  *view, gboolean is_delete);
-void       eab_view_cut                 (EABView  *view);
-void       eab_view_copy                (EABView  *view);
-void       eab_view_paste               (EABView  *view);
-void       eab_view_select_all          (EABView  *view);
-void       eab_view_show_all            (EABView  *view);
-void       eab_view_stop                (EABView  *view);
-void       eab_view_copy_to_folder      (EABView  *view, gboolean all);
-void       eab_view_move_to_folder      (EABView  *view, gboolean all);
-
-gboolean   eab_view_can_create          (EABView  *view);
-gboolean   eab_view_can_print           (EABView  *view);
-gboolean   eab_view_can_save_as         (EABView  *view);
-gboolean   eab_view_can_view            (EABView  *view);
-gboolean   eab_view_can_send            (EABView  *view);
-gboolean   eab_view_can_send_to         (EABView  *view);
-gboolean   eab_view_can_delete          (EABView  *view);
-gboolean   eab_view_can_cut             (EABView  *view);
-gboolean   eab_view_can_copy            (EABView  *view);
-gboolean   eab_view_can_paste           (EABView  *view);
-gboolean   eab_view_can_select_all      (EABView  *view);
-gboolean   eab_view_can_stop            (EABView  *view);
-gboolean   eab_view_can_copy_to_folder  (EABView  *view);
-gboolean   eab_view_can_move_to_folder  (EABView  *view);
-
-struct _EABMenuTargetSelect *eab_view_get_menu_target (EABView *view, struct _EABMenu *menu);
+GType		eab_view_get_type		(void);
+GtkWidget *	eab_view_new			(void);
+void		eab_view_show_contact_preview	(EABView *view,
+						 gboolean show);
+void		eab_view_setup_menus		(EABView *view,
+						 BonoboUIComponent *uic);
+void		eab_view_discard_menus		(EABView *view);
+
+RuleContext *	eab_view_peek_search_context	(EABView *view);
+FilterRule *	eab_view_peek_search_rule	(EABView *view);
+
+void		eab_view_save_as		(EABView *view,
+						 gboolean all);
+void		eab_view_view			(EABView *view);
+void		eab_view_send			(EABView *view);
+void		eab_view_send_to		(EABView *view);
+void		eab_view_print			(EABView *view,
+						 GtkPrintOperationAction action);
+void		eab_view_delete_selection	(EABView *view,
+						 gboolean is_delete);
+void		eab_view_cut			(EABView *view);
+void		eab_view_copy			(EABView *view);
+void		eab_view_paste			(EABView *view);
+void		eab_view_select_all		(EABView *view);
+void		eab_view_show_all		(EABView *view);
+void		eab_view_stop			(EABView *view);
+void		eab_view_copy_to_folder		(EABView *view,
+						 gboolean all);
+void		eab_view_move_to_folder		(EABView *view,
+						 gboolean all);
+
+gboolean	eab_view_can_create		(EABView *view);
+gboolean	eab_view_can_print		(EABView *view);
+gboolean	eab_view_can_save_as		(EABView *view);
+gboolean	eab_view_can_view		(EABView *view);
+gboolean	eab_view_can_send		(EABView *view);
+gboolean	eab_view_can_send_to		(EABView *view);
+gboolean	eab_view_can_delete		(EABView *view);
+gboolean	eab_view_can_cut		(EABView *view);
+gboolean	eab_view_can_copy		(EABView *view);
+gboolean	eab_view_can_paste		(EABView *view);
+gboolean	eab_view_can_select_all		(EABView *view);
+gboolean	eab_view_can_stop		(EABView *view);
+gboolean	eab_view_can_copy_to_folder	(EABView *view);
+gboolean	eab_view_can_move_to_folder	(EABView *view);
+
+struct _EABMenuTargetSelect *
+		eab_view_get_menu_target	(EABView *view,
+						 struct _EABMenu *menu);
 
 G_END_DECLS
 
-#endif /* __EAB_VIEW_H__ */
+#endif /* EAB_VIEW_H */