aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog11
-rw-r--r--mail/GNOME_Evolution_Mail.server.in.in8
-rw-r--r--mail/em-account-prefs.h2
-rw-r--r--mail/em-composer-prefs.h2
-rw-r--r--mail/em-mailer-prefs.h2
-rw-r--r--mail/mail-config.glade4
6 files changed, 20 insertions, 9 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 2c63e7fae3..c97b2f0ec9 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,16 @@
2003-10-29 Jeffrey Stedfast <fejj@ximian.com>
+ * em-account-prefs.h: Changed the OAFIID.
+
+ * em-composer-prefs.h: Changed the OAFIID.
+
+ * em-mailer-prefs.h: Changed the OAFIID.
+
+ * GNOME_Evolution_Mail.server.in.in: Changed OAFIIDs for the prefs
+ controls.
+
+2003-10-29 Jeffrey Stedfast <fejj@ximian.com>
+
* GNOME_Evolution_Mail.server.in.in: Nuked the MailConfig
interface stuff.
diff --git a/mail/GNOME_Evolution_Mail.server.in.in b/mail/GNOME_Evolution_Mail.server.in.in
index c80e8b662b..e2dd225411 100644
--- a/mail/GNOME_Evolution_Mail.server.in.in
+++ b/mail/GNOME_Evolution_Mail.server.in.in
@@ -103,7 +103,7 @@
<!-- Configuration pages -->
<!-- Account Editor -->
- <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Accounts_ConfigControl"
+ <oaf_server iid="OAFIID:GNOME_Evolution_Mail_AccountPrefs_ConfigControl_2"
type="factory"
location="OAFIID:GNOME_Evolution_Mail_Factory_2">
@@ -131,8 +131,8 @@
</oaf_server>
- <!-- Mail Preferences -->
- <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Preferences_ConfigControl"
+ <!-- Mailer Preferences -->
+ <oaf_server iid="OAFIID:GNOME_Evolution_Mail_MailerPrefs_ConfigControl_2"
type="factory"
location="OAFIID:GNOME_Evolution_Mail_Factory_2">
@@ -157,7 +157,7 @@
</oaf_server>
<!-- Composer Preferences -->
- <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ComposerPrefs_ConfigControl"
+ <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ComposerPrefs_ConfigControl_2"
type="factory"
location="OAFIID:GNOME_Evolution_Mail_Factory_2">
diff --git a/mail/em-account-prefs.h b/mail/em-account-prefs.h
index 55cf27ec1c..1fa3b66d58 100644
--- a/mail/em-account-prefs.h
+++ b/mail/em-account-prefs.h
@@ -90,7 +90,7 @@ GtkWidget *em_account_prefs_new (GNOME_Evolution_Shell shell);
void em_account_prefs_apply (EMAccountPrefs *prefs);
/* needed by global config */
-#define EM_ACCOUNT_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_Accounts_ConfigControl"
+#define EM_ACCOUNT_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_AccountPrefs_ConfigControl_2"
#ifdef __cplusplus
}
diff --git a/mail/em-composer-prefs.h b/mail/em-composer-prefs.h
index 0e4ad636c4..e3582d6031 100644
--- a/mail/em-composer-prefs.h
+++ b/mail/em-composer-prefs.h
@@ -121,7 +121,7 @@ void em_composer_prefs_apply (EMComposerPrefs *prefs);
MailConfigSignature *em_composer_prefs_new_signature (GtkWindow *parent, gboolean html, const char *script);
/* needed by global config */
-#define EM_COMPOSER_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_ComposerPrefs_ConfigControl"
+#define EM_COMPOSER_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_ComposerPrefs_ConfigControl_2"
#ifdef __cplusplus
}
diff --git a/mail/em-mailer-prefs.h b/mail/em-mailer-prefs.h
index 5f547a77a6..acd6e88d07 100644
--- a/mail/em-mailer-prefs.h
+++ b/mail/em-mailer-prefs.h
@@ -115,7 +115,7 @@ GtkWidget *em_mailer_prefs_new (void);
void em_mailer_prefs_apply (EMMailerPrefs *prefs);
/* needed by global config */
-#define EM_MAILER_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_Preferences_ConfigControl"
+#define EM_MAILER_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_MailerPrefs_ConfigControl_2"
#ifdef __cplusplus
}
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index 42feea9f6e..884a533a4b 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -2927,10 +2927,10 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
<child>
<widget class="Custom" id="etableMailAccounts">
<property name="visible">True</property>
- <property name="creation_function">mail_accounts_treeview_new</property>
+ <property name="creation_function">em_account_prefs_treeview_new</property>
<property name="int1">0</property>
<property name="int2">0</property>
- <property name="last_modification_time">Thu, 12 Dec 2002 23:20:52 GMT</property>
+ <property name="last_modification_time">Wed, 29 Oct 2003 17:47:08 GMT</property>
</widget>
<packing>
<property name="padding">0</property>