summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2007-03-17 19:21:30 +0000
committerElijah Newren <newren@gmail.com>2007-03-17 19:21:30 +0000
commit1015eea5310f39cbf4b75f84a0cff63327ebc4e0 (patch)
tree626156cbe3fb8b5eed57aa98413f06c08dff8214
parenta0805898e59c702dd517cdeda188d7a9b7d77766 (diff)
downloadstartup-notification-1015eea5310f39cbf4b75f84a0cff63327ebc4e0.tar.gz
Patch from Laszlo Peter at
http://bugzilla.gnome.org/show_bug.cgi?id=392801, replacing __FUNCTION__ with __func__ to increase portability.
-rw-r--r--ChangeLog7
-rw-r--r--libsn/sn-launcher.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 29cfcd4..5f54c51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-17 Elijah Newren <newren gmail com>
+
+ * libsn/sn-launcher.c (sn_launcher_context_initiate,
+ sn_launcher_context_setup_child_process): Patch from Laszlo Peter
+ at http://bugzilla.gnome.org/show_bug.cgi?id=392801, replacing
+ __FUNCTION__ with __func__ to increase portability.
+
2005-03-07 Mark McLoughlin <mark@skynet.ie>
Based on fix from Aivars Kalvans <aivars.kalvans@inbox.lv>
diff --git a/libsn/sn-launcher.c b/libsn/sn-launcher.c
index c60ff31..21344cd 100644
--- a/libsn/sn-launcher.c
+++ b/libsn/sn-launcher.c
@@ -182,7 +182,7 @@ sn_launcher_context_initiate (SnLauncherContext *context,
if (context->startup_id != NULL)
{
fprintf (stderr, "%s called twice for the same SnLaunchContext\n",
- __FUNCTION__);
+ __func__);
return;
}
@@ -369,7 +369,7 @@ sn_launcher_context_setup_child_process (SnLauncherContext *context)
/* FIXME use something pluggable, not fprintf */
#define WARN_ALREADY_INITIATED(context) do { if ((context)->startup_id != NULL) { \
fprintf (stderr, "%s called for an SnLauncherContext that has already been initiated\n", \
- __FUNCTION__); \
+ __func__); \
return; \
} } while (0)