Changeset 1821


Ignore:
Timestamp:
04/24/07 16:54:40 (6 years ago)
Author:
thomas
Message:
Location:
trunk/src/target/OM-2007/applications/openmoko-dialer/src
Files:
2 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am

    r1162 r1821  
    1515contacts.c\ 
    1616common.c\ 
    17 dialergsm.c\ 
    1817openmoko-dialer-window-history.c\ 
    1918openmoko-dialer-window-dialer.c\ 

  • trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c

    r1819 r1821  
    3737#include  "history.h" 
    3838#include "error.h" 
    39 #include "dialergsm.h" 
     39#include "errno.h" 
    4040#include "openmoko-dialer-main.h" 
    4141#include "openmoko-dialer-window-dialer.h" 
    … …  
    167167 
    168168  MOKO_DIALER_APP_DATA *appdata = moko_get_app_data (); 
    169   gsm_hangup (); 
     169  /* TODO: MokoGsmdConnection->hangup  
     170   * gsm_hangup (); 
     171   */ 
     172 
    170173  if (appdata->window_talking) 
    171174    gtk_widget_hide (appdata->window_talking); 
    … …  
    338341  } 
    339342 
    340 //from now on we will not use multithreads. 
    341   gsm_lgsm_start (mainloop); 
    342  
    343 //for debug only>> 
    344 //gsm_incoming_call("13917209523"); 
    345 //<<for debug only 
    346  
    347   g_main_loop_run (mainloop); 
     343  gtk_main (); 
    348344 
    349345 

  • trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c

    r1820 r1821  
    3737#include "openmoko-dialer-window-talking.h" 
    3838#include "openmoko-dialer-window-history.h" 
    39 #include "dialergsm.h" 
    4039#include "history.h" 
    4140 
    … …  
    4443                          MOKO_DIALER_APP_DATA * appdata)  
    4544{ 
    46    
    47 DBG_ENTER (); 
    48    
    49  
    50 appdata->g_state.callstate = STATE_TALKING; 
    51    
    52 gsm_answer (); 
    53    
    54  
    55 gtk_widget_hide (appdata->window_incoming); 
    56    
    57  
    58  
    59 //transfer the contact info 
    60     window_talking_prepare (appdata); 
    61    
    62  
    63  
    64 gtk_widget_show (appdata->window_talking); 
    65    
    66  
    67 DBG_LEAVE (); 
    68  
     45  DBG_ENTER (); 
     46  appdata->g_state.callstate = STATE_TALKING; 
     47  /* TODO: MokoGsmdConnection->answer 
     48   * gsm_answer (); 
     49   */ 
     50 
     51  gtk_widget_hide (appdata->window_incoming); 
     52 
     53  //transfer the contact info 
     54   window_talking_prepare (appdata); 
     55  gtk_widget_show (appdata->window_talking); 
     56   
     57 
     58DBG_LEAVE (); 
    6959}  
    7060 
    71 void  
    72  
     61void 
    7362cb_ignore_button_clicked (GtkButton * button, 
    7463                          MOKO_DIALER_APP_DATA * appdata)  
    … …  
    9079                          MOKO_DIALER_APP_DATA * appdata)  
    9180{ 
    92    
    93 DBG_ENTER (); 
    94    
    95 gsm_hangup (); 
    96    
    97 appdata->g_state.callstate = STATE_REJECTED; 
    98    
    99 gtk_widget_hide (appdata->window_incoming); 
    100    
    101 DBG_LEAVE (); 
    102  
    103 }  
    104  
    105 void  
    106  
     81  DBG_ENTER (); 
     82  /* TODO: MokoGsmdConnection->hangup 
     83   * gsm_hangup (); 
     84   */ 
     85  appdata->g_state.callstate = STATE_REJECTED; 
     86  gtk_widget_hide (appdata->window_incoming); 
     87  DBG_LEAVE (); 
     88} 
     89 
     90void 
    10791window_incoming_prepare (MOKO_DIALER_APP_DATA * appdata)  
    10892{ 

  • trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c

    r1820 r1821  
    3737#include "openmoko-dialer-window-history.h" 
    3838#include "openmoko-dialer-window-talking.h" 
    39 #include "dialergsm.h" 
    4039 
    4140/* function declerations */ 
    … …  
    8180  appdata->g_state.callstate = STATE_CALLING; 
    8281  appdata->g_state.historytype = OUTGOING; 
    83   gsm_dial (appdata->g_peer_info.number); 
     82  /* TOOD: MokoGsmdConnection->dial 
     83   * gsm_dial (appdata->g_peer_info.number); 
     84   */ 
    8485 
    8586  DBG_LEAVE (); 
    … …  
    9091{ 
    9192  DBG_ENTER (); 
    92   gsm_hangup (); 
     93  /* TODO: MokoGsmdConnection->hangup 
     94   * gsm_hangup (); 
     95   */ 
    9396  appdata->g_state.callstate = STATE_FAILED; 
    9497  DBG_TRACE (); 
    … …  
    240243  appdata->g_state.historytype = OUTGOING; 
    241244  //DBG_TRACE (); 
    242   int retv = gsm_dial (appdata->g_peer_info.number); 
    243   DBG_MESSAGE ("GSM_DIAL returns %d", retv); 
     245  /* TODO: MokoGsmdConnection->dial 
     246   * int retv = gsm_dial (appdata->g_peer_info.number); 
     247   * DBG_MESSAGE ("GSM_DIAL returns %d", retv); 
     248   */ 
    244249  //DBG_LEAVE (); 
    245250} 

  • trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c

    r1820 r1821  
    3737#include "openmoko-dialer-window-talking.h" 
    3838#include "openmoko-dialer-window-history.h" 
    39 #include "dialergsm.h" 
    4039 
    4140void 
    … …  
    113112                               MOKO_DIALER_APP_DATA * appdata) 
    114113{ 
    115   gsm_hangup (); 
     114  /* TODO: MokoGsmdConnection->hangup 
     115   * gsm_hangup (); 
     116   */ 
    116117  gtk_widget_hide (appdata->window_talking); 
    117118 
    … …  
    133134 
    134135 
    135   gsm_dtmf_send (input[0]); 
     136  /* TODO: MokoGsmdConnection->dtmf_send 
     137   * gsm_dtmf_send (input[0]); 
     138   */ 
    136139//lgsm_voice_dtmf(lgsmh, buf[1]); 
    137140 
Note: See TracChangeset for help on using the changeset viewer.