[Opensync-commits] r6073 - plugins/evolution2/src

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

Author: cdfrey
Date: Sat Jul 10 03:52:00 2010
New Revision: 6073
URL: http://www.opensync.org/changeset/6073

Log:
Fixed more memory leaks, and removed unused struct

Modified:
   plugins/evolution2/src/evolution2_ebook.c
   plugins/evolution2/src/evolution2_ecal.c
   plugins/evolution2/src/evolution2_sync.c
   plugins/evolution2/src/evolution2_sync.h

Modified: plugins/evolution2/src/evolution2_ebook.c
==============================================================================
--- plugins/evolution2/src/evolution2_ebook.c	Fri Jul  9 21:27:14 2010	(r6072)
+++ plugins/evolution2/src/evolution2_ebook.c	Sat Jul 10 03:52:00 2010	(r6073)
@@ -30,7 +30,7 @@
 
 #include "evolution2_ebook.h"
 
-EBook *evo2_ebook_open_book(char *path, OSyncError **error) 
+EBook *evo2_ebook_open_book(const char *path, OSyncError **error) 
 {
 	EBook *addressbook = NULL;
 	GError *gerror = NULL;
@@ -98,7 +98,7 @@
 	osync_assert(caps);
 
 	if (env->contact_sink) {
-		if (!(book = evo2_ebook_open_book(g_strdup(env->addressbook_path), error))) {
+		if (!(book = evo2_ebook_open_book(env->addressbook_path, error))) {
 			goto error;
 		}
 		writable = e_book_is_writable(book);
@@ -139,7 +139,7 @@
 	OSyncEvoEnv *env = (OSyncEvoEnv *)userdata;
 	osync_bool state_match;
 
-	if (!(env->addressbook = evo2_ebook_open_book(osync_strdup(env->addressbook_path), &error))) {
+	if (!(env->addressbook = evo2_ebook_open_book(env->addressbook_path, &error))) {
 		goto error;
 	}
 	

Modified: plugins/evolution2/src/evolution2_ecal.c
==============================================================================
--- plugins/evolution2/src/evolution2_ecal.c	Fri Jul  9 21:27:14 2010	(r6072)
+++ plugins/evolution2/src/evolution2_ecal.c	Sat Jul 10 03:52:00 2010	(r6073)
@@ -30,7 +30,7 @@
 #include "evolution2_capabilities.h"
 #include "evolution2_ecal.h"
 
-ECal *evo2_ecal_open_cal(char *path, ECalSourceType source_type, OSyncError **error)
+ECal *evo2_ecal_open_cal(const char *path, ECalSourceType source_type, OSyncError **error)
 {
 	ECal *calendar = NULL;
 	GError *gerror = NULL;
@@ -88,7 +88,7 @@
         osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, ctx, userdata);
  	OSyncEvoCalendar * evo_cal = (OSyncEvoCalendar *)userdata;
 
-	if (!(evo_cal->calendar = evo2_ecal_open_cal(osync_strdup(evo_cal->uri), evo_cal->source_type, &error))) {
+	if (!(evo_cal->calendar = evo2_ecal_open_cal(evo_cal->uri, evo_cal->source_type, &error))) {
 		goto error;
 	}
 
@@ -370,7 +370,7 @@
 	osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, evo_cal, caps, error);
 
 	if (evo_cal->sink) {
-		if (!(cal = evo2_ecal_open_cal(osync_strdup(evo_cal->uri), evo_cal->source_type, error))) {
+		if (!(cal = evo2_ecal_open_cal(evo_cal->uri, evo_cal->source_type, error))) {
 			goto error;
 		}
 		if (!e_cal_is_read_only(cal, &read_only, &gerror)) {

Modified: plugins/evolution2/src/evolution2_sync.c
==============================================================================
--- plugins/evolution2/src/evolution2_sync.c	Fri Jul  9 21:27:14 2010	(r6072)
+++ plugins/evolution2/src/evolution2_sync.c	Sat Jul 10 03:52:00 2010	(r6073)
@@ -58,7 +58,10 @@
 {
 	if (env->contact_sink)
 		osync_objtype_sink_unref(env->contact_sink);
-
+	if (env->pluginInfo)
+		osync_plugin_info_unref(env->pluginInfo);
+	if (env->change_id)
+		g_free(env->change_id);
 
 	g_list_foreach(env->calendars, free_osync_evo_calendar, NULL);
 	g_list_free(env->calendars);
@@ -68,7 +71,7 @@
 
 
 
-ESource *evo2_find_source(ESourceList *list, char *uri)
+ESource *evo2_find_source(ESourceList *list, const char *uri)
 {
 	GSList *g;
 	for (g = e_source_list_peek_groups (list); g; g = g->next) {
@@ -100,9 +103,9 @@
 	env->pluginInfo = osync_plugin_info_ref(info);
 		
 	osync_trace(TRACE_INTERNAL, "Setting change id: %s", osync_plugin_info_get_groupname(info));
-	
+
 	env->change_id = g_strdup(osync_plugin_info_get_groupname(info));
-	
+
 	osync_trace(TRACE_INTERNAL, "The config: %p", osync_plugin_info_get_config(info));
 
 

Modified: plugins/evolution2/src/evolution2_sync.h
==============================================================================
--- plugins/evolution2/src/evolution2_sync.h	Fri Jul  9 21:27:14 2010	(r6072)
+++ plugins/evolution2/src/evolution2_sync.h	Sat Jul 10 03:52:00 2010	(r6073)
@@ -43,11 +43,6 @@
 #define STR_URI_KEY		"uri_"
 
 
-typedef struct evo2_location {
-	char *name;
-	char *uri;
-} evo2_location;
-
 typedef struct OSyncEvoCalendar {
 	const char *uri_key;
 	const char *uri;
@@ -73,6 +68,6 @@
 	OSyncPluginInfo *pluginInfo;	
 } OSyncEvoEnv;
 
-ESource *evo2_find_source(ESourceList *list, char *uri);
+ESource *evo2_find_source(ESourceList *list, const char *uri);
 
 #endif