r1358 - trunk/src/target/OM-2007/applications/openmoko-dialer/src
tony_guan at sita.openmoko.org
tony_guan at sita.openmoko.org
Wed Mar 14 05:06:29 CET 2007
Author: tony_guan
Date: 2007-03-14 05:06:18 +0100 (Wed, 14 Mar 2007)
New Revision: 1358
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
Log:
revert the show_all & hide splashing ugly method for now. I have to for the phone call debugging.
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c 2007-03-14 02:55:14 UTC (rev 1357)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c 2007-03-14 04:06:18 UTC (rev 1358)
@@ -276,6 +276,7 @@
g_option_context_free (context);
}
+ //FIXME: the following lines to enable unique instance will be changed.
lockapp = testlock ("/tmp/dialer.lock");
if (lockapp > 0)
{
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c 2007-03-14 02:55:14 UTC (rev 1357)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c 2007-03-14 04:06:18 UTC (rev 1358)
@@ -290,8 +290,12 @@
window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
gtk_window_set_decorated(GTK_WINDOW(window ),FALSE);
moko_finger_window_set_contents (window, GTK_WIDGET (vbox));
+ //FIXME: dear thomas, I know that show & hide is not good, but when you removed the following 2 lines, the incoming window
+ //is simply not displaying well. please have a try and then commit. If you cannot test the incoming window, you can simply modify the code to show it out debuggingly.
+ //Pardon me to re-add the 2 lines. Tony Guan 14,3,2007
+ gtk_widget_show_all(GTK_WIDGET(window));
+ gtk_widget_hide(GTK_WIDGET(window));
-
moko_dialer_status_set_title_label (MOKO_DIALER_STATUS (status), "Incoming call");
moko_dialer_status_set_status_label (MOKO_DIALER_STATUS (status), "");
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c 2007-03-14 02:55:14 UTC (rev 1357)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c 2007-03-14 04:06:18 UTC (rev 1358)
@@ -324,7 +324,7 @@
gtk_box_pack_start (GTK_BOX (vbox), content_talk, FALSE, FALSE, 0);
-//now the dtmf content
+ //now the dtmf content
content_dtmf = gtk_vbox_new (FALSE, 0);
GtkWidget *eventbox1 = gtk_event_box_new ();
gtk_widget_show (eventbox1);
@@ -351,7 +351,7 @@
gtk_box_pack_start (GTK_BOX (vbox), content_dtmf, FALSE, FALSE, 0);
p_dialer_data->content_dtmf = content_dtmf;
- g_object_set (G_OBJECT (content_dtmf), "no-show-all", TRUE);
+ //g_object_set (G_OBJECT (content_dtmf), "no-show-all", TRUE);
//now the container--window
@@ -366,7 +366,15 @@
//now the wheel and tool box, why should the wheel and toolbox created after the gtk_widget_show_all???
+ //please refer to bug 175.
+ //FIXME:Dear Thomas, please modify the libmokoui before deleting the show_all & hide codes. I don't want to splash
+ //any window either, but for now, it's the most convenient way to debug the application. We will remove it, but later, OK?
+ //Tony Guan 14/3/2007
+ gtk_widget_show_all(GTK_WIDGET(window));
+ gtk_widget_hide(content_dtmf); //And this line is necessary because dtmf interface & talking interface share the same window.
+ //we have to hide it first.
wheel=moko_finger_window_get_wheel (window);
+
g_signal_connect (G_OBJECT (wheel),
"press_left_up",
G_CALLBACK (openmoko_wheel_press_left_up_cb),
More information about the commitlog
mailing list