diff options
| -rw-r--r-- | mail/ChangeLog | 11 | ||||
| -rw-r--r-- | mail/em-migrate.c | 2 | ||||
| -rw-r--r-- | mail/em-network-prefs.c | 7 | ||||
| -rw-r--r-- | mail/em-subscribe-editor.c | 8 | ||||
| -rw-r--r-- | mail/mail-vfolder.c | 2 |
5 files changed, 20 insertions, 10 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 4a9c7ede69..3ae48299d6 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,14 @@ +2008-08-04 Matthew Barnes <mbarnes@redhat.com> + + * em-migrate.c (migrate_to_db): + * em-network-prefs.c (notify_proxy_type_changed), + (widget_entry_changed_cb): + * em-subscribe-editor.c (sub_fill_level), (sub_queue_fill_level), + (sub_row_expanded): + * mail-vfolder.c: + Use G_STRLOC or G_STRFUNC instead of deprecated + G_GNUC_PRETTY_FUNCTION. + 2008-08-04 Paul Bolle <pebolle@tiscali.nl> ** Fix for bug #543058 diff --git a/mail/em-migrate.c b/mail/em-migrate.c index 92749d5d86..07e9c1cdab 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__, G_GNUC_PRETTY_FUNCTION); + printf("%s:%s: failed to get folder infos \n", G_STRLOC, G_STRFUNC); camel_exception_clear(&ex); } diff --git a/mail/em-network-prefs.c b/mail/em-network-prefs.c index 6a53581b56..31b703864a 100644 --- a/mail/em-network-prefs.c +++ b/mail/em-network-prefs.c @@ -323,8 +323,7 @@ notify_proxy_type_changed (GtkWidget *widget, EMNetworkPrefs *prefs) emnp_set_sensitiveness (prefs, NETWORK_PROXY_MANUAL, FALSE); 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__,G_GNUC_PRETTY_FUNCTION, __LINE__)); + d(g_print ("%s:%s: Loading sys settings... \n", G_STRLOC, G_STRFUNC)); emnp_load_sys_settings (prefs->gconf); } @@ -357,11 +356,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__,G_GNUC_PRETTY_FUNCTION, __LINE__, (const char *)data, port)); + d(g_print ("%s:%s: %s is SpinButton: value = [%d]\n", G_STRLOC, G_STRFUNC, (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__,G_GNUC_PRETTY_FUNCTION, __LINE__, (const char *)data, value)); + d(g_print ("%s:%s: %s is Entry: value = [%s]\n", G_STRLOC, G_STRFUNC, (const char *)data, value)); } } diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c index 23aca40c4d..8a5e3fd0dd 100644 --- a/mail/em-subscribe-editor.c +++ b/mail/em-subscribe-editor.c @@ -312,8 +312,8 @@ sub_fill_level(EMSubscribe *sub, CamelFolderInfo *info, GtkTreeIter *parent, in e_dlist_addtail(&sub->pending, (EDListNode *)node); } } else { - d(printf("%s:%d:%s: fi->flags & CAMEL_FOLDER_NOINFERIORS=%d\t node->path=[%p]\n", - __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__, fi->flags & CAMEL_FOLDER_NOINFERIORS, + d(printf("%s:%s: fi->flags & CAMEL_FOLDER_NOINFERIORS=%d\t node->path=[%p]\n", + G_STRLOC, G_STRFUNC, fi->flags & CAMEL_FOLDER_NOINFERIORS, node->path)); } @@ -408,7 +408,7 @@ sub_queue_fill_level(EMSubscribe *sub, EMSubscribeNode *node) struct _emse_folderinfo_msg *m; int id; - d(printf("%s:%d:%s: Starting get folderinfo of '%s'\n", __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__, + d(printf("%s:%s: Starting get folderinfo of '%s'\n", G_STRLOC, G_STRFUNC, node?node->info->full_name:"<root>")); m = mail_msg_new (&sub_folderinfo_info); @@ -501,7 +501,7 @@ sub_row_expanded(GtkTreeView *tree, GtkTreeIter *iter, GtkTreePath *path, EMSubs char *row_name; gtk_tree_model_get(model, iter, 1, &row_name, -1); - d(printf("%s:%d:%s: row-expanded '%s'\n", __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__, + d(printf("%s:%s: row-expanded '%s'\n", G_STRLOC, G_STRFUNC, row_name?row_name:"<root>")); /* Do we really need to fetch the children for this row? */ diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index cf21b3c60f..6d0d83e46e 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -50,7 +50,7 @@ #include "mail-tools.h" #include "mail-vfolder.h" -#define d(x) /* (printf("%s(%d):%s: ", __FILE__, __LINE__, __PRETTY_FUNCTION__), (x))*/ +#define d(x) /* (printf("%s:%s: ", G_STRLOC, G_STRFUNC), (x))*/ static EMVFolderContext *context; /* context remains open all time */ CamelStore *vfolder_store; /* the 1 static vfolder store */ |