From daf38bc8b0643edaf1629f7767ddb3051821d000 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Thu, 7 Nov 2002 04:45:26 +0000 Subject: gobjectify this. 2002-11-06 Chris Toshok * gui/widgets/gal-view-minicard.[ch]: gobjectify this. * gui/widgets/e-minicard.[ch]: gobjectify this. (e_minicard_class_init): change the min/max values of the width/height paramspecs so that they can actually be set to something other than 0.0. * gui/widgets/e-minicard-widget.[ch]: gobjectify this. * gui/widgets/e-minicard-view.[ch]: gobjectify this. (set_empty_message): don't need e_utf8_from_locale_string anymore. * gui/widgets/e-minicard-view-widget.[ch]: gobjectify this. * gui/widgets/e-minicard-label.[ch]: gobjectify this. * gui/widgets/e-addressbook-view.[ch]: gobjectify this. * gui/widgets/e-addressbook-table-adapter.[ch]: gobjectify this. * gui/widgets/e-addressbook-reflow-adapter.[ch]: gobjectify this. * gui/widgets/e-addressbook-model.[ch]: gobjectify this. * gui/widgets/e-minicard-control.c (e_minicard_control_factory): fix bonobo_persist_stream_new api change. * gui/contact-list-editor/e-contact-list-model.c (e_contact_list_model_add_destination): get rid of the gtk_object_sink here. * gui/component/ldap-config.glade: glade-2 version of this file. * gui/component/e-address-popup.c (e_address_popup_refresh_names): don't need e_utf8_to_gtk_string anymore. * gui/component/addressbook.c (make_suboptions): don't need e_utf8_to_locale_string anymore. * gui/component/addressbook-config.c (addressbook_dialog_get_source): get rid of the e_utf8 gtk_entry functions. (addressbook_source_dialog_set_source): same. (general_tab_check): same. (port_changed_func): same. (connecting_tab_check): same. (query_for_supported_bases): same. (display_name_check): same. (display_name_page_prepare): same. (edit_source_clicked): same. (addressbook_config_create_new_source): same. svn path=/trunk/; revision=18626 --- addressbook/gui/widgets/e-minicard-view.h | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'addressbook/gui/widgets/e-minicard-view.h') diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h index 361cb3c628..afd432fd8e 100644 --- a/addressbook/gui/widgets/e-minicard-view.h +++ b/addressbook/gui/widgets/e-minicard-view.h @@ -27,10 +27,7 @@ #include "addressbook/backend/ebook/e-book.h" #include "e-addressbook-reflow-adapter.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS /* EMinicardView - A canvas item container. * @@ -51,11 +48,11 @@ extern "C" { * height double RW height of the reflow */ -#define E_MINICARD_VIEW_TYPE (e_minicard_view_get_type ()) -#define E_MINICARD_VIEW(obj) (GTK_CHECK_CAST ((obj), E_MINICARD_VIEW_TYPE, EMinicardView)) -#define E_MINICARD_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_VIEW_TYPE, EMinicardViewClass)) -#define E_IS_MINICARD_VIEW(obj) (GTK_CHECK_TYPE ((obj), E_MINICARD_VIEW_TYPE)) -#define E_IS_MINICARD_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_VIEW_TYPE)) +#define E_TYPE_MINICARD_VIEW (e_minicard_view_get_type ()) +#define E_MINICARD_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MINICARD_VIEW, EMinicardView)) +#define E_MINICARD_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MINICARD_VIEW, EMinicardViewClass)) +#define E_IS_MINICARD_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW)) +#define E_IS_MINICARD_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW)) typedef struct _EMinicardView EMinicardView; @@ -83,7 +80,7 @@ struct _EMinicardViewClass void (*right_click) (EMinicardView *view, GdkEvent *event); }; -GtkType e_minicard_view_get_type (void); +GType e_minicard_view_get_type (void); void e_minicard_view_remove_selection (EMinicardView *view, EBookCallback cb, gpointer closure); @@ -91,9 +88,7 @@ void e_minicard_view_jump_to_letter (EMinicardView *view, gunichar letter); GList *e_minicard_view_get_card_list (EMinicardView *view); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_MINICARD_VIEW_H__ */ -- cgit v1.2.3