diff options
28 files changed, 9 insertions, 33 deletions
diff --git a/addressbook/gui/contact-editor/contact-editor.ui b/addressbook/gui/contact-editor/contact-editor.ui index 88c90c1c31..668fa63ab6 100644 --- a/addressbook/gui/contact-editor/contact-editor.ui +++ b/addressbook/gui/contact-editor/contact-editor.ui @@ -69,7 +69,6 @@ <property name="title" translatable="yes">Contact Editor</property> <property name="window_position">center</property> <property name="type_hint">dialog</property> - <property name="has_separator">False</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index ca4fb6f01b..4ddca1b003 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -387,7 +387,7 @@ build_quick_add_dialog (QuickAdd *qa) dialog = gtk_dialog_new_with_buttons ( _("Contact Quick-Add"), e_shell_get_active_window (NULL), - GTK_DIALOG_NO_SEPARATOR, + 0, _("_Edit Full"), QUICK_ADD_RESPONSE_EDIT_FULL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, diff --git a/addressbook/gui/contact-editor/fullname.ui b/addressbook/gui/contact-editor/fullname.ui index 62e45250e2..47cfde5d2e 100644 --- a/addressbook/gui/contact-editor/fullname.ui +++ b/addressbook/gui/contact-editor/fullname.ui @@ -68,7 +68,6 @@ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="focus_on_map">True</property> <property name="urgency_hint">False</property> - <property name="has_separator">False</property> <child internal-child="vbox"> <object class="GtkVBox" id="vbox-container"> <property name="visible">True</property> diff --git a/addressbook/gui/contact-list-editor/contact-list-editor.ui b/addressbook/gui/contact-list-editor/contact-list-editor.ui index f8c94e6b1b..31bc2fc1a6 100644 --- a/addressbook/gui/contact-list-editor/contact-list-editor.ui +++ b/addressbook/gui/contact-list-editor/contact-list-editor.ui @@ -8,7 +8,6 @@ <property name="window_position">GTK_WIN_POS_CENTER</property> <property name="icon_name">stock_contact-list</property> <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="has_separator">False</property> <signal handler="contact_list_editor_delete_event_cb" name="delete_event"/> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox"> diff --git a/addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui b/addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui index 3bb61184b6..aefd3de172 100644 --- a/addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui +++ b/addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui @@ -10,7 +10,6 @@ <property name="modal">False</property> <property name="resizable">True</property> <property name="destroy_with_parent">False</property> - <property name="has_separator">True</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> diff --git a/addressbook/gui/merging/eab-contact-duplicate-detected.ui b/addressbook/gui/merging/eab-contact-duplicate-detected.ui index 38d8f0e1d8..124b9c2787 100644 --- a/addressbook/gui/merging/eab-contact-duplicate-detected.ui +++ b/addressbook/gui/merging/eab-contact-duplicate-detected.ui @@ -14,7 +14,6 @@ <property name="skip_pager_hint">False</property> <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="has_separator">False</property> <property name="height-request">400</property> <property name="width-request">500</property> <child internal-child="vbox"> diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c index dd99a12dce..1aababe57a 100644 --- a/addressbook/gui/merging/eab-contact-merging.c +++ b/addressbook/gui/merging/eab-contact-merging.c @@ -221,7 +221,7 @@ mergeit (EContactMergingLookup *lookup) gint row = -1; gint value = 0, result; - dialog = (GtkDialog *)(gtk_dialog_new_with_buttons (_("Merge Contact"), NULL, GTK_DIALOG_NO_SEPARATOR, NULL)); + dialog = (GtkDialog *)(gtk_dialog_new_with_buttons (_("Merge Contact"), NULL, 0, NULL)); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); content_area = gtk_dialog_get_content_area (dialog); diff --git a/calendar/gui/alarm-notify/alarm-notify.ui b/calendar/gui/alarm-notify/alarm-notify.ui index b83d9f3bff..181c381aee 100644 --- a/calendar/gui/alarm-notify/alarm-notify.ui +++ b/calendar/gui/alarm-notify/alarm-notify.ui @@ -20,7 +20,6 @@ <property name="default_width">384</property> <property name="default_height">200</property> <property name="type_hint">dialog</property> - <property name="has_separator">False</property> <child internal-child="vbox"> <object class="GtkVBox" id="content-area"> <property name="visible">True</property> diff --git a/calendar/gui/dialogs/alarm-dialog.ui b/calendar/gui/dialogs/alarm-dialog.ui index bf6e570e4a..1bbd1b4096 100644 --- a/calendar/gui/dialogs/alarm-dialog.ui +++ b/calendar/gui/dialogs/alarm-dialog.ui @@ -99,7 +99,6 @@ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="focus_on_map">True</property> <property name="urgency_hint">False</property> - <property name="has_separator">False</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> diff --git a/calendar/gui/dialogs/alarm-list-dialog.ui b/calendar/gui/dialogs/alarm-list-dialog.ui index 095aa36604..ce21bfa666 100644 --- a/calendar/gui/dialogs/alarm-list-dialog.ui +++ b/calendar/gui/dialogs/alarm-list-dialog.ui @@ -17,7 +17,6 @@ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="focus_on_map">True</property> <property name="urgency_hint">False</property> - <property name="has_separator">False</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> diff --git a/calendar/gui/dialogs/e-delegate-dialog.ui b/calendar/gui/dialogs/e-delegate-dialog.ui index 3330e04a45..95356d95cb 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.ui +++ b/calendar/gui/dialogs/e-delegate-dialog.ui @@ -8,7 +8,6 @@ <property name="modal">False</property> <property name="resizable">True</property> <property name="destroy_with_parent">False</property> - <property name="has_separator">True</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> diff --git a/calendar/gui/dialogs/event-page.ui b/calendar/gui/dialogs/event-page.ui index 17919048a6..0f5841ea08 100644 --- a/calendar/gui/dialogs/event-page.ui +++ b/calendar/gui/dialogs/event-page.ui @@ -989,7 +989,6 @@ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="focus_on_map">True</property> <property name="urgency_hint">False</property> - <property name="has_separator">True</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> diff --git a/calendar/gui/goto-dialog.ui b/calendar/gui/goto-dialog.ui index a7e3014712..8ddbfb8575 100644 --- a/calendar/gui/goto-dialog.ui +++ b/calendar/gui/goto-dialog.ui @@ -66,7 +66,6 @@ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="focus_on_map">True</property> <property name="urgency_hint">False</property> - <property name="has_separator">True</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> diff --git a/e-util/e-config.c b/e-util/e-config.c index 6646fa17d9..99597e2b05 100644 --- a/e-util/e-config.c +++ b/e-util/e-config.c @@ -1143,8 +1143,7 @@ e_config_create_window (EConfig *emp, GtkWindow *parent, const gchar *title) if (emp->type == E_CONFIG_BOOK) { w = gtk_dialog_new_with_buttons (title, parent, - GTK_DIALOG_DESTROY_WITH_PARENT | - GTK_DIALOG_NO_SEPARATOR, + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c index 8b454d21a2..014d59d850 100644 --- a/mail/em-folder-properties.c +++ b/mail/em-folder-properties.c @@ -288,7 +288,7 @@ emfp_dialog_got_folder_quota (CamelFolder *folder, dialog = gtk_dialog_new_with_buttons ( _("Folder Properties"), GTK_WINDOW (shell_window), - GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); gtk_window_set_default_size ((GtkWindow *) dialog, 192, 160); diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 1736d7b7aa..aed6cf59a0 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -432,8 +432,7 @@ build_dialog (GtkWindow *parent, EMEventTargetSendReceive *target; send_recv_dialog = gtk_dialog_new_with_buttons ( - _("Send & Receive Mail"), parent, - GTK_DIALOG_NO_SEPARATOR, NULL); + _("Send & Receive Mail"), parent, 0, NULL); gd = GTK_DIALOG (send_recv_dialog); gtk_window_set_modal ((GtkWindow *) gd, FALSE); diff --git a/modules/addressbook/ldap-config.ui b/modules/addressbook/ldap-config.ui index a82e4689d0..c26cb1e95e 100644 --- a/modules/addressbook/ldap-config.ui +++ b/modules/addressbook/ldap-config.ui @@ -91,7 +91,6 @@ <property name="default_width">320</property> <property name="default_height">200</property> <property name="type_hint">dialog</property> - <property name="has_separator">False</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox8"> <property name="visible">True</property> diff --git a/modules/plugin-manager/evolution-plugin-manager.c b/modules/plugin-manager/evolution-plugin-manager.c index 322ac2d1d1..de1df62a5d 100644 --- a/modules/plugin-manager/evolution-plugin-manager.c +++ b/modules/plugin-manager/evolution-plugin-manager.c @@ -256,7 +256,6 @@ action_plugin_manager_cb (GtkAction *action, content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); gtk_window_set_default_size (GTK_WINDOW (dialog), 640, 400); - g_object_set (dialog, "has_separator", FALSE, NULL); gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); hbox = gtk_hbox_new (FALSE, 12); diff --git a/plugins/caldav/caldav-browse-server.c b/plugins/caldav/caldav-browse-server.c index 95937e0dbf..00bcdcfebc 100644 --- a/plugins/caldav/caldav-browse-server.c +++ b/plugins/caldav/caldav-browse-server.c @@ -1521,7 +1521,7 @@ caldav_browse_server (GtkWindow *parent, const gchar *server_url, const gchar *u dialog = gtk_dialog_new_with_buttons ( _("Browse for a CalDAV calendar"), parent, - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); diff --git a/plugins/email-custom-header/org-gnome-email-custom-header.ui b/plugins/email-custom-header/org-gnome-email-custom-header.ui index e1d347df8c..26857d9997 100644 --- a/plugins/email-custom-header/org-gnome-email-custom-header.ui +++ b/plugins/email-custom-header/org-gnome-email-custom-header.ui @@ -17,7 +17,6 @@ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="focus_on_map">True</property> <property name="urgency_hint">False</property> - <property name="has_separator">True</property> <child internal-child="vbox"> <object class="GtkVBox" id="email-custom-header-vbox"> <property name="visible">True</property> diff --git a/plugins/groupwise-features/proxy-add-dialog.ui b/plugins/groupwise-features/proxy-add-dialog.ui index e1050f4f4f..3aafc15ead 100644 --- a/plugins/groupwise-features/proxy-add-dialog.ui +++ b/plugins/groupwise-features/proxy-add-dialog.ui @@ -16,7 +16,6 @@ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="focus_on_map">True</property> - <property name="has_separator">True</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox2"> <property name="visible">True</property> diff --git a/plugins/groupwise-features/proxy-login-dialog.ui b/plugins/groupwise-features/proxy-login-dialog.ui index a8c33317ca..341c63f832 100644 --- a/plugins/groupwise-features/proxy-login-dialog.ui +++ b/plugins/groupwise-features/proxy-login-dialog.ui @@ -16,7 +16,6 @@ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="focus_on_map">True</property> - <property name="has_separator">True</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox2"> <property name="visible">True</property> diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index 4a4e57aa11..790edb4d8a 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -313,7 +313,7 @@ new_folder_response (EMFolderSelector *emfs, gint response, EMFolderTreeModel *m cnc = get_cnc (store); users_dialog = gtk_dialog_new_with_buttons ( - _("Users"), NULL, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); + _("Users"), NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); w = gtk_label_new_with_mnemonic (_("Enter the users and set permissions")); gtk_widget_show (w); content_area = gtk_dialog_get_content_area (GTK_DIALOG (users_dialog)); diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c index 6af94ddc37..38b62738be 100644 --- a/shell/e-shell-content.c +++ b/shell/e-shell-content.c @@ -611,7 +611,7 @@ e_shell_content_run_advanced_search_dialog (EShellContent *shell_content) dialog = gtk_dialog_new_with_buttons ( _("Advanced Search"), GTK_WINDOW (shell_window), - GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_APPLY, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); @@ -715,7 +715,7 @@ e_shell_content_run_save_search_dialog (EShellContent *shell_content) dialog = gtk_dialog_new_with_buttons ( _("Save Search"), GTK_WINDOW (shell_window), - GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); diff --git a/smime/gui/smime-ui.ui b/smime/gui/smime-ui.ui index 3d3dd28939..6e8397543d 100644 --- a/smime/gui/smime-ui.ui +++ b/smime/gui/smime-ui.ui @@ -20,7 +20,6 @@ <property name="title">dialog1</property> <property name="window_position">center</property> <property name="type_hint">dialog</property> - <property name="has_separator">False</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> @@ -1163,7 +1162,6 @@ <property name="title" translatable="yes">Certificate Authority Trust</property> <property name="window_position">center</property> <property name="type_hint">normal</property> - <property name="has_separator">False</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox2"> <property name="visible">True</property> @@ -1390,7 +1388,6 @@ <property name="title" translatable="yes">Email Certificate Trust Settings</property> <property name="window_position">center</property> <property name="type_hint">normal</property> - <property name="has_separator">False</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox3"> <property name="visible">True</property> diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.ui b/widgets/e-timezone-dialog/e-timezone-dialog.ui index a02ec00f1c..017c76c5f3 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.ui +++ b/widgets/e-timezone-dialog/e-timezone-dialog.ui @@ -15,7 +15,6 @@ <property name="skip_pager_hint">False</property> <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="has_separator">False</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> diff --git a/widgets/menus/gal-view-new-dialog.ui b/widgets/menus/gal-view-new-dialog.ui index af31aa54e9..227e3954d8 100644 --- a/widgets/menus/gal-view-new-dialog.ui +++ b/widgets/menus/gal-view-new-dialog.ui @@ -13,7 +13,6 @@ <property name="skip_pager_hint">False</property> <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="has_separator">True</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> diff --git a/widgets/misc/e-send-options.ui b/widgets/misc/e-send-options.ui index 5ca5e7045f..681e6e0693 100644 --- a/widgets/misc/e-send-options.ui +++ b/widgets/misc/e-send-options.ui @@ -122,7 +122,6 @@ <property name="modal">True</property> <property name="window_position">mouse</property> <property name="type_hint">dialog</property> - <property name="has_separator">False</property> <child internal-child="vbox"> <object class="GtkVBox" id="vbox"> <property name="visible">True</property> |