[glibmm] SocketService, ThreadedSocketService: Correct ref-counting for signals.

[Murray Cumming <murrayc src gnome org>]

commit 68e234164ee79e52854c95af35c7897db1e6433b
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jan 6 14:36:45 2011 +0100

    SocketService, ThreadedSocketService: Correct ref-counting for signals.
    
    * tools/m4/convert_gio.m4: Remove conversions that are only for signals.
    These should not generally be in the general m4 files, to avoid them being
    used implicitly in the wrong place. This is important because they use
    different reference-taking.
    * gio/src/socketservice.hg:
    * gio/src/threadedsocketservice.hg: Add corrected conversions here.

 ChangeLog                        |   15 +++++++++++++--
 gio/src/socketservice.hg         |    1 +
 gio/src/threadedsocketservice.hg |    1 +
 tools/m4/convert_gio.m4          |    1 -
 4 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index edf0590..9a95590 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,20 @@
+2011-01-06  Murray Cumming  <murrayc murrayc com>
+
+	SocketService, ThreadedSocketService: Correct ref-counting for signals.
+
+	* tools/m4/convert_gio.m4: Remove conversions that are only for signals.
+	These should not generally be in the general m4 files, to avoid them being 
+	used implicitly in the wrong place. This is important because they use 
+	different reference-taking.
+	* gio/src/socketservice.hg:
+	* gio/src/threadedsocketservice.hg: Add corrected conversions here.
+	
 2010-01-06  Krzesimir Nowak  <qdlacz gmail com>
 
 	Gmmproc: Try harder to limit false unwrapped properties.
 
-        * tools/pm/GtkDefs.pm: When taking list of properties that are
-        unwrapped, try to filter out the properties defined in base class.
+	* tools/pm/GtkDefs.pm: When taking list of properties that are
+	unwrapped, try to filter out the properties defined in base class.
 
 2011-01-05  José Alburquerque  <jaalburqu svn gnome org>
 
diff --git a/gio/src/socketservice.hg b/gio/src/socketservice.hg
index ebe454b..2a8b573 100644
--- a/gio/src/socketservice.hg
+++ b/gio/src/socketservice.hg
@@ -72,6 +72,7 @@ public:
     _WRAP_METHOD(bool is_active(), g_socket_service_is_active)
 
 #m4 _CONVERSION(`GObject*',`const Glib::RefPtr<Glib::Object>&',`Glib::wrap($3, true)')
+#m4 _CONVERSION(`GSocketConnection*',`const Glib::RefPtr<SocketConnection>&',`Glib::wrap($3, true)')
     _WRAP_SIGNAL(bool incoming(const Glib::RefPtr<SocketConnection>& connection, const Glib::RefPtr<Glib::Object>& source_object), "incoming")
 };
 
diff --git a/gio/src/threadedsocketservice.hg b/gio/src/threadedsocketservice.hg
index cccc8bf..82b3565 100644
--- a/gio/src/threadedsocketservice.hg
+++ b/gio/src/threadedsocketservice.hg
@@ -58,6 +58,7 @@ public:
     _WRAP_CREATE(int max_threads)
 
 #m4 _CONVERSION(`GObject*',`const Glib::RefPtr<Glib::Object>&',`Glib::wrap($3, true)')
+#m4 _CONVERSION(`GSocketConnection*',`const Glib::RefPtr<SocketConnection>&',`Glib::wrap($3, true)')
     _WRAP_SIGNAL(bool run(const Glib::RefPtr<SocketConnection>& connection, const Glib::RefPtr<Glib::Object>& source_object), "run")
     _WRAP_PROPERTY("max-threads", int)
 };
diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4
index c24ea6f..b40c816 100644
--- a/tools/m4/convert_gio.m4
+++ b/tools/m4/convert_gio.m4
@@ -207,7 +207,6 @@ _CONVERSION(`const Glib::RefPtr<SocketConnectable>&',`GSocketConnectable*',__CON
 
 #SocketConnection
 _CONVERSION(`GSocketConnection*',`Glib::RefPtr<SocketConnection>',`Glib::wrap($3)')
-_CONVERSION(`GSocketConnection*',`const Glib::RefPtr<SocketConnection>&',`Glib::wrap($3)')
 _CONVERSION(`const Glib::RefPtr<SocketConnection>&',`GSocketConnection*',__CONVERT_CONST_REFPTR_TO_P)
 
 #SocketControlMessage