patches/startup-notification-01-__FUNCTION__.diff
author dcarbery
Fri, 24 Nov 2006 16:37:59 +0000
branch217update
changeset 19096 d542fc2c823e
parent 1674 07fd160acb5c
permissions -rw-r--r--
Merged trunk changes r9797:9829 into 217update branch.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1674
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
     1
Common subdirectories: startup-notification-0.5.orig/doc and startup-notification-0.5/doc
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
     2
Common subdirectories: startup-notification-0.5.orig/libsn and startup-notification-0.5/libsn
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
     3
Common subdirectories: startup-notification-0.5.orig/test and startup-notification-0.5/test
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
     4
diff -ru startup-notification-0.5.orig/libsn/sn-launcher.c startup-notification-0.5/libsn/sn-launcher.c
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
     5
--- startup-notification-0.5.orig/libsn/sn-launcher.c	Sat Nov 30 17:58:17 2002
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
     6
+++ startup-notification-0.5/libsn/sn-launcher.c	Sun Feb 15 05:43:46 2004
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
     7
@@ -176,7 +176,7 @@
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
     8
   if (context->startup_id != NULL)
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
     9
     {
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    10
       fprintf (stderr, "%s called twice for the same SnLaunchContext\n",
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    11
-               __FUNCTION__);
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    12
+               __func__);
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    13
       return;
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    14
     }
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    15
 
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    16
@@ -362,7 +362,7 @@
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    17
 /* FIXME use something pluggable, not fprintf */
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    18
 #define WARN_ALREADY_INITIATED(context) do { if ((context)->startup_id != NULL) {               \
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    19
       fprintf (stderr, "%s called for an SnLauncherContext that has already been initiated\n", \
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    20
-               __FUNCTION__);                                                                  \
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    21
+               __func__);                                                                  \
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    22
       return;                                                                                  \
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    23
 } } while (0)
07fd160acb5c 2004-02-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    24