From 564090665a4c3aeada310e4b5116ffe6e2deca73 Mon Sep 17 00:00:00 2001
From: Gerald Britton <gerald.britton@gmail.com>
Date: Fri, 17 Apr 2009 16:39:22 +0000
Subject: [PATCH] Bug 2888: ensure proper "requires" statement in glade files

svn: r12467
---
 src/plugins/export/ExportCsv.glade       | 3 ++-
 src/plugins/export/ExportFtree.glade     | 2 +-
 src/plugins/export/ExportGeneWeb.glade   | 2 +-
 src/plugins/export/ExportVCalendar.glade | 2 +-
 src/plugins/export/ExportVCard.glade     | 2 +-
 src/plugins/tool/eventcmp.glade          | 2 +-
 src/plugins/tool/merge.glade             | 2 +-
 src/plugins/tool/verify.glade            | 2 +-
 8 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/plugins/export/ExportCsv.glade b/src/plugins/export/ExportCsv.glade
index 73ba6fe5c..c84ff44ec 100644
--- a/src/plugins/export/ExportCsv.glade
+++ b/src/plugins/export/ExportCsv.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.12"/>
+  <!-- interface-requires gtk+ 2.12 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="csvExport">
     <property name="visible">True</property>
@@ -280,6 +280,7 @@
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
             <property name="fill">False</property>
             <property name="pack_type">end</property>
             <property name="position">0</property>
diff --git a/src/plugins/export/ExportFtree.glade b/src/plugins/export/ExportFtree.glade
index 838d3c436..951593c0c 100644
--- a/src/plugins/export/ExportFtree.glade
+++ b/src/plugins/export/ExportFtree.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.12"/>
+  <!-- interface-requires gtk+ 2.12 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="top">
     <property name="visible">True</property>
diff --git a/src/plugins/export/ExportGeneWeb.glade b/src/plugins/export/ExportGeneWeb.glade
index e2ad27cc1..e9a5248f4 100644
--- a/src/plugins/export/ExportGeneWeb.glade
+++ b/src/plugins/export/ExportGeneWeb.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.12"/>
+  <!-- interface-requires gtk+ 2.12 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="genewebExport">
     <property name="visible">True</property>
diff --git a/src/plugins/export/ExportVCalendar.glade b/src/plugins/export/ExportVCalendar.glade
index e0f270c4a..3c2115723 100644
--- a/src/plugins/export/ExportVCalendar.glade
+++ b/src/plugins/export/ExportVCalendar.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.12"/>
+  <!-- interface-requires gtk+ 2.12 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="calendarExport">
     <property name="visible">True</property>
diff --git a/src/plugins/export/ExportVCard.glade b/src/plugins/export/ExportVCard.glade
index be3643519..9d001e243 100644
--- a/src/plugins/export/ExportVCard.glade
+++ b/src/plugins/export/ExportVCard.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.12"/>
+  <!-- interface-requires gtk+ 2.12 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="vcardExport">
     <property name="visible">True</property>
diff --git a/src/plugins/tool/eventcmp.glade b/src/plugins/tool/eventcmp.glade
index 62337bfd9..d5ddd3fff 100644
--- a/src/plugins/tool/eventcmp.glade
+++ b/src/plugins/tool/eventcmp.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.12"/>
+  <!-- interface-requires gtk+ 2.12 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkListStore" id="liststore1">
     <columns>
diff --git a/src/plugins/tool/merge.glade b/src/plugins/tool/merge.glade
index d86585473..96ed88819 100644
--- a/src/plugins/tool/merge.glade
+++ b/src/plugins/tool/merge.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.12"/>
+  <!-- interface-requires gtk+ 2.12 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="message">
     <property name="modal">True</property>
diff --git a/src/plugins/tool/verify.glade b/src/plugins/tool/verify.glade
index 7434680f0..422e7ac98 100644
--- a/src/plugins/tool/verify.glade
+++ b/src/plugins/tool/verify.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.12"/>
+  <!-- interface-requires gtk+ 2.12 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="verify_settings">
     <property name="type_hint">dialog</property>