Merge lp:~agateau/unity-2d/check-indicator-loaded into lp:unity-2d/3.0

[Aurélien Gâteau]

[panel] Check pointer returned by indicator_object_new_from_file() is correct and log error if not.

Don't assume indicator_object_new_from_file() never fails.

To test it:

- sudo touch /usr/lib/indicators/5/libcrash.so
- Restart panel, it should not crash.

[Olivier Tilloy (osomon)]

I cannot reproduce the crash before merging your work, even with a fake empty indicator module as suggested.

However, the changes in this branch are sound and make perfect sense regarding libindicator’s documentation, so let’s merge them: better safe than sorry.

Whether that fixes the original crash reported as bug #727483, I don’t know…

review: Approve

=== modified file 'panel/applets/indicator/indicator.c'
--- panel/applets/indicator/indicator.c	2011-03-09 15:44:01 +0000
+++ panel/applets/indicator/indicator.c	2011-03-30 14:58:25 +0000
@@ -343,6 +343,7 @@
 	gchar * fullpath = g_build_filename(INDICATOR_DIR, name, NULL);
 	IndicatorObject * io = indicator_object_new_from_file(fullpath);
 	g_free(fullpath);
+	g_return_val_if_fail(io != NULL, FALSE);
 
 	/* Attach the 'name' to the object */
 	g_object_set_data(G_OBJECT(io), IO_DATA_ORDER_NUMBER, GINT_TO_POINTER(name2order(name)));
@@ -438,8 +439,14 @@
 
     dir = g_dir_open(INDICATOR_DIR, 0, NULL);
     while ((name = g_dir_read_name (dir)) != NULL) {
-      if ((g_strcmp0(name, "libappmenu.so") != 0) && load_module(name, indicator->menu)) {
+      if (g_strcmp0(name, "libappmenu.so") == 0) {
+        continue;
+      }
+
+      if (load_module(name, indicator->menu)) {
         indicators_loaded++;
+      } else {
+        g_warning("Failed to load module %s", name);
       }
     }
     g_dir_close(dir);