Fix duplicate symbols in Glade files.

15 files changed, 28 insertions, 28 deletions

diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
index 3367e41ca8..81048c7768 100644
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ b/addressbook/gui/contact-editor/contact-editor.glade
@@ -2621,7 +2621,7 @@ Personal</property>
 		  </child>
 
 		  <child>
-		    <widget class="GtkLabel" id="frame72">
+		    <widget class="GtkLabel" id="frame73">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">&lt;b&gt;Home&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
diff --git a/calendar/gui/dialogs/alarm-dialog.glade b/calendar/gui/dialogs/alarm-dialog.glade
index 91b23c5e6d..5b5be4f61f 100644
--- a/calendar/gui/dialogs/alarm-dialog.glade
+++ b/calendar/gui/dialogs/alarm-dialog.glade
@@ -516,7 +516,7 @@ days</property>
 			  <property name="column_spacing">6</property>
 
 			  <child>
-			    <widget class="GtkLabel" id="label2">
+			    <widget class="GtkLabel" id="label7">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">Mes_sage:</property>
 			      <property name="use_underline">True</property>
@@ -648,7 +648,7 @@ days</property>
 			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkLabel" id="label3">
+			    <widget class="GtkLabel" id="label8">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">_Sound:</property>
 			      <property name="use_underline">True</property>
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade
index 984e509b64..ee729bddc8 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade
+++ b/calendar/gui/dialogs/cal-prefs-dialog.glade
@@ -1125,7 +1125,7 @@ Days</property>
             <property name="border_width">12</property>
             <property name="spacing">6</property>
 	    <child>
-	      <widget class="GtkLabel" id="label65">
+	      <widget class="GtkLabel" id="label67">
 	        <property name="visible">True</property>
 	        <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Alarms&lt;/span&gt;</property>
 	        <property name="use_underline">False</property>
diff --git a/calendar/gui/dialogs/event-page.glade b/calendar/gui/dialogs/event-page.glade
index f1bb4e15dc..19e2529ba5 100644
--- a/calendar/gui/dialogs/event-page.glade
+++ b/calendar/gui/dialogs/event-page.glade
@@ -1113,7 +1113,7 @@ b</property>
 		  <property name="spacing">3</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox71">
+		    <widget class="GtkHBox" id="hbox72">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">0</property>
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index 292d4ef573..dd6a51d1b6 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -2533,7 +2533,7 @@ For example: "Work" or "Personal"</property>
         <property name="can_focus">True</property>
         <property name="scrollable">True</property>
         <child>
-          <widget class="GtkVBox" id="vboxGeneral">
+          <widget class="GtkVBox" id="vboxMailGeneral">
             <property name="visible">True</property>
             <property name="border_width">12</property>
             <property name="orientation">vertical</property>
@@ -3143,7 +3143,7 @@ b</property>
           </widget>
         </child>
         <child>
-          <widget class="GtkLabel" id="lblGeneral">
+          <widget class="GtkLabel" id="lblMailGeneral">
             <property name="visible">True</property>
             <property name="label" translatable="yes">General</property>
             <property name="use_underline">True</property>
@@ -4064,7 +4064,7 @@ b</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <child>
-          <widget class="GtkVBox" id="vboxGeneral">
+          <widget class="GtkVBox" id="vboxComposerGeneral">
             <property name="visible">True</property>
             <property name="border_width">12</property>
             <property name="orientation">vertical</property>
@@ -4465,7 +4465,7 @@ Quoted</property>
           </widget>
         </child>
         <child>
-          <widget class="GtkLabel" id="lblGeneral">
+          <widget class="GtkLabel" id="lblComposerGeneral">
             <property name="visible">True</property>
             <property name="label" translatable="yes">General</property>
             <property name="use_underline">True</property>
@@ -4687,7 +4687,7 @@ Quoted</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkHBox" id="hboxImageAndHelp">
+                              <widget class="GtkHBox" id="hboxSpelling">
                                 <property name="visible">True</property>
                                 <property name="spacing">6</property>
                                 <child>
@@ -5215,7 +5215,7 @@ for display purposes only. </property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <child>
-          <widget class="GtkVBox" id="vboxGeneral">
+          <widget class="GtkVBox" id="vboxNetworkGeneral">
             <property name="visible">True</property>
             <property name="border_width">12</property>
             <property name="orientation">vertical</property>
