talons

commit c3961114430c14f2ed1c1afac25f99602bb13d7a
parent 349cb44cf22d3d978c160ec43e6d8d80ffda2b69
Author: Colin Leroy <colin@colino.net>
Date:   Tue, 21 Dec 2010 21:30:34 +0000

2010-12-21 [colin]	3.7.8cvs17

	* src/etpan/etpan-thread-manager.c
		Dead code removal

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/etpan/etpan-thread-manager.c
 | 
34
----------------------------------

4 files changed, 7 insertions(+), 35 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-21 [colin]	3.7.8cvs17
+
+	* src/etpan/etpan-thread-manager.c
+		Dead code removal
+
 2010-12-21 [colin]	3.7.8cvs16
 
 	* src/textview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4090,3 +4090,4 @@
 ( cvs diff -u -r 1.382.2.562 -r 1.382.2.563 src/compose.c;  ) > 3.7.8cvs14.patchset
 ( cvs diff -u -r 1.27.2.48 -r 1.27.2.49 src/addr_compl.c;  cvs diff -u -r -1.1.4.10 -r -1.1.4.11 src/addrcindex.c;  cvs diff -u -r -1.1.4.6 -r -1.1.4.7 src/addrcindex.h;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.4.58 -r 1.1.4.59 src/gtk/gtksctree.c;  ) > 3.7.8cvs15.patchset
 ( cvs diff -u -r 1.96.2.225 -r 1.96.2.226 src/textview.c;  ) > 3.7.8cvs16.patchset
+( cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/etpan/etpan-thread-manager.c;  ) > 3.7.8cvs17.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=16
+EXTRA_VERSION=17
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/etpan/etpan-thread-manager.c b/src/etpan/etpan-thread-manager.c
@@ -540,40 +540,6 @@ static int etpan_thread_op_cancelled(struct etpan_thread_op * op)
   return cancelled;
 }
 
-#if 0
-static void etpan_thread_op_cancel(struct etpan_thread_op * op)
-{ 
-  etpan_thread_op_lock(op);
-  if (op->cancelled) {
-    g_warning("cancelled twice");
-  }
-  op->cancelled = 1;
-  if ((op->callback != NULL) && (!op->callback_called)) {
-    op->callback(op->cancelled, op->result, op->callback_data);
-    op->callback_called = 1;
-  }
-  etpan_thread_op_unlock(op);
-}
-#endif
-
-#if 0
-static int etpan_thread_manager_op_schedule(struct etpan_thread_manager * manager,
-    struct etpan_thread_op * op)
-{
-  struct etpan_thread * thread;
-  
-  thread = etpan_thread_manager_get_thread(manager);
-  
-  if (thread == NULL)
-    goto err;
-  
-  return etpan_thread_op_schedule(thread, op);
-  
- err:
-  return ERROR_MEMORY;
-}
-#endif
-
 int etpan_thread_manager_get_fd(struct etpan_thread_manager * manager)
 {
   return manager->notify_fds[0];