[Opensync-commits] r5807 - plugins/tomboy-sync/src

[<svn...@op...>]

Author: bricks
Date: Fri Sep 18 14:11:02 2009
New Revision: 5807
URL: http://www.opensync.org/changeset/5807

Log:
don't free dbus structs in tomboy-sync finalize

Modified:
   plugins/tomboy-sync/src/tomboy_sync.c
   plugins/tomboy-sync/src/tomboy_sync_dbus.c
   plugins/tomboy-sync/src/tomboy_sync_dbus.h

Modified: plugins/tomboy-sync/src/tomboy_sync.c
==============================================================================
--- plugins/tomboy-sync/src/tomboy_sync.c	Fri Sep 18 14:09:31 2009	(r5806)
+++ plugins/tomboy-sync/src/tomboy_sync.c	Fri Sep 18 14:11:02 2009	(r5807)
@@ -215,8 +215,8 @@
 	OSyncTomboyEnv *tomboyenv;
 	tomboyenv = (OSyncTomboyEnv*)data;
 
-	osync_free(tomboyenv->connection);
-	osync_free(tomboyenv->proxy);
+	osync_tomboysync_dbus_finalize(tomboyenv);
+
 }
 
 /* Here we actually tell opensync which sinks are available. For this plugin, we

Modified: plugins/tomboy-sync/src/tomboy_sync_dbus.c
==============================================================================
--- plugins/tomboy-sync/src/tomboy_sync_dbus.c	Fri Sep 18 14:09:31 2009	(r5806)
+++ plugins/tomboy-sync/src/tomboy_sync_dbus.c	Fri Sep 18 14:11:02 2009	(r5807)
@@ -448,3 +448,8 @@
 	osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(&error));
 	osync_error_unref(&error);
 }
+
+void osync_tomboysync_dbus_finalize(OSyncTomboyEnv *env) {
+	osync_assert(env);
+	dbus_g_connection_unref(tomboyenv->connection);
+}

Modified: plugins/tomboy-sync/src/tomboy_sync_dbus.h
==============================================================================
--- plugins/tomboy-sync/src/tomboy_sync_dbus.h	Fri Sep 18 14:09:31 2009	(r5806)
+++ plugins/tomboy-sync/src/tomboy_sync_dbus.h	Fri Sep 18 14:11:02 2009	(r5807)
@@ -32,6 +32,7 @@
 void osync_tomboysync_dbus_read(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *userdata);
 
 osync_bool osync_tomboysync_dbus_initalize(OSyncTomboyEnv *tomboyenv, OSyncError **error);
+void osync_tomboysync_dbus_finalize(OSyncTomboyEnv *env);
 
 void osync_tomboysync_dbus_connect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data);