diff options
| author | Mikael Hallendal <micke@codefactory.se> | 2002-05-22 11:10:19 +0000 |
|---|---|---|
| committer | Mikael Hallendal <hallski@src.gnome.org> | 2002-05-22 11:10:19 +0000 |
| commit | 27fb323fec6a018f4fddfd0702da95eee9f1390d (patch) | |
| tree | 607085444dba56b32e0383b4ae073145c6d7e0f8 | |
| parent | d2cd235e7876ac6a6d1a7d89d66010834649b6c8 (diff) | |
| download | yelp-27fb323fec6a018f4fddfd0702da95eee9f1390d.tar.gz | |
create reader without an argument. same
2002-05-22 Mikael Hallendal <micke@codefactory.se>
* src/test-reader.c (main): create reader without an argument.
* src/yelp-view-content.c (content_init): same
* src/yelp-reader.c: always be async, don't be optional.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/test-reader.c | 2 | ||||
| -rw-r--r-- | src/yelp-reader.c | 24 | ||||
| -rw-r--r-- | src/yelp-reader.h | 2 | ||||
| -rw-r--r-- | src/yelp-view-content.c | 2 |
5 files changed, 17 insertions, 18 deletions
@@ -1,5 +1,10 @@ 2002-05-22 Mikael Hallendal <micke@codefactory.se> + * src/test-reader.c (main): create reader without an argument. + * src/yelp-view-content.c (content_init): same + + * src/yelp-reader.c: always be async, don't be optional. + * src/yelp-view-toc.c (toc_page_end): added a space, thanks rhult. * src/yelp-window.c (window_about_cb): diff --git a/src/test-reader.c b/src/test-reader.c index 30def7f5..a09411ab 100644 --- a/src/test-reader.c +++ b/src/test-reader.c @@ -82,7 +82,7 @@ main (int argc, char **argv) return 1; } - reader = yelp_reader_new (TRUE); + reader = yelp_reader_new (); g_signal_connect (reader, "start", G_CALLBACK (start_cb), diff --git a/src/yelp-reader.c b/src/yelp-reader.c index a7256b81..a7bdb74b 100644 --- a/src/yelp-reader.c +++ b/src/yelp-reader.c @@ -33,12 +33,10 @@ #define d(x) #define BUFFER_SIZE 16384 -#define STAMP_MUTEX_LOCK if(priv->async)g_mutex_lock(priv->stamp_mutex); -#define STAMP_MUTEX_UNLOCK if(priv->async)g_mutex_unlock(priv->stamp_mutex); +#define STAMP_MUTEX_LOCK g_mutex_lock(priv->stamp_mutex); +#define STAMP_MUTEX_UNLOCK g_mutex_unlock(priv->stamp_mutex); struct _YelpReaderPriv { - gboolean async; - gint stamp; gboolean active; @@ -703,6 +701,7 @@ reader_q_data_free (ReaderQueueData *q_data) g_free (q_data->data); g_free (q_data); } + #if 0 static void reader_th_data_free (ReaderThreadData *th_data) @@ -715,8 +714,9 @@ reader_th_data_free (ReaderThreadData *th_data) g_free (th_data); } #endif + YelpReader * -yelp_reader_new (gboolean async) +yelp_reader_new () { YelpReader *reader; YelpReaderPriv *priv; @@ -725,8 +725,6 @@ yelp_reader_new (gboolean async) priv = reader->priv; - priv->async = async; - return reader; } @@ -759,15 +757,11 @@ yelp_reader_start (YelpReader *reader, YelpURI *uri) STAMP_MUTEX_UNLOCK; - if (priv->async) { - g_idle_add ((GSourceFunc) reader_idle_check_queue, th_data); + g_idle_add ((GSourceFunc) reader_idle_check_queue, th_data); - g_thread_create ((GThreadFunc) reader_start, th_data, - TRUE, - NULL /* FIXME: check for errors */); - } else { - reader_start (th_data); - } + g_thread_create ((GThreadFunc) reader_start, th_data, + TRUE, + NULL /* FIXME: check for errors */); } void diff --git a/src/yelp-reader.h b/src/yelp-reader.h index 662119d6..e90c4f76 100644 --- a/src/yelp-reader.h +++ b/src/yelp-reader.h @@ -59,7 +59,7 @@ struct _YelpReaderClass { }; GType yelp_reader_get_type (void); -YelpReader * yelp_reader_new (gboolean async); +YelpReader * yelp_reader_new (void); void yelp_reader_start (YelpReader *reader, YelpURI *uri); diff --git a/src/yelp-view-content.c b/src/yelp-view-content.c index 7a9e1cd1..4434d25c 100644 --- a/src/yelp-view-content.c +++ b/src/yelp-view-content.c @@ -146,7 +146,7 @@ content_init (YelpViewContent *view) G_CALLBACK (content_html_uri_selected_cb), view); - priv->reader = yelp_reader_new (TRUE); + priv->reader = yelp_reader_new (); #if 0 g_signal_connect (G_OBJECT (priv->reader), "start", |