[evolution-mapi] Fix a build break after recent API changes in eds



commit 3ae3ba841b3ef8560502ee42b95aafb9d25976e3
Author: Milan Crha <mcrha redhat com>
Date:   Mon Aug 13 09:13:45 2012 +0200

    Fix a build break after recent API changes in eds

 src/camel/camel-mapi-store.c            |    2 +-
 src/camel/camel-mapi-transport.c        |    2 +-
 src/configuration/e-mapi-config-utils.c |    8 ++------
 3 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/src/camel/camel-mapi-store.c b/src/camel/camel-mapi-store.c
index 7dbd56f..391746f 100644
--- a/src/camel/camel-mapi-store.c
+++ b/src/camel/camel-mapi-store.c
@@ -1932,7 +1932,7 @@ mapi_store_unsubscribe_folder_sync (CamelSubscribable *subscribable,
 			cancellable,
 			error);
 
-		g_object_unref (profile);
+		g_object_unref (settings);
 	}
 
 	if ((msi->mapi_folder_flags & CAMEL_MAPI_STORE_FOLDER_FLAG_PUBLIC) != 0 &&
diff --git a/src/camel/camel-mapi-transport.c b/src/camel/camel-mapi-transport.c
index f9ed7c7..df281f4 100644
--- a/src/camel/camel-mapi-transport.c
+++ b/src/camel/camel-mapi-transport.c
@@ -122,7 +122,7 @@ mapi_send_to_sync (CamelTransport *transport,
 			if (g_strcmp0 (my_uid, store_uid) == 0 ||
 			    g_str_has_prefix (my_uid, store_uid) ||
 			    g_str_has_prefix (store_uid, my_uid)) {
-				settings = camel_service_dup_settings (store);
+				settings = camel_service_ref_settings (store);
 				profile = camel_mapi_settings_dup_profile (CAMEL_MAPI_SETTINGS (settings));
 				g_object_unref (settings);
 			}
diff --git a/src/configuration/e-mapi-config-utils.c b/src/configuration/e-mapi-config-utils.c
index 6ba619a..046090e 100644
--- a/src/configuration/e-mapi-config-utils.c
+++ b/src/configuration/e-mapi-config-utils.c
@@ -1064,7 +1064,7 @@ action_folder_permissions_source_cb (GtkAction *action,
 	extension_name = e_source_camel_get_extension_name ("mapi");
 	extension = e_source_get_extension (parent_source, extension_name);
 
-	settings = e_source_camel_ref_settings (extension);
+	settings = e_source_camel_get_settings (extension);
 
 	e_mapi_edit_folder_permissions (NULL,
 		registry,
@@ -1079,8 +1079,6 @@ action_folder_permissions_source_cb (GtkAction *action,
 		foreign_username,
 		strstr (gtk_action_get_name (action), "calendar") != NULL);
 
-	g_object_unref (settings);
-
 	g_object_unref (source);
 	g_object_unref (parent_source);
 	g_object_unref (registry);
@@ -1530,7 +1528,7 @@ e_mapi_download_folder_structure_thread (GObject *source_obj,
 
 	extension = e_source_get_extension (source, extension_name);
 
-	settings = e_source_camel_ref_settings (extension);
+	settings = e_source_camel_get_settings (extension);
 
 	conn = e_mapi_config_utils_open_connection_for (NULL,
 		fsd->registry,
@@ -1539,8 +1537,6 @@ e_mapi_download_folder_structure_thread (GObject *source_obj,
 		cancellable,
 		perror);
 
-	g_object_unref (settings);
-
 	if (!conn)
 		return;
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]