aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-10-26 02:25:17 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-10-26 02:25:17 +0800
commit06a35575071afe841195199754a27f04a4b03716 (patch)
treea808cfce7f05e185214b7b5b885d15fd28f79aa8
parent9707f615595f3c969e9a0e6cc3e4a623f1057e4c (diff)
downloadgsoc2013-evolution-06a35575071afe841195199754a27f04a4b03716.tar.gz
gsoc2013-evolution-06a35575071afe841195199754a27f04a4b03716.tar.zst
gsoc2013-evolution-06a35575071afe841195199754a27f04a4b03716.zip
Don't use __FUNCTION__. (evolution_wizard_set_show_finish): Likewise.
* evolution-wizard.c (evolution_wizard_set_buttons_sensitive): Don't use __FUNCTION__. (evolution_wizard_set_show_finish): Likewise. (evolution_wizard_set_page): Likewise. * e-shell-startup-wizard.c (make_mail_dialog_pages): Do not use __FUNCTION__ and __LINE__. This breaks the string freeze, but the old way made Evolution non-compilable with non-GNU compilers. svn path=/trunk/; revision=14094
-rw-r--r--shell/ChangeLog11
-rw-r--r--shell/e-shell-startup-wizard.c4
-rw-r--r--shell/evolution-wizard.c6
3 files changed, 16 insertions, 5 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 1afc6b2756..8c9a795e14 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,14 @@
+2001-10-25 Ettore Perazzoli <ettore@ximian.com>
+
+ * evolution-wizard.c (evolution_wizard_set_buttons_sensitive):
+ Don't use __FUNCTION__.
+ (evolution_wizard_set_show_finish): Likewise.
+ (evolution_wizard_set_page): Likewise.
+
+ * e-shell-startup-wizard.c (make_mail_dialog_pages): Do not use
+ __FUNCTION__ and __LINE__. This breaks the string freeze, but the
+ old way made Evolution non-compilable with non-GNU compilers.
+
2001-10-24 Ettore Perazzoli <ettore@ximian.com>
* e-shell-about-box.c: Add a few names to the box.
diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c
index c434a95463..067f8e90c9 100644
--- a/shell/e-shell-startup-wizard.c
+++ b/shell/e-shell-startup-wizard.c
@@ -157,7 +157,7 @@ make_mail_dialog_pages (SWData *data)
data->mailer = oaf_activate_from_id ("OAFIID:GNOME_Evolution_Mail_Wizard", 0, NULL, &ev);
if (BONOBO_EX (&ev)) {
e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
- _("(%s:%d)Could not start the Evolution Mailer Assistant interface\n%s"), __FUNCTION__, __LINE__, CORBA_exception_id (&ev));
+ _("Could not start the Evolution Mailer Assistant interface\n(%s)"), CORBA_exception_id (&ev));
g_warning ("Could not start mailer (%s)", CORBA_exception_id (&ev));
CORBA_exception_free (&ev);
return;
@@ -166,7 +166,7 @@ make_mail_dialog_pages (SWData *data)
CORBA_exception_free (&ev);
if (data->mailer == CORBA_OBJECT_NIL) {
e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
- _("(%s:%d)Could not start the Evolution Mailer Assistant interface\n%s"), __FUNCTION__, __LINE__, "");
+ _("Could not start the Evolution Mailer Assistant interface\n"));
return;
}
diff --git a/shell/evolution-wizard.c b/shell/evolution-wizard.c
index 20f576e8e7..291c7ad57a 100644
--- a/shell/evolution-wizard.c
+++ b/shell/evolution-wizard.c
@@ -301,7 +301,7 @@ evolution_wizard_set_buttons_sensitive (EvolutionWizard *wizard,
EVOLUTION_WIZARD_SET_BUTTONS_SENSITIVE,
&any, &ev);
if (opt_ev == NULL && BONOBO_EX (&ev)) {
- g_warning ("ERROR(%s): %s", __FUNCTION__, CORBA_exception_id (&ev));
+ g_warning ("ERROR(evolution_wizard_set_buttons_sensitive): %s", CORBA_exception_id (&ev));
}
if (opt_ev == NULL) {
@@ -336,7 +336,7 @@ evolution_wizard_set_show_finish (EvolutionWizard *wizard,
EVOLUTION_WIZARD_SET_SHOW_FINISH,
&any, &ev);
if (opt_ev == NULL && BONOBO_EX (&ev)) {
- g_warning ("ERROR(%s): %s", __FUNCTION__, CORBA_exception_id (&ev));
+ g_warning ("ERROR(evolution_wizard_set_show_finish): %s", CORBA_exception_id (&ev));
}
if (opt_ev == NULL) {
@@ -375,7 +375,7 @@ evolution_wizard_set_page (EvolutionWizard *wizard,
&any, &ev);
if (opt_ev == NULL && BONOBO_EX (&ev)) {
- g_warning ("ERROR(%s): %s", __FUNCTION__, CORBA_exception_id (&ev));
+ g_warning ("ERROR(evolution_wizard_set_page): %s", CORBA_exception_id (&ev));
}
if (opt_ev == NULL) {