Merge lp:~raof/netbook-remix-launcher/fix-bug-467474 into lp:netbook-remix-launcher

[Chris Halse Rogers]

Check that clutter has successfully initialised the stage in nl-window's constructed method; bail if the stage isn't correctly initialised, as the subsequent calls are guaranteed to fail, and in the case of bug #467474 results in segfaults in libGL.

If this happens, catch the invalid nl-window in main.c, and spawn netbook-launcher-efl.

=== modified file 'src/main.c'
--- src/main.c	2010-02-17 16:51:06 +0000
+++ src/main.c	2010-03-15 05:31:13 +0000
@@ -241,6 +241,20 @@
     return TRUE;
 }
 
+static gint
+fallback_to_efl (void)
+{
+  GError *error = NULL;
+  
+  if (!g_spawn_command_line_async ("/usr/bin/netbook-launcher-efl", &error))
+    {
+      g_print ("Error in netbook-launcher-efl: %s\n", error->message);
+      g_error_free (error);
+      return EXIT_FAILURE;
+    }
+  return 0;
+}
+
 gint
 main (gint argc, gchar *argv[])
 {
@@ -269,13 +283,7 @@
     {
       g_print ("No rendering avaible for netbook-launcher, try to run netbook-launcher-efl\n");
       
-      if (!g_spawn_command_line_async ("/usr/bin/netbook-launcher-efl", &error))
-        {
-          g_print ("Error in netbook-launcher-efl: %s\n", error->message);
-          g_error_free (error);
-          return EXIT_FAILURE;
-        }
-      return 0;
+      return fallback_to_efl ();
     }
 
   if (!notify_init ("Netbook Launcher"))
@@ -380,6 +388,12 @@
   /* Create the nl window */
   window = nl_window_get_default ();
 
+  if (!nl_window_is_valid (window))
+    {
+      g_print ("Error creating clutter launcher.  Trying to run netbook-launcher-efl\n");
+      return fallback_to_efl ();
+    }
+
   plugin_manager = nl_plugin_manager_new (NL_SHELL (window));
   folders_source = nl_folders_source_new (NL_SHELL (window));
   volumes_source = nl_volumes_source_new (NL_SHELL (window));

=== modified file 'src/nl-window.c'
--- src/nl-window.c	2010-03-11 07:14:00 +0000
+++ src/nl-window.c	2010-03-15 05:31:13 +0000
@@ -192,6 +192,12 @@
   priv->stage = gtk_clutter_embed_get_stage
                 (GTK_CLUTTER_EMBED (priv->gtkclutter));
 
+  // Given sufficiently poor OpenGL drivers getting the stage
+  // can fail.  In this case, there's a good chance that further
+  // OpenGL calls will fail, sometimes spectacularly.
+  // See LP: #467474 for an example.
+  g_return_if_fail (CLUTTER_IS_STAGE (priv->stage));
+
   /* Set NlWidget's direction */
   direction = gtk_widget_get_default_direction ();
   ctk_actor_set_default_direction (direction);
@@ -370,6 +376,14 @@
   return window;
 }
 
+gboolean
+nl_window_is_valid (GtkWidget *window)
+{
+  // This is not all of the state required to declare a window valid, but
+  // it's enough to LP: #467474
+  return CLUTTER_IS_STAGE (NL_WINDOW (window)->priv->stage);
+}
+
 /*
  * Private methods
  */

=== modified file 'src/nl-window.h'
--- src/nl-window.h	2009-07-23 13:45:56 +0000
+++ src/nl-window.h	2010-03-15 05:31:13 +0000
@@ -61,6 +61,8 @@
 
 GtkWidget * nl_window_get_default (void);
 
+gboolean    nl_window_is_valid    (GtkWidget *window);
+
 void        nl_window_set_transient (NlWindow *self, GtkWindow *window);
 
 #endif /* _NL_WINDOW_H_ */