[Commits] dbus-service.c 1.1 1.2 server-object.c 1.2 1.3

[miras at claws-mail.org]

Update of /home/claws-mail/contacts/src/dbus
In directory claws-mail:/tmp/cvs-serv4887/src/dbus

Modified Files:
	dbus-service.c server-object.c 
Log Message:
2011-10-04 [mir]	0.6.0cvs20

	* dbus-client/client.c
	* plugins/example/example-plugin.c
	* plugins/ldap/ldap-plugin.c
	* plugins/xml/plugin-init.c
	* plugins/xml/xml-plugin.c
	* src/about.c
	* src/callbacks.c
	* src/claws-contacts.c
	* src/contactwindow.c
	* src/gtk-utils.c
	* src/mainwindow.c
	* src/plugin-loader.c
	* src/plugin-loader.h
	* src/plugin.h
	* src/printing.c
	* src/utils.c
	* src/utils.h
	* src/dbus/dbus-service.c
	* src/dbus/server-object.c
	* xmllib/parser.c
	* xmllib/parser.h
	    - Implemented forgotten functionality to reactivate closed
	    address books.
	    - Fix a ton of bugs.
	    - Extended plugin API so that it is possible to get a list
	      of closed address books as well as splitting attributes
	      in mandatory and optional.
	    - Provide plugins a way to have a fixed set of attributes.
	      Eg. LDAP has a finite set of attributes while XML supports
	      an infinite set of attributes. 

Index: server-object.c
===================================================================
RCS file: /home/claws-mail/contacts/src/dbus/server-object.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- server-object.c	20 Sep 2011 21:58:44 -0000	1.2
+++ server-object.c	4 Oct 2011 20:21:40 -0000	1.3
@@ -147,7 +147,7 @@
     klass->connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
     if (klass->connection == NULL) {
         g_warning("Unable to connect to dbus: %s", error->message);
-        g_error_free (error);
+        g_clear_error(&error);
         return;
     }
     /* &dbus_glib__object_info is provided in the
@@ -192,7 +192,7 @@
                 driver_proxy, "org.clawsmail.Contacts",
                 DBUS_NAME_FLAG_DO_NOT_QUEUE, &request_ret, &error)) {
         g_warning("Unable to register service: %s", error->message);
-        g_error_free(error);
+        g_clear_error(&error);
     }
     g_object_unref(driver_proxy);
     read_config(NULL);

Index: dbus-service.c
===================================================================
RCS file: /home/claws-mail/contacts/src/dbus/dbus-service.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dbus-service.c	7 Sep 2011 17:35:29 -0000	1.1
+++ dbus-service.c	4 Oct 2011 20:21:40 -0000	1.2
@@ -83,8 +83,7 @@
     switch (pid = fork()) {
         case -1:
             if (error) {
-                g_error_free(error);
-                error = NULL;
+                g_clear_error(&error);
             }
             g_set_error(&error,
                         server_object_error_quark(),
@@ -93,8 +92,7 @@
             break;
         case 0:
             if (error) {
-                g_error_free(error);
-                error = NULL;
+                g_clear_error(&error);
             }
 	        debug_print("Entering child process\n");
 	    /*
@@ -156,7 +154,7 @@
     
     if (error) {
         g_warning("%s\n", error->message);
-        g_error_free(error);
+        g_clear_error(&error);
     }
     
     return 0;