diff options
Diffstat (limited to 'camel')
| -rw-r--r-- | camel/Makefile.am | 25 | ||||
| -rw-r--r-- | camel/camel-folder-pt-proxy.c | 10 |
2 files changed, 26 insertions, 9 deletions
diff --git a/camel/Makefile.am b/camel/Makefile.am index 322f096e76..ef3d19c44d 100644 --- a/camel/Makefile.am +++ b/camel/Makefile.am @@ -11,13 +11,29 @@ INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) \ -I$(top_srcdir)/intl \ $(GTK_INCLUDEDIR) + +if HAVE_PTHREAD + +libcamel_pthread_SOURCES = \ + camel-folder-pt-proxy.c + +libcamel_pthread_HEADERS = \ + camel-folder-pt-proxy.h + +else + +libcamel_pthread_SOURCES = +libcamel_pthread_HEADERS = + +endif + + libcamel_la_SOURCES = \ camel.c \ camel-log.c \ camel-data-wrapper.c \ camel-simple-data-wrapper.c \ camel-folder.c \ - camel-folder-pt-proxy.c \ camel-folder-summary.c \ camel-medium.c \ camel-mime-body-part.c \ @@ -42,7 +58,8 @@ libcamel_la_SOURCES = \ hash-table-utils.c \ md5-utils.c \ string-utils.c \ - url-util.c + url-util.c \ + $(libcamel_pthread_SOURCES) libcamelinclude_HEADERS = \ camel.h \ @@ -50,7 +67,6 @@ libcamelinclude_HEADERS = \ camel-data-wrapper.h \ camel-simple-data-wrapper.h \ camel-folder.h \ - camel-folder-pt-proxy.h \ camel-folder-summary.h \ camel-mime-body-part.h \ camel-medium.h \ @@ -75,7 +91,8 @@ libcamelinclude_HEADERS = \ hash-table-utils.h \ md5-utils.h \ string-utils.h \ - url-util.h + url-util.h \ + $(libcamel_pthread_HEADERS) libcamel_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) diff --git a/camel/camel-folder-pt-proxy.c b/camel/camel-folder-pt-proxy.c index 6aa5340000..289c02ddcf 100644 --- a/camel/camel-folder-pt-proxy.c +++ b/camel/camel-folder-pt-proxy.c @@ -80,7 +80,7 @@ static gboolean _thread_notification_catch (GIOChannel *source, gpointer data); static void -camel_folder_proxy_class_init (CamelFolderPtProxyClass *camel_folder_pt_proxy_class) +camel_folder_pt_proxy_class_init (CamelFolderPtProxyClass *camel_folder_pt_proxy_class) { GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (camel_folder_pt_proxy_class); CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS (camel_folder_pt_proxy_class); @@ -123,7 +123,7 @@ camel_folder_proxy_class_init (CamelFolderPtProxyClass *camel_folder_pt_proxy_cl static void -camel_folder_proxy_init (CamelFolderPtProxy *folder_pt_proxy) +camel_folder_pt_proxy_init (CamelFolderPtProxy *folder_pt_proxy) { folder_pt_proxy->op_queue = camel_op_queue_new (); folder_pt_proxy->signal_data_cond = g_cond_new(); @@ -133,7 +133,7 @@ camel_folder_proxy_init (CamelFolderPtProxy *folder_pt_proxy) GtkType -camel_folder_proxy_get_type (void) +camel_folder_pt_proxy_get_type (void) { static GtkType camel_folder_pt_proxy_type = 0; @@ -143,8 +143,8 @@ camel_folder_proxy_get_type (void) "CamelFolderPtProxy", sizeof (CamelFolderPtProxy), sizeof (CamelFolderPtProxyClass), - (GtkClassInitFunc) camel_folder_proxy_class_init, - (GtkObjectInitFunc) camel_folder_proxy_init, + (GtkClassInitFunc) camel_folder_pt_proxy_class_init, + (GtkObjectInitFunc) camel_folder_pt_proxy_init, /* reserved_1 */ NULL, /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, |