[evolution] Prefer e_source_extension_ref_source().



commit f81e89acbf04d70d559f16c0bdf173e5f7f80493
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Oct 13 10:06:53 2012 -0400

    Prefer e_source_extension_ref_source().
    
    e_source_extension_get_source() is now deprecated.

 modules/book-config-ldap/e-source-ldap.c           |    6 +++---
 .../evolution-book-config-webdav.c                 |    4 +++-
 modules/cal-config-contacts/e-source-contacts.c    |    4 +++-
 3 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/modules/book-config-ldap/e-source-ldap.c b/modules/book-config-ldap/e-source-ldap.c
index a491409..18bb104 100644
--- a/modules/book-config-ldap/e-source-ldap.c
+++ b/modules/book-config-ldap/e-source-ldap.c
@@ -20,8 +20,6 @@
 
 #include <ldap.h>
 
-#include <libedataserver/libedataserver.h>
-
 #define E_SOURCE_LDAP_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_SOURCE_LDAP, ESourceLDAPPrivate))
@@ -245,7 +243,7 @@ source_ldap_constructed (GObject *object)
 	const gchar *extension_name;
 
 	this_extension = E_SOURCE_EXTENSION (object);
-	source = e_source_extension_get_source (this_extension);
+	source = e_source_extension_ref_source (this_extension);
 
 	extension_name = E_SOURCE_EXTENSION_AUTHENTICATION;
 	other_extension = e_source_get_extension (source, extension_name);
@@ -270,6 +268,8 @@ source_ldap_constructed (GObject *object)
 		source_ldap_transform_enum_nick_to_value,
 		source_ldap_transform_enum_value_to_nick,
 		NULL, (GDestroyNotify) NULL);
+
+	g_object_unref (source);
 }
 
 static void
diff --git a/modules/book-config-webdav/evolution-book-config-webdav.c b/modules/book-config-webdav/evolution-book-config-webdav.c
index 78b92a6..0e7a6f3 100644
--- a/modules/book-config-webdav/evolution-book-config-webdav.c
+++ b/modules/book-config-webdav/evolution-book-config-webdav.c
@@ -94,7 +94,7 @@ book_config_webdav_text_to_uri (GBinding *binding,
 		return FALSE;
 
 	target = g_binding_get_target (binding);
-	source = e_source_extension_get_source (E_SOURCE_EXTENSION (target));
+	source = e_source_extension_ref_source (E_SOURCE_EXTENSION (target));
 
 	extension_name = E_SOURCE_EXTENSION_AUTHENTICATION;
 	extension = e_source_get_extension (source, extension_name);
@@ -104,6 +104,8 @@ book_config_webdav_text_to_uri (GBinding *binding,
 
 	g_value_take_boxed (target_value, soup_uri);
 
+	g_object_unref (source);
+
 	return TRUE;
 }
 
diff --git a/modules/cal-config-contacts/e-source-contacts.c b/modules/cal-config-contacts/e-source-contacts.c
index 8e8eac3..c19cc66 100644
--- a/modules/cal-config-contacts/e-source-contacts.c
+++ b/modules/cal-config-contacts/e-source-contacts.c
@@ -86,7 +86,7 @@ source_contacts_constructed (GObject *object)
 	G_OBJECT_CLASS (e_source_contacts_parent_class)->constructed (object);
 
 	extension = E_SOURCE_EXTENSION (object);
-	source = e_source_extension_get_source (extension);
+	source = e_source_extension_ref_source (extension);
 
 	extension_name = E_SOURCE_EXTENSION_ADDRESS_BOOK;
 	backend_extension = e_source_get_extension (source, extension_name);
@@ -97,6 +97,8 @@ source_contacts_constructed (GObject *object)
 
 	contacts_extension = E_SOURCE_CONTACTS (extension);
 	e_source_contacts_set_include_me (contacts_extension, include_me);
+
+	g_object_unref (source);
 }
 
 static void



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