r652 - trunk/src/target/OM-2007/applications/openmoko-dialer/src

tony_guan at sita.openmoko.org tony_guan at sita.openmoko.org
Fri Feb 2 04:56:34 CET 2007


Author: tony_guan
Date: 2007-02-02 04:56:28 +0100 (Fri, 02 Feb 2007)
New Revision: 652

Modified:
   trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.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-outgoing.c
   trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
Log:
libebook ok


Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.c	2007-02-02 03:33:48 UTC (rev 651)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.c	2007-02-02 03:56:28 UTC (rev 652)
@@ -144,7 +144,7 @@
   if (!lgsmh)
   {
     fprintf (stderr, "Can't connect to gsmd\n");
-    exit (1);
+    return -1;
   }
   pin_init (lgsmh, pin);
   event_init (lgsmh);

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-02-02 03:33:48 UTC (rev 651)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c	2007-02-02 03:56:28 UTC (rev 652)
@@ -179,7 +179,7 @@
 add_histroy_entry(appdata,appdata->g_state.historytype,
 	appdata->g_peer_info.name,
 	appdata->g_peer_info.number,
-	appdata->g_peer_info.id,
+	appdata->g_peer_info.ID,
 	appdata->g_state.starttime,
 	appdata->g_state.startdate,
 	0);

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c	2007-02-02 03:33:48 UTC (rev 651)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c	2007-02-02 03:56:28 UTC (rev 652)
@@ -84,6 +84,7 @@
 
 void window_outgoing_prepare(MOKO_DIALER_APP_DATA * appdata)
 {
+DBG_ENTER();
 if(appdata->window_outgoing==0)
 	window_outgoing_init( appdata);
 
@@ -101,8 +102,8 @@
 
 }
 strcpy(appdata->g_state.lastnumber,appdata->g_peer_info.number);
+DBG_LEAVE();
 
-
 }
 
 gint window_outgoing_fails(MOKO_DIALER_APP_DATA * appdata)
@@ -207,15 +208,16 @@
                                         MOKO_DIALER_APP_DATA * appdata)
 {
 
-
+DBG_ENTER();
 window_outgoing_setup_timer(appdata);
-
-
+DBG_TRACE();
 appdata->g_state.callstate=STATE_CALLING;
+DBG_TRACE();
 appdata->g_state.historytype=OUTGOING;	
+DBG_TRACE();
 gsm_dial(appdata->g_peer_info.number);
+DBG_LEAVE();
 
-
 }
 
 

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-02-02 03:33:48 UTC (rev 651)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c	2007-02-02 03:56:28 UTC (rev 652)
@@ -130,14 +130,19 @@
 void window_talking_prepare(MOKO_DIALER_APP_DATA * appdata)
 {
 DBG_ENTER();
+
 //   moko_dialer_status_set_person_number(appdata->status_talking, appdata->g_peer_info.number);
 
 if(!appdata->window_talking)
 	window_talking_init(appdata);
 
 if(!appdata->window_talking)
+{
+	DBG_WARN("NO TALKING WINDOW INITIATED");
 	return;
-	
+}
+
+
 if(appdata->g_peer_info.hasname)
 {
 DBG_TRACE();
@@ -193,6 +198,8 @@
 on_window_talking_hide                 (GtkWidget       *widget,
                                         MOKO_DIALER_APP_DATA * appdata)
 {
+
+
 if(appdata->g_timer_data.ptimer!=0)
 {
 gtk_timeout_remove(appdata->g_timer_data.ptimer);
@@ -244,7 +251,7 @@
 gtk_widget_show(appdata->toolbox_talking);
 
 
-   
+
 DBG_LEAVE();
 }
 
@@ -331,15 +338,17 @@
 	                    p_dialer_data);
 
      
+
+
+
      gtk_widget_show_all( GTK_WIDGET(window) );
-
 //the gtk_widget_show_all is really bad, cause i have to call it and then hide some widgets.
 
    gtk_widget_hide(content_dtmf);
 
 
  //now the wheel and tool box, why should the wheel and toolbox created after the gtk_widget_show_all???
-   gtk_widget_show(GTK_WIDGET(moko_finger_window_get_wheel(window)));
+//   gtk_widget_show(GTK_WIDGET(moko_finger_window_get_wheel(window)));
     
     g_signal_connect(G_OBJECT(moko_finger_window_get_wheel(window)),
 		    "press_left_up",
@@ -383,6 +392,7 @@
 
 	DBG_LEAVE();
 }
+
     return 1;
 }
 





More information about the commitlog mailing list