diff options
Diffstat (limited to 'addressbook/gui/contact-editor/e-contact-editor.c')
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 63 |
1 files changed, 32 insertions, 31 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 0f8eb07b15..2f885e4721 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -293,57 +293,57 @@ e_contact_editor_class_init (EContactEditorClass *klass) g_object_class_install_property (object_class, PROP_SOURCE_BOOK, g_param_spec_object ("source_book", - _("Source Book"), - /*_( */"XXX blurb" /*)*/, + "Source Book", + NULL, E_TYPE_BOOK, G_PARAM_READWRITE)); g_object_class_install_property (object_class, PROP_TARGET_BOOK, g_param_spec_object ("target_book", - _("Target Book"), - /*_( */"XXX blurb" /*)*/, + "Target Book", + NULL, E_TYPE_BOOK, G_PARAM_READWRITE)); g_object_class_install_property (object_class, PROP_CONTACT, g_param_spec_object ("contact", - _("Contact"), - /*_( */"XXX blurb" /*)*/, + "Contact", + NULL, E_TYPE_CONTACT, G_PARAM_READWRITE)); g_object_class_install_property (object_class, PROP_IS_NEW_CONTACT, g_param_spec_boolean ("is_new_contact", - _("Is New Contact"), - /*_( */"XXX blurb" /*)*/, + "Is New Contact", + NULL, FALSE, G_PARAM_READWRITE)); g_object_class_install_property (object_class, PROP_WRITABLE_FIELDS, g_param_spec_object ("writable_fields", - _("Writable Fields"), - /*_( */"XXX blurb" /*)*/, + "Writable Fields", + NULL, E_TYPE_LIST, G_PARAM_READWRITE)); g_object_class_install_property (object_class, PROP_REQUIRED_FIELDS, g_param_spec_object ("required_fields", - _("Required Fields"), - /*_( */"XXX blurb" /*)*/, + "Required Fields", + NULL, E_TYPE_LIST, G_PARAM_READWRITE)); g_object_class_install_property (object_class, PROP_EDITABLE, g_param_spec_boolean ("editable", - _("Editable"), - /*_( */"XXX blurb" /*)*/, + "Editable", + NULL, FALSE, G_PARAM_READWRITE)); g_object_class_install_property (object_class, PROP_CHANGED, g_param_spec_boolean ("changed", - _("Changed"), - /*_( */"XXX blurb" /*)*/, + "Changed", + NULL, FALSE, G_PARAM_READWRITE)); } @@ -1202,13 +1202,16 @@ expand_mail (EContactEditor *editor, gboolean expanded) check = e_builder_get_widget (editor->builder, "checkbutton-htmlmail"); table = GTK_TABLE (e_builder_get_widget (editor->builder, "email-table")); if (check != NULL && table != NULL) { - g_object_ref (G_OBJECT (check)); - gtk_container_remove (GTK_CONTAINER (check->parent), check); + GtkWidget *parent; + + g_object_ref (check); + parent = gtk_widget_get_parent (check); + gtk_container_remove (GTK_CONTAINER (parent), check); if (expanded) gtk_table_attach_defaults (table, check, 0, 4, 2, 3); else gtk_table_attach_defaults (table, check, 2, 4, 0, 1); - g_object_unref (G_OBJECT (check)); + g_object_unref (check); } } @@ -3484,11 +3487,7 @@ expand_phone_toggle (EContactEditor *ce) GtkWidget *phone_ext_table; phone_ext_table = e_builder_get_widget (ce->builder, "table-phone-extended"); -#if GTK_CHECK_VERSION(2,19,7) expand_phone (ce, !gtk_widget_get_visible (phone_ext_table)); -#else - expand_phone (ce, !GTK_WIDGET_VISIBLE (phone_ext_table)); -#endif } static void @@ -3497,11 +3496,7 @@ expand_mail_toggle (EContactEditor *ce) GtkWidget *mail; mail = e_builder_get_widget (ce->builder, "entry-email-4"); -#if GTK_CHECK_VERSION(2,19,7) expand_mail (ce, !gtk_widget_get_visible (mail)); -#else - expand_mail (ce, !GTK_WIDGET_VISIBLE (mail)); -#endif } static void @@ -3509,6 +3504,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor) { GtkBuilder *builder; EShell *shell; + GtkWidget *container; GtkWidget *widget, *label; GtkEntryCompletion *completion; @@ -3539,8 +3535,10 @@ e_contact_editor_init (EContactEditor *e_contact_editor) gtk_widget_ensure_style (widget); gtk_window_set_type_hint (GTK_WINDOW (widget), GDK_WINDOW_TYPE_HINT_NORMAL); - gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (widget)->vbox), 0); - gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (widget)->action_area), 12); + container = gtk_dialog_get_action_area (GTK_DIALOG (widget)); + gtk_container_set_border_width (GTK_CONTAINER (container), 12); + container = gtk_dialog_get_content_area (GTK_DIALOG (widget)); + gtk_container_set_border_width (GTK_CONTAINER (container), 0); init_all (e_contact_editor); @@ -3938,9 +3936,12 @@ static void e_contact_editor_raise (EABEditor *editor) { EContactEditor *ce = E_CONTACT_EDITOR (editor); + GdkWindow *window; + + window = gtk_widget_get_window (ce->app); - if (GTK_WIDGET (ce->app)->window) - gdk_window_raise (GTK_WIDGET (ce->app)->window); + if (window != NULL) + gdk_window_raise (window); } /** |