aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-migrate.c2
-rw-r--r--mail/em-network-prefs.c6
3 files changed, 11 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 215e370dfa..a25c4346a5 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-28 Jeff Cai <jeff.cai@sun.com>
+
+ * em-migrate.c: (migrate_to_db):
+ * em-network-prefs.c: (notify_proxy_type_changed),
+ (widget_entry_changed_cb):
+ Use G_GNUC_PRETTY_FUNCTION instead of __PRETTY__FUNCTION
+
2008-07-27 Lucian Langa <lucilanga@gnome.org>
* mail/em-event.h (struct _EMEventTargetCustomIcon):
diff --git a/mail/em-migrate.c b/mail/em-migrate.c
index ea727c4601..92749d5d86 100644
--- a/mail/em-migrate.c
+++ b/mail/em-migrate.c
@@ -2934,7 +2934,7 @@ migrate_to_db()
migrate_folders(store, info, account->name, &ex);
} else
- printf("%s(%d):%s: failed to get folder infos \n", __FILE__, __LINE__, __PRETTY_FUNCTION__);
+ printf("%s(%d):%s: failed to get folder infos \n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
camel_exception_clear(&ex);
}
diff --git a/mail/em-network-prefs.c b/mail/em-network-prefs.c
index ea44ef46b2..6a53581b56 100644
--- a/mail/em-network-prefs.c
+++ b/mail/em-network-prefs.c
@@ -324,7 +324,7 @@ notify_proxy_type_changed (GtkWidget *widget, EMNetworkPrefs *prefs)
emnp_set_sensitiveness (prefs, NETWORK_PROXY_AUTOCONFIG, FALSE);
if (type == NETWORK_PROXY_SYS_SETTINGS) {
d(g_print ("%s:%s:%d: Loading sys settings... \n",
- __FILE__, __PRETTY_FUNCTION__, __LINE__));
+ __FILE__,G_GNUC_PRETTY_FUNCTION, __LINE__));
emnp_load_sys_settings (prefs->gconf);
}
@@ -357,11 +357,11 @@ widget_entry_changed_cb (GtkWidget *widget, gpointer data)
if (GTK_IS_SPIN_BUTTON (widget)) {
port = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget));
gconf_client_set_int (gconf, (const char *)data, port, NULL);
- d(g_print ("%s:%s:%d: %s is SpinButton: value = [%d]\n", __FILE__, __PRETTY_FUNCTION__, __LINE__, (const char *)data, port));
+ d(g_print ("%s:%s:%d: %s is SpinButton: value = [%d]\n", __FILE__,G_GNUC_PRETTY_FUNCTION, __LINE__, (const char *)data, port));
} else if (GTK_IS_ENTRY (widget)) {
value = gtk_entry_get_text (GTK_ENTRY (widget));
gconf_client_set_string (gconf, (const char *)data, value, NULL);
- d(g_print ("%s:%s:%d: %s is Entry: value = [%s]\n", __FILE__, __PRETTY_FUNCTION__, __LINE__, (const char *)data, value));
+ d(g_print ("%s:%s:%d: %s is Entry: value = [%s]\n", __FILE__,G_GNUC_PRETTY_FUNCTION, __LINE__, (const char *)data, value));
}
}