ayatana-commits team mailing list archive

[Michael Terry <michael.terry@xxxxxxxxxxxxx>]

Michael Terry has proposed merging lp:~mterry/indicator-application/dont-abort-so-much into lp:indicator-application.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)

For more details, see:
https://code.launchpad.net/~mterry/indicator-application/dont-abort-so-much/+merge/49405

This is similar to my merge request for indicator-appmenu.  Basically, g_error aborts the program, which is terrible for in-process plugins like indicator-application and not so great either for services like indicator-application-service.

I suspect the intention of these calls was really to emit a critical warning, not abort.  This branch converts the calls.
-- 
https://code.launchpad.net/~mterry/indicator-application/dont-abort-so-much/+merge/49405
Your team ayatana-commits is subscribed to branch lp:indicator-application.

=== modified file 'src/application-service-appstore.c'
--- src/application-service-appstore.c	2011-02-07 18:01:11 +0000
+++ src/application-service-appstore.c	2011-02-11 15:27:44 +0000
@@ -163,7 +163,7 @@
 
 		node_info = g_dbus_node_info_new_for_xml(_application_service, &error);
 		if (error != NULL) {
-			g_error("Unable to parse Application Service Interface description: %s", error->message);
+			g_critical("Unable to parse Application Service Interface description: %s", error->message);
 			g_error_free(error);
 		}
 	}
@@ -172,7 +172,7 @@
 		interface_info = g_dbus_node_info_lookup_interface(node_info, INDICATOR_APPLICATION_DBUS_IFACE);
 
 		if (interface_info == NULL) {
-			g_error("Unable to find interface '" INDICATOR_APPLICATION_DBUS_IFACE "'");
+			g_critical("Unable to find interface '" INDICATOR_APPLICATION_DBUS_IFACE "'");
 		}
 	}
 
@@ -215,7 +215,7 @@
 	GDBusConnection * connection = g_bus_get_finish(res, &error);
 
 	if (error != NULL) {
-		g_error("OMG! Unable to get a connection to DBus: %s", error->message);
+		g_critical("OMG! Unable to get a connection to DBus: %s", error->message);
 		g_error_free(error);
 		return;
 	}
@@ -240,7 +240,7 @@
 	                                                            &error);
 
 	if (error != NULL) {
-		g_error("Unable to register the object to DBus: %s", error->message);
+		g_critical("Unable to register the object to DBus: %s", error->message);
 		g_error_free(error);
 		return;
 	}
@@ -441,7 +441,7 @@
 	}
 
 	if (error != NULL) {
-		g_error("Could not grab DBus properties for %s: %s", app->dbus_name, error->message);
+		g_critical("Could not grab DBus properties for %s: %s", app->dbus_name, error->message);
 		g_error_free(error);
 		if (!app->validated)
 			application_free(app);
@@ -773,7 +773,7 @@
 		                       &error);
 
 	if (error != NULL) {
-		g_error("Unable to send %s signal: %s", name, error->message);
+		g_critical("Unable to send %s signal: %s", name, error->message);
 		g_error_free(error);
 		return;
 	}
@@ -1021,7 +1021,7 @@
 	}
 
 	if (error != NULL) {
-		g_error("Could not grab DBus proxy for %s: %s", app->dbus_name, error->message);
+		g_critical("Could not grab DBus proxy for %s: %s", app->dbus_name, error->message);
 		g_error_free(error);
 		application_free(app);
 		return;
@@ -1077,7 +1077,7 @@
 	}
 
 	if (error != NULL) {
-		g_error("Could not grab Properties DBus proxy for %s: %s", app->dbus_name, error->message);
+		g_critical("Could not grab Properties DBus proxy for %s: %s", app->dbus_name, error->message);
 		g_error_free(error);
 		application_free(app);
 		return;
@@ -1416,7 +1416,7 @@
 	}
 
 	if (error != NULL) {
-		g_error("Could not grab DBus proxy for approver: %s", error->message);
+		g_critical("Could not grab DBus proxy for approver: %s", error->message);
 		g_error_free(error);
 		return;
 	}

=== modified file 'src/indicator-application.c'
--- src/indicator-application.c	2011-01-29 02:25:32 +0000
+++ src/indicator-application.c	2011-02-11 15:27:44 +0000
@@ -279,7 +279,7 @@
 	}
 
 	if (error != NULL) {
-		g_error("Could not grab DBus proxy for %s: %s", INDICATOR_APPLICATION_DBUS_ADDR, error->message);
+		g_critical("Could not grab DBus proxy for %s: %s", INDICATOR_APPLICATION_DBUS_ADDR, error->message);
 		g_error_free(error);
 		return;
 	}