diff options
author | Chris Toshok <toshok@ximian.com> | 2002-11-07 12:45:26 +0800 |
---|---|---|
committer | Chris Toshok <toshok@src.gnome.org> | 2002-11-07 12:45:26 +0800 |
commit | daf38bc8b0643edaf1629f7767ddb3051821d000 (patch) | |
tree | 8117feb14ddfc3301f9f7c4f240e68c99d82e421 /addressbook/gui/widgets/e-addressbook-model.c | |
parent | f1bf0afda992d969be86bfe29c464a8c435dcebf (diff) | |
download | gsoc2013-evolution-daf38bc8b0643edaf1629f7767ddb3051821d000.tar gsoc2013-evolution-daf38bc8b0643edaf1629f7767ddb3051821d000.tar.gz gsoc2013-evolution-daf38bc8b0643edaf1629f7767ddb3051821d000.tar.bz2 gsoc2013-evolution-daf38bc8b0643edaf1629f7767ddb3051821d000.tar.lz gsoc2013-evolution-daf38bc8b0643edaf1629f7767ddb3051821d000.tar.xz gsoc2013-evolution-daf38bc8b0643edaf1629f7767ddb3051821d000.tar.zst gsoc2013-evolution-daf38bc8b0643edaf1629f7767ddb3051821d000.zip |
gobjectify this.
2002-11-06 Chris Toshok <toshok@ximian.com>
* 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
Diffstat (limited to 'addressbook/gui/widgets/e-addressbook-model.c')
-rw-r--r-- | addressbook/gui/widgets/e-addressbook-model.c | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index 6fa61a018b..e40ca3ce9a 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -18,8 +18,8 @@ #include "e-addressbook-util.h" #include "e-addressbook-marshal.h" -#define PARENT_TYPE gtk_object_get_type() -GtkObjectClass *parent_class; +#define PARENT_TYPE G_TYPE_OBJECT +GObjectClass *parent_class; /* * EAddressbookModel callbacks @@ -279,7 +279,7 @@ backend_died (EBook *book, static void e_addressbook_model_class_init (GObjectClass *object_class) { - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref (PARENT_TYPE); object_class->dispose = addressbook_dispose; object_class->set_property = e_addressbook_model_set_property; @@ -387,7 +387,7 @@ e_addressbook_model_class_init (GObjectClass *object_class) G_STRUCT_OFFSET (EAddressbookModelClass, stop_state_changed), NULL, NULL, e_addressbook_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); + G_TYPE_NONE, 0); e_addressbook_model_signals [BACKEND_DIED] = g_signal_new ("backend_died", @@ -400,7 +400,7 @@ e_addressbook_model_class_init (GObjectClass *object_class) } static void -e_addressbook_model_init (GtkObject *object) +e_addressbook_model_init (GObject *object) { EAddressbookModel *model = E_ADDRESSBOOK_MODEL(object); model->book = NULL; @@ -594,24 +594,25 @@ e_addressbook_model_get_property (GObject *object, guint prop_id, GValue *value, } } -GtkType +GType e_addressbook_model_get_type (void) { - static GtkType type = 0; + static GType type = 0; - if (!type){ - GtkTypeInfo info = { - "EAddressbookModel", - sizeof (EAddressbookModel), + if (!type) { + static const GTypeInfo info = { sizeof (EAddressbookModelClass), - (GtkClassInitFunc) e_addressbook_model_class_init, - (GtkObjectInitFunc) e_addressbook_model_init, - NULL, /* reserved 1 */ - NULL, /* reserved 2 */ - (GtkClassInitFunc) NULL + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) e_addressbook_model_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (EAddressbookModel), + 0, /* n_preallocs */ + (GInstanceInitFunc) e_addressbook_model_init, }; - type = gtk_type_unique (PARENT_TYPE, &info); + type = g_type_register_static (PARENT_TYPE, "EAddressbookModel", &info, 0); } return type; @@ -622,7 +623,7 @@ e_addressbook_model_new (void) { EAddressbookModel *et; - et = gtk_type_new (e_addressbook_model_get_type ()); + et = g_object_new (E_TYPE_ADDRESSBOOK_MODEL, NULL); return et; } |