Merge lp:~dobey/ubuntuone-client/fix-crashes into lp:ubuntuone-client

[dobey]

Don't register a VOID__POINTER marshaller with dbus, as this now breaks
Use g_return_if_fail to avoid NULL for important typed arguments

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

[Roberto Alsina (ralsina)]

Looks good, seems to work :-)

review: Approve

=== modified file 'libsyncdaemon/syncdaemon-authentication.c'
--- libsyncdaemon/syncdaemon-authentication.c	2011-10-06 13:53:56 +0000
+++ libsyncdaemon/syncdaemon-authentication.c	2012-01-03 16:37:38 +0000
@@ -162,13 +162,6 @@
 		auth->priv->proxy = dbus_g_proxy_new_for_name (auth->priv->bus, "com.ubuntuone.Credentials",
 		                                               "/credentials", "com.ubuntuone.CredentialsManagement");
 		if (auth->priv->proxy != NULL) {
-			dbus_g_object_register_marshaller (_syncdaemon_marshal_VOID__POINTER,
-							   G_TYPE_NONE,
-							   dbus_g_type_get_map ("GHashTable",
-										G_TYPE_STRING,
-										G_TYPE_STRING),
-							   G_TYPE_INVALID);
-
 			dbus_g_proxy_add_signal (auth->priv->proxy, "CredentialsFound",
 						 dbus_g_type_get_map ("GHashTable",
 								      G_TYPE_STRING,
 
=== modified file 'libsyncdaemon/syncdaemon-marshal.list'
--- libsyncdaemon/syncdaemon-marshal.list	2010-08-11 08:48:24 +0000
+++ libsyncdaemon/syncdaemon-marshal.list	2012-01-03 16:37:38 +0000
@@ -1,4 +1,3 @@
-NONE:POINTER
 NONE:STRING,POINTER
 NONE:STRING,OBJECT
 NONE:POINTER,STRING
 
=== modified file 'libsyncdaemon/syncdaemon-publicfiles-interface.c'
--- libsyncdaemon/syncdaemon-publicfiles-interface.c	2010-11-03 14:58:41 +0000
+++ libsyncdaemon/syncdaemon-publicfiles-interface.c	2012-01-03 16:37:38 +0000
@@ -59,6 +59,8 @@
 	SyncdaemonDaemon *daemon = NULL;
 	SyncdaemonPublicfilesInterface *interface = SYNCDAEMON_PUBLICFILES_INTERFACE (user_data);
 
+    g_return_if_fail (hash != NULL);
+
 	g_object_get (G_OBJECT (interface), "daemon", &daemon, NULL);
 	if (daemon != NULL) {
 		SyncdaemonFileInfo *finfo;
@@ -79,6 +81,8 @@
 	SyncdaemonDaemon *daemon = NULL;
 	SyncdaemonPublicfilesInterface *interface = SYNCDAEMON_PUBLICFILES_INTERFACE (user_data);
 
+    g_return_if_fail (files != NULL);
+
 	if (interface->priv->public_files == NULL) {
 		interface->priv->public_files = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
 	}
@@ -106,6 +110,8 @@
 	SyncdaemonDaemon *daemon = NULL;
 	SyncdaemonPublicfilesInterface *interface = SYNCDAEMON_PUBLICFILES_INTERFACE (user_data);
 
+    g_return_if_fail (hash != NULL);
+
 	g_object_get (G_OBJECT (interface), "daemon", &daemon, NULL);
 	if (daemon != NULL) {
 		SyncdaemonFileInfo *finfo;