From 8bbaca9fafb528a718949e1b6b105447a6e4df1e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 24 Sep 2009 17:52:24 -0400 Subject: Fix duplicate symbols in Glade files. --- addressbook/gui/contact-editor/contact-editor.glade | 2 +- calendar/gui/dialogs/alarm-dialog.glade | 4 ++-- calendar/gui/dialogs/cal-prefs-dialog.glade | 2 +- calendar/gui/dialogs/event-page.glade | 2 +- mail/mail-config.glade | 16 ++++++++-------- mail/mail-dialogs.glade | 10 +++++----- modules/addressbook/ldap-config.glade | 2 +- modules/mail/em-composer-prefs.c | 2 +- modules/mail/em-mailer-prefs.c | 2 +- modules/mail/em-network-prefs.c | 2 +- .../exchange-permissions-dialog.glade | 2 +- plugins/exchange-operations/exchange-send-options.glade | 2 +- plugins/groupwise-features/proxy-add-dialog.glade | 2 +- plugins/groupwise-features/proxy-listing.glade | 2 +- widgets/table/e-table-config.glade | 4 ++-- 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 - + True <b>Home</b> False 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 6 - + True Mes_sage: True @@ -648,7 +648,7 @@ days 6 - + True _Sound: True 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 12 6 - + True <span weight="bold">Alarms</span> False 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 3 - + True False 0 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" True True - + True 12 vertical @@ -3143,7 +3143,7 @@ b - + True General True @@ -4064,7 +4064,7 @@ b True True - + True 12 vertical @@ -4465,7 +4465,7 @@ Quoted - + True General True @@ -4687,7 +4687,7 @@ Quoted - + True 6 @@ -5215,7 +5215,7 @@ for display purposes only. True True - + True 12 vertical @@ -5293,7 +5293,7 @@ for display purposes only. vertical 6 - + True 4 4 @@ -5560,7 +5560,7 @@ for display purposes only. - + True General 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 @@ - + True end @@ -385,7 +385,7 @@ 0 0 - + True 2 @@ -401,7 +401,7 @@ - + True _Accept License True @@ -694,7 +694,7 @@ b - + True 6 6 @@ -775,7 +775,7 @@ b - + True 1 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 @@ - + True False 6 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 @@ 6 - + True Role: False 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 @@ - + 6 True 2 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 @@ 0 - + True False 2 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 @@ False - + 12 True False 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 @@ - + True False @@ -2351,7 +2351,7 @@ - + True False -- cgit v1.2.3