[Xfce4-commits] <exo:master> Fix abicheck and visibility of exo-(simple)-job.

[Nick Schermer]

Updating branch refs/heads/master
         to 98d5545b871b591ac93e780c2b1b135e1af9c694 (commit)
       from 05627cdb04d5d49d947f6acb7e3bbea26cfe5ec9 (commit)

commit 98d5545b871b591ac93e780c2b1b135e1af9c694
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Aug 20 19:32:01 2009 +0200

    Fix abicheck and visibility of exo-(simple)-job.

 exo/abicheck.sh      |    2 +-
 exo/exo-job.c        |    7 +++++++
 exo/exo-simple-job.c |    5 +++++
 exo/exo.symbols      |   24 ++++++++++++++++++++++++
 4 files changed, 37 insertions(+), 1 deletions(-)

diff --git a/exo/abicheck.sh b/exo/abicheck.sh
index 8fd6de5..5200a43 100755
--- a/exo/abicheck.sh
+++ b/exo/abicheck.sh
@@ -20,5 +20,5 @@
 #
 
 cpp -P -DINCLUDE_INTERNAL_SYMBOLS -DINCLUDE_VARIABLES -DALL_FILES ${srcdir:-.}/exo.symbols | sed -e '/^$/d' -e 's/ EXO_GNUC.*$//' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi
-nm -D .libs/libexo-0.3.so | grep " T\|R " | cut -d ' ' -f 3 | grep -v '^_.*' | sort > actual-abi
+nm -D .libs/libexo-1.so | grep " T\|R " | cut -d ' ' -f 3 | grep -v '^_.*' | sort > actual-abi
 diff -u expected-abi actual-abi && rm expected-abi actual-abi
diff --git a/exo/exo-job.c b/exo/exo-job.c
index 0531f33..5d27dde 100644
--- a/exo/exo-job.c
+++ b/exo/exo-job.c
@@ -31,6 +31,7 @@
 #include <exo/exo-job.h>
 #include <exo/exo-private.h>
 #include <exo/exo-string.h>
+#include <exo/exo-alias.h>
 
 
 
@@ -622,3 +623,9 @@ exo_job_send_to_mainloop (ExoJob        *job,
   return g_io_scheduler_job_send_to_mainloop (job->priv->scheduler_job, func, user_data,
                                               destroy_notify);
 }
+
+
+
+
+#define __EXO_JOB_C__
+#include <exo/exo-aliasdef.c>
diff --git a/exo/exo-simple-job.c b/exo/exo-simple-job.c
index cd01f85..26ee5b5 100644
--- a/exo/exo-simple-job.c
+++ b/exo/exo-simple-job.c
@@ -38,6 +38,7 @@
 #include <exo/exo-job.h>
 #include <exo/exo-private.h>
 #include <exo/exo-simple-job.h>
+#include <exo/exo-alias.h>
 
 
 
@@ -200,3 +201,7 @@ exo_simple_job_launch (ExoSimpleJobFunc func,
   /* launch the job */
   return exo_job_launch (EXO_JOB (simple_job));
 }
+
+
+#define __EXO_SIMPLE_JOB_C__
+#include <exo/exo-aliasdef.c>
diff --git a/exo/exo.symbols b/exo/exo.symbols
index 38c9bef..210b72a 100644
--- a/exo/exo.symbols
+++ b/exo/exo.symbols
@@ -221,6 +221,22 @@ exo_icon_view_set_search_position_func
 #endif
 #endif
 
+/* exo-job functions */
+#if IN_HEADER(__EXO_JOB_H__)
+#if IN_SOURCE(__EXO_JOB_C__)
+exo_job_cancel
+exo_job_emit
+exo_job_get_cancellable
+exo_job_get_type G_GNUC_CONST
+exo_job_info_message
+exo_job_is_cancelled
+exo_job_launch
+exo_job_percent
+exo_job_send_to_mainloop
+exo_job_set_error_if_cancelled
+#endif
+#endif
+
 /* exo-mount-point functions */
 #if IN_HEADER(__EXO_MOUNT_POINT_H__)
 #if IN_SOURCE(__EXO_MOUNT_POINT_C__)
@@ -247,6 +263,14 @@ exo_atomic_dec
 #endif
 #endif
 
+/* exo-simple-job functions */
+#if IN_HEADER(__EXO_SIMPLE_JOB_H__)
+#if IN_SOURCE(__EXO_SIMPLE_JOB_C__)
+exo_simple_job_get_type G_GNUC_CONST
+exo_simple_job_launch G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT
+#endif
+#endif
+
 /* exo-string functions */
 #if IN_HEADER(__EXO_STRING_H__)
 #if IN_SOURCE(__EXO_STRING_C__)