diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/application-service-appstore.c | 18 | ||||
| -rw-r--r-- | src/indicator-application.c | 4 |
3 files changed, 18 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index b787a8c..ba6685c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-application (0.2.93-0ubuntu4) natty; urgency=low + + * Make the accessible description NULL so that indicator-applet doesn't + crash (LP: #721533) + + -- Ken VanDine <ken.vandine@canonical.com> Sat, 19 Feb 2011 23:18:11 -0500 + indicator-application (0.2.93-0ubuntu3) natty; urgency=low * debian/control diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index 3d9e49d..c95e91b 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; } @@ -1025,7 +1025,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; @@ -1081,7 +1081,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; @@ -1420,7 +1420,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..c18c2b0 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; } @@ -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; |