GNOME.org
 

[evolution-data-server/mmeeks-gdbus-import: 250/250] Make everything compile post the merge.

commit 97d3e939a569f84328f5f9b5682d560a8ff0e5d3
Author: Michael Meeks <michael meeks novell com>
Date:   Fri Feb 26 14:38:03 2010 +0000

    Make everything compile post the merge.

 addressbook/libebook/e-book.c                |    3 +-
 addressbook/tests/ebook/ebook-test-utils.h   |   41 ------------------
 calendar/libecal/e-cal.c                     |    4 +-
 calendar/libecal/e-data-cal-gdbus-bindings.h |   14 ++++++
 calendar/tests/ecal/ecal-test-utils.h        |   59 --------------------------
 camel/camel-net-utils.c                      |   24 +----------
 edbus/tests/Makefile.am                      |    2 +-
 7 files changed, 19 insertions(+), 128 deletions(-)
---
diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c
index 7966562..1f040cd 100644
--- a/addressbook/libebook/e-book.c
+++ b/addressbook/libebook/e-book.c
@@ -301,8 +301,7 @@ e_book_activate(GError **error)
 
 			return FALSE;
 		}
-
-		dbus_connection_add_filter (dbus_g_connection_get_connection (connection), filter_dbus_msgs_cb, NULL, NULL);
+		g_object_add_weak_pointer (G_OBJECT (connection_gdbus), (gpointer)&connection_gdbus);
 	}
 
 	/* FIXME: watch for changes to this proxy instead of relying upon
diff --git a/addressbook/tests/ebook/ebook-test-utils.h b/addressbook/tests/ebook/ebook-test-utils.h
index 8a5cfaf..789e21d 100644
--- a/addressbook/tests/ebook/ebook-test-utils.h
+++ b/addressbook/tests/ebook/ebook-test-utils.h
@@ -36,31 +36,18 @@ typedef struct {
 } EBookTestClosure;
 
 void
-<<<<<<< HEAD:addressbook/tests/ebook/ebook-test-utils.h
-test_print (const char *format,
-=======
 test_print (const gchar *format,
->>>>>>> master:addressbook/tests/ebook/ebook-test-utils.h
 	    ...);
 
 gboolean
 ebook_test_utils_callback_quit (gpointer user_data);
 
-<<<<<<< HEAD:addressbook/tests/ebook/ebook-test-utils.h
-char*
-ebook_test_utils_new_vcard_from_test_case (const char *case_name);
-
-char*
-ebook_test_utils_book_add_contact_from_test_case_verify (EBook       *book,
-                                                         const char  *case_name,
-=======
 gchar *
 ebook_test_utils_new_vcard_from_test_case (const gchar *case_name);
 
 gchar *
 ebook_test_utils_book_add_contact_from_test_case_verify (EBook       *book,
                                                          const gchar  *case_name,
->>>>>>> master:addressbook/tests/ebook/ebook-test-utils.h
 							 EContact   **contact);
 
 gboolean
@@ -68,21 +55,12 @@ ebook_test_utils_contacts_are_equal_shallow (EContact *a,
                                              EContact *b);
 
 EBook*
-<<<<<<< HEAD:addressbook/tests/ebook/ebook-test-utils.h
-ebook_test_utils_book_new_from_uri (const char *uri);
-
-EBook*
-ebook_test_utils_book_new_temp (char **uri);
-
-const char*
-=======
 ebook_test_utils_book_new_from_uri (const gchar *uri);
 
 EBook*
 ebook_test_utils_book_new_temp (gchar **uri);
 
 const gchar *
->>>>>>> master:addressbook/tests/ebook/ebook-test-utils.h
 ebook_test_utils_book_add_contact (EBook    *book,
                                    EContact *contact);
 void
@@ -102,17 +80,10 @@ ebook_test_utils_book_async_commit_contact (EBook       *book,
 
 EContact*
 ebook_test_utils_book_get_contact (EBook      *book,
-<<<<<<< HEAD:addressbook/tests/ebook/ebook-test-utils.h
-                                   const char *uid);
-void
-ebook_test_utils_book_async_get_contact (EBook       *book,
-                                         const char  *uid,
-=======
                                    const gchar *uid);
 void
 ebook_test_utils_book_async_get_contact (EBook       *book,
                                          const gchar  *uid,
->>>>>>> master:addressbook/tests/ebook/ebook-test-utils.h
                                          GSourceFunc  callback,
                                          gpointer     user_data);
 
@@ -137,20 +108,12 @@ ebook_test_utils_book_async_get_supported_auth_methods (EBook       *book,
 							GSourceFunc  callback,
 							gpointer     user_data);
 
-<<<<<<< HEAD:addressbook/tests/ebook/ebook-test-utils.h
-const char*
-=======
 const gchar *
->>>>>>> master:addressbook/tests/ebook/ebook-test-utils.h
 ebook_test_utils_book_get_static_capabilities (EBook *book);
 
 void
 ebook_test_utils_book_remove_contact (EBook      *book,
-<<<<<<< HEAD:addressbook/tests/ebook/ebook-test-utils.h
-                                      const char *uid);
-=======
                                       const gchar *uid);
->>>>>>> master:addressbook/tests/ebook/ebook-test-utils.h
 void
 ebook_test_utils_book_async_remove_contact (EBook       *book,
 					    EContact    *contact,
@@ -158,11 +121,7 @@ ebook_test_utils_book_async_remove_contact (EBook       *book,
 					    gpointer     user_data);
 void
 ebook_test_utils_book_async_remove_contact_by_id (EBook       *book,
-<<<<<<< HEAD:addressbook/tests/ebook/ebook-test-utils.h
-                                                  const char  *uid,
-=======
                                                   const gchar  *uid,
->>>>>>> master:addressbook/tests/ebook/ebook-test-utils.h
                                                   GSourceFunc  callback,
                                                   gpointer     user_data);
 
diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c
index 7880ca7..bc4fc3f 100644
--- a/calendar/libecal/e-cal.c
+++ b/calendar/libecal/e-cal.c
@@ -1407,10 +1407,10 @@ e_cal_refresh (ECal *ecal, GError **error)
 
 	e_return_error_if_fail (E_IS_CAL (ecal), E_CALENDAR_STATUS_INVALID_ARG);
 	priv = ecal->priv;
-	e_return_error_if_fail (priv->proxy, E_CALENDAR_STATUS_REPOSITORY_OFFLINE);
+	e_return_error_if_fail (priv->gdbus_proxy, E_CALENDAR_STATUS_REPOSITORY_OFFLINE);
 
 	LOCK_CONN ();
-	if (!org_gnome_evolution_dataserver_calendar_Cal_refresh (priv->proxy, error)) {
+	if (!e_data_cal_gdbus_refresh_sync (priv->gdbus_proxy, error)) {
 		UNLOCK_CONN ();
 		E_CALENDAR_CHECK_STATUS (E_CALENDAR_STATUS_CORBA_EXCEPTION, error);
 	}
diff --git a/calendar/libecal/e-data-cal-gdbus-bindings.h b/calendar/libecal/e-data-cal-gdbus-bindings.h
index 5affa62..50ac43d 100644
--- a/calendar/libecal/e-data-cal-gdbus-bindings.h
+++ b/calendar/libecal/e-data-cal-gdbus-bindings.h
@@ -131,6 +131,20 @@ e_data_cal_gdbus_remove_sync (EDBusProxy  *proxy,
 }
 
 static gboolean
+e_data_cal_gdbus_refresh_sync (EDBusProxy  *proxy,
+			       GError     **error)
+{
+        EVariant *parameters;
+        EVariant *retvals;
+
+        parameters = e_variant_new ("()");
+        retvals = e_dbus_proxy_invoke_method_sync (proxy, "refresh", parameters,
+                                                        -1, NULL, error);
+
+        return demarshal_retvals__VOID (retvals);
+}
+
+static gboolean
 e_data_cal_gdbus_get_alarm_email_address_sync (EDBusProxy  *proxy,
 					       char       **address,
 					       GError     **error)
diff --git a/calendar/tests/ecal/ecal-test-utils.h b/calendar/tests/ecal/ecal-test-utils.h
index 92e7fb0..60760e7 100644
--- a/calendar/tests/ecal/ecal-test-utils.h
+++ b/calendar/tests/ecal/ecal-test-utils.h
@@ -33,18 +33,6 @@ typedef struct {
 } ECalTestClosure;
 
 void
-<<<<<<< HEAD:calendar/tests/ecal/ecal-test-utils.h
-test_print (const char *format,
-            ...);
-
-ECal*
-ecal_test_utils_cal_new_from_uri (const char     *uri,
-				  ECalSourceType  type);
-
-ECal*
-ecal_test_utils_cal_new_temp (char           **uri,
-		              ECalSourceType   type);
-=======
 test_print (const gchar *format,
             ...);
 
@@ -55,7 +43,6 @@ ecal_test_utils_cal_new_from_uri (const gchar     *uri,
 ECal*
 ecal_test_utils_cal_new_temp (gchar           **uri,
 			      ECalSourceType   type);
->>>>>>> master:calendar/tests/ecal/ecal-test-utils.h
 
 void
 ecal_test_utils_cal_open (ECal     *cal,
@@ -70,15 +57,6 @@ ecal_test_utils_cal_async_open (ECal        *cal,
 void
 ecal_test_utils_cal_remove (ECal *cal);
 
-<<<<<<< HEAD:calendar/tests/ecal/ecal-test-utils.h
-char*
-ecal_test_utils_cal_get_alarm_email_address (ECal *cal);
-
-char*
-ecal_test_utils_cal_get_cal_address (ECal *cal);
-
-char*
-=======
 gchar *
 ecal_test_utils_cal_get_alarm_email_address (ECal *cal);
 
@@ -86,7 +64,6 @@ gchar *
 ecal_test_utils_cal_get_cal_address (ECal *cal);
 
 gchar *
->>>>>>> master:calendar/tests/ecal/ecal-test-utils.h
 ecal_test_utils_cal_get_ldap_attribute (ECal *cal);
 
 void
@@ -108,11 +85,7 @@ ecal_test_utils_cal_assert_e_cal_components_equal (ECalComponent *a,
 
 icalcomponent*
 ecal_test_utils_cal_get_object (ECal       *cal,
-<<<<<<< HEAD:calendar/tests/ecal/ecal-test-utils.h
-                                const char *uid);
-=======
                                 const gchar *uid);
->>>>>>> master:calendar/tests/ecal/ecal-test-utils.h
 
 void
 ecal_test_utils_cal_modify_object (ECal          *cal,
@@ -121,26 +94,13 @@ ecal_test_utils_cal_modify_object (ECal          *cal,
 
 void
 ecal_test_utils_cal_remove_object (ECal       *cal,
-<<<<<<< HEAD:calendar/tests/ecal/ecal-test-utils.h
-				   const char *uid);
-=======
 				   const gchar *uid);
->>>>>>> master:calendar/tests/ecal/ecal-test-utils.h
 
 icalcomponent*
 ecal_test_utils_cal_get_default_object (ECal *cal);
 
 GList*
 ecal_test_utils_cal_get_object_list (ECal       *cal,
-<<<<<<< HEAD:calendar/tests/ecal/ecal-test-utils.h
-                                     const char *query);
-
-GList*
-ecal_test_utils_cal_get_objects_for_uid (ECal       *cal,
-					 const char *uid);
-
-char*
-=======
                                      const gchar *query);
 
 GList*
@@ -148,7 +108,6 @@ ecal_test_utils_cal_get_objects_for_uid (ECal       *cal,
 					 const gchar *uid);
 
 gchar *
->>>>>>> master:calendar/tests/ecal/ecal-test-utils.h
 ecal_test_utils_cal_create_object (ECal          *cal,
 				   icalcomponent *component);
 
@@ -160,15 +119,6 @@ ecal_test_utils_cal_set_mode (ECal        *cal,
 
 void
 ecal_test_utils_create_component (ECal           *cal,
-<<<<<<< HEAD:calendar/tests/ecal/ecal-test-utils.h
-                                  const char     *dtstart,
-                                  const char     *dtstart_tzid,
-                                  const char     *dtend,
-                                  const char     *dtend_tzid,
-                                  const char     *summary,
-                                  ECalComponent **comp_out,
-                                  char          **uid_out);
-=======
                                   const gchar     *dtstart,
                                   const gchar     *dtstart_tzid,
                                   const gchar     *dtend,
@@ -176,7 +126,6 @@ ecal_test_utils_create_component (ECal           *cal,
                                   const gchar     *summary,
                                   ECalComponent **comp_out,
                                   gchar          **uid_out);
->>>>>>> master:calendar/tests/ecal/ecal-test-utils.h
 
 void
 ecal_test_utils_cal_component_set_icalcomponent (ECalComponent *e_component,
@@ -184,11 +133,7 @@ ecal_test_utils_cal_component_set_icalcomponent (ECalComponent *e_component,
 
 icaltimezone*
 ecal_test_utils_cal_get_timezone (ECal       *cal,
-<<<<<<< HEAD:calendar/tests/ecal/ecal-test-utils.h
-                                  const char *tzid);
-=======
                                   const gchar *tzid);
->>>>>>> master:calendar/tests/ecal/ecal-test-utils.h
 
 void
 ecal_test_utils_cal_add_timezone (ECal         *cal,
@@ -210,10 +155,6 @@ ecal_test_utils_cal_receive_objects (ECal          *cal,
 
 ECalView*
 ecal_test_utils_get_query (ECal       *cal,
-<<<<<<< HEAD:calendar/tests/ecal/ecal-test-utils.h
-                           const char *sexp);
-=======
                            const gchar *sexp);
->>>>>>> master:calendar/tests/ecal/ecal-test-utils.h
 
 #endif /* _ECAL_TEST_UTILS_H */