@@ -5293,7 +5293,7 @@ for display purposes only. </property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
-                              <widget class="GtkTable" id="table8">
+                              <widget class="GtkTable" id="table9">
                                 <property name="visible">True</property>
                                 <property name="n_rows">4</property>
                                 <property name="n_columns">4</property>
@@ -5560,7 +5560,7 @@ for display purposes only. </property>
           </widget>
         </child>
         <child>
-          <widget class="GtkLabel" id="lblGeneral">
+          <widget class="GtkLabel" id="lblNetworkGeneral">
             <property name="visible">True</property>
             <property name="label" translatable="yes">General</property>
           </widget>
diff --git a/mail/mail-dialogs.glade b/mail/mail-dialogs.glade
index 67feb18be0..08e7415da7 100644
--- a/mail/mail-dialogs.glade
+++ b/mail/mail-dialogs.glade
@@ -353,7 +353,7 @@
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area1">
+          <widget class="GtkHButtonBox" id="dialog-action_area4">
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
@@ -385,7 +385,7 @@
                     <property name="xscale">0</property>
                     <property name="yscale">0</property>
                     <child>
-                      <widget class="GtkHBox" id="hbox1">
+                      <widget class="GtkHBox" id="hbox3">
                         <property name="visible">True</property>
                         <property name="spacing">2</property>
                         <child>
@@ -401,7 +401,7 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label1">
+                          <widget class="GtkLabel" id="label2">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">_Accept License</property>
                             <property name="use_underline">True</property>
@@ -694,7 +694,7 @@ b</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkVBox" id="vbox3">
+                  <widget class="GtkVBox" id="vbox5">
                     <property name="visible">True</property>
                     <property name="border_width">6</property>
                     <property name="spacing">6</property>
@@ -775,7 +775,7 @@ b</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkVBox" id="vbox1">
+                          <widget class="GtkVBox" id="vbox4">
                             <property name="visible">True</property>
                             <property name="spacing">1</property>
                             <child>
diff --git a/modules/addressbook/ldap-config.glade b/modules/addressbook/ldap-config.glade
index f87cf84b14..5c095f73d6 100644
--- a/modules/addressbook/ldap-config.glade
+++ b/modules/addressbook/ldap-config.glade
@@ -320,7 +320,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkHBox" id="hbox123">
+			    <widget class="GtkHBox" id="hbox129">
 			      <property name="visible">True</property>
 			      <property name="homogeneous">False</property>
 			      <property name="spacing">6</property>
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 6ca42321d9..ac3c663d1b 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -335,7 +335,7 @@ emcp_widget_glade (EConfig *ec,
 /* plugin meta-data */
 static EMConfigItem emcp_items[] = {
 	{ E_CONFIG_BOOK, (gchar *) "", (gchar *) "composer_toplevel", emcp_widget_glade },
-	{ E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) "vboxGeneral", emcp_widget_glade },
+	{ E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) "vboxComposerGeneral", emcp_widget_glade },
 	{ E_CONFIG_SECTION, (gchar *) "00.general/00.behavior", (gchar *) "vboxBehavior", emcp_widget_glade },
 	{ E_CONFIG_SECTION, (gchar *) "00.general/10.alerts", (gchar *) "vboxAlerts", emcp_widget_glade },
 	{ E_CONFIG_PAGE, (gchar *) "10.signatures", (gchar *) "vboxSignatures", emcp_widget_glade },
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index b1434665dd..630f77563f 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -677,7 +677,7 @@ emmp_widget_glade(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *
 /* plugin meta-data */
 static EMConfigItem emmp_items[] = {
 	{ E_CONFIG_BOOK, (gchar *) "", (gchar *) "preferences_toplevel", emmp_widget_glade },
-	{ E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) "vboxGeneral", emmp_widget_glade },
+	{ E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) "vboxMailGeneral", emmp_widget_glade },
 	{ E_CONFIG_SECTION, (gchar *) "00.general/00.fonts", (gchar *) "vboxMessageFonts", emmp_widget_glade },
 	{ E_CONFIG_SECTION, (gchar *) "00.general/10.display", (gchar *) "vboxMessageDisplay", emmp_widget_glade },
 	{ E_CONFIG_SECTION, (gchar *) "00.general/20.delete", (gchar *) "vboxDeletingMail", emmp_widget_glade },
