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/component/addressbook-config.c | 70 +- addressbook/gui/component/addressbook.c | 4 +- addressbook/gui/component/e-address-popup.c | 8 +- addressbook/gui/component/ldap-config.glade | 12010 ++++++++++--------- .../gui/contact-list-editor/e-contact-list-model.c | 1 - addressbook/gui/widgets/e-addressbook-model.c | 37 +- addressbook/gui/widgets/e-addressbook-model.h | 17 +- .../gui/widgets/e-addressbook-reflow-adapter.c | 27 +- .../gui/widgets/e-addressbook-reflow-adapter.h | 12 +- .../gui/widgets/e-addressbook-table-adapter.c | 27 +- .../gui/widgets/e-addressbook-table-adapter.h | 12 +- addressbook/gui/widgets/e-addressbook-view.c | 34 +- addressbook/gui/widgets/e-addressbook-view.h | 12 +- addressbook/gui/widgets/e-minicard-control.c | 22 +- addressbook/gui/widgets/e-minicard-label.c | 39 +- addressbook/gui/widgets/e-minicard-label.h | 12 +- addressbook/gui/widgets/e-minicard-view-widget.c | 41 +- addressbook/gui/widgets/e-minicard-view-widget.h | 21 +- addressbook/gui/widgets/e-minicard-view.c | 31 +- addressbook/gui/widgets/e-minicard-view.h | 21 +- addressbook/gui/widgets/e-minicard-widget.c | 39 +- addressbook/gui/widgets/e-minicard-widget.h | 12 +- addressbook/gui/widgets/e-minicard.c | 43 +- addressbook/gui/widgets/e-minicard.h | 12 +- .../gui/widgets/gal-view-factory-minicard.c | 33 +- .../gui/widgets/gal-view-factory-minicard.h | 12 +- addressbook/gui/widgets/gal-view-minicard.c | 33 +- addressbook/gui/widgets/gal-view-minicard.h | 12 +- 28 files changed, 6550 insertions(+), 6104 deletions(-) (limited to 'addressbook/gui') diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index 39a716f358..746d1d9b1c 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -15,6 +15,7 @@ #include #include +#include #include #include #include @@ -269,13 +270,13 @@ addressbook_dialog_get_source (AddressbookSourceDialog *dialog) { AddressbookSource *source = g_new0 (AddressbookSource, 1); - source->name = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->display_name)); - source->host = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->host)); - source->email_addr = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->email)); - source->binddn = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->binddn)); - source->port = e_utf8_gtk_entry_get_text (GTK_ENTRY (GTK_COMBO(dialog->port_combo)->entry)); - source->rootdn = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->rootdn)); - source->limit = atoi(e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->limit_spinbutton))); + source->name = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->display_name))); + source->host = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->host))); + source->email_addr = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->email))); + source->binddn = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->binddn))); + source->port = g_strdup (gtk_entry_get_text (GTK_ENTRY (GTK_COMBO(dialog->port_combo)->entry))); + source->rootdn = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->rootdn))); + source->limit = atoi(gtk_entry_get_text (GTK_ENTRY (dialog->limit_spinbutton))); source->scope = dialog->scope; source->auth = dialog->auth; source->ssl = dialog->ssl; @@ -289,15 +290,15 @@ static void addressbook_source_dialog_set_source (AddressbookSourceDialog *dialog, AddressbookSource *source) { char *string; - e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->display_name), source ? source->name : ""); - e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->host), source ? source->host : ""); - e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->email), source ? source->email_addr : ""); - e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->binddn), source ? source->binddn : ""); - e_utf8_gtk_entry_set_text (GTK_ENTRY (GTK_COMBO(dialog->port_combo)->entry), source ? source->port : LDAP_PORT_STRING); - e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->rootdn), source ? source->rootdn : ""); + gtk_entry_set_text (GTK_ENTRY (dialog->display_name), source ? source->name : ""); + gtk_entry_set_text (GTK_ENTRY (dialog->host), source ? source->host : ""); + gtk_entry_set_text (GTK_ENTRY (dialog->email), source ? source->email_addr : ""); + gtk_entry_set_text (GTK_ENTRY (dialog->binddn), source ? source->binddn : ""); + gtk_entry_set_text (GTK_ENTRY (GTK_COMBO(dialog->port_combo)->entry), source ? source->port : LDAP_PORT_STRING); + gtk_entry_set_text (GTK_ENTRY (dialog->rootdn), source ? source->rootdn : ""); string = g_strdup_printf ("%d", source ? source->limit : 100); - e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->limit_spinbutton), string); + gtk_entry_set_text (GTK_ENTRY (dialog->limit_spinbutton), string); g_free (string); dialog->auth = source ? source->auth : ADDRESSBOOK_LDAP_AUTH_NONE; @@ -457,23 +458,21 @@ static gboolean general_tab_check (AddressbookSourceDialog *dialog) { gboolean valid = TRUE; - char *string; + const char *string; - string = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->host)); + string = gtk_entry_get_text (GTK_ENTRY (dialog->host)); if (!string || !string[0]) valid = FALSE; - g_free (string); if (valid) { if (dialog->auth != ADDRESSBOOK_LDAP_AUTH_NONE) { if (dialog->auth == ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN) - string = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->binddn)); + string = gtk_entry_get_text (GTK_ENTRY (dialog->binddn)); else - string = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->email)); + string = gtk_entry_get_text (GTK_ENTRY (dialog->email)); if (!string || !string[0]) valid = FALSE; - g_free (string); } } @@ -535,7 +534,7 @@ port_changed_func (GtkWidget *item, AddressbookSourceDialog *dialog) { /* if the port value is ldaps, set the SSL/TLS option menu to Always and desensitize it */ - char *string = e_utf8_gtk_entry_get_text (GTK_ENTRY (item)); + const char *string = gtk_entry_get_text (GTK_ENTRY (item)); dialog->connecting_modify_func (item, dialog); @@ -549,9 +548,7 @@ port_changed_func (GtkWidget *item, AddressbookSourceDialog *dialog) else { gtk_widget_set_sensitive (dialog->ssl_optionmenu, TRUE); } - - - g_free (string); + } static void @@ -580,12 +577,11 @@ static gboolean connecting_tab_check (AddressbookSourceDialog *dialog) { gboolean valid = TRUE; - char *string; + const char *string; - string = e_utf8_gtk_entry_get_text (GTK_ENTRY (GTK_COMBO(dialog->port_combo)->entry)); + string = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO(dialog->port_combo)->entry)); if (!string || !string[0]) valid = FALSE; - g_free (string); return valid; } @@ -731,7 +727,7 @@ query_for_supported_bases (GtkWidget *button, AddressbookSourceDialog *sdialog) /* ugh. */ for (i = 0; values[i]; i ++) { if (e_selection_model_is_row_selected (selection_model, i)) { - e_utf8_gtk_entry_set_text (GTK_ENTRY (sdialog->rootdn), values[i]); + gtk_entry_set_text (GTK_ENTRY (sdialog->rootdn), values[i]); break; /* single selection, so we can quit when we've found it. */ } } @@ -818,12 +814,11 @@ static gboolean display_name_check (AddressbookSourceDialog *dialog) { gboolean valid = TRUE; - char *string; + const char *string; - string = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->display_name)); + string = gtk_entry_get_text (GTK_ENTRY (dialog->display_name)); if (!string || !string[0]) valid = FALSE; - g_free (string); return valid; } @@ -832,9 +827,8 @@ static void display_name_page_prepare (GtkWidget *page, GtkWidget *gnome_druid, AddressbookSourceDialog *dialog) { if (!dialog->display_name_changed) { - char *server_name = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->host)); - e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->display_name), server_name); - g_free (server_name); + const char *server_name = gtk_entry_get_text (GTK_ENTRY (dialog->host)); + gtk_entry_set_text (GTK_ENTRY (dialog->display_name), server_name); } gnome_druid_set_buttons_sensitive (GNOME_DRUID(dialog->druid), @@ -1470,8 +1464,8 @@ edit_source_clicked (GtkWidget *widget, AddressbookDialog *dialog) /* Ok was clicked */ source = addressbook_source_copy(sdialog->source); - e_utf8_gtk_clist_set_text (GTK_CLIST (dialog->clistSources), dialog->source_row, 0, source->name); - e_utf8_gtk_clist_set_text (GTK_CLIST (dialog->clistSources), dialog->source_row, 1, source->host); + gtk_clist_set_text (GTK_CLIST (dialog->clistSources), dialog->source_row, 0, source->name); + gtk_clist_set_text (GTK_CLIST (dialog->clistSources), dialog->source_row, 1, source->host); gtk_clist_set_row_data (GTK_CLIST (dialog->clistSources), dialog->source_row, source); evolution_config_control_changed (dialog->config_control); @@ -1725,11 +1719,11 @@ addressbook_config_create_new_source (const char *new_source, GtkWidget *parent) AddressbookSourceDialog *dialog; GladeXML *gui; - gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, NULL); + gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, NULL, NULL); dialog = addressbook_source_dialog (gui, NULL, parent); - e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->name), new_source); + gtk_entry_set_text (GTK_ENTRY (dialog->name), new_source); gnome_dialog_close_hides (GNOME_DIALOG(dialog->dialog), TRUE); diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 8456c5abed..2bb49521b0 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -12,6 +12,8 @@ #include #include +#include +#include #include #include #include @@ -1072,7 +1074,7 @@ make_suboptions (AddressbookView *view) const char *category = e_categories_master_list_nth (master_list, i); subitems[i+1].id = i; - subitems[i+1].text = e_utf8_to_locale_string (category); + subitems[i+1].text = g_strdup (category); subitems[i+1].translate = FALSE; } subitems[N+1].id = -1; diff --git a/addressbook/gui/component/e-address-popup.c b/addressbook/gui/component/e-address-popup.c index 540d1fc734..976191eaef 100644 --- a/addressbook/gui/component/e-address-popup.c +++ b/addressbook/gui/component/e-address-popup.c @@ -753,9 +753,7 @@ e_address_popup_refresh_names (EAddressPopup *pop) { if (pop->name_widget) { if (pop->name && *pop->name) { - gchar *s = e_utf8_to_gtk_string (pop->name_widget, pop->name); - gtk_label_set_text (GTK_LABEL (pop->name_widget), s); - g_free (s); + gtk_label_set_text (GTK_LABEL (pop->name_widget), pop->name); gtk_widget_show (pop->name_widget); } else { gtk_widget_hide (pop->name_widget); @@ -764,9 +762,7 @@ e_address_popup_refresh_names (EAddressPopup *pop) if (pop->email_widget) { if (pop->email && *pop->email) { - gchar *s = e_utf8_to_gtk_string (pop->email_widget, pop->email); - gtk_label_set_text (GTK_LABEL (pop->email_widget), s); - g_free (s); + gtk_label_set_text (GTK_LABEL (pop->email_widget), pop->email); gtk_widget_show (pop->email_widget); } else { gtk_widget_hide (pop->email_widget); diff --git a/addressbook/gui/component/ldap-config.glade b/addressbook/gui/component/ldap-config.glade index 82c2d5d8b5..adb23cbe3f 100644 --- a/addressbook/gui/component/ldap-config.glade +++ b/addressbook/gui/component/ldap-config.glade @@ -1,5819 +1,6299 @@ - - - - - addressbook-config-mockup - addressbook-config-mockup - - src - ../../../art - C - True - True - - - - GnomeDialog - Add/Edit Attribute Mappings--Simple Version - False - Add (or Edit) Attribute Mappings - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - True - False - False - False - - - GtkVBox - GnomeDialog:vbox - dialog-vbox4 - False - 8 - - 4 - True - True - - - - GtkHButtonBox - GnomeDialog:action_area - dialog-action_area4 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - - - - GtkButton - button37 - True - True - GNOME_STOCK_BUTTON_OK + + + + + + + + no + Add (or Edit) Attribute Mappings + GTK_WINDOW_TOPLEVEL + no + yes + yes + GTK_WIN_POS_NONE + + + + no + 8 + yes + + + + GTK_BUTTONBOX_END + 8 + yes + + + + yes + yes + yes + gtk-ok + yes + yes + + + + + + yes + yes + yes + gtk-cancel + yes + yes + + + + + 0 + no + yes + GTK_PACK_END + + + + + + no + 0 + yes + + + + 3 + no + 3 + yes + + + + ldap.png + yes + + + 0 + no + no + + + + + + Please select an Evolution attribute and an +LDAP attribute to associate with it. + GTK_JUSTIFY_LEFT + no + 0.5 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + 0 + yes + yes + + + + + + yes + + + 0 + yes + yes + + + + + + 3 + no + 3 + 3 + 2 + 2 + yes + + + + _Evolution attribute: + GTK_JUSTIFY_CENTER + no + 0 + 0.5 + 0 + 0 + combo-entry2 + yes + yes + + + 0 + 1 + 0 + 1 + 0 + 0 + fill + + + + + + + _LDAP attribute: + GTK_JUSTIFY_CENTER + no + 0 + 0.5 + 0 + 0 + combo-entry3 + yes + yes + + + 0 + 1 + 1 + 2 + 0 + 0 + fill + + + + + + + no + no + yes + no + yes + yes + + + + yes + yes + + 0 + yes + yes + + + + + + yes + + + + yes + + + + + 0.0 + yes + + + + + + + + + 1 + 2 + 0 + 1 + 0 + 0 + expand|fill + + + + + + + no + no + yes + no + yes + yes + + + + yes + yes + + 0 + yes + yes + + + + + + yes + + + + yes + + + + + 0.0 + yes + + + + + + + + + 1 + 2 + 1 + 2 + 0 + 0 + expand|fill + + + + + + 0 + yes + yes + + + + + 0 + yes + yes + + - - - GtkButton - button39 - True - True - GNOME_STOCK_BUTTON_CANCEL - - - - - GtkVBox - vbox30 - False - 0 - - 0 - True - True - - - - GtkHBox - hbox66 - 3 - False - 3 - - 0 - True - True - - - - GnomePixmap - pixmap35 - ldap.png - - 0 - False - False - - - - - GtkLabel - label283 - - GTK_JUSTIFY_LEFT - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkHSeparator - hseparator8 - - 0 - True - True - - - - - GtkTable - table18 - 3 - 2 - 2 - False - 3 - 3 - - 0 - True - True - - - - GtkLabel - label284 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - combo-entry2 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label285 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - combo-entry3 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - - GtkCombo - combo4 - False - True - False - True - False - - - 1 - 2 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - GtkEntry - GtkCombo:entry - combo-entry2 - True - True - True - 0 - - - - - - GtkCombo - combo5 - False - True - False - True - False - - - 1 - 2 - 1 - 2 - 0 - 0 - True - False - False - False - True - False - - - - GtkEntry - GtkCombo:entry - combo-entry3 - True - True - True - 0 - - - - - - - - - - GnomeDialog - Add/Edit Attribute Mappings-- Multiple Selection Version - False - Add (or Edit) Attribute Mappings - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 393 - 324 - False - True - False - False - False - - - GtkVBox - GnomeDialog:vbox - vbox31 - False - 8 - - 4 - True - True + + 4 + yes + yes + - - - GtkHButtonBox - GnomeDialog:action_area - hbuttonbox9 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - - - - GtkButton - button40 - True - True - GNOME_STOCK_BUTTON_OK - - - - GtkButton - button41 - True - True - GNOME_STOCK_BUTTON_CANCEL - - - - - GtkVBox - vbox32 - False - 0 - - 0 - True - True - - - - GtkHBox - hbox67 - 3 - False - 3 - - 0 - False - False - - - - GnomePixmap - pixmap36 - ldap.png - - 0 - False - False - - - - - GtkLabel - label286 - - GTK_JUSTIFY_LEFT - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkHSeparator - hseparator9 - - 0 - False - False - - - - - GtkTable - table19 - 3 - 2 - 2 - False - 3 - 3 - - 0 - True - True - - - - GtkLabel - label287 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry32 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkCombo - combo6 - False - True - False - True - False - - - 1 - 2 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - GtkEntry - GtkCombo:entry - entry32 - True - True - True - 0 - - - - - - GtkLabel - label288 - - GTK_JUSTIFY_CENTER - False - 0 - 7.45058e-09 - 0 - 0 - - 0 - 1 - 1 - 2 - 0 - 0 - False - True - False - False - True - True - - - - - GtkScrolledWindow - scrolledwindow6 - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - 1 - 2 - 1 - 2 - 0 - 0 - False - False - False - False - True - True - - - - GtkCList - clist4 - True - 2 - 163,80 - GTK_SELECTION_SINGLE - True - GTK_SHADOW_IN - - - GtkLabel - CList:title - label289 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CList:title - label290 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - - - - - - GtkWindow - account-editor-window - False - account-editor - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - True - False - - - GtkVBox - vbox37 - False - 0 - - - GtkNotebook - account-editor-notebook - True - True - True - GTK_POS_TOP - False - 2 - 2 - False - - 0 - True - True - - - - GtkVBox - account-editor-general-vbox - 6 - False - 3 - - - GtkHBox - hbox100 - 3 - False - 4 - - 0 - False - False - - - - GtkLabel - label431 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkAlignment - alignment45 - 1 - 0.5 - 0.9 - 1 - - 0 - True - True - - - - GtkEntry - account-editor-display-name-entry - True - True - True - 0 - - - - - - - GtkHSeparator - hseparator12 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label331 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkVBox - account-editor-connecting-vbox - False - 0 - - - Placeholder - + + no + Add (or Edit) Attribute Mappings + GTK_WINDOW_TOPLEVEL + no + 393 + 324 + no + yes + GTK_WIN_POS_NONE + + + + no + 8 + yes + + + + GTK_BUTTONBOX_END + 8 + yes + + + + yes + yes + yes + gtk-ok + yes + yes + + + + + + yes + yes + yes + gtk-cancel + yes + yes + + + + + 0 + no + yes + GTK_PACK_END + + + + + + no + 0 + yes + + + + 3 + no + 3 + yes + + + + ldap.png + yes + + + 0 + no + no + + + + + + Please select and Evolution attribute and an +LDAP attribute to associate with it. + GTK_JUSTIFY_LEFT + no + 0.5 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + 0 + no + no + + + + + + yes + + + 0 + no + no + + + + + + 3 + no + 3 + 3 + 2 + 2 + yes + + + + _Evolution attribute: + GTK_JUSTIFY_CENTER + no + 0 + 0.5 + 0 + 0 + entry32 + yes + yes + + + 0 + 1 + 0 + 1 + 0 + 0 + fill + + + + + + + no + no + yes + no + yes + yes + + + + yes + yes + + 0 + yes + yes + + + + + + yes + + + + yes + + + + + 0.0 + yes + + + + + + + + + 1 + 2 + 0 + 1 + 0 + 0 + expand|fill + + + + + + + _LDAP attributes: + GTK_JUSTIFY_CENTER + no + 0 + 7.45058e-09 + 0 + 0 + yes + yes + + + 0 + 1 + 1 + 2 + 0 + 0 + fill + expand|fill + + + + + + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + yes + + + + yes + yes + yes + + + + CList:title + Attribute + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + + + + CList:title + Select + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + + + + + + GTK_UPDATE_CONTINUOUS + yes + + + + + + GTK_UPDATE_CONTINUOUS + yes + + + + + 1 + 2 + 1 + 2 + 0 + 0 + fill + fill + + + + + 0 + yes + yes + + + + + 0 + yes + yes + + + + 4 + yes + yes + + + + + no + account-editor + GTK_WINDOW_TOPLEVEL + no + no + yes + GTK_WIN_POS_NONE - - GtkLabel - Notebook:tab - label334 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkVBox - account-editor-searching-vbox - False - 0 - - - Placeholder - - - - - GtkLabel - Notebook:tab - label344 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkVBox - account-editor-objectclasses-vbox - False - 0 - - - Placeholder - - - - - GtkLabel - Notebook:tab - account-editor-objectclasses-label - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkVBox - account-editor-mappings-vbox - False - 0 - - - Placeholder - - - - - GtkLabel - Notebook:tab - account-editor-mappings-label - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkVBox - account-editor-dn-customization-vbox - False - 0 - - - Placeholder - + + + no + 0 + yes + + + + yes + yes + yes + GTK_POS_TOP + no + 2 + 2 + no + yes + + + + 6 + no + 3 + yes + + + + 3 + no + 4 + yes + + + + _Display name: + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + yes + + + 0 + no + no + + + + + + 1 + 0.5 + 0.9 + 1 + yes + + + + yes + yes + + 0 + yes + yes + + + + + 0 + yes + yes + + + + + 0 + no + no + + + + + + yes + + + 0 + no + no + + + + + + + + General + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + no + 0 + yes + + + + + + + + + + Connecting + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + no + 0 + yes + + + + + + + + + + Searching + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + no + 0 + yes + + + + + + + + + + Objectclasses + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + no + 0 + yes + + + + + + + + + + Mappings + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + no + 0 + yes + + + + + + + + + + DN Customization + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + 0 + yes + yes + + + + + + yes + + + 0 + yes + yes + + + + + + no + 0 + yes + + + + no + no + GTK_POS_TOP + no + 2 + 2 + no + yes + + + + GTK_BUTTONBOX_START + 0 + yes + + + + yes + yes + << Fewer Options + GTK_RELIEF_NORMAL + yes + + + + + + + + label554 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + GTK_BUTTONBOX_START + 0 + yes + + + + yes + yes + _More Options >> + GTK_RELIEF_NORMAL + yes + yes + + + + + + + + label555 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + 0 + yes + yes + + + + + + GTK_BUTTONBOX_END + 0 + yes + + + + no + yes + yes + GTK_RELIEF_NORMAL + yes + gtk-ok + yes + yes + + + + + + no + yes + yes + GTK_RELIEF_NORMAL + yes + gtk-apply + yes + yes + + + + + + yes + yes + GTK_RELIEF_NORMAL + yes + gtk-close + yes + yes + + + + + 0 + yes + yes + + + + + 0 + no + no + + + + + + no + account-druid + GTK_WINDOW_TOPLEVEL + no + no + yes + GTK_WIN_POS_NONE - - GtkLabel - Notebook:tab - account-editor-dn-customization-label - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - - GtkHSeparator - hseparator10 - - 0 - True - True - - - - - GtkHBox - hbox120 - False - 0 - - 0 - False - False - - - - GtkNotebook - account-editor-advanced-button-notebook - False - False - GTK_POS_TOP - False - 2 - 2 - False - - 0 - True - True - - - - GtkHButtonBox - hbuttonbox21 - GTK_BUTTONBOX_START - 0 - 85 - 27 - 7 - 0 - - - GtkButton - account-editor-fewer-options-button - True - True - - GTK_RELIEF_NORMAL - - - - - GtkLabel - Notebook:tab - label554 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHButtonBox - hbuttonbox28 - GTK_BUTTONBOX_START - 0 - 85 - 27 - 7 - 0 - - - GtkButton - account-editor-more-options-button - True - True - - GTK_RELIEF_NORMAL - - - - - GtkLabel - Notebook:tab - label555 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - + + + yes - - GtkHButtonBox - hbuttonbox20 - GTK_BUTTONBOX_END - 0 - 85 - 27 - 7 - 0 - - 0 - True - True - - - - GtkButton - account-editor-ok-button - False - True - True - GNOME_STOCK_BUTTON_OK - GTK_RELIEF_NORMAL - - - - GtkButton - account-editor-apply-button - False - True - True - GNOME_STOCK_BUTTON_APPLY - GTK_RELIEF_NORMAL - - - - GtkButton - account-editor-close-button - True - True - GNOME_STOCK_BUTTON_CLOSE - GTK_RELIEF_NORMAL - - - - - - - - GtkWindow - account-druid-window - False - account-druid - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - True - False - - - GnomeDruid - account-druid - - - GnomeDruidPageStart - druidpagestart1 - LDAP Configuration Assistant - This assistant will help you to access online directory services + + + LDAP Configuration Assistant + This assistant will help you to access online directory services using LDAP (Lightweight Directory Access Protocol) servers. Adding a new LDAP server requires some specialized information about the server. Please contact your system administrator if you -need help finding this information. - 255,255,255 - 0,0,0 - 0,0,0 - 0,0,0 - 255,255,255 - ldap.png - xstdruidbg-3.png - - - - GnomeDruidPageStandard - add-server-druid-info-page - Step 1: Server Information - 255,255,255 - 0,0,0 - 0,0,0 - - - GtkVBox - GnomeDruidPageStandard:vbox - druid-vbox1 - 3 - False - 3 - - 0 - True - True - - - - GtkVBox - account-druid-general-vbox - 3 - False - 3 - - 0 - True - True - - - - GtkLabel - label158 - - GTK_JUSTIFY_LEFT - False - 7.45058e-09 - 0.5 - 3 - 0 - - 0 - False - False - - - - - GtkHSeparator - hseparator2 - - 0 - False - False - - - - - - - - GnomeDruidPageStandard - add-server-druid-connecting-page - Step 2: Connecting to Server - 255,255,255 - 0,0,0 - 0,0,0 - - - GtkVBox - GnomeDruidPageStandard:vbox - druid-vbox2 - 3 - False - 3 - - 0 - True - True - - - - GtkVBox - account-druid-connecting-vbox - 3 - False - 3 - - 0 - True - True - - - - GtkLabel - label174 - + + + + + Step 1: Server Information + yes + #ffffff + #000000 + #000000 + + + + 3 + no + 3 + yes + + + + 3 + no + 3 + yes + + + + The first step in configuring an LDAP server is to provide its name, and your log in +information. Please ask your system administrator if you are unsure of this information. + GTK_JUSTIFY_LEFT + no + 7.45058e-09 + 0.5 + 3 + 0 + yes + + + 0 + no + no + + + + + + yes + + + 0 + no + no + + + + + 0 + yes + yes + + + + + 0 + yes + yes + + + + + + + + Step 2: Connecting to Server + yes + #ffffff + #000000 + #000000 + + + + 3 + no + 3 + yes + + + + 3 + no + 3 + yes + + + + Now, you must specify how you want to connect to the LDAP server. The SSL (Secure Sockets Layer) and TLS (Transport Layer Security) protocols are used by some servers to cryptographically protect -your connection. Ask your system administrator if your LDAP server uses these protocols. - GTK_JUSTIFY_LEFT - False - 7.45058e-09 - 0.5 - 3 - 0 - - 0 - False - False - - - - - GtkHSeparator - hseparator3 - - 0 - False - False - - - - - - - - GnomeDruidPageStandard - add-server-druid-searching-page - Step 3: Searching the Directory - 255,255,255 - 0,0,0 - 0,0,0 - - - GtkVBox - GnomeDruidPageStandard:vbox - vbox23 - 3 - False - 3 - - 0 - True - True - - - - GtkVBox - account-druid-searching-vbox - 3 - False - 3 - - 0 - True - True - - - - GtkLabel - label254 - + + 0 + no + no + + + + + + yes + + + 0 + no + no + + + + + 0 + yes + yes + + + + + 0 + yes + yes + + + + + + + + Step 3: Searching the Directory + yes + #ffffff + #000000 + #000000 + + + + 3 + no + 3 + yes + + + + 3 + no + 3 + yes + + + + The options on this page control how many entries should be included in your searches, and how long a search should take. Ask your system administrator if you -need to change these options. - GTK_JUSTIFY_LEFT - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkHSeparator - hseparator7 - - 0 - False - False - - - - - - - - GnomeDruidPageStandard - add-server-druid-display-name-page - Step 4: Display Name - 255,255,255 - 0,0,0 - 0,0,0 - - - GtkVBox - GnomeDruidPageStandard:vbox - druid-vbox5 - 3 - False - 3 - - 0 - True - True - - - - GtkVBox - vbox21 - 3 - False - 3 - - 0 - True - True - - - - GtkLabel - label198 - - GTK_JUSTIFY_LEFT - False - 7.45058e-09 - 0.5 - 3 - 0 - - 0 - False - False - - - - - GtkHSeparator - hseparator5 - - 0 - False - False - - - - - GtkTable - table15 - 3 - 1 - 2 - False - 3 - 3 - - 0 - False - False - - - - GtkEntry - druid-display-name-entry - True - True - True - True - 0 - - - 1 - 2 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - - GtkLabel - label199 - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - druid-display-name-entry - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - - GtkNotebook - notebook15 - False - False - GTK_POS_TOP - False - 2 - 2 - False - - 0 - False - False - GTK_PACK_END - - - - GtkHBox - hbox41 - 3 - False - 2 - - - GnomePixmap - pixmap21 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label207 - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label208 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox42 - 3 - False - 3 - - - GnomePixmap - pixmap22 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label215 - - GTK_JUSTIFY_LEFT - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label210 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - - - - - GnomeDruidPageFinish - add-server-druid-finish-page - Finished - Congratulations, you are finished setting up this LDAP server. You +need to change these options. + GTK_JUSTIFY_LEFT + no + 0.5 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + yes + + + 0 + no + no + + + + + 0 + yes + yes + + + + + 0 + yes + yes + + + + + + + + Step 4: Display Name + yes + #ffffff + #000000 + #000000 + + + + 3 + no + 3 + yes + + + + 3 + no + 3 + yes + + + + Specifying a display name is the last required step in configuring an LDAP server. + GTK_JUSTIFY_LEFT + no + 7.45058e-09 + 0.5 + 3 + 0 + yes + + + 0 + no + no + + + + + + yes + + + 0 + no + no + + + + + + 3 + no + 3 + 3 + 1 + 2 + yes + + + + yes + yes + yes + + 0 + yes + yes + + + 1 + 2 + 0 + 1 + 0 + 0 + expand|fill + + + + + + + _Display name: + GTK_JUSTIFY_LEFT + no + 0 + 0.5 + 0 + 0 + druid-display-name-entry + yes + yes + + + 0 + 1 + 0 + 1 + 0 + 0 + fill + + + + + + 0 + no + no + + + + + + no + no + GTK_POS_TOP + no + 2 + 2 + no + yes + + + + 3 + no + 2 + yes + + + + gnome-hint.png + yes + + + 0 + no + no + + + + + + This is the name for this server that will appear in your Evolution folder list. +It is for display purposes only. + GTK_JUSTIFY_LEFT + no + 0 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + + + label163 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + 3 + no + 3 + yes + + + + gnome-hint.png + yes + + + 0 + no + no + + + + + + Selecting this option will let you change Evolution's default settings for LDAP +searches, and for creating and editing contacts. + GTK_JUSTIFY_LEFT + no + 0.5 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + + + label164 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + 0 + no + no + GTK_PACK_END + + + + + 0 + yes + yes + + + + + 0 + yes + yes + + + + + + + + Finished + Congratulations, you are finished setting up this LDAP server. You are now ready to access this directory. -Please click the "Finish" button to save the settings you have entered here. - 0,0,0 - 0,0,0 - 255,255,255 - 0,0,0 - 255,255,255 - xstdruidbg-3.png - - - - - - GtkWindow - edit_server_window_simple - False - edit_server_window_simple - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - True - False - - - GtkVBox - vbox67 - False - 0 - - - GtkNotebook - notebook25 - True - True - True - GTK_POS_TOP - False - 2 - 2 - False - - 0 - True - True - - - - GtkVBox - vbox68 - 6 - False - 3 - - - GtkHBox - hbox121 - 3 - False - 4 - - 0 - False - False - - - - GtkLabel - label484 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkAlignment - alignment52 - 1 - 0.5 - 0.9 - 1 - - 0 - True - True - - - - GtkEntry - entry54 - True - True - True - 0 - - - - - - - GtkHSeparator - hseparator13 - - 0 - False - False - - - - - GtkTable - table32 - 3 - 3 - 2 - False - 3 - 3 - - 0 - False - False - - - - GtkLabel - label485 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry55 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label486 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label487 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - entry56 - - 0 - 1 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - GtkEntry - entry55 - True - True - True - True - 0 - - - 1 - 2 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - - GtkAlignment - alignment53 - 7.45058e-09 - 0.5 - 0 - 1 - - 1 - 2 - 1 - 2 - 0 - 0 - True - False - False - False - True - False - - - - GtkOptionMenu - optionmenu18 - True - Anonymously -Using email address -Using distinguished name (DN) - - 2 - - - - - GtkEntry - entry56 - True - True - True - 0 - - - 1 - 2 - 2 - 3 - 0 - 0 - True - False - False - False - True - False - - - - - - GtkNotebook - notebook26 - False - False - GTK_POS_TOP - False - 2 - 2 - False - - 0 - False - False - GTK_PACK_END - - - - GtkHBox - hbox122 - 3 - False - 2 - - - GnomePixmap - pixmap66 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label488 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label489 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox123 - 3 - False - 2 - - - GnomePixmap - pixmap67 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label490 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label491 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox124 - 3 - False - 2 - - - GnomePixmap - pixmap68 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label492 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label493 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - Placeholder - - - - GtkLabel - Notebook:tab - label494 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox125 - 3 - False - 2 - - - GnomePixmap - pixmap69 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label495 - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label496 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - - - GtkLabel - Notebook:tab - label497 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 +Please click the "Finish" button to save the settings you have entered here. + xstdruidbg-3.png + GNOME_EDGE_FINISH + yes + #ffffff + #000000 + #000000 + #000000 + #ffffff + + + + + + no + edit_server_window_simple + GTK_WINDOW_TOPLEVEL + no + no + yes + GTK_WIN_POS_NONE - - GtkVBox - vbox69 - 6 - False - 3 - - - GtkTable - table33 - 3 - 2 - 2 - False - 3 - 3 - - 0 - False - False - - - - GtkLabel - label498 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkAlignment - alignment54 - 7.45058e-09 - 0.5 - 0 - 1 - - 1 - 2 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - GtkVBox - vbox70 - False - 0 - - - GtkRadioButton - radiobutton9 - True - - False - True - - 0 - False - False - - - - - GtkRadioButton - radiobutton10 - True - - False - True - - 0 - False - False - - - - - GtkRadioButton - radiobutton11 - True - - False - True - - 0 - False - False - - - - - - - GtkAlignment - alignment55 - 7.45058e-09 - 0.5 - 0 - 1 - - 1 - 2 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - GtkPixmap - pixmap70 - gnome-hint.png - 0.5 - 0.5 - 0 - 0 - True - - - - - GtkAlignment - alignment56 - 7.45058e-09 - 0.5 - 0 - 1 - - 1 - 2 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - GtkCombo - combo8 - False - True - False - True - False - 380 -666 -1234 - - - - GtkEntry - GtkCombo:entry - entry57 - True - True - True - True - 0 - 380 - - - - - - GtkLabel - label499 - - GTK_JUSTIFY_CENTER - False - 0 - 7.45058e-09 - 0 - 0 - - 0 - 1 - 1 - 2 - 0 - 0 - False - True - False - False - True - True - - - - - - GtkNotebook - notebook27 - False - False - GTK_POS_TOP - False - 2 - 2 - False - - 0 - False - False - GTK_PACK_END - - - - GtkHBox - hbox126 - 3 - False - 3 - - - GnomePixmap - pixmap71 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label500 - - GTK_JUSTIFY_LEFT - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label501 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox127 - 3 - False - 2 - - - GnomePixmap - pixmap72 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label502 - - GTK_JUSTIFY_LEFT - False - 7.45058e-09 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label503 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox128 - 3 - False - 2 - - - GnomePixmap - pixmap73 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label504 - + + 0 + no + no + + + + + + + + label163 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + 3 + no + 2 + yes + + + + gnome-hint.png + yes + + + 0 + no + no + + + + + + Selecting this option means that Evolution will only connect to your LDAP server if +your LDAP server supports SSL or TLS. + GTK_JUSTIFY_LEFT + no + 7.45058e-09 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + + + label398 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + 3 + no + 2 + yes + + + + gnome-hint.png + yes + + + 0 + no + no + + + + + + Selecting this option means that Evolution will only try to use SSL/TLS if you are in a insecure environment. For example, if you and your LDAP server are behind a firewall at work, then Evolution doesn't need to use SSL/TLS because your connection is already -secure. - GTK_JUSTIFY_LEFT - False - 7.45058e-09 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label505 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox129 - 3 - False - 2 - - - GnomePixmap - pixmap74 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label506 - + + 0 + no + no + + + + + + + + label396 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + 3 + no + 2 + yes + + + + gnome-hint.png + yes + + + 0 + no + no + + + + + + Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security -exploits. - GTK_JUSTIFY_LEFT - False - 7.45058e-09 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label507 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - - - GtkLabel - Notebook:tab - label508 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkVBox - vbox71 - 6 - False - 3 - - - GtkTable - table34 - 3 - 4 - 2 - False - 3 - 3 - - 0 - True - True - - - - GtkLabel - label509 - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label510 - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - - GtkAlignment - alignment57 - 7.45058e-09 - 7.45058e-09 - 0 - 1 - - 1 - 2 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - GtkOptionMenu - optionmenu19 - True - Sub -One - - 0 - - - - - GtkHBox - hbox130 - 3 - False - 3 - - 1 - 2 - 0 - 1 - 0 - 0 - True - False - False - False - True - True - - - - GtkEntry - entry58 - True - True - True - True - 0 - - - 0 - True - True - - - - - GtkButton - button90 - True - - GTK_RELIEF_NORMAL - - 0 - False - False - - - - - - GtkLabel - label511 - - GTK_JUSTIFY_LEFT - False - 0 - 1 - 0 - 0 - - 0 - 1 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - GtkAlignment - alignment58 - 7.45058e-09 - 0.5 - 1 - 1 - - 1 - 2 - 2 - 3 - 0 - 0 - True - False - False - False - True - False - - - - GtkHBox - hbox131 - 3 - False - 3 - - - GtkLabel - label512 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkHScale - hscale5 - True - False - GTK_POS_LEFT - 0 - GTK_UPDATE_DELAYED - 3 - 1 - 5 - 0.5 - 1 - 0 - - 0 - True - True - - - - - GtkLabel - label513 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 3 - 0 - - 0 - False - False - - - - - GtkLabel - label514 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkLabel - label515 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - - GtkLabel - label516 - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 3 - 4 - 0 - 0 - False - False - False - False - True - False - - - - - GtkAlignment - alignment59 - 0 - 0.5 - 0 - 1 - - 1 - 2 - 3 - 4 - 0 - 0 - False - False - False - False - True - True - - - - GtkHBox - hbox132 - 3 - False - 3 - - - GtkSpinButton - spinbutton5 - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 100 - 0 - 10000 - 1 - 10 - 10 - - 0 - True - True - - - - - GtkLabel - label517 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - - - GtkNotebook - notebook28 - False - False - GTK_POS_TOP - False - 2 - 2 - False - - 0 - False - False - GTK_PACK_END - - - - GtkHBox - hbox133 - 3 - False - 3 - - - GnomePixmap - pixmap75 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label518 - - GTK_JUSTIFY_LEFT - False - 7.45058e-09 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label519 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox134 - 3 - False - 2 - - - GnomePixmap - pixmap76 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label520 - + + 0 + no + no + + + + + + + + label397 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + 0 + no + no + GTK_PACK_END + + + + + + + + Connecting + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + 6 + no + 3 + yes + + + + 3 + no + 3 + 3 + 4 + 2 + yes + + + + _Search base: + GTK_JUSTIFY_LEFT + no + 0 + 0.5 + 0 + 0 + yes + yes + + + 0 + 1 + 0 + 1 + 0 + 0 + fill + + + + + + + S_earch scope: + GTK_JUSTIFY_LEFT + no + 0 + 0.5 + 0 + 0 + yes + yes + + + 0 + 1 + 1 + 2 + 0 + 0 + fill + + + + + + + 7.45058e-09 + 7.45058e-09 + 0 + 1 + yes + + + + yes + 0 + yes + + + + yes + + + + Sub + yes + + + + + + One + yes + + + + + + + + + 1 + 2 + 1 + 2 + 0 + 0 + fill + + + + + + + 3 + no + 3 + yes + + + + yes + yes + yes + + 0 + yes + yes + + + 0 + yes + yes + + + + + + yes + S_how Supported Bases + GTK_RELIEF_NORMAL + yes + yes + + + 0 + no + no + + + + + 1 + 2 + 0 + 1 + 0 + 0 + expand|fill + fill + + + + + + _Timeout (minutes): + GTK_JUSTIFY_LEFT + no + 0 + 1 + 0 + 0 + yes + yes + + + 0 + 1 + 2 + 3 + 0 + 0 + fill + + + + + + + 7.45058e-09 + 0.5 + 1 + 1 + yes + + + + 3 + no + 3 + yes + + + + 1:00 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + yes + no + GTK_POS_LEFT + 0 + yes + 3 1 5 0.5 1 0 + + + 0 + yes + yes + + + + + + 5:00 + GTK_JUSTIFY_CENTER + no + 0 + 0.5 + 3 + 0 + yes + + + 0 + no + no + + + + + + Selected: + GTK_JUSTIFY_CENTER + no + 1 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + 2:30 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + + 1 + 2 + 2 + 3 + 0 + 0 + expand|fill + + + + + + + _Download limit: + GTK_JUSTIFY_LEFT + no + 0 + 0.5 + 0 + 0 + yes + yes + + + 0 + 1 + 3 + 4 + 0 + 0 + fill + + + + + + + 0 + 0.5 + 0 + 1 + yes + + + + 3 + no + 3 + yes + + + + yes + 1 + 0 + no + GTK_UPDATE_ALWAYS + no + no + yes + 100 0 10000 1 10 10 + + + 0 + yes + yes + + + + + + cards + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + + 1 + 2 + 3 + 4 + 0 + 0 + fill + fill + + + + + 0 + yes + yes + + + + + + no + no + GTK_POS_TOP + no + 2 + 2 + no + yes + + + + 3 + no + 3 + yes + + + + gnome-hint.png + yes + + + 0 + no + no + + + + + + The search base is the distinguished name (DN) of the entry where your searches will +begin. If you leave this blank, the search will begin at the root of the directory tree. + GTK_JUSTIFY_LEFT + no + 7.45058e-09 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + + + label163 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + 3 + no + 2 + yes + + + + gnome-hint.png + yes + + + 0 + no + no + + + + + + The search scope defines how deep you would like the search to extend down the directory tree. A search scope of "sub" will include all entries below your search base. A search scope of "one" will only include the entries one level beneath your base. - - GTK_JUSTIFY_LEFT - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label521 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox135 - 3 - False - 2 - - - GnomePixmap - pixmap77 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label522 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label523 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox136 - 3 - False - 2 - - - GnomePixmap - pixmap78 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label524 - - GTK_JUSTIFY_LEFT - False - 7.45058e-09 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label525 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - - - GtkLabel - Notebook:tab - label526 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 + + GTK_JUSTIFY_LEFT + no + 0.5 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + + + label164 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + 3 + no + 2 + yes + + + + gnome-hint.png + yes + + + 0 + no + no + + + + + + This option controls how long a search will be run. + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + + + label165 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + 3 + no + 2 + yes + + + + gnome-hint.png + yes + + + 0 + no + no + + + + + + This is the maximum number of entries to download. Setting this number to be +too large will slow down your addressbook. + GTK_JUSTIFY_LEFT + no + 7.45058e-09 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + + + label166 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + 0 + no + no + GTK_PACK_END + + + + + + + + Searching + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + 0 + yes + yes + + + + + + yes + + + 0 + yes + yes + + + + + + no + 0 + yes + + + + GTK_BUTTONBOX_START + 0 + yes + + + + yes + yes + _More Options >> + GTK_RELIEF_NORMAL + yes + yes + + + + + 0 + yes + yes + + + + + + GTK_BUTTONBOX_END + 0 + yes + + + + yes + yes + GTK_RELIEF_NORMAL + yes + gtk-ok + yes + yes + + + + + + yes + yes + GTK_RELIEF_NORMAL + yes + gtk-apply + yes + yes + + + + + + yes + yes + GTK_RELIEF_NORMAL + yes + gtk-close + yes + yes + + + + + 0 + yes + yes + + + + + 0 + no + no + + - - - - GtkHSeparator - hseparator14 - - 0 - True - True - - - - - GtkHBox - hbox142 - False - 0 - - 0 - False - False - - - - GtkHButtonBox - hbuttonbox25 - GTK_BUTTONBOX_START - 0 - 85 - 27 - 7 - 0 - - 0 - True - True - - - - GtkButton - button100 - True - True - - GTK_RELIEF_NORMAL - - - - - GtkHButtonBox - hbuttonbox26 - GTK_BUTTONBOX_END - 0 - 85 - 27 - 7 - 0 - - 0 - True - True - - - - GtkButton - button101 - True - True - GNOME_STOCK_BUTTON_OK - GTK_RELIEF_NORMAL - - - - GtkButton - button102 - True - True - GNOME_STOCK_BUTTON_APPLY - GTK_RELIEF_NORMAL - - - - GtkButton - button103 - True - True - GNOME_STOCK_BUTTON_CLOSE - GTK_RELIEF_NORMAL - - - - - - - - GnomeDialog - addressbook-sources-window - False - Addressbook Sources - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 355 - 285 - True - True - False - False - False - - - GtkVBox - GnomeDialog:vbox - addressbook-sources-vbox - False - 8 - - 4 - True - True - - - GtkHButtonBox - GnomeDialog:action_area - hbuttonbox27 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - - - - GtkButton - button104 - True - True - GNOME_STOCK_BUTTON_OK - - - - GtkButton - button105 - True - True - GNOME_STOCK_BUTTON_APPLY - - - - GtkButton - button106 - True - True - GNOME_STOCK_BUTTON_CLOSE - - - - - GtkHBox - addressbook-sources - False - 0 - - 0 - True - True - - - - Custom - sourcesTable - addressbook_dialog_create_sources_table - 0 - 0 - Thu, 11 Apr 2002 00:31:02 GMT - - 0 - True - True - - - - - GtkVBox - vbox73 - False - 0 - - 0 - False - False - - - - GtkLabel - label529 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkVButtonBox - vbuttonbox18 - GTK_BUTTONBOX_START - 0 - 85 - 27 - 7 - 0 - - 0 - True - True - - - - GtkButton - addSource - True - True - - GTK_RELIEF_NORMAL - - - - GtkButton - editSource - True - True - - GTK_RELIEF_NORMAL - - - - GtkButton - deleteSource - True - True - - GTK_RELIEF_NORMAL - - - - - - - - GtkWindow - general-tab-window - False - general-tab - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - True - False - - - GtkVBox - general-tab - 6 - False - 3 - - - GtkTable - table36 - 3 - 3 - 2 - False - 3 - 3 - - 0 - False - False - - - - GtkLabel - label534 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - server-name-entry - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label535 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - - GtkEntry - server-name-entry - True - True - True - True - 0 - - - 1 - 2 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - - GtkAlignment - alignment63 - 7.45058e-09 - 0.5 - 0 - 1 - - 1 - 2 - 1 - 2 - 0 - 0 - True - False - False - False - True - False - - - - GtkOptionMenu - auth-optionmenu - True - Anonymously -Using email address -Using distinguished name (DN) - - 0 - - - - - GtkNotebook - auth-label-notebook - False - False - False - GTK_POS_TOP - False - 2 - 2 - False - - 0 - 1 - 2 - 3 - 0 - 0 - False - False - False - False - True - True - - - - GtkLabel - label553 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - - - GtkLabel - Notebook:tab - label546 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - label536 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - - - GtkLabel - Notebook:tab - label547 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - - GtkNotebook - auth-entry-notebook - False - False - False - GTK_POS_TOP - False - 2 - 2 - False - - 1 - 2 - 2 - 3 - 0 - 0 - False - False - False - False - True - True - - - - GtkEntry - email-entry - True - True - True - 0 - - - - - GtkLabel - Notebook:tab - label549 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkEntry - dn-entry - True - True - True - 0 - - - - - GtkLabel - Notebook:tab - label550 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - - - GtkNotebook - general-tab-help - False - False - GTK_POS_TOP - False - 2 - 2 - False - - 0 - False - False - GTK_PACK_END - - - - GtkHBox - hbox145 - 3 - False - 2 - - - GnomePixmap - pixmap79 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label537 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label538 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox146 - 3 - False - 2 - - - GnomePixmap - pixmap80 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label539 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label540 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 + + no + Addressbook Sources + GTK_WINDOW_TOPLEVEL + no + 355 + 285 + yes + yes + GTK_WIN_POS_NONE + + + + no + 8 + yes + + + + GTK_BUTTONBOX_END + 8 + yes + + + + yes + yes + yes + gtk-ok + yes + yes + + + + + + yes + yes + yes + gtk-apply + yes + yes + + + + + + yes + yes + yes + gtk-close + yes + yes + + + + + 0 + no + yes + GTK_PACK_END + + + + + + no + 0 + yes + + + + addressbook_dialog_create_sources_table + 0 + 0 + Thu, 11 Apr 2002 00:31:02 GMT + yes + + + 0 + yes + yes + + + + + + no + 0 + yes + + + + + + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + GTK_BUTTONBOX_START + 0 + yes + + + + yes + yes + _Add + GTK_RELIEF_NORMAL + yes + yes + + + + + + yes + yes + _Edit + GTK_RELIEF_NORMAL + yes + yes + + + + + + yes + yes + De_lete + GTK_RELIEF_NORMAL + yes + yes + + + + + 0 + yes + yes + + + + + 0 + no + no + + + + + 0 + yes + yes + + - - - GtkHBox - hbox147 - 3 - False - 2 - - - GnomePixmap - pixmap81 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label541 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label542 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - label552 - - GTK_JUSTIFY_CENTER - True - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - Notebook:tab - label551 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox148 - 3 - False - 2 - - - GnomePixmap - pixmap82 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label544 - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label545 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - + + 4 + yes + yes + + - - - - GtkWindow - connecting-tab-window - False - connecting-tab - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - True - False - - - GtkVBox - connecting-tab - False - 0 - - - GtkTable - table14 - 3 - 2 - 2 - False - 3 - 3 - - 0 - False - True - - - - GtkLabel - label175 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkAlignment - alignment23 - 7.45058e-09 - 0.5 - 0 - 1 - - 1 - 2 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - GtkPixmap - pixmap11 - gnome-hint.png - 0.5 - 0.5 - 0 - 0 - True - - + + no + general-tab + GTK_WINDOW_TOPLEVEL + no + no + yes + GTK_WIN_POS_NONE - - GtkAlignment - alignment21 - 7.45058e-09 - 0.5 - 0 - 1 - - 1 - 2 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - GtkCombo - port-combo - False - True - False - True - False - 389 -636 -3268 - - - - GtkEntry - GtkCombo:entry - entry27 - True - True - True - True - 0 - 389 - - - - - - GtkLabel - label176 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 1 - 2 - 0 - 0 - False - True - False - False - True - True - + + + 6 + no + 3 + yes + + + + 3 + no + 3 + 3 + 3 + 2 + yes + + + + _Server name: + GTK_JUSTIFY_CENTER + no + 0 + 0.5 + 0 + 0 + server-name-entry + yes + yes + + + 0 + 1 + 0 + 1 + 0 + 0 + fill + + + + + + + _Log in method: + GTK_JUSTIFY_CENTER + no + 0 + 0.5 + 0 + 0 + yes + yes + + + 0 + 1 + 1 + 2 + 0 + 0 + fill + + + + + + + yes + yes + yes + + 0 + yes + yes + + + 1 + 2 + 0 + 1 + 0 + 0 + expand|fill + + + + + + + 7.45058e-09 + 0.5 + 0 + 1 + yes + + + + yes + 0 + yes + + + + yes + + + + Anonymously + yes + + + + + + Using email address + yes + + + + + + Using distinguished name (DN) + yes + + + + + + + + + 1 + 2 + 1 + 2 + 0 + 0 + expand|fill + + + + + + + no + no + no + GTK_POS_TOP + no + 2 + 2 + no + yes + + + + Email Address: + GTK_JUSTIFY_CENTER + no + 0 + 0.5 + 0 + 0 + yes + + + + + + label546 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + Distinguished _name: + GTK_JUSTIFY_CENTER + no + 0 + 0.5 + 0 + 0 + yes + yes + + + + + + label547 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + 0 + 1 + 2 + 3 + 0 + 0 + fill + fill + + + + + + no + no + no + GTK_POS_TOP + no + 2 + 2 + no + yes + + + + yes + yes + + 0 + yes + yes + + + + + + label549 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + yes + yes + + 0 + yes + yes + + + + + + label550 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + 1 + 2 + 2 + 3 + 0 + 0 + fill + fill + + + + + 0 + no + no + + + + + + no + no + GTK_POS_TOP + no + 2 + 2 + no + yes + + + + 3 + no + 2 + yes + + + + gnome-hint.png + yes + + + 0 + no + no + + + + + + This is the full name of your ldap server. For example, "ldap.mycompany.com". + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + + + label163 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + 3 + no + 2 + yes + + + + gnome-hint.png + yes + + + 0 + no + no + + + + + + Evolution will use this email address to authenticate you with the server + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + + + label164 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + 3 + no + 2 + yes + + + + gnome-hint.png + yes + + + 0 + no + no + + + + + + Evolution will use this DN to authenticate you with the server + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + + + label165 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + This is the method evolution will use to authenticate you. Note that setting this to "Email Address" requires anonymous access to your ldap server. + GTK_JUSTIFY_CENTER + yes + 0.5 + 0.5 + 0 + 0 + yes + + + + + + label551 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + 3 + no + 2 + yes + + + + gnome-hint.png + yes + + + 0 + no + no + + + + + + This is the name for this server that will appear in your Evolution folder list. +It is for display purposes only. + GTK_JUSTIFY_LEFT + no + 0 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + + + label452 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + 0 + no + no + GTK_PACK_END + + + + + + no + connecting-tab + GTK_WINDOW_TOPLEVEL + no + no + yes + GTK_WIN_POS_NONE - - GtkAlignment - alignment60 - 7.45058e-09 - 0.5 - 0 - 1 - - 1 - 2 - 1 - 2 - 0 - 0 - False - False - False - False - True - True - - - - GtkOptionMenu - ssl-optionmenu - True - Always -Whenever Possible -Never - - 1 - - - - - - GtkNotebook - connecting-tab-help - False - False - GTK_POS_TOP - False - 2 - 2 - False - - 0 - True - True - - - - GtkHBox - hbox30 - 3 - False - 3 - - - GnomePixmap - pixmap7 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label178 - - GTK_JUSTIFY_LEFT - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label179 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox31 - 3 - False - 2 - - - GnomePixmap - pixmap8 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label395 - - GTK_JUSTIFY_LEFT - False - 7.45058e-09 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label398 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox91 - 3 - False - 2 - - - GnomePixmap - pixmap43 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label399 - + + 0 + no + no + + + + + + + + label163 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + 3 + no + 2 + yes + + + + gnome-hint.png + yes + + + 0 + no + no + + + + + + Selecting this option means that Evolution will only connect to your LDAP server if +your LDAP server supports SSL or TLS. + GTK_JUSTIFY_LEFT + no + 7.45058e-09 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + + + label398 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + 3 + no + 2 + yes + + + + gnome-hint.png + yes + + + 0 + no + no + + + + + + Selecting this option means that Evolution will only try to use SSL/TLS if you are in a insecure environment. For example, if you and your LDAP server are behind a firewall at work, then Evolution doesn't need to use SSL/TLS because your connection is already -secure. - GTK_JUSTIFY_LEFT - False - 7.45058e-09 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label396 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox92 - 3 - False - 2 - - - GnomePixmap - pixmap44 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label400 - + + 0 + no + no + + + + + + + + label396 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + 3 + no + 2 + yes + + + + gnome-hint.png + yes + + + 0 + no + no + + + + + + Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security -exploits. - GTK_JUSTIFY_LEFT - False - 7.45058e-09 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label397 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 +exploits. + GTK_JUSTIFY_LEFT + no + 7.45058e-09 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + + + label397 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + 0 + yes + yes + + - + - - - - GtkWindow - searching-tab-window - False - searching-tab - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - True - False - - - GtkVBox - searching-tab - 6 - False - 3 - - - GtkTable - table30 - 3 - 4 - 2 - False - 3 - 3 - - 0 - True - True - - - - GtkLabel - label455 - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label456 - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - - GtkAlignment - alignment49 - 7.45058e-09 - 7.45058e-09 - 0 - 1 - - 1 - 2 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - GtkOptionMenu - scope-optionmenu - True - One -Sub - - 0 - - - - - GtkHBox - hbox109 - 3 - False - 3 - - 1 - 2 - 0 - 1 - 0 - 0 - True - False - False - False - True - True - - - - GtkEntry - rootdn-entry - True - True - True - True - 0 - - - 0 - True - True - - - - - GtkButton - rootdn-button - True - - GTK_RELIEF_NORMAL - - 0 - False - False - - - - - - GtkLabel - label457 - - GTK_JUSTIFY_LEFT - False - 0 - 1 - 0 - 0 - - 0 - 1 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - GtkAlignment - alignment50 - 7.45058e-09 - 0.5 - 1 - 1 - - 1 - 2 - 2 - 3 - 0 - 0 - True - False - False - False - True - False - - - - GtkHBox - hbox110 - 3 - False - 3 - - - GtkLabel - label458 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkHScale - timeout-scale - True - False - GTK_POS_LEFT - 0 - GTK_UPDATE_DELAYED - 3 - 1 - 5 - 0.5 - 1 - 0 - - 0 - True - True - - - - - GtkLabel - label459 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 3 - 0 - - 0 - False - False - - - - - GtkLabel - label460 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkLabel - label461 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - - GtkLabel - label462 - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 3 - 4 - 0 - 0 - False - False - False - False - True - False - - + + no + searching-tab + GTK_WINDOW_TOPLEVEL + no + no + yes + GTK_WIN_POS_NONE - - GtkAlignment - alignment51 - 0 - 0.5 - 0 - 1 - - 1 - 2 - 3 - 4 - 0 - 0 - False - False - False - False - True - True - - - - GtkHBox - hbox111 - 3 - False - 3 - - - GtkSpinButton - download-limit-spinbutton - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 100 - 0 - 10000 - 1 - 10 - 10 - - 0 - True - True - - - - - GtkLabel - label463 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - - - GtkNotebook - searching-tab-help - False - False - GTK_POS_TOP - False - 2 - 2 - False - - 0 - False - False - GTK_PACK_END - - - - GtkHBox - hbox112 - 3 - False - 3 - - - GnomePixmap - pixmap60 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label464 - - GTK_JUSTIFY_LEFT - False - 7.45058e-09 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label465 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox113 - 3 - False - 2 - - - GnomePixmap - pixmap61 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label466 - - GTK_JUSTIFY_LEFT - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - + + GTK_JUSTIFY_LEFT + no + 0.5 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + + + label164 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + 3 + no + 2 + yes + + + + gnome-hint.png + yes + + + 0 + no + no + + + + + + This option controls how long a search will be run. + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + + + label165 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + 3 + no + 2 + yes + + + + gnome-hint.png + yes + + + 0 + no + no + + + + + + This is the maximum number of entries to download. Setting this number to be +too large will slow down your addressbook. + GTK_JUSTIFY_LEFT + no + 7.45058e-09 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + + + label166 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + 0 + no + no + GTK_PACK_END + + - - - GtkLabel - Notebook:tab - label467 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox114 - 3 - False - 2 - - - GnomePixmap - pixmap62 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label468 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label469 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox115 - 3 - False - 2 - - - GnomePixmap - pixmap63 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label470 - - GTK_JUSTIFY_LEFT - False - 7.45058e-09 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label471 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - + - - - - GtkWindow - objectclasses-tab-window - False - objectclasses-tab - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - True - False - - - GtkVBox - objectclasses-tab - 3 - False - 3 - - - GtkHBox - hbox93 - 3 - False - 3 - - 0 - True - True - - - - GtkVBox - vbox51 - 3 - False - 3 - - 0 - True - True - - - - GtkLabel - label405 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - Custom - objectclasses-server-table - objectclasses_create_server_table - 0 - 0 - Tue, 16 Apr 2002 17:09:21 GMT - - 0 - True - True - - - - - - GtkVBox - vbox52 - 3 - False - 3 - - 0 - False - True - - - - GtkLabel - label407 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkVButtonBox - vbuttonbox15 - GTK_BUTTONBOX_START - 1 - 47 - 27 - 7 - 0 - - 0 - True - True - - - - GtkButton - objectclasses-add-button - True - True - - GTK_RELIEF_NORMAL - - - - GtkButton - objectclasses-remove-button - True - True - - GTK_RELIEF_NORMAL - - - + + no + objectclasses-tab + GTK_WINDOW_TOPLEVEL + no + no + yes + GTK_WIN_POS_NONE - - GtkVBox - vbox53 - 3 - False - 3 - - 0 - True - True - - - - GtkLabel - label408 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - Custom - objectclasses-evolution-table - objectclasses_create_evolution_table - 0 - 0 - Tue, 16 Apr 2002 17:09:43 GMT - - 0 - True - True - - - - - - - GtkHButtonBox - hbuttonbox16 - 6 - GTK_BUTTONBOX_DEFAULT_STYLE - 0 - 87 - 27 - 7 - 0 - - 0 - False - False - GTK_PACK_END - - - - GtkButton - objectclasses-default-button - True - True - - GTK_RELIEF_NORMAL + + + 3 + no + 3 + yes + + + + 3 + no + 3 + yes + + + + 3 + no + 3 + yes + + + + Objectclasses Used on Server: + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + objectclasses_create_server_table + 0 + 0 + Tue, 16 Apr 2002 17:09:21 GMT + yes + + + 0 + yes + yes + + + + + 0 + yes + yes + + + + + + 3 + no + 3 + yes + + + + + + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + GTK_BUTTONBOX_START + 1 + yes + + + + yes + yes + _Add -> + GTK_RELIEF_NORMAL + yes + yes + + + + + + yes + yes + <- _Remove + GTK_RELIEF_NORMAL + yes + yes + + + + + 0 + yes + yes + + + + + 0 + no + yes + + + + + + 3 + no + 3 + yes + + + + Objectclasses Used in Evolution: + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + objectclasses_create_evolution_table + 0 + 0 + Tue, 16 Apr 2002 17:09:43 GMT + yes + + + 0 + yes + yes + + + + + 0 + yes + yes + + + + + 0 + yes + yes + + + + + + 6 + GTK_BUTTONBOX_DEFAULT_STYLE + 0 + yes + + + + yes + yes + R_estore Defaults + GTK_RELIEF_NORMAL + yes + yes + + + + + 0 + no + no + GTK_PACK_END + + - + - - - - GtkWindow - mappings-tab-window - False - mappings-tab - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - True - False - - - GtkVBox - mappings-tab - 3 - False - 3 - - - GtkHBox - hbox94 - 3 - False - 3 - - 0 - True - True - - - - GtkVBox - vbox55 - 3 - False - 3 - - 0 - True - True - - - - GtkScrolledWindow - scrolledwindow21 - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - 0 - True - True - - - - GtkCList - clist18 - True - 2 - 146,80 - GTK_SELECTION_SINGLE - True - GTK_SHADOW_IN - - - GtkLabel - CList:title - label411 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CList:title - label412 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - + + no + mappings-tab + GTK_WINDOW_TOPLEVEL + no + no + yes + GTK_WIN_POS_NONE - - GtkVBox - vbox56 - 3 - False - 3 - - 0 - False - False - - - - GtkLabel - label413 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkVButtonBox - vbuttonbox16 - GTK_BUTTONBOX_DEFAULT_STYLE - 0 - 85 - 27 - 7 - 0 - - 0 - False - False - - - - GtkButton - button71 - True - True - - GTK_RELIEF_NORMAL - - - - GtkButton - button72 - True - True - - GTK_RELIEF_NORMAL - - - - GtkButton - button73 - True - True - - GTK_RELIEF_NORMAL - - - - - - - GtkHButtonBox - hbuttonbox17 - GTK_BUTTONBOX_DEFAULT_STYLE - 30 - 85 - 27 - 7 - 0 - - 0 - False - False - GTK_PACK_END - - - - GtkButton - button74 - True - True - - GTK_RELIEF_NORMAL + + + 3 + no + 3 + yes + + + + 3 + no + 3 + yes + + + + 3 + no + 3 + yes + + + + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + yes + + + + yes + yes + yes + + + + CList:title + Evolution Attribute + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + + + + CList:title + Associated LDAP Attribute + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + + + + + + GTK_UPDATE_CONTINUOUS + yes + + + + + + GTK_UPDATE_CONTINUOUS + yes + + + + + 0 + yes + yes + + + + + 0 + yes + yes + + + + + + 3 + no + 3 + yes + + + + + + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + GTK_BUTTONBOX_DEFAULT_STYLE + 0 + yes + + + + yes + yes + _Add Mapping + GTK_RELIEF_NORMAL + yes + yes + + + + + + yes + yes + _Edit Mapping + GTK_RELIEF_NORMAL + yes + yes + + + + + + yes + yes + _Delete Mapping + GTK_RELIEF_NORMAL + yes + yes + + + + + 0 + no + no + + + + + 0 + no + no + + + + + 0 + yes + yes + + + + + + GTK_BUTTONBOX_DEFAULT_STYLE + 30 + yes + + + + yes + yes + Re_store Defaults + GTK_RELIEF_NORMAL + yes + yes + + + + + 0 + no + no + GTK_PACK_END + + - + - - - - GtkWindow - dn-customization-tab-window - False - dn-customization-tab - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - True - False - - - GtkVBox - dn-customization-tab - 3 - False - 3 - - - GtkNotebook - notebook24 - False - False - GTK_POS_TOP - False - 2 - 2 - False - - 0 - False - False - GTK_PACK_END - - - - GtkHBox - hbox116 - 3 - False - 2 - - - GnomePixmap - pixmap64 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label473 - - GTK_JUSTIFY_LEFT - False - 7.45058e-09 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label474 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox117 - 3 - False - 3 - - - GnomePixmap - pixmap65 - gnome-hint.png - - 0 - False - False - - - - - GtkLabel - label475 - - GTK_JUSTIFY_LEFT - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label476 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - - GtkTable - table31 - 3 - 2 - 2 - False - 3 - 3 - - 0 - True - True - - - - GtkVBox - vbox64 - False - 0 - - 1 - 2 - 1 - 2 - 0 - 0 - False - False - False - False - False - True - - - - GtkLabel - label477 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkVButtonBox - vbuttonbox17 - GTK_BUTTONBOX_START - 10 - 85 - 27 - 7 - 0 - - 0 - False - False - - - - GtkButton - button78 - True - True - - GTK_RELIEF_NORMAL - - - - - - GtkScrolledWindow - scrolledwindow22 - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - 0 - 1 - 1 - 2 - 0 - 0 - True - True - False - False - True - True - - - - GtkCList - clist19 - True - 2 - 152,80 - GTK_SELECTION_SINGLE - True - GTK_SHADOW_IN - - - GtkLabel - CList:title - label478 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CList:title - label479 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - + + no + dn-customization-tab + GTK_WINDOW_TOPLEVEL + no + no + yes + GTK_WIN_POS_NONE - - GtkHBox - hbox118 - 3 - False - 3 - - 0 - 1 - 0 - 1 - 0 - 0 - True - False - False - False - True - True - - - - GtkLabel - label480 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - entry53 - - 0 - False - False - - - - - GtkEntry - entry53 - True - True - True - 0 - - - 0 - True - True - - - - - - GtkHButtonBox - hbuttonbox18 - GTK_BUTTONBOX_DEFAULT_STYLE - 0 - 85 - 27 - 7 - 0 - - 1 - 2 - 0 - 1 - 0 - 0 - False - False - False - False - False - True - - - - GtkButton - button79 - True - True - - GTK_RELIEF_NORMAL - - - - - - - - GnomeDialog - supported-bases-dialog - False - Supported Search Bases - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 300 - 200 - True - True - False - False - False - - - GtkVBox - GnomeDialog:vbox - dialog-vbox5 - False - 8 - 4 - True - True - - - - GtkHButtonBox - GnomeDialog:action_area - dialog-action_area5 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - - - - GtkButton - button107 - True - True - GNOME_STOCK_BUTTON_OK + + 3 + no + 3 + yes + + + + no + no + GTK_POS_TOP + no + 2 + 2 + no + yes + + + + 3 + no + 2 + yes + + + + gnome-hint.png + yes + + + 0 + no + no + + + + + + To add an attribute to the DN, select it from the list and click the "Add Attribute" button. +Any values that you add to the DN will become required values for any new contacts +that you add to the directory on the LDAP server. + GTK_JUSTIFY_LEFT + no + 7.45058e-09 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + + + label163 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + + 3 + no + 3 + yes + + + + gnome-hint.png + yes + + + 0 + no + no + + + + + + Selecting this option will let you change Evolution's default settings for LDAP +searches, and for creating and editting contacts. + GTK_JUSTIFY_LEFT + no + 0.5 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + + + label164 + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + tab + + + + + 0 + no + no + GTK_PACK_END + + + + + + 3 + no + 3 + 3 + 2 + 2 + yes + + + + no + 0 + yes + + + + + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + 0 + no + no + + + + + + GTK_BUTTONBOX_START + 10 + yes + + + + yes + yes + _Add to DN + GTK_RELIEF_NORMAL + yes + yes + + + + + 0 + no + no + + + + + 1 + 2 + 1 + 2 + 0 + 0 + + fill + + + + + + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + yes + + + + yes + yes + yes + + + + CList:title + LDAP Attribute + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + + + + CList:title + Corresponding Evolution Attribute + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + yes + + + + + + + + GTK_UPDATE_CONTINUOUS + yes + + + + + + GTK_UPDATE_CONTINUOUS + yes + + + + + 0 + 1 + 1 + 2 + 0 + 0 + expand|fill + expand|fill + + + + + + 3 + no + 3 + yes + + + + _Distinguished Name (DN): + GTK_JUSTIFY_CENTER + no + 0.5 + 0.5 + 0 + 0 + entry53 + yes + yes + + + 0 + no + no + + + + + + yes + yes + + 0 + yes + yes + + + 0 + yes + yes + + + + + 0 + 1 + 0 + 1 + 0 + 0 + expand|fill + fill + + + + + + GTK_BUTTONBOX_DEFAULT_STYLE + 0 + yes + + + + yes + yes + _Restore Defaults + GTK_RELIEF_NORMAL + yes + yes + + + + + 1 + 2 + 0 + 1 + 0 + 0 + + fill + + + + + 0 + yes + yes + + - - - GtkButton - button109 - True - True - GNOME_STOCK_BUTTON_CANCEL + + + + no + Supported Search Bases + GTK_WINDOW_TOPLEVEL + no + 300 + 200 + yes + yes + GTK_WIN_POS_NONE + + + + no + 8 + yes + + + + GTK_BUTTONBOX_END + 8 + yes + + + + yes + yes + yes + gtk-ok + yes + yes + + + + + + yes + yes + yes + gtk-cancel + yes + yes + + + + + 0 + no + yes + GTK_PACK_END + + + + + + supported_bases_create_table + 0 + 0 + Fri, 12 Apr 2002 20:06:45 GMT + yes + + + 0 + yes + yes + + - - - - Custom - supported-bases-table - supported_bases_create_table - 0 - 0 - Fri, 12 Apr 2002 20:06:45 GMT - - 0 - True - True - - + + 4 + yes + yes + + - - - + diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c index 147e4ba1f3..bf6c1fb7ad 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-model.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-model.c @@ -178,7 +178,6 @@ e_contact_list_model_add_destination (EContactListModel *model, EDestination *de model->data[model->data_count ++] = dest; g_object_ref (dest); - gtk_object_sink (GTK_OBJECT (dest)); e_table_model_changed (E_TABLE_MODEL (model)); } 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; } diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h index 7cc97ba2ad..4863c62e07 100644 --- a/addressbook/gui/widgets/e-addressbook-model.h +++ b/addressbook/gui/widgets/e-addressbook-model.h @@ -2,22 +2,23 @@ #ifndef _E_ADDRESSBOOK_MODEL_H_ #define _E_ADDRESSBOOK_MODEL_H_ -#include +#include +#include #include "addressbook/backend/ebook/e-book.h" #include "addressbook/backend/ebook/e-book-view.h" #include "addressbook/backend/ebook/e-card-simple.h" #define E_TYPE_ADDRESSBOOK_MODEL (e_addressbook_model_get_type ()) -#define E_ADDRESSBOOK_MODEL(o) (GTK_CHECK_CAST ((o), E_TYPE_ADDRESSBOOK_MODEL, EAddressbookModel)) -#define E_ADDRESSBOOK_MODEL_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_TYPE_ADDRESSBOOK_MODEL, EAddressbookModelClass)) -#define E_IS_ADDRESSBOOK_MODEL(o) (GTK_CHECK_TYPE ((o), E_TYPE_ADDRESSBOOK_MODEL)) -#define E_IS_ADDRESSBOOK_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TYPE_ADDRESSBOOK_MODEL)) +#define E_ADDRESSBOOK_MODEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_ADDRESSBOOK_MODEL, EAddressbookModel)) +#define E_ADDRESSBOOK_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), E_TYPE_ADDRESSBOOK_MODEL, EAddressbookModelClass)) +#define E_IS_ADDRESSBOOK_MODEL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_ADDRESSBOOK_MODEL)) +#define E_IS_ADDRESSBOOK_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_ADDRESSBOOK_MODEL)) typedef struct _EAddressbookModel EAddressbookModel; typedef struct _EAddressbookModelClass EAddressbookModelClass; struct _EAddressbookModel { - GtkObject parent; + GObject parent; /* item specific fields */ EBook *book; @@ -40,7 +41,7 @@ struct _EAddressbookModel { struct _EAddressbookModelClass { - GtkObjectClass parent_class; + GObjectClass parent_class; /* * Signals @@ -58,7 +59,7 @@ struct _EAddressbookModelClass { }; -GtkType e_addressbook_model_get_type (void); +GType e_addressbook_model_get_type (void); EAddressbookModel *e_addressbook_model_new (void); /* Returns object with ref count of 1. */ diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index 140a09facd..1310442471 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -413,24 +413,25 @@ e_addressbook_reflow_adapter_init (GtkObject *object) priv->model_changed_id = 0; } -GtkType +GType e_addressbook_reflow_adapter_get_type (void) { - static GtkType type = 0; + static GType type = 0; - if (!type){ - GtkTypeInfo info = { - "EAddressbookReflowAdapter", - sizeof (EAddressbookReflowAdapter), + if (!type) { + static const GTypeInfo info = { sizeof (EAddressbookReflowAdapterClass), - (GtkClassInitFunc) e_addressbook_reflow_adapter_class_init, - (GtkObjectInitFunc) e_addressbook_reflow_adapter_init, - NULL, /* reserved 1 */ - NULL, /* reserved 2 */ - (GtkClassInitFunc) NULL + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) e_addressbook_reflow_adapter_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (EAddressbookReflowAdapter), + 0, /* n_preallocs */ + (GInstanceInitFunc) e_addressbook_reflow_adapter_init, }; - type = gtk_type_unique (PARENT_TYPE, &info); + type = g_type_register_static (PARENT_TYPE, "EAddressbookReflowAdapter", &info, 0); } return type; @@ -468,7 +469,7 @@ e_addressbook_reflow_adapter_new (EAddressbookModel *model) { EAddressbookReflowAdapter *et; - et = gtk_type_new (e_addressbook_reflow_adapter_get_type ()); + et = g_object_new (E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER, NULL); e_addressbook_reflow_adapter_construct (et, model); diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h index b3f6ab9c0d..4bf131bc5c 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h @@ -9,11 +9,11 @@ #include "addressbook/backend/ebook/e-book-view.h" #include "addressbook/backend/ebook/e-card.h" -#define E_ADDRESSBOOK_REFLOW_ADAPTER_TYPE (e_addressbook_reflow_adapter_get_type ()) -#define E_ADDRESSBOOK_REFLOW_ADAPTER(o) (GTK_CHECK_CAST ((o), E_ADDRESSBOOK_REFLOW_ADAPTER_TYPE, EAddressbookReflowAdapter)) -#define E_ADDRESSBOOK_REFLOW_ADAPTER_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_ADDRESSBOOK_REFLOW_ADAPTER_TYPE, EAddressbookReflowAdapterClass)) -#define E_IS_ADDRESSBOOK_REFLOW_ADAPTER(o) (GTK_CHECK_TYPE ((o), E_ADDRESSBOOK_REFLOW_ADAPTER_TYPE)) -#define E_IS_ADDRESSBOOK_REFLOW_ADAPTER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_ADDRESSBOOK_REFLOW_ADAPTER_TYPE)) +#define E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER (e_addressbook_reflow_adapter_get_type ()) +#define E_ADDRESSBOOK_REFLOW_ADAPTER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER, EAddressbookReflowAdapter)) +#define E_ADDRESSBOOK_REFLOW_ADAPTER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER, EAddressbookReflowAdapterClass)) +#define E_IS_ADDRESSBOOK_REFLOW_ADAPTER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER)) +#define E_IS_ADDRESSBOOK_REFLOW_ADAPTER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER)) typedef struct _EAddressbookReflowAdapter EAddressbookReflowAdapter; typedef struct _EAddressbookReflowAdapterPrivate EAddressbookReflowAdapterPrivate; @@ -36,7 +36,7 @@ struct _EAddressbookReflowAdapterClass { }; -GtkType e_addressbook_reflow_adapter_get_type (void); +GType e_addressbook_reflow_adapter_get_type (void); void e_addressbook_reflow_adapter_construct (EAddressbookReflowAdapter *adapter, EAddressbookModel *model); EReflowModel *e_addressbook_reflow_adapter_new (EAddressbookModel *model); diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c index 2f38cffcff..eecb6248fd 100644 --- a/addressbook/gui/widgets/e-addressbook-table-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c @@ -343,24 +343,25 @@ model_changed (EAddressbookModel *model, e_table_model_changed (E_TABLE_MODEL (adapter)); } -GtkType +GType e_addressbook_table_adapter_get_type (void) { - static GtkType type = 0; + static GType type = 0; - if (!type){ - GtkTypeInfo info = { - "EAddressbookTableAdapter", - sizeof (EAddressbookTableAdapter), + if (!type) { + static const GTypeInfo info = { sizeof (EAddressbookTableAdapterClass), - (GtkClassInitFunc) e_addressbook_table_adapter_class_init, - (GtkObjectInitFunc) e_addressbook_table_adapter_init, - NULL, /* reserved 1 */ - NULL, /* reserved 2 */ - (GtkClassInitFunc) NULL + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) e_addressbook_table_adapter_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (EAddressbookTableAdapter), + 0, /* n_preallocs */ + (GInstanceInitFunc) e_addressbook_table_adapter_init, }; - type = gtk_type_unique (PARENT_TYPE, &info); + type = g_type_register_static (PARENT_TYPE, "EAddressbookTableAdapter", &info, 0); } return type; @@ -400,7 +401,7 @@ e_addressbook_table_adapter_new (EAddressbookModel *model) { EAddressbookTableAdapter *et; - et = gtk_type_new (e_addressbook_table_adapter_get_type ()); + et = g_object_new(E_TYPE_ADDRESSBOOK_TABLE_ADAPTER, NULL); e_addressbook_table_adapter_construct (et, model); diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.h b/addressbook/gui/widgets/e-addressbook-table-adapter.h index d76434e80a..df66e1dce9 100644 --- a/addressbook/gui/widgets/e-addressbook-table-adapter.h +++ b/addressbook/gui/widgets/e-addressbook-table-adapter.h @@ -7,11 +7,11 @@ #include "addressbook/backend/ebook/e-book-view.h" #include "addressbook/backend/ebook/e-card-simple.h" -#define E_ADDRESSBOOK_TABLE_ADAPTER_TYPE (e_addressbook_table_adapter_get_type ()) -#define E_ADDRESSBOOK_TABLE_ADAPTER(o) (GTK_CHECK_CAST ((o), E_ADDRESSBOOK_TABLE_ADAPTER_TYPE, EAddressbookTableAdapter)) -#define E_ADDRESSBOOK_TABLE_ADAPTER_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_ADDRESSBOOK_TABLE_ADAPTER_TYPE, EAddressbookTableAdapterClass)) -#define E_IS_ADDRESSBOOK_TABLE_ADAPTER(o) (GTK_CHECK_TYPE ((o), E_ADDRESSBOOK_TABLE_ADAPTER_TYPE)) -#define E_IS_ADDRESSBOOK_TABLE_ADAPTER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_ADDRESSBOOK_TABLE_ADAPTER_TYPE)) +#define E_TYPE_ADDRESSBOOK_TABLE_ADAPTER (e_addressbook_table_adapter_get_type ()) +#define E_ADDRESSBOOK_TABLE_ADAPTER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_ADDRESSBOOK_TABLE_ADAPTER, EAddressbookTableAdapter)) +#define E_ADDRESSBOOK_TABLE_ADAPTER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), E_TYPE_ADDRESSBOOK_TABLE_ADAPTER, EAddressbookTableAdapterClass)) +#define E_IS_ADDRESSBOOK_TABLE_ADAPTER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_ADDRESSBOOK_TABLE_ADAPTER)) +#define E_IS_ADDRESSBOOK_TABLE_ADAPTER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_ADDRESSBOOK_TABLE_ADAPTER)) /* Virtual Column list: 0 Email @@ -36,7 +36,7 @@ struct _EAddressbookTableAdapterClass { }; -GtkType e_addressbook_table_adapter_get_type (void); +GType e_addressbook_table_adapter_get_type (void); void e_addressbook_table_adapter_construct (EAddressbookTableAdapter *adapter, EAddressbookModel *model); ETableModel *e_addressbook_table_adapter_new (EAddressbookModel *model); diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 0f47f334b1..46019b2f94 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -21,7 +21,7 @@ #include -#include +#include #include #include @@ -128,25 +128,25 @@ static GdkAtom clipboard_atom = GDK_NONE; static GalViewCollection *collection = NULL; -GtkType +GType e_addressbook_view_get_type (void) { - static GtkType type = 0; + static GType type = 0; if (!type) { - static const GtkTypeInfo info = - { - "EAddressbookView", - sizeof (EAddressbookView), + static const GTypeInfo info = { sizeof (EAddressbookViewClass), - (GtkClassInitFunc) e_addressbook_view_class_init, - (GtkObjectInitFunc) e_addressbook_view_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) e_addressbook_view_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (EAddressbookView), + 0, /* n_preallocs */ + (GInstanceInitFunc) e_addressbook_view_init, }; - - type = gtk_type_unique (gtk_table_get_type (), &info); + + type = g_type_register_static (GTK_TYPE_TABLE, "EAddressbookView", &info, 0); } return type; @@ -356,7 +356,7 @@ e_addressbook_view_dispose (GObject *object) GtkWidget* e_addressbook_view_new (void) { - GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_addressbook_view_get_type ())); + GtkWidget *widget = GTK_WIDGET (g_object_new (E_TYPE_ADDRESSBOOK_VIEW, NULL)); return widget; } @@ -370,7 +370,6 @@ writable_status (GtkObject *object, gboolean writable, EAddressbookView *eav) static void init_collection (void) { -#ifdef PENDING_PORT_WORK GalViewFactory *factory; ETableSpecification *spec; char *galview; @@ -401,7 +400,6 @@ init_collection (void) gal_view_collection_load(collection); } -#endif } static void @@ -423,6 +421,7 @@ display_view(GalViewInstance *instance, static void setup_menus (EAddressbookView *view) { +#if PENDING_PORT_WORK if (view->book && view->view_instance == NULL) { init_collection (); view->view_instance = gal_view_instance_new (collection, e_book_get_uri (view->book)); @@ -437,6 +436,7 @@ setup_menus (EAddressbookView *view) g_signal_connect(view->view_instance, "display_view", G_CALLBACK (display_view), view); } +#endif } static void diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h index 305092ff35..bf7b987b75 100644 --- a/addressbook/gui/widgets/e-addressbook-view.h +++ b/addressbook/gui/widgets/e-addressbook-view.h @@ -40,11 +40,11 @@ extern "C" { * -------------------------------------------------------------------------------- */ -#define E_ADDRESSBOOK_VIEW_TYPE (e_addressbook_view_get_type ()) -#define E_ADDRESSBOOK_VIEW(obj) (GTK_CHECK_CAST ((obj), E_ADDRESSBOOK_VIEW_TYPE, EAddressbookView)) -#define E_ADDRESSBOOK_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_ADDRESSBOOK_VIEW_TYPE, EAddressbookViewClass)) -#define E_IS_ADDRESSBOOK_VIEW(obj) (GTK_CHECK_TYPE ((obj), E_ADDRESSBOOK_VIEW_TYPE)) -#define E_IS_ADDRESSBOOK_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_ADDRESSBOOK_VIEW_TYPE)) +#define E_TYPE_ADDRESSBOOK_VIEW (e_addressbook_view_get_type ()) +#define E_ADDRESSBOOK_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_ADDRESSBOOK_VIEW, EAddressbookView)) +#define E_ADDRESSBOOK_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_ADDRESSBOOK_VIEW, EAddressbookViewClass)) +#define E_IS_ADDRESSBOOK_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_ADDRESSBOOK_VIEW)) +#define E_IS_ADDRESSBOOK_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_ADDRESSBOOK_VIEW)) typedef enum { E_ADDRESSBOOK_VIEW_NONE, /* initialized to this */ @@ -100,7 +100,7 @@ struct _EAddressbookViewClass }; GtkWidget *e_addressbook_view_new (void); -GtkType e_addressbook_view_get_type (void); +GType e_addressbook_view_get_type (void); void e_addressbook_view_setup_menus (EAddressbookView *view, BonoboUIComponent *uic); diff --git a/addressbook/gui/widgets/e-minicard-control.c b/addressbook/gui/widgets/e-minicard-control.c index 1aeba789e2..782e384029 100644 --- a/addressbook/gui/widgets/e-minicard-control.c +++ b/addressbook/gui/widgets/e-minicard-control.c @@ -26,6 +26,9 @@ #include "e-minicard-widget.h" #include "e-card-merging.h" +#define MINICARD_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control" +#define MINICARD_CONTROL_FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory" + typedef struct { EMinicardWidget *minicard; GList *card_list; @@ -220,21 +223,6 @@ pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream, g_free (vcard); } /* pstream_save */ -static CORBA_long -pstream_get_max_size (BonoboPersistStream *ps, void *data, - CORBA_Environment *ev) -{ - EMinicardControl *minicard_control = data; - char *vcard; - gint length; - - vcard = e_card_list_get_vcard(minicard_control->card_list); - length = strlen (vcard); - g_free (vcard); - - return length; -} - static Bonobo_Persist_ContentTypeList * pstream_get_content_types (BonoboPersistStream *ps, void *closure, CORBA_Environment *ev) @@ -333,8 +321,8 @@ e_minicard_control_factory (BonoboGenericFactory *Factory, G_CALLBACK (free_struct), minicard_control); stream = bonobo_persist_stream_new (pstream_load, pstream_save, - pstream_get_max_size, pstream_get_content_types, + MINICARD_CONTROL_ID, minicard_control); #if 0 @@ -368,7 +356,7 @@ e_minicard_control_factory_init (void) factory = bonobo_generic_factory_new ( - "OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory", + MINICARD_CONTROL_FACTORY_ID, e_minicard_control_factory, NULL); if (factory == NULL) diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index 1dbbe22dad..22ec585c96 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -57,29 +57,28 @@ enum { ARG_EDITABLE }; -GtkType +GType e_minicard_label_get_type (void) { - static GtkType minicard_label_type = 0; - - if (!minicard_label_type) - { - static const GtkTypeInfo minicard_label_info = - { - "EMinicardLabel", - sizeof (EMinicardLabel), - sizeof (EMinicardLabelClass), - (GtkClassInitFunc) e_minicard_label_class_init, - (GtkObjectInitFunc) e_minicard_label_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - - minicard_label_type = gtk_type_unique (gnome_canvas_group_get_type (), &minicard_label_info); - } + static GType type = 0; + + if (!type) { + static const GTypeInfo info = { + sizeof (EMinicardLabelClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) e_minicard_label_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (EMinicardLabel), + 0, /* n_preallocs */ + (GInstanceInitFunc) e_minicard_label_init, + }; + + type = g_type_register_static (gnome_canvas_group_get_type (), "EMinicardLabel", &info, 0); + } - return minicard_label_type; + return type; } static void diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h index 3e1044defd..0fdc48a451 100644 --- a/addressbook/gui/widgets/e-minicard-label.h +++ b/addressbook/gui/widgets/e-minicard-label.h @@ -40,11 +40,11 @@ extern "C" { * fieldname string RW text in the fieldname label */ -#define E_MINICARD_LABEL_TYPE (e_minicard_label_get_type ()) -#define E_MINICARD_LABEL(obj) (GTK_CHECK_CAST ((obj), E_MINICARD_LABEL_TYPE, EMinicardLabel)) -#define E_MINICARD_LABEL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_LABEL_TYPE, EMiniCardLabelClass)) -#define E_IS_MINICARD_LABEL(obj) (GTK_CHECK_TYPE ((obj), E_MINICARD_LABEL_TYPE)) -#define E_IS_MINICARD_LABEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_LABEL_TYPE)) +#define E_TYPE_MINICARD_LABEL (e_minicard_label_get_type ()) +#define E_MINICARD_LABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MINICARD_LABEL, EMinicardLabel)) +#define E_MINICARD_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MINICARD_LABEL, EMiniCardLabelClass)) +#define E_IS_MINICARD_LABEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_LABEL)) +#define E_IS_MINICARD_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_LABEL)) typedef struct _EMinicardLabel EMinicardLabel; @@ -72,7 +72,7 @@ struct _EMinicardLabelClass }; -GtkType e_minicard_label_get_type (void); +GType e_minicard_label_get_type (void); GnomeCanvasItem *e_minicard_label_new(GnomeCanvasGroup *parent); void e_minicard_label_construct (GnomeCanvasItem *item); diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index 626ceea5c3..5a2d9c3e0e 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -58,29 +58,28 @@ enum { static guint signals [LAST_SIGNAL] = {0, }; -GtkType +GType e_minicard_view_widget_get_type (void) { - static GtkType type = 0; - - if (!type) - { - static const GtkTypeInfo info = - { - "EMinicardViewWidget", - sizeof (EMinicardViewWidget), - sizeof (EMinicardViewWidgetClass), - (GtkClassInitFunc) e_minicard_view_widget_class_init, - (GtkObjectInitFunc) e_minicard_view_widget_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - - type = gtk_type_unique (e_canvas_get_type (), &info); - } - - return type; + static GType type = 0; + + if (!type) { + static const GTypeInfo info = { + sizeof (EMinicardViewWidgetClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) e_minicard_view_widget_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (EMinicardViewWidget), + 0, /* n_preallocs */ + (GInstanceInitFunc) e_minicard_view_widget_init, + }; + + type = g_type_register_static (e_canvas_get_type (), "EMinicardViewWidget", &info, 0); + } + + return type; } static void diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h index 96e3b9e465..abb6b9c745 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.h +++ b/addressbook/gui/widgets/e-minicard-view-widget.h @@ -24,16 +24,13 @@ #include "addressbook/backend/ebook/e-book.h" #include "e-minicard-view.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS -#define E_MINICARD_VIEW_WIDGET_TYPE (e_minicard_view_widget_get_type ()) -#define E_MINICARD_VIEW_WIDGET(obj) (GTK_CHECK_CAST ((obj), E_MINICARD_VIEW_WIDGET_TYPE, EMinicardViewWidget)) -#define E_MINICARD_VIEW_WIDGET_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_VIEW_WIDGET_TYPE, EMinicardViewWidgetClass)) -#define E_IS_MINICARD_VIEW_WIDGET(obj) (GTK_CHECK_TYPE ((obj), E_MINICARD_VIEW_WIDGET_TYPE)) -#define E_IS_MINICARD_VIEW_WIDGET_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_VIEW_WIDGET_TYPE)) +#define E_TYPE_MINICARD_VIEW_WIDGET (e_minicard_view_widget_get_type ()) +#define E_MINICARD_VIEW_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MINICARD_VIEW_WIDGET, EMinicardViewWidget)) +#define E_MINICARD_VIEW_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MINICARD_VIEW_WIDGET, EMinicardViewWidgetClass)) +#define E_IS_MINICARD_VIEW_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET)) +#define E_IS_MINICARD_VIEW_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET)) typedef struct _EMinicardViewWidget EMinicardViewWidget; @@ -63,15 +60,13 @@ struct _EMinicardViewWidgetClass }; -GtkType e_minicard_view_widget_get_type (void); +GType e_minicard_view_widget_get_type (void); GtkWidget *e_minicard_view_widget_new (EAddressbookReflowAdapter *adapter); /* Get parts of the view widget. */ ESelectionModel *e_minicard_view_widget_get_selection_model (EMinicardViewWidget *view); EMinicardView *e_minicard_view_widget_get_view (EMinicardViewWidget *view); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_MINICARD_VIEW_WIDGET_H__ */ diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 28f7cfe497..afb08ef02f 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -138,16 +138,14 @@ set_empty_message (EMinicardView *view) } if (editable) - empty_message = e_utf8_from_locale_string(_("\n\nThere are no items to show in this view.\n\n" - "Double-click here to create a new Contact.")); + empty_message = _("\n\nThere are no items to show in this view.\n\n" + "Double-click here to create a new Contact."); else - empty_message = e_utf8_from_locale_string(_("\n\nThere are no items to show in this view.")); + empty_message = _("\n\nThere are no items to show in this view."); g_object_set (view, "empty_message", empty_message, NULL); - - g_free (empty_message); } static void @@ -477,24 +475,25 @@ e_minicard_view_init (EMinicardView *view) set_empty_message (view); } -GtkType +GType e_minicard_view_get_type (void) { - static GtkType reflow_type = 0; + static GType reflow_type = 0; if (!reflow_type) { - static const GtkTypeInfo reflow_info = { - "EMinicardView", - sizeof (EMinicardView), + static const GTypeInfo reflow_info = { sizeof (EMinicardViewClass), - (GtkClassInitFunc) e_minicard_view_class_init, - (GtkObjectInitFunc) e_minicard_view_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) e_minicard_view_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (EMinicardView), + 0, /* n_preallocs */ + (GInstanceInitFunc) e_minicard_view_init, }; - reflow_type = gtk_type_unique (PARENT_TYPE, &reflow_info); + reflow_type = g_type_register_static (PARENT_TYPE, "EMinicardView", &reflow_info, 0); } return reflow_type; 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__ */ diff --git a/addressbook/gui/widgets/e-minicard-widget.c b/addressbook/gui/widgets/e-minicard-widget.c index 4c9d7b0f30..a82dae4ca0 100644 --- a/addressbook/gui/widgets/e-minicard-widget.c +++ b/addressbook/gui/widgets/e-minicard-widget.c @@ -41,27 +41,26 @@ enum { ARG_CARD, }; -GtkType +GType e_minicard_widget_get_type (void) { - static GtkType type = 0; - - if (!type) - { - static const GtkTypeInfo info = - { - "EMinicardWidget", - sizeof (EMinicardWidget), - sizeof (EMinicardWidgetClass), - (GtkClassInitFunc) e_minicard_widget_class_init, - (GtkObjectInitFunc) e_minicard_widget_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - - type = gtk_type_unique (e_canvas_get_type (), &info); - } + static GType type = 0; + + if (!type) { + static const GTypeInfo info = { + sizeof (EMinicardWidgetClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) e_minicard_widget_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (EMinicardWidget), + 0, /* n_preallocs */ + (GInstanceInitFunc) e_minicard_widget_init, + }; + + type = g_type_register_static (e_canvas_get_type (), "EMinicardWidget", &info, 0); + } return type; } @@ -187,7 +186,7 @@ e_minicard_widget_destroy (GtkObject *object) GtkWidget* e_minicard_widget_new (void) { - GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_minicard_widget_get_type ())); + GtkWidget *widget = GTK_WIDGET (g_object_new (E_TYPE_MINICARD_WIDGET, NULL)); return widget; } diff --git a/addressbook/gui/widgets/e-minicard-widget.h b/addressbook/gui/widgets/e-minicard-widget.h index eaf0f8edb6..829ad8f77d 100644 --- a/addressbook/gui/widgets/e-minicard-widget.h +++ b/addressbook/gui/widgets/e-minicard-widget.h @@ -36,11 +36,11 @@ extern "C" { * -------------------------------------------------------------------------------- */ -#define E_MINICARD_WIDGET_TYPE (e_minicard_widget_get_type ()) -#define E_MINICARD_WIDGET(obj) (GTK_CHECK_CAST ((obj), E_MINICARD_WIDGET_TYPE, EMinicardWidget)) -#define E_MINICARD_WIDGET_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_WIDGET_TYPE, EMinicardWidgetClass)) -#define E_IS_MINICARD_WIDGET(obj) (GTK_CHECK_TYPE ((obj), E_MINICARD_WIDGET_TYPE)) -#define E_IS_MINICARD_WIDGET_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_WIDGET_TYPE)) +#define E_TYPE_MINICARD_WIDGET (e_minicard_widget_get_type ()) +#define E_MINICARD_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MINICARD_WIDGET, EMinicardWidget)) +#define E_MINICARD_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MINICARD_WIDGET, EMinicardWidgetClass)) +#define E_IS_MINICARD_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_WIDGET)) +#define E_IS_MINICARD_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_WIDGET)) typedef struct _EMinicardWidget EMinicardWidget; @@ -64,7 +64,7 @@ struct _EMinicardWidgetClass GtkWidget *e_minicard_widget_new(void); -GtkType e_minicard_widget_get_type (void); +GType e_minicard_widget_get_type (void); void e_minicard_widget_set_card (EMinicardWidget *, ECard *); diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index f932661eb6..28ae0d07e1 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -96,29 +96,28 @@ enum { static guint e_minicard_signals [LAST_SIGNAL] = {0, }; -GtkType +GType e_minicard_get_type (void) { - static GtkType minicard_type = 0; - - if (!minicard_type) - { - static const GtkTypeInfo minicard_info = - { - "EMinicard", - sizeof (EMinicard), - sizeof (EMinicardClass), - (GtkClassInitFunc) e_minicard_class_init, - (GtkObjectInitFunc) e_minicard_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - - minicard_type = gtk_type_unique (gnome_canvas_group_get_type (), &minicard_info); - } + static GType type = 0; + + if (!type) { + static const GTypeInfo info = { + sizeof (EMinicardClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) e_minicard_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (EMinicard), + 0, /* n_preallocs */ + (GInstanceInitFunc) e_minicard_init, + }; + + type = g_type_register_static (gnome_canvas_group_get_type (), "EMinicard", &info, 0); + } - return minicard_type; + return type; } static void @@ -139,14 +138,14 @@ e_minicard_class_init (EMinicardClass *klass) g_param_spec_double ("width", _("Width"), /*_( */"XXX blurb" /*)*/, - 0.0, 0.0, 0.0, + 10.0, G_MAXDOUBLE, 10.0, G_PARAM_READWRITE | G_PARAM_LAX_VALIDATION)); g_object_class_install_property (object_class, PROP_HEIGHT, g_param_spec_double ("height", _("Height"), /*_( */"XXX blurb" /*)*/, - 0.0, 0.0, 0.0, + 10.0, G_MAXDOUBLE, 10.0, G_PARAM_READWRITE | G_PARAM_LAX_VALIDATION)); g_object_class_install_property (object_class, PROP_HAS_FOCUS, diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h index 674d709e4b..99e2ccbf63 100644 --- a/addressbook/gui/widgets/e-minicard.h +++ b/addressbook/gui/widgets/e-minicard.h @@ -41,11 +41,11 @@ extern "C" { * card ECard* RW Pointer to the ECard */ -#define E_MINICARD_TYPE (e_minicard_get_type ()) -#define E_MINICARD(obj) (GTK_CHECK_CAST ((obj), E_MINICARD_TYPE, EMinicard)) -#define E_MINICARD_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_TYPE, EMinicardClass)) -#define E_IS_MINICARD(obj) (GTK_CHECK_TYPE ((obj), E_MINICARD_TYPE)) -#define E_IS_MINICARD_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_TYPE)) +#define E_TYPE_MINICARD (e_minicard_get_type ()) +#define E_MINICARD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MINICARD, EMinicard)) +#define E_MINICARD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MINICARD, EMinicardClass)) +#define E_IS_MINICARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD)) +#define E_IS_MINICARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD)) typedef struct _EMinicard EMinicard; @@ -106,7 +106,7 @@ struct _EMinicardClass }; -GtkType e_minicard_get_type (void); +GType e_minicard_get_type (void); const char *e_minicard_get_card_id (EMinicard *minicard); int e_minicard_compare (EMinicard *minicard1, EMinicard *minicard2); diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.c b/addressbook/gui/widgets/gal-view-factory-minicard.c index 7e6767ce20..e6cac225ce 100644 --- a/addressbook/gui/widgets/gal-view-factory-minicard.c +++ b/addressbook/gui/widgets/gal-view-factory-minicard.c @@ -75,7 +75,7 @@ gal_view_factory_minicard_init (GalViewFactoryMinicard *factory) GalViewFactory * gal_view_factory_minicard_new (void) { - return gal_view_factory_minicard_construct (gtk_type_new (gal_view_factory_minicard_get_type ())); + return gal_view_factory_minicard_construct (g_object_new (GAL_TYPE_VIEW_FACTORY_MINICARD, NULL)); } /** @@ -93,26 +93,25 @@ gal_view_factory_minicard_construct (GalViewFactoryMinicard *factory) return GAL_VIEW_FACTORY(factory); } -GtkType +GType gal_view_factory_minicard_get_type (void) { - static guint type = 0; - - if (!type) - { - GtkTypeInfo info = - { - "GalViewFactoryMinicard", - sizeof (GalViewFactoryMinicard), + static GType type = 0; + + if (!type) { + static const GTypeInfo info = { sizeof (GalViewFactoryMinicardClass), - (GtkClassInitFunc) gal_view_factory_minicard_class_init, - (GtkObjectInitFunc) gal_view_factory_minicard_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) gal_view_factory_minicard_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (GalViewFactoryMinicard), + 0, /* n_preallocs */ + (GInstanceInitFunc) gal_view_factory_minicard_init, }; - - type = gtk_type_unique (PARENT_TYPE, &info); + + type = g_type_register_static (PARENT_TYPE, "GalViewFactoryMinicard", &info, 0); } return type; diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.h b/addressbook/gui/widgets/gal-view-factory-minicard.h index 3816fdba46..02eea99e47 100644 --- a/addressbook/gui/widgets/gal-view-factory-minicard.h +++ b/addressbook/gui/widgets/gal-view-factory-minicard.h @@ -13,11 +13,11 @@ #include #include -#define GAL_VIEW_FACTORY_MINICARD_TYPE (gal_view_factory_minicard_get_type ()) -#define GAL_VIEW_FACTORY_MINICARD(o) (GTK_CHECK_CAST ((o), GAL_VIEW_FACTORY_MINICARD_TYPE, GalViewFactoryMinicard)) -#define GAL_VIEW_FACTORY_MINICARD_CLASS(k) (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_FACTORY_MINICARD_TYPE, GalViewFactoryMinicardClass)) -#define GAL_IS_VIEW_FACTORY_MINICARD(o) (GTK_CHECK_TYPE ((o), GAL_VIEW_FACTORY_MINICARD_TYPE)) -#define GAL_IS_VIEW_FACTORY_MINICARD_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_FACTORY_MINICARD_TYPE)) +#define GAL_TYPE_VIEW_FACTORY_MINICARD (gal_view_factory_minicard_get_type ()) +#define GAL_VIEW_FACTORY_MINICARD(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_TYPE_VIEW_FACTORY_MINICARD, GalViewFactoryMinicard)) +#define GAL_VIEW_FACTORY_MINICARD_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GAL_TYPE_VIEW_FACTORY_MINICARD, GalViewFactoryMinicardClass)) +#define GAL_IS_VIEW_FACTORY_MINICARD(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GAL_TYPE_VIEW_FACTORY_MINICARD)) +#define GAL_IS_VIEW_FACTORY_MINICARD_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GAL_TYPE_VIEW_FACTORY_MINICARD)) typedef struct { GalViewFactory base; @@ -28,7 +28,7 @@ typedef struct { } GalViewFactoryMinicardClass; /* Standard functions */ -GtkType gal_view_factory_minicard_get_type (void); +GType gal_view_factory_minicard_get_type (void); GalViewFactory *gal_view_factory_minicard_new (void); GalViewFactory *gal_view_factory_minicard_construct (GalViewFactoryMinicard *factory); diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c index aed71e86ac..44e4e9c86c 100644 --- a/addressbook/gui/widgets/gal-view-minicard.c +++ b/addressbook/gui/widgets/gal-view-minicard.c @@ -132,7 +132,7 @@ gal_view_minicard_init (GalViewMinicard *gvm) GalView * gal_view_minicard_new (const gchar *title) { - return gal_view_minicard_construct (gtk_type_new (gal_view_minicard_get_type ()), title); + return gal_view_minicard_construct (g_object_new (GAL_TYPE_VIEW_MINICARD, NULL), title); } /** @@ -153,26 +153,25 @@ gal_view_minicard_construct (GalViewMinicard *view, return GAL_VIEW(view); } -GtkType +GType gal_view_minicard_get_type (void) { - static guint type = 0; - - if (!type) - { - GtkTypeInfo info = - { - "GalViewMinicard", - sizeof (GalViewMinicard), + static GType type = 0; + + if (!type) { + static const GTypeInfo info = { sizeof (GalViewMinicardClass), - (GtkClassInitFunc) gal_view_minicard_class_init, - (GtkObjectInitFunc) gal_view_minicard_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) gal_view_minicard_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (GalViewMinicard), + 0, /* n_preallocs */ + (GInstanceInitFunc) gal_view_minicard_init, }; - - type = gtk_type_unique (PARENT_TYPE, &info); + + type = g_type_register_static (PARENT_TYPE, "GalViewMinicard", &info, 0); } return type; diff --git a/addressbook/gui/widgets/gal-view-minicard.h b/addressbook/gui/widgets/gal-view-minicard.h index 31a28c56d9..2d267d71d0 100644 --- a/addressbook/gui/widgets/gal-view-minicard.h +++ b/addressbook/gui/widgets/gal-view-minicard.h @@ -14,11 +14,11 @@ #include #include -#define GAL_VIEW_MINICARD_TYPE (gal_view_minicard_get_type ()) -#define GAL_VIEW_MINICARD(o) (GTK_CHECK_CAST ((o), GAL_VIEW_MINICARD_TYPE, GalViewMinicard)) -#define GAL_VIEW_MINICARD_CLASS(k) (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_MINICARD_TYPE, GalViewMinicardClass)) -#define GAL_IS_VIEW_MINICARD(o) (GTK_CHECK_TYPE ((o), GAL_VIEW_MINICARD_TYPE)) -#define GAL_IS_VIEW_MINICARD_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_MINICARD_TYPE)) +#define GAL_TYPE_VIEW_MINICARD (gal_view_minicard_get_type ()) +#define GAL_VIEW_MINICARD(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_TYPE_VIEW_MINICARD, GalViewMinicard)) +#define GAL_VIEW_MINICARD_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GAL_TYPE_VIEW_MINICARD, GalViewMinicardClass)) +#define GAL_IS_VIEW_MINICARD(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GAL_TYPE_VIEW_MINICARD)) +#define GAL_IS_VIEW_MINICARD_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GAL_TYPE_VIEW_MINICARD)) typedef struct { GalView base; @@ -35,7 +35,7 @@ typedef struct { } GalViewMinicardClass; /* Standard functions */ -GtkType gal_view_minicard_get_type (void); +GType gal_view_minicard_get_type (void); GalView *gal_view_minicard_new (const gchar *title); GalView *gal_view_minicard_construct (GalViewMinicard *view, const gchar *title); -- cgit v1.2.3