Only hide plymouth when the web login page is ready

Jolicloud · Feb 21, 2011 · 8e2f073 · 8e2f073
1 parent 64317f4
commit 8e2f073
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/displaymanager.c b/displaymanager.c
@@ -386,12 +386,8 @@ static void _dm_root_window_prepare(void)
 }
 
 
-static void _dm_xserver_ready(void)
+static void _dm_ui_ready(void)
 {
-  int argc = 1;
-  char* av = PACKAGE;
-  char** argv = &av;
-
   /* The thing bellow should never disappear!
    */
   {
@@ -401,6 +397,14 @@ static void _dm_xserver_ready(void)
     else if (WIFSIGNALED(ret))
       fprintf(stderr, "Jolicloud-DisplayManager: plymouth killed, signal=%d\n", WTERMSIG(ret));
   }
+}
+
+
+static void _dm_xserver_ready(void)
+{
+  int argc = 1;
+  char* av = PACKAGE;
+  char** argv = &av;
 
   gtk_init(&argc, &argv);
 
@@ -416,7 +420,7 @@ static void _dm_xserver_ready(void)
       return;
     }
 
-  ui_init(_dm_sign_in);
+  ui_init(_dm_ui_ready, _dm_sign_in);
 }
 
 

diff --git a/ui.c b/ui.c
@@ -19,7 +19,8 @@ static JSObjectRef g_uiJSCallback = NULL;
 static JSValueRef g_uiJSCapslockCallbackValue = NULL;
 static JSObjectRef g_uiJSCapslockCallback = NULL;
 
-static sign_in_callback g_uiSignInCallback = NULL;
+static ui_callback g_uiReadyCallback = NULL;
+static ui_callback g_uiSignInCallback = NULL;
 
 
 static gboolean _ui_main_window_delete_event(GtkWidget* widget, GdkEvent* event,
@@ -34,7 +35,8 @@ static void _uibind_objects(WebKitWebView* webkitWebView,
 
 
 
-gboolean ui_init(sign_in_callback signinCallback)
+gboolean ui_init(ui_callback readyCallback,
+		 ui_callback signinCallback)
 {
   GdkDisplay* display;
   GdkScreen* screen;
@@ -43,12 +45,13 @@ gboolean ui_init(sign_in_callback signinCallback)
   gint screenHeight;
   GdkColor colorBlack = { 0, };
 
-  if (signinCallback == NULL)
+  if (readyCallback == NULL || signinCallback == NULL)
     {
       fprintf(stderr, "Jolicloud-DisplayManager: UI is being initialized without a callback\n");
       return FALSE;
     }
 
+  g_uiReadyCallback = readyCallback;
   g_uiSignInCallback = signinCallback;
 
   device_cpu_init();
@@ -65,10 +68,8 @@ gboolean ui_init(sign_in_callback signinCallback)
 
   g_uiMainWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   gtk_widget_modify_bg(g_uiMainWindow, GTK_STATE_NORMAL, &colorBlack);
-  /* gtk_window_set_default_size(GTK_WINDOW(g_uiMainWindow), screenWidth, screenHeight); */
-  /* gtk_window_fullscreen(GTK_WINDOW(g_uiMainWindow)); */
-
-  gtk_window_set_default_size(GTK_WINDOW(g_uiMainWindow), 320, 240);
+  gtk_window_set_default_size(GTK_WINDOW(g_uiMainWindow), screenWidth, screenHeight);
+  gtk_window_fullscreen(GTK_WINDOW(g_uiMainWindow));
 
   /* AlwaysOnTop
    */
@@ -561,4 +562,6 @@ static void _uibind_objects(WebKitWebView* webkitWebView,
 		      JSContextGetGlobalObject(context),
 		      JSStringCreateWithUTF8CString("device"),
 		      deviceObject, kJSPropertyAttributeNone, NULL);
+
+  g_uiReadyCallback();
 }
diff --git a/ui.h b/ui.h
@@ -12,11 +12,11 @@ typedef enum STATUS_CODE
   } STATUS_CODE;
 
 
-typedef void (*sign_in_callback)(void);
+typedef void (*ui_callback)(void);
 
 
-
-gboolean ui_init(sign_in_callback signinCallback);
+gboolean ui_init(ui_callback readyCallback,
+		 ui_callback signinCallback);
 
 void ui_cleanup(void);