[Commits] action.c 1.12.2.69 1.12.2.70 main.c 1.115.2.240 1.115.2.241

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src
In directory claws-mail:/tmp/cvs-serv23768/src

Modified Files:
      Tag: gtk2
	action.c main.c 
Log Message:
2011-10-17 [colin]	3.7.10cvs31

	* src/action.c
	* src/main.c
	* src/gtk/gtkutils.c
	* src/gtk/gtkutils.h
		Undeprecate GIO/GdkCondition

Index: main.c
===================================================================
RCS file: /home/claws-mail/claws/src/main.c,v
retrieving revision 1.115.2.240
retrieving revision 1.115.2.241
diff -u -d -r1.115.2.240 -r1.115.2.241
--- main.c	16 Oct 2011 00:48:32 -0000	1.115.2.240
+++ main.c	17 Oct 2011 08:59:47 -0000	1.115.2.241
@@ -222,7 +222,7 @@
 static gint lock_socket_remove		(void);
 static void lock_socket_input_cb	(gpointer	   data,
 					 gint		   source,
-					 GdkInputCondition condition);
+					 GIOCondition      condition);
 
 static void open_compose_new		(const gchar	*address,
 					 GPtrArray	*attach_files);
@@ -587,8 +587,8 @@
 		(*sc_ice_installed_handler) (connection);
 }
 static gboolean sc_process_ice_messages (GIOChannel   *source,
-		      GIOCondition  condition,
-		      gpointer      data)
+					 GIOCondition  condition,
+					 gpointer      data)
 {
 	IceConn connection = (IceConn) data;
 	IceProcessMessagesStatus status;
@@ -1396,7 +1396,7 @@
 
 	/* register the callback of unix domain socket input */
 	lock_socket_tag = claws_input_add(lock_socket,
-					GDK_INPUT_READ | GDK_INPUT_EXCEPTION,
+					G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI,
 					lock_socket_input_cb,
 					mainwin, TRUE);
 
@@ -2475,7 +2475,7 @@
 
 static void lock_socket_input_cb(gpointer data,
 				 gint source,
-				 GdkInputCondition condition)
+				 GIOCondition condition)
 {
 	MainWindow *mainwin = (MainWindow *)data;
 	gint sock;

Index: action.c
===================================================================
RCS file: /home/claws-mail/claws/src/action.c,v
retrieving revision 1.12.2.69
retrieving revision 1.12.2.70
diff -u -d -r1.12.2.69 -r1.12.2.70
--- action.c	7 Oct 2011 09:40:14 -0000	1.12.2.69
+++ action.c	17 Oct 2011 08:59:47 -0000	1.12.2.70
@@ -180,13 +180,13 @@
 
 static void catch_output		(gpointer		 data,
 					 gint			 source,
-					 GdkInputCondition	 cond);
+					 GIOCondition		 cond);
 static void catch_input			(gpointer		 data, 
 					 gint			 source,
-					 GdkInputCondition	 cond);
+					 GIOCondition		 cond);
 static void catch_status		(gpointer		 data,
 					 gint			 source,
-					 GdkInputCondition	 cond);
+					 GIOCondition		 cond);
 
 static gchar *get_user_string		(const gchar	*action,
 					 ActionType	 type);
@@ -905,7 +905,7 @@
 			child_info->data = data;
 			child_info->tag_status = 
 				claws_input_add(child_info->chld_status,
-					      GDK_INPUT_READ,
+					      G_IO_IN | G_IO_HUP | G_IO_ERR,
 					      catch_status, child_info,
 					      FALSE);
 		}
@@ -1072,9 +1072,9 @@
 	child_info->chld_err    = chld_err[0];
 	child_info->chld_status = chld_status[0];
 	child_info->tag_in      = -1;
-	child_info->tag_out     = claws_input_add(chld_out[0], GDK_INPUT_READ,
+	child_info->tag_out     = claws_input_add(chld_out[0], G_IO_IN | G_IO_HUP | G_IO_ERR,
 						catch_output, child_info, FALSE);
-	child_info->tag_err     = claws_input_add(chld_err[0], GDK_INPUT_READ,
+	child_info->tag_err     = claws_input_add(chld_err[0], G_IO_IN | G_IO_HUP | G_IO_ERR,
 						catch_output, child_info, FALSE);
 
 	if (!(children->action_type &
@@ -1158,7 +1158,7 @@
 	ChildInfo *child_info = (ChildInfo *) children->list->data;
 
 	child_info->tag_in = claws_input_add(child_info->chld_in,
-					   GDK_INPUT_WRITE,
+					   G_IO_OUT | G_IO_ERR,
 					   catch_input, children, FALSE);
 }
 
@@ -1465,7 +1465,7 @@
 	gtk_widget_show(dialog);
 }
 
-static void catch_status(gpointer data, gint source, GdkInputCondition cond)
+static void catch_status(gpointer data, gint source, GIOCondition cond)
 {
 	ChildInfo *child_info = (ChildInfo *)data;
 	gchar buf;
@@ -1533,7 +1533,7 @@
 	wait_for_children(child_info->children);
 }
 	
-static void catch_input(gpointer data, gint source, GdkInputCondition cond)
+static void catch_input(gpointer data, gint source, GIOCondition cond)
 {
 	Children *children = (Children *)data;
 	ChildInfo *child_info = (ChildInfo *)children->list->data;
@@ -1542,7 +1542,7 @@
 	gssize by_read = 0, by_written = 0;
 
 	debug_print("Sending input to grand child.\n");
-	if (!(cond & GDK_INPUT_WRITE))
+	if (!(cond & (G_IO_OUT | G_IO_ERR)))
 		return;
 
 	gtk_widget_set_sensitive(children->input_hbox, FALSE);
@@ -1581,7 +1581,7 @@
 	debug_print("Input to grand child sent.\n");
 }
 
-static void catch_output(gpointer data, gint source, GdkInputCondition cond)
+static void catch_output(gpointer data, gint source, GIOCondition cond)
 {
 	ChildInfo *child_info = (ChildInfo *)data;
 	gint c;