From ba05584de52f5f953eee7e458ebf4d45da5a3319 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 13 Jan 2011 22:55:52 -0500
Subject: Dialogs no longer have separators.

---
 addressbook/gui/contact-editor/contact-editor.ui                 | 1 -
 addressbook/gui/contact-editor/e-contact-quick-add.c             | 2 +-
 addressbook/gui/contact-editor/fullname.ui                       | 1 -
 addressbook/gui/contact-list-editor/contact-list-editor.ui       | 1 -
 addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui | 1 -
 addressbook/gui/merging/eab-contact-duplicate-detected.ui        | 1 -
 addressbook/gui/merging/eab-contact-merging.c                    | 2 +-
 7 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'addressbook')

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);
-- 
cgit