X-Git-Url: https://git.karo-electronics.de/?p=oswald.git;a=blobdiff_plain;f=ui%2Foswald-ui.c;h=a89523b3ad27c9734ca4347c8333f0c3f7b1cf16;hp=27e83044f81894f91329548b94c5b8f56faff0e5;hb=8e3cbad72c8e3abb97f2081527f91af98d8558be;hpb=013b763c4c6740bb48dfcb28c2dd8547ff7e7697

diff --git a/ui/oswald-ui.c b/ui/oswald-ui.c
index 27e8304..a89523b 100644
--- a/ui/oswald-ui.c
+++ b/ui/oswald-ui.c
@@ -91,7 +91,7 @@ void button_A_clicked (GtkButton *button, gpointer user_data)
 {
 	oswald_ui *ui = (oswald_ui *)user_data;
 
-	g_print("Button-A clicked\n");
+	// g_print("Button-A clicked\n");
 	oswald_handle_button_press(BUTTON_A);
 }
 
@@ -99,7 +99,7 @@ void button_B_clicked (GtkButton *button, gpointer user_data)
 {
 	oswald_ui *ui = (oswald_ui *)user_data;
 
-	g_print("Button-B clicked\n");
+	// g_print("Button-B clicked\n");
 	oswald_handle_button_press(BUTTON_B);
 }
 
@@ -107,7 +107,7 @@ void button_C_clicked (GtkButton *button, gpointer user_data)
 {
 	oswald_ui *ui = (oswald_ui *)user_data;
 
-	g_print("Button-C clicked\n");
+	// g_print("Button-C clicked\n");
 	oswald_handle_button_press(BUTTON_C);
 }
 
@@ -115,7 +115,7 @@ void button_D_clicked (GtkButton *button, gpointer user_data)
 {
 	oswald_ui *ui = (oswald_ui *)user_data;
 
-	g_print("Button-D clicked\n");
+	// g_print("Button-D clicked\n");
 	oswald_handle_button_press(BUTTON_D);
 }
 
@@ -123,7 +123,7 @@ void button_E_clicked (GtkButton *button, gpointer user_data)
 {
 	oswald_ui *ui = (oswald_ui *)user_data;
 
-	g_print("Button-E clicked\n");
+	// g_print("Button-E clicked\n");
 	oswald_handle_button_press(BUTTON_E);
 }
 
@@ -131,7 +131,7 @@ void button_F_clicked (GtkButton *button, gpointer user_data)
 {
 	oswald_ui *ui = (oswald_ui *)user_data;
 
-	g_print("Button-F clicked\n");
+	// g_print("Button-F clicked\n");
 	oswald_handle_button_press(BUTTON_F);
 }
 
@@ -180,7 +180,7 @@ static void create_mainwin(oswald_ui *ui)
 
 	btn = gtk_button_new_with_label(" E ");
 	gtk_box_pack_start (GTK_BOX(vb), btn, FALSE, FALSE, 10);
-	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(button_D_clicked), ui);
+	g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(button_E_clicked), ui);
 
 	btn = gtk_button_new_with_label(" F ");
 	gtk_box_pack_start (GTK_BOX(vb), btn, FALSE, FALSE, 10);
@@ -254,7 +254,11 @@ gboolean one_second_tmo_handler (gpointer userdata)
 gboolean app_idle_handler (gpointer user_data)
 {
 	g_print("i");
-	return TRUE;
+	if (OswaldState.pending_idle) {
+		// call Oswald's idle function
+		return TRUE;
+	};
+	return FALSE;
 }
 
 int main(int argc , char ** argv)
@@ -271,9 +275,10 @@ int main(int argc , char ** argv)
 	gtk_init (&argc, &argv);
 
 	create_mainwin(&ui);
+	gtk_widget_realize(ui.mainwin);
 
-	oswald_init();
 	oswald_set_time(mtime.tm_hour, mtime.tm_min, mtime.tm_sec);
+	oswald_init();
 
 	g_timeout_add_seconds(1, one_second_tmo_handler, &ui);
 	// g_idle_add(app_idle_handler, &ui);