From fb64a7a187bd7878528b76ebf8fc86159c9ed443 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Fri, 11 Feb 2011 10:25:25 -0500 Subject: don't abort on various unexpected situations; just spit out critical warning --- src/application-service-appstore.c | 18 +++++++++--------- src/indicator-application.c | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index 23047b4..04becf7 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -163,7 +163,7 @@ application_service_appstore_class_init (ApplicationServiceAppstoreClass *klass) 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 @@ application_service_appstore_class_init (ApplicationServiceAppstoreClass *klass) 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 @@ bus_get_cb (GObject * object, GAsyncResult * res, gpointer user_data) 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 @@ bus_get_cb (GObject * object, GAsyncResult * res, gpointer user_data) &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 @@ got_all_properties (GObject * source_object, GAsyncResult * res, } 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 @@ emit_signal (ApplicationServiceAppstore * appstore, const gchar * name, &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 @@ dbus_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data) } 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 @@ props_cb (GObject * object, GAsyncResult * res, gpointer user_data) } 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 @@ approver_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data) } 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; } diff --git a/src/indicator-application.c b/src/indicator-application.c index cd83bdf..2fbdb13 100644 --- a/src/indicator-application.c +++ b/src/indicator-application.c @@ -279,7 +279,7 @@ service_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data) } 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; } -- cgit v1.2.3 From f614bf09906d0bc9230fbf35522ae2f10a026b41 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Feb 2011 23:32:53 -0600 Subject: Ensures the accessible description is NULL --- src/indicator-application.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/indicator-application.c b/src/indicator-application.c index 2fbdb13..c18c2b0 100644 --- a/src/indicator-application.c +++ b/src/indicator-application.c @@ -456,7 +456,7 @@ application_added (IndicatorApplication * application, const gchar * iconname, g g_debug("Building new application entry: %s with icon: %s at position %i", dbusaddress, iconname, position); IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application); - ApplicationEntry * app = g_new(ApplicationEntry, 1); + ApplicationEntry * app = g_new0(ApplicationEntry, 1); app->old_service = FALSE; app->icon_theme_path = NULL; -- cgit v1.2.3