r1937 - trunk/src/target/OM-2007/applications/openmoko-dialer/src
thomas at sita.openmoko.org
thomas at sita.openmoko.org
Wed May 9 16:36:25 CEST 2007
Author: thomas
Date: 2007-05-09 16:36:24 +0200 (Wed, 09 May 2007)
New Revision: 1937
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.h
Log:
openmoko-dialer: clean up dialing method
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c 2007-05-09 14:24:51 UTC (rev 1936)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c 2007-05-09 14:36:24 UTC (rev 1937)
@@ -96,70 +96,12 @@
}
static void
-window_dialer_dial_out (MokoDialerData * appdata)
-{
- gchar *codesinput;
- //get the input digits
- codesinput =
- g_strdup (moko_dialer_textview_get_input
- (appdata->moko_dialer_text_view, FALSE));
- 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)
- {
- moko_dialer_textview_insert (appdata->moko_dialer_text_view,
- appdata->g_state.lastnumber);
- moko_dialer_autolist_refresh_by_string (appdata->
- moko_dialer_autolist,
- appdata->g_state.lastnumber,
- TRUE);
- }
- return;
- }
-//empty the textview
- moko_dialer_textview_empty (appdata->moko_dialer_text_view);
-
-//and we set the selected autolist to be No
- moko_dialer_autolist_set_select (appdata->moko_dialer_autolist, -1);
- moko_dialer_autolist_hide_all_tips (appdata->moko_dialer_autolist);
-
-//got the number;//FIXME:which function should I use if not g_strdup. & strcpy.
- //strcpy(appdata->g_peer_info.number, codesinput );
- g_stpcpy (appdata->g_peer_info.number, codesinput);
-
-//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
-
-/*
-if(!appdata->window_outgoing)
- window_incoming_init(appdata);
-
-//transfer the contact info
-window_incoming_prepare(appdata);
-
-//start dialling.
-gtk_widget_show(appdata->window_incoming);
-*/
-
-//transfer the contact info
- window_outgoing_prepare (appdata);
-
-//start dialling.
- gtk_widget_show_all (appdata->window_outgoing);
-
- g_free (codesinput);
-
-}
-
-static void
cb_dialer_button_clicked (GtkButton * button, MokoDialerData * appdata)
{
- window_dialer_dial_out (appdata);
+ gchar *number;
+ number = moko_dialer_textview_get_input (appdata->moko_dialer_text_view, TRUE);
+ g_debug ("Dialing: %s", number);
+ window_outgoing_dial (appdata, number);
}
@@ -202,7 +144,7 @@
on_dialer_autolist_user_confirmed (GtkWidget * widget, gpointer para_pointer,
gpointer user_data)
{
-
+#if 0
MokoDialerData *appdata = (MokoDialerData *) user_data;
MokoDialerTextview *moko_dialer_text_view = appdata->moko_dialer_text_view;
DIALER_READY_CONTACT *ready_contact = (DIALER_READY_CONTACT *) para_pointer;
@@ -210,10 +152,8 @@
ready_contact->p_entry->content);
moko_dialer_textview_confirm_it (moko_dialer_text_view,
ready_contact->p_entry->content);
- DBG_MESSAGE ("And here we are supposed to call out directly");
- window_dialer_dial_out (appdata);
-
+#endif
}
static void
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c 2007-05-09 14:24:51 UTC (rev 1936)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c 2007-05-09 14:36:24 UTC (rev 1937)
@@ -49,12 +49,6 @@
//start dialling.
- DBG_TRACE ();
-// gtk_widget_show_all (appdata->window_talking);
- gtk_widget_show (appdata->window_talking);
-
-
- DBG_LEAVE ();
}
static void
@@ -91,47 +85,6 @@
DBG_LEAVE ();
}
-void
-window_outgoing_prepare (MokoDialerData * appdata)
-{
- DBG_ENTER ();
- if (appdata->window_outgoing == 0)
- window_outgoing_init (appdata);
-
-
- moko_dialer_status_set_person_number (appdata->status_outgoing,
- appdata->g_peer_info.number);
- if (appdata->g_peer_info.hasname)
- {
- moko_dialer_status_set_person_image (appdata->status_outgoing,
- appdata->g_peer_info.ID);
- moko_dialer_status_set_person_name (appdata->status_outgoing,
- appdata->g_peer_info.name);
- }
- else
- {
- moko_dialer_status_set_person_image (appdata->status_outgoing, "");
- moko_dialer_status_set_person_name (appdata->status_outgoing, "");
-
- }
-// strcpy (appdata->g_state.lastnumber, appdata->g_peer_info.number);
- g_stpcpy (appdata->g_state.lastnumber, appdata->g_peer_info.number);
- DBG_LEAVE ();
-
-}
-
-void
-window_outgoing_fails (MokoDialerData * appdata)
-{
- DBG_ENTER ();
- moko_dialer_status_set_error (appdata->status_outgoing);
- moko_dialer_status_set_title_label (appdata->status_outgoing,
- "Call Failure");
- gtk_widget_hide (appdata->buttonSpeaker);
- gtk_widget_show (appdata->buttonRedial);
- DBG_LEAVE ();
-}
-
gint
timer_outgoing_time_out (MokoDialerData * appdata)
{
@@ -162,7 +115,7 @@
g_source_remove (timer_data->ptimer);
timer_data->ptimer = 0;
//maybe it failes
- window_outgoing_fails (appdata);
+// window_outgoing_fails (appdata);
return 0; //0 stops the timer.
}
else
@@ -311,7 +264,7 @@
}
void
-window_outgoing_run (MokoDialerData *appdata, gchar *number)
+window_outgoing_dial (MokoDialerData *appdata, gchar *number)
{
moko_gsmd_connection_voice_dial (appdata->connection, number);
gtk_dialog_run (appdata->window_outgoing);
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.h 2007-05-09 14:24:51 UTC (rev 1936)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.h 2007-05-09 14:36:24 UTC (rev 1937)
@@ -21,7 +21,6 @@
#define _OPENMOKO_DIALER_WINDOW_OUTGOING_H
gint window_outgoing_init (MokoDialerData * p_dialer_data);
-void window_outgoing_prepare (MokoDialerData * appdata);
-void window_outgoing_fails (MokoDialerData * appdata);
+void window_outgoing_dial (MokoDialerData *data, gchar *number);
#endif
More information about the commitlog
mailing list
