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

tony_guan at sita.openmoko.org tony_guan at sita.openmoko.org
Fri Mar 2 04:53:50 CET 2007


Author: tony_guan
Date: 2007-03-02 04:53:45 +0100 (Fri, 02 Mar 2007)
New Revision: 1216

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-dialer.c
   trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c
Log:
removed some gtk critical problem.


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-01 23:49:55 UTC (rev 1215)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c	2007-03-02 03:53:45 UTC (rev 1216)
@@ -75,22 +75,25 @@
 if(appdata)
 {
 //first, we should remove the "" from the number.
-char temp[20];
+char* temp=NULL;
 int start=0;
-int end=strlen(number);
+int end=strlen(number)-1;
 while(number[start]=='\"'&&start<end)start++;
-if(end>1)while(number[end-1]=='\"'&&start<end)end--;
+if(end>0)while(number[end]=='\"'&&start<end)end--;
 
+g_return_if_fail(start<=end);
+
 DBG_MESSAGE("START=%d,END=%d",start,end);
-g_stpcpy(temp,number+start);
-temp[end-start]=0;
-DBG_MESSAGE("%s",temp);	
+temp=g_strndup(number+start,end-start+1);
 
+g_return_if_fail(temp!=NULL);
 
+DBG_MESSAGE("%s",temp);	
 
 //got the number;
 g_stpcpy(appdata->g_peer_info.number,temp);
 
+g_free(temp);
 //retrieve the contact information if any.
 contact_get_peer_info_from_number(appdata->g_contactlist.contacts , &(appdata->g_peer_info));
 // contact_get_peer_info_from_number
@@ -153,7 +156,8 @@
 
      MOKO_DIALER_APP_DATA* appdata=moko_get_app_data();
      gsm_hangup();
-     gtk_widget_hide(appdata->window_talking);
+    if(appdata->window_talking)gtk_widget_hide(appdata->window_talking);
+    if(appdata->window_outgoing)gtk_widget_hide(appdata->window_outgoing);
 
 }
 

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c	2007-03-01 23:49:55 UTC (rev 1215)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c	2007-03-02 03:53:45 UTC (rev 1216)
@@ -102,10 +102,8 @@
   codesinput =
     g_strdup (moko_dialer_textview_get_input
               (appdata->moko_dialer_text_view, FALSE));
-  if (!codesinput)
-    return;
-
-  if (g_utf8_strlen (codesinput, -1) < 1)
+  DBG_TRACE();
+  if ((!codesinput)||((codesinput!=NULL)&&g_utf8_strlen (codesinput, -1) )< 1)
   {
     //user didn't input anything, maybe it's a redial, so we just insert the last dialed number and return this time.
     if (g_utf8_strlen (appdata->g_state.lastnumber, -1) > 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-03-01 23:49:55 UTC (rev 1215)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c	2007-03-02 03:53:45 UTC (rev 1216)
@@ -90,6 +90,7 @@
   DBG_ENTER ();
   gsm_hangup ();
   appdata->g_state.callstate = STATE_FAILED;
+  DBG_TRACE();
   gtk_widget_hide (appdata->window_outgoing);
   DBG_LEAVE ();
 }





More information about the commitlog mailing list