diff --git a/modules/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c
index 4c05fca77d..f2d21545bd 100644
--- a/modules/mail/em-network-prefs.c
+++ b/modules/mail/em-network-prefs.c
@@ -268,7 +268,7 @@ widget_entry_changed_cb (GtkWidget *widget, gpointer data)
 /* plugin meta-data */
 static EMConfigItem emnp_items[] = {
 	{ E_CONFIG_BOOK, (gchar *) "", (gchar *) "network_preferences_toplevel", emnp_widget_glade },
-	{ E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) "vboxGeneral", emnp_widget_glade },
+	{ E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) "vboxNetworkGeneral", emnp_widget_glade },
 	{ E_CONFIG_SECTION, (gchar *) "00.general/00.proxy", (gchar *) "frameProxy", emnp_widget_glade },
 };
 
diff --git a/plugins/exchange-operations/exchange-permissions-dialog.glade b/plugins/exchange-operations/exchange-permissions-dialog.glade
index cf566fc0e4..91404ffb1d 100644
--- a/plugins/exchange-operations/exchange-permissions-dialog.glade
+++ b/plugins/exchange-operations/exchange-permissions-dialog.glade
@@ -193,7 +193,7 @@
 	      <property name="spacing">6</property>
 
 	      <child>
-		<widget class="GtkLabel" id="label3">
+		<widget class="GtkLabel" id="label4">
 		  <property name="visible">True</property>
 		  <property name="label" translatable="yes">Role: </property>
 		  <property name="use_underline">False</property>
diff --git a/plugins/exchange-operations/exchange-send-options.glade b/plugins/exchange-operations/exchange-send-options.glade
index 22003ae588..518e0979e6 100644
--- a/plugins/exchange-operations/exchange-send-options.glade
+++ b/plugins/exchange-operations/exchange-send-options.glade
@@ -118,7 +118,7 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkTable" id="msg_settings_label">
+		<widget class="GtkTable" id="msg_settings_table">
 		  <property name="border_width">6</property>
 		  <property name="visible">True</property>
 		  <property name="n_rows">2</property>
diff --git a/plugins/groupwise-features/proxy-add-dialog.glade b/plugins/groupwise-features/proxy-add-dialog.glade
index a8622f232b..5deb089d4d 100644
--- a/plugins/groupwise-features/proxy-add-dialog.glade
+++ b/plugins/groupwise-features/proxy-add-dialog.glade
@@ -183,7 +183,7 @@
 				      <property name="right_padding">0</property>
 
 				      <child>
-					<widget class="GtkHBox" id="hbox1">
+					<widget class="GtkHBox" id="hbox2">
 					  <property name="visible">True</property>
 					  <property name="homogeneous">False</property>
 					  <property name="spacing">2</property>
diff --git a/plugins/groupwise-features/proxy-listing.glade b/plugins/groupwise-features/proxy-listing.glade
index 5f33da23ad..2ff0baaa97 100644
--- a/plugins/groupwise-features/proxy-listing.glade
+++ b/plugins/groupwise-features/proxy-listing.glade
@@ -50,7 +50,7 @@
 	  <property name="enable_popup">False</property>
 
 	  <child>
-	    <widget class="GtkVBox" id="proxy_vbox">
+	    <widget class="GtkVBox" id="proxy_vbox2">
 	      <property name="border_width">12</property>
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
diff --git a/widgets/table/e-table-config.glade b/widgets/table/e-table-config.glade
index 3b41036c41..9fa6519cce 100644
--- a/widgets/table/e-table-config.glade
+++ b/widgets/table/e-table-config.glade
@@ -1099,7 +1099,7 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="label12">
+		<widget class="GtkLabel" id="label32">
 		  <property name="visible">True</property>
 		  <property name="label" translatable="yes"></property>
 		  <property name="use_underline">False</property>
@@ -2351,7 +2351,7 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="label22">
+		<widget class="GtkLabel" id="label33">
 		  <property name="visible">True</property>
 		  <property name="label" translatable="yes"></property>
 		  <property name="use_underline">False</property>