diff --git a/camel/camel-net-utils.c b/camel/camel-net-utils.c
index f179378..67cd538 100644
--- a/camel/camel-net-utils.c
+++ b/camel/camel-net-utils.c
@@ -506,9 +506,7 @@ cs_waitinfo(gpointer (worker)(gpointer), struct _addrinfo_msg *msg, const gchar
 			   We check the reply port incase we had a reply in the mean time, which we free later */
 			d(printf("Canceling lookup thread and leaving it\n"));
 			msg->cancelled = 1;
-#warning FIXME: do we want this pthread_cancel here as per the comment ?
-/*			pthread_cancel(id); */
-			pthread_join (id, NULL);
+			g_thread_join (thread);
 			cancel = 1;
 		} else {
 			struct _addrinfo_msg *reply;
@@ -606,13 +604,7 @@ cs_getaddrinfo(gpointer data)
 		}
 	}
 
-<<<<<<< HEAD:camel/camel-net-utils.c
-	pthread_testcancel ();
-
-	for (i=0;h.h_addr_list[i];i++) {
-=======
 	for (i = 0; h.h_addr_list[i] && !msg->cancelled; i++) {
->>>>>>> master:camel/camel-net-utils.c
 		res = g_malloc0(sizeof(*res));
 		if (msg->hints) {
 			res->ai_flags = msg->hints->ai_flags;
@@ -662,11 +654,6 @@ cs_getaddrinfo(gpointer data)
 			info->result = getaddrinfo(info->name, "443", info->hints, info->res);
 	}
 
-<<<<<<< HEAD:camel/camel-net-utils.c
-	pthread_testcancel ();
-
-=======
->>>>>>> master:camel/camel-net-utils.c
 	if (!info->cancelled)
 		camel_msgport_reply((CamelMsg *)info);
 
@@ -788,12 +775,8 @@ cs_getnameinfo(gpointer data)
 	if (msg->serv)
 		sprintf(msg->serv, "%d", sin->sin_port);
 
-<<<<<<< HEAD:camel/camel-net-utils.c
-	camel_msgport_reply((CamelMsg *)msg);
-=======
 	if (!msg->cancelled)
 		camel_msgport_reply ((CamelMsg *)msg);
->>>>>>> master:camel/camel-net-utils.c
 cancel:
 	return NULL;
 }
@@ -806,11 +789,6 @@ cs_getnameinfo(gpointer data)
 	/* there doens't appear to be a return code which says host or serv buffers are too short, lengthen them */
 	msg->result = getnameinfo(msg->addr, msg->addrlen, msg->host, msg->hostlen, msg->serv, msg->servlen, msg->flags);
 
-<<<<<<< HEAD:camel/camel-net-utils.c
-	pthread_testcancel ();
-
-=======
->>>>>>> master:camel/camel-net-utils.c
 	if (!msg->cancelled)
 		camel_msgport_reply((CamelMsg *)msg);
 
diff --git a/edbus/tests/Makefile.am b/edbus/tests/Makefile.am
index 765a7f1..7ee63eb 100644
--- a/edbus/tests/Makefile.am
+++ b/edbus/tests/Makefile.am
@@ -2,7 +2,7 @@ include $(srcdir)/Makefile.decl
 
 NULL =
 
-INCLUDES =                      \
+AM_CPPFLAGS =			\
         -g                      \
         -I$(top_srcdir)         \
 	$(EDBUS_CFLAGS)		\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]