[balsa/gtk3] Reduce glib requirement to 2.32
- From: Peter Bloomfield <PeterB src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/gtk3] Reduce glib requirement to 2.32
- Date: Thu, 2 May 2013 22:25:32 +0000 (UTC)
commit 2529d82fd73f4a910be331083c5760e676c9f119
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Thu May 2 18:24:42 2013 -0400
Reduce glib requirement to 2.32
* libbalsa/libbalsa.c (libbalsa_init): reduce glib requirement
to 2.32.
* src/main.c (threads_init): ditto.
* src/balsa-message.c (balsa_message_init): typo.
ChangeLog | 7 +++++++
libbalsa/libbalsa.c | 4 ++--
src/balsa-message.c | 4 ++--
src/main.c | 4 ++--
4 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8bf0d1d..9c7c04f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-05-02 Peter Bloomfield
+
+ * libbalsa/libbalsa.c (libbalsa_init): reduce glib requirement
+ to 2.32.
+ * src/main.c (threads_init): ditto.
+ * src/balsa-message.c (balsa_message_init): typo.
+
2013-05-01 Peter Bloomfield
Replace "ghelp:" help URIs by "help:" URIs
diff --git a/libbalsa/libbalsa.c b/libbalsa/libbalsa.c
index 8eb8f6c..7f27ac2 100644
--- a/libbalsa/libbalsa.c
+++ b/libbalsa/libbalsa.c
@@ -91,11 +91,11 @@ libbalsa_init(LibBalsaInformationFunc information_callback)
#endif
#ifdef BALSA_USE_THREADS
-#if !GLIB_CHECK_VERSION(2, 35, 0)
+#if !GLIB_CHECK_VERSION(2, 32, 0)
if (!g_thread_supported()) {
g_error("Threads have not been initialised.");
}
-#endif /* !GLIB_CHECK_VERSION(2, 35, 0) */
+#endif /* !GLIB_CHECK_VERSION(2, 32, 0) */
main_thread_id = pthread_self();
#endif
diff --git a/src/balsa-message.c b/src/balsa-message.c
index 64d69b7..b4eb879 100644
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@ -727,10 +727,10 @@ balsa_message_init(BalsaMessage * bm)
(gpointer) bm);
#if GTK_CHECK_VERSION(3, 8, 0)
gtk_container_add(GTK_CONTAINER(bm->scroll), bm->bm_widget->widget);
-#else /* GTK_CHECK_VERSION(3, 8, 0 */
+#else /* GTK_CHECK_VERSION(3, 8, 0) */
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(bm->scroll),
bm->bm_widget->widget);
-#endif /* GTK_CHECK_VERSION(3, 8, 0 */
+#endif /* GTK_CHECK_VERSION(3, 8, 0) */
/* structure view */
model = gtk_tree_store_new (NUM_COLUMNS,
diff --git a/src/main.c b/src/main.c
index 16e81bb..1e51992 100644
--- a/src/main.c
+++ b/src/main.c
@@ -255,9 +255,9 @@ pthread_mutex_t checking_mail_lock = PTHREAD_MUTEX_INITIALIZER;
static void
threads_init(void)
{
-#if !GLIB_CHECK_VERSION(2, 35, 0)
+#if !GLIB_CHECK_VERSION(2, 32, 0)
g_type_init();
-#endif /* !GLIB_CHECK_VERSION(2, 35, 0) */
+#endif /* !GLIB_CHECK_VERSION(2, 32, 0) */
pthread_mutex_init(&send_messages_lock, NULL);
if (pipe(mail_thread_pipes) < 0) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]