Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r2076 -
trunk/src/target/OM-2007/applications/openmoko-dialer/src
([EMAIL PROTECTED])
2. r2077 -
trunk/src/target/OM-2007/applications/openmoko-dialer/src
([EMAIL PROTECTED])
3. r2078 -
trunk/src/target/OM-2007/applications/openmoko-dialer/src
([EMAIL PROTECTED])
4. r2079 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2007-05-24 13:13:00 +0200 (Thu, 24 May 2007)
New Revision: 2076
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-autolist.c
Log:
Patch by Neil J Patel <[EMAIL PROTECTED]>
openmoko-dialer: Add threaded support for autolist
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.c
2007-05-24 10:24:12 UTC (rev 2075)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.c
2007-05-24 11:13:00 UTC (rev 2076)
@@ -23,6 +23,7 @@
#include <unistd.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include <signal.h>
#include "contacts.h"
#include "error.h"
@@ -171,7 +172,9 @@
}
setlock ("/tmp/dialer.lock");
- /* Initialize GTK+ */
+ /* Initialize Threading & GTK+ */
+ g_thread_init (NULL);
+ gdk_threads_init ();
gtk_init (&argc, &argv);
moko_stock_register ();
@@ -201,7 +204,7 @@
signal (SIGUSR1, handle_sigusr1);
- //init the dialer window
+ //init the dialer windows
window_dialer_init (p_dialer_data);
window_incoming_init (p_dialer_data);
window_pin_init (p_dialer_data);
@@ -212,8 +215,10 @@
{
handle_sigusr1 (SIGUSR1);
}
-
+
+ gdk_threads_enter ();
gtk_main ();
+ gdk_threads_leave ();
//release everything
contact_release_contact_list (&(p_dialer_data->g_contactlist));
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-24 10:24:12 UTC (rev 2075)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
2007-05-24 11:13:00 UTC (rev 2076)
@@ -37,6 +37,7 @@
#include "dialer-window-history.h"
#include "dialer-window-outgoing.h"
+#if 1
static void
cb_delete_button_clicked (GtkButton * button, MokoDialerData * appdata)
{
@@ -62,6 +63,8 @@
{
moko_dialer_autolist_refresh_by_string (appdata->moko_dialer_autolist,
codesinput, TRUE);
+
+ moko_dialer_textview_set_color (appdata->moko_dialer_text_view);
}
else
{
@@ -72,7 +75,55 @@
g_free (codesinput);
}
+#else
+ static void
+ cb_delete_button_clicked (GtkButton * button, MokoDialerData * appdata)
+ {
+ moko_dialer_textview_delete (appdata->moko_dialer_text_view);
+ g_print (moko_dialer_textview_get_input
+ (appdata->moko_dialer_text_view, FALSE));
+
+ if (moko_dialer_autolist_has_selected (appdata->moko_dialer_autolist))
+ {
+ //first of all, we un-select the selection.
+ moko_dialer_autolist_set_select (appdata->moko_dialer_autolist, -1);
+
+ //fill the textview with ""
+ moko_dialer_textview_fill_it (appdata->moko_dialer_text_view, " ");
+ //moko_dialer_textview_set_color(moko_dialer_textview);
+ }
+ else
+ {
+ moko_dialer_textview_delete (appdata->moko_dialer_text_view);
+ //refresh the autolist,but do not automaticall fill the textview
+ gchar *codesinput = 0;
+ codesinput =
+ g_strdup (moko_dialer_textview_get_input
+ (appdata->moko_dialer_text_view, FALSE));
+
+ if (codesinput)
+ {
+ DBG_MESSAGE ("input %s", codesinput);
+ if (g_utf8_strlen (codesinput, -1) >= MOKO_DIALER_MIN_SENSATIVE_LEN)
+ {
+ moko_dialer_autolist_refresh_by_string (appdata->
+ moko_dialer_autolist,
+ codesinput, FALSE);
+ moko_dialer_textview_set_color (appdata->moko_dialer_text_view);
+ }
+ else
+ moko_dialer_autolist_hide_all_tips (appdata->moko_dialer_autolist);
+ g_free (codesinput);
+ }
+ else
+ {
+ DBG_WARN ("No input now.");
+ }
+ }
+
+ }
+#endif
static void
cb_history_button_clicked (GtkButton * button, MokoDialerData * appdata)
{
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-autolist.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-autolist.c
2007-05-24 10:24:12 UTC (rev 2075)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-autolist.c
2007-05-24 11:13:00 UTC (rev 2076)
@@ -43,6 +43,11 @@
/* Previous search string */
gchar *last_string;
+ /* The current list to search */
+ GThread *thread;
+ GList *search_list;
+ gboolean selectdefault;
+
/* old method of finding data */
DIALER_CONTACTS_LIST_HEAD *head;
DIALER_READY_CONTACT readycontacts[MOKO_DIALER_MAX_TIPS];
@@ -282,7 +287,7 @@
* else, we only refresh our tip list.
* @retval
*/
-
+#if 0
int
moko_dialer_autolist_fill_alternative (MokoDialerAutolist
*moko_dialer_autolist,
gint count,
@@ -292,49 +297,54 @@
gint i;
AutolistEntry *entry = NULL;
+
priv = MOKO_DIALER_AUTOLIST_GET_PRIVATE (moko_dialer_autolist);
priv->selected = FALSE;
-
if (count > 0)
{
//init the labels.
for (i = 0; i < count && i < MOKO_DIALER_MAX_TIPS; i++)
{
entry = (AutolistEntry*)g_list_nth_data (priv->last, i);
-
+ gdk_threads_enter ();
moko_dialer_tip_set_label (priv->tips[i], entry->contact->name);
moko_dialer_tip_set_index (priv->tips[i], i);
moko_dialer_tip_set_selected (priv->tips[i], FALSE);
gtk_widget_show (priv->tips[i]);
+ gdk_threads_leave ();
}
-
/* Invalidate the remaining tips */
for (; i < MOKO_DIALER_MAX_TIPS; i++)
{
+ gdk_threads_enter ();
moko_dialer_tip_set_index (priv->tips[i], -1);
moko_dialer_tip_set_label (priv->tips[i], "");
gtk_widget_hide (priv->tips[i]);
moko_dialer_tip_set_selected (priv->tips[i], FALSE);
+ gdk_threads_leave ();
}
-
if (selectdefault)
{
//we set the first one as defaultly selected
+ gdk_threads_enter ();
moko_dialer_autolist_set_select (moko_dialer_autolist, 0);
+ gdk_threads_leave ();
}
}
else
{
+ gdk_threads_enter ();
moko_dialer_autolist_hide_all_tips (moko_dialer_autolist);
//notify the client that no match has been found
g_signal_emit (moko_dialer_autolist,
moko_dialer_autolist_signals[NOMATCH_SIGNAL], 0, 0);
+ gdk_threads_leave ();
}
return 1;
}
-
+#endif
static void
moko_dialer_autolist_create_tips (MokoDialerAutolist *moko_dialer_autolist)
{
@@ -420,17 +430,107 @@
return matches;
}
+gpointer
+moko_dialer_autolist_worker (MokoDialerAutolist *autolist)
+{
+ MokoDialerAutolistPrivate *priv;
+ priv = MOKO_DIALER_AUTOLIST_GET_PRIVATE (autolist);
+ GList *numbers = priv->search_list;
+ const gchar *string = priv->last_string;
+ GList *matches = NULL;
+ gint count = 0;
+ GList *n;
+ AutolistEntry *entry = NULL;
+ gint i = 0;
+ gint len = strlen (string);
+ gboolean found_one = FALSE;
+ gboolean prev_matched = FALSE;
+ gboolean selectdefault = priv->selectdefault;
+
+ for (n = numbers; n != NULL; n = n->next)
+ {
+ entry = (AutolistEntry*)n->data;
+ if (g_strstr_len (entry->number, len, string))
+ {
+ matches = g_list_append (matches, (gpointer)entry);
+ found_one = prev_matched = TRUE;
+ i++;
+ }
+ else
+ {
+ /*
+ * If we have already found at least one, but the previous entry didn't
+ * match, we don't bother continuing.
+ */
+ if (found_one && !prev_matched)
+ break;
+ prev_matched = FALSE;
+ }
+ }
+ priv->last = matches;
+
+ count = g_list_length (matches);
+ priv->selected = FALSE;
+ if (count > 0)
+ {
+ //init the labels.
+ for (i = 0; i < count && i < MOKO_DIALER_MAX_TIPS; i++)
+ {
+ entry = (AutolistEntry*)g_list_nth_data (priv->last, i);
+ gdk_threads_enter ();
+ moko_dialer_tip_set_label (priv->tips[i], entry->contact->name);
+ moko_dialer_tip_set_index (priv->tips[i], i);
+ moko_dialer_tip_set_selected (priv->tips[i], FALSE);
+ gtk_widget_show (priv->tips[i]);
+ gdk_threads_leave ();
+ }
+ /* Invalidate the remaining tips */
+ for (; i < MOKO_DIALER_MAX_TIPS; i++)
+ {
+ gdk_threads_enter ();
+ moko_dialer_tip_set_index (priv->tips[i], -1);
+ moko_dialer_tip_set_label (priv->tips[i], "");
+ gtk_widget_hide (priv->tips[i]);
+ moko_dialer_tip_set_selected (priv->tips[i], FALSE);
+ gdk_threads_leave ();
+ }
+ if (selectdefault)
+ {
+ //we set the first one as defaultly selected
+ gdk_threads_enter ();
+ moko_dialer_autolist_set_select (autolist, 0);
+ gdk_threads_leave ();
+ }
+ }
+ else
+ {
+ gdk_threads_enter ();
+ moko_dialer_autolist_hide_all_tips (autolist);
+
+ //notify the client that no match has been found
+ g_signal_emit (autolist,
+ moko_dialer_autolist_signals[NOMATCH_SIGNAL], 0, 0);
+ gdk_threads_leave ();
+ }
+
+ return 0;
+}
+
gint
moko_dialer_autolist_refresh_by_string (MokoDialerAutolist *autolist,
gchar * string,
gboolean selectdefault)
{
MokoDialerAutolistPrivate *priv;
+ priv = MOKO_DIALER_AUTOLIST_GET_PRIVATE (autolist);
+ if (priv->thread)
+ g_thread_join (priv->thread);
+ priv->thread = NULL;
GList *matches = NULL;
gint n_matches = 0;
- priv = MOKO_DIALER_AUTOLIST_GET_PRIVATE (autolist);
+
if (!priv->tipscreated)
moko_dialer_autolist_create_tips (autolist);
@@ -440,33 +540,35 @@
if (strlen (string) < strlen (priv->last_string))
{
/* We have 'deleted' so we can't use our previous results */
- g_print ("Deleted\n");
+ ;
}
else if (strstr (string, priv->last_string))
{
- matches = _autolist_find_number_in_entry_list (priv->last, string);
+ matches = priv->last;
}
}
if (matches == NULL)
{
+ if (priv->last)
+ g_list_free (priv->last);
+ priv->last = NULL;
+
/* We need to look though the whole list */
- matches = _autolist_find_number_in_entry_list (priv->numbers, string);
+ matches = priv->numbers;
}
/* We reset the last & last_string variables */
- if (priv->last)
- g_list_free (priv->last);
- priv->last = matches;
+ priv->search_list = matches;
if (priv->last_string)
g_free (priv->last_string);
priv->last_string = g_strdup (string);
-
- n_matches = g_list_length (matches);
- moko_dialer_autolist_fill_alternative (autolist,
- n_matches,
- selectdefault);
+ priv->selectdefault = selectdefault;
+ priv->thread = g_thread_create ((GThreadFunc)moko_dialer_autolist_worker,
+ (gpointer)autolist,
+ TRUE,
+ NULL);
return n_matches;
}
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-05-24 16:19:49 +0200 (Thu, 24 May 2007)
New Revision: 2077
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
Log:
openmoko-dialer: remove autolist functionality again as threads don't seem to
work too well
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-24 11:13:00 UTC (rev 2076)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
2007-05-24 14:19:49 UTC (rev 2077)
@@ -41,11 +41,11 @@
static void
cb_delete_button_clicked (GtkButton * button, MokoDialerData * appdata)
{
- gchar *codesinput = NULL;
+ //gchar *codesinput = NULL;
moko_dialer_textview_delete (appdata->moko_dialer_text_view);
- /* skip the auto list for the moment as it is too slow */
+ /* skip the auto list for the moment as it is too slow
if (moko_dialer_autolist_has_selected (appdata->moko_dialer_autolist))
{
//first of all, we un-select the selection.
@@ -73,6 +73,7 @@
if (codesinput)
g_free (codesinput);
+ */
}
#else
@@ -220,14 +221,14 @@
char input[2];
input[0] = parac;
input[1] = 0;
- gchar *codesinput = NULL;
+ //gchar *codesinput = NULL;
MokoDialerData *appdata = (MokoDialerData *) user_data;
MokoDialerTextview *moko_dialer_text_view = appdata->moko_dialer_text_view;
moko_dialer_textview_insert (moko_dialer_text_view, input);
-
+#if 0
codesinput =
g_strdup (moko_dialer_textview_get_input (moko_dialer_text_view, FALSE));
@@ -244,6 +245,7 @@
if (codesinput)
g_free (codesinput);
+#endif
}
static void
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-05-24 18:03:31 +0200 (Thu, 24 May 2007)
New Revision: 2078
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
Log:
openmoko-dialer: remove more unused code, add some debugging messages
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
2007-05-24 14:19:49 UTC (rev 2077)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
2007-05-24 16:03:31 UTC (rev 2078)
@@ -854,109 +854,3 @@
}
-
-/**
- * @brief add an entry to the history treeview
- *
- *
- *
- * @param entry HISTORY_ENTRY *, the history entry to be added to the treeview.
- * @return
- * @retval 0 error occured
- * @retval 1 everything is OK
- */
-static gint
-history_list_view_add (MokoDialerData * appdata, MokoJournalEntry * entry)
-{
-#if 0
- DBG_ENTER ();
- if (entry == 0)
- {
- DBG_ERROR ("THE ENTRY IS ZERO");
- return 0;
- }
-
- if (appdata->treeview_history == 0)
- {
- DBG_WARN ("treeview_history not ready");
- return 0;
-
- }
- //
- GtkTreeIter iter; //iter of the filter store
- GtkTreeModel *model;
- GtkListStore *list_store;
- GtkTreeView *treeview;
-
- treeview = GTK_TREE_VIEW (appdata->treeview_history);
-
- model =
- gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER
- (appdata->g_list_store_filter));
-
- list_store = GTK_LIST_STORE (model);
- //
-
-
- //DBG_MESSAGE(entry->number);
- gtk_list_store_insert (list_store, &iter, 0);
- gtk_list_store_set (list_store, &iter, COLUMN_TYPE, entry->type,
- COLUMN_SEPRATE, "--", COLUMN_TIME, entry->time,
- COLUMN_DURATION, entry->durationsec,
- COLUMN_ENTRYPOINTER, entry, COLUMN_HASNAME, 0, -1);
- if (entry->name == 0)
- {
- //DBG_MESSAGE(entry->number);
- gtk_list_store_set (list_store, &iter, COLUMN_NAME_NUMBER,
- entry->number, -1);
- gtk_list_store_set (list_store, &iter, COLUMN_HASNAME, 0, -1);
- }
- else
- {
- gtk_list_store_set (list_store, &iter, COLUMN_NAME_NUMBER, entry->name,
- -1);
- gtk_list_store_set (list_store, &iter, COLUMN_HASNAME, 1, -1);
- }
- switch (entry->type)
- {
- case INCOMING:
- {
- gtk_list_store_set (list_store, &iter, COLUMN_TYPEICON,
- appdata->g_iconReceived, -1);
- // icon=gdk_pixbuf_new_from_file("./received.png",&error);
- break;
- }
- case OUTGOING:
- { //
icon=gdk_pixbuf_new_from_file("./dialed.png",&error);
- gtk_list_store_set (list_store, &iter, COLUMN_TYPEICON,
- appdata->g_iconDialed, -1);
- break;
- }
- case MISSED:
- {
//icon=gdk_pixbuf_new_from_file("./missed.png",&error);
- gtk_list_store_set (list_store, &iter, COLUMN_TYPEICON,
- appdata->g_iconMissed, -1);
- break;
- }
-
- default:
-
- {
//icon=gdk_pixbuf_new_from_file("./missed.png",&error);
- gtk_list_store_set (list_store, &iter, COLUMN_TYPEICON,
- appdata->g_iconMissed, -1);
- break;
- }
- }
- history_update_counter (appdata);
-#endif
- return 1;
-}
-
-
-static gint
-add_histroy_entry (MokoDialerData * appdata, CallFilter type,
- const char *name, const char *number, const char *id,
- char *time, char *date, int durationsec)
-{
-return 0;
-}
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.c
2007-05-24 14:19:49 UTC (rev 2077)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.c
2007-05-24 16:03:31 UTC (rev 2078)
@@ -26,47 +26,8 @@
#include "dialer-window-incoming.h"
#include "dialer-window-talking.h"
#include "dialer-window-history.h"
-void
-cb_answer_button_clicked (GtkButton * button,
- MokoDialerData * appdata)
-{
- DBG_ENTER ();
- appdata->g_state.callstate = STATE_TALKING;
- /* TODO: MokoGsmdConnection->answer
- * gsm_answer ();
- */
- gtk_widget_hide (appdata->window_incoming);
-
- //transfer the contact info
- window_talking_prepare (appdata);
- gtk_widget_show (appdata->window_talking);
- DBG_LEAVE ();
-}
-
void
-cb_ignore_button_clicked (GtkButton * button,
- MokoDialerData * appdata)
-{
- DBG_ENTER ();
- DBG_MESSAGE ("We will mute the phone for this call.");
- appdata->g_state.callstate = STATE_IGNORED;
- DBG_LEAVE ();
-} void
-
-cb_reject_button_clicked (GtkButton * button,
- MokoDialerData * appdata)
-{
- DBG_ENTER ();
- /* TODO: MokoGsmdConnection->hangup
- * gsm_hangup ();
- */
- appdata->g_state.callstate = STATE_REJECTED;
- gtk_widget_hide (appdata->window_incoming);
- DBG_LEAVE ();
-}
-
-void
window_incoming_prepare (MokoDialerData * appdata)
{
if (!appdata)
@@ -98,111 +59,8 @@
moko_dialer_status_set_person_name (appdata->status_incoming, "");
}
}
-void
-window_incoming_fails (MokoDialerData * appdata)
-{
- DBG_ENTER ();
- DBG_LEAVE ();
-}
-gint
-timer_incoming_time_out (MokoDialerData * appdata)
-{
-
-//DBG_ENTER();
- //TIMER_DATA * timer_data = &(appdata->g_timer_data);
- moko_dialer_status_update_icon (appdata->status_incoming);
-
- //now that we have the incoming call status report correctly, the timeout
- //mechanism is not needed.
-/*
- if (event_get_keep_calling ())
- {
- event_reset_keep_calling ();
- timer_data->ticks = 0;
- }
- else
- { //we count 4 before we confirm that there are no calling at all.
- if (timer_data->ticks >= 3)
- {
- DBG_MESSAGE ("THE CALLER aborted, we quit.");
- gsm_hangup ();
- appdata->g_state.callstate = STATE_MISSED;
- appdata->g_state.historytype = MISSED;
- gdk_threads_enter ();
- gtk_widget_hide (appdata->window_incoming);
- gdk_threads_leave ();
- return 0; //don't lookout the timeout.
- }
- else
- {
- DBG_MESSAGE ("ticks=%d", timer_data->ticks);
- timer_data->ticks++;
- }
- }
-*/
- return 1;
-}
-void
-on_window_incoming_hide (GtkWidget * widget, MokoDialerData * appdata)
-{
- DBG_ENTER ();
- if (appdata->g_timer_data.ptimer != 0)
-
- {
- g_source_remove (appdata->g_timer_data.ptimer);
- appdata->g_timer_data.ptimer = 0;
- }
- /*
- event_reset_clip_signaled ();
- event_reset_incoming_signaled ();
- event_reset_keep_calling ();
- */
- if (appdata->g_state.callstate != STATE_TALKING)
-
- { //
add_histroy_entry(g_state.historytype,g_state.contactinfo.name,g_state.contactinfo.number,g_state.contactinfo.picpath,g_state.starttime,0);
- /*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_state.starttime,
- appdata->g_state.startdate, 0);
- */
- }
- DBG_LEAVE ();
-}
-void
-window_incoming_setup_timer (MokoDialerData * appdata)
-{
- time_t timep;
- struct tm *p;
- time (&timep);
- p = localtime (&timep);
- sprintf (appdata->g_state.starttime, "%02d:%02d:%02d", p->tm_hour,
- p->tm_min, p->tm_sec);
- sprintf (appdata->g_state.startdate, "%04d/%02d/%02d", p->tm_year,
- p->tm_mon, p->tm_mday);
- if (appdata->g_timer_data.ptimer != 0)
-
- {
- g_source_remove (appdata->g_timer_data.ptimer);
- appdata->g_timer_data.ptimer = 0;
- }
- memset (&(appdata->g_timer_data), 0, sizeof (appdata->g_timer_data));
- appdata->g_timer_data.stopsec = 0;
- appdata->g_timer_data.ptimer =
- g_timeout_add (1000, (GSourceFunc)timer_incoming_time_out,
(gpointer)appdata);
-}
-void
-on_window_incoming_show (GtkWidget * widget, MokoDialerData * appdata)
-{
- DBG_ENTER ();
- appdata->g_state.callstate = STATE_INCOMING;
- window_incoming_setup_timer (appdata);
- DBG_LEAVE ();
-}
-
void
window_incoming_init (MokoDialerData * data)
{
@@ -224,6 +82,7 @@
static void
call_progress_cb (MokoGsmdConnection *connection, int type, MokoDialerData
*data)
{
+ g_debug ("Incoming Call Progress: %d", type);
if (type == MOKO_GSMD_PROG_DISCONNECT)
{
/* call was disconnected before it was answered */
@@ -283,6 +142,7 @@
void
window_incoming_update_message (MokoDialerData *data, const gchar *clip)
{
+ g_debug ("Incoming Call CLIP: %s", clip);
moko_message_dialog_set_message (MOKO_MESSAGE_DIALOG (data->window_incoming),
"Incoming call from %s", clip);
// moko_journal_voice_info_set_distant_number ();
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-24 14:19:49 UTC (rev 2077)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
2007-05-24 16:03:31 UTC (rev 2078)
@@ -29,9 +29,6 @@
#include "dialer-window-history.h"
#include "dialer-window-talking.h"
-/* function declerations */
-static void window_outgoing_setup_timer (MokoDialerData * appdata);
-
static void
cb_speaker_button_clicked (GtkButton * button, MokoDialerData * data)
{
@@ -57,60 +54,8 @@
moko_gsmd_connection_voice_dial (data->connection, number);
}
-#if 0 /* Not used at the moment */
-static void
-cb_cancel_button_clicked (GtkButton * button, MokoDialerData * appdata)
-{
- DBG_ENTER ();
- /* TODO: MokoGsmdConnection->hangup
- * gsm_hangup ();
- */
- appdata->g_state.callstate = STATE_FAILED;
- DBG_TRACE ();
- gtk_widget_hide (appdata->window_outgoing);
- DBG_LEAVE ();
-}
-#endif
gint
-timer_outgoing_time_out (MokoDialerData * appdata)
-{
-//DBG_ENTER();
- TIMER_DATA *timer_data = &(appdata->g_timer_data);
-
-
- timer_data->ticks++;
- timer_data->hour = timer_data->ticks / 3600;
- timer_data->min = (timer_data->ticks - timer_data->hour * 3600) / 60;
- timer_data->sec = timer_data->ticks % 60;
-
-
- sprintf (timer_data->timestring, "Calling ... (%02d:%02d:%02d)",
- timer_data->hour, timer_data->min, timer_data->sec);
-
-//ok,we update the label now.
-
-
- moko_dialer_status_set_status_label (appdata->status_outgoing,
- timer_data->timestring);
- moko_dialer_status_update_icon (appdata->status_outgoing);
-
- if (timer_data->stopsec != 0 && timer_data->ticks >= timer_data->stopsec)
- {
-
- timer_data->timeout = 1;
- g_source_remove (timer_data->ptimer);
- timer_data->ptimer = 0;
-//maybe it failes
-// window_outgoing_fails (appdata);
- return 0; //0 stops the timer.
- }
- else
- return 1;
-}
-
-
-gint
window_outgoing_init (MokoDialerData * p_dialer_data)
{
GtkWidget *window;
@@ -182,6 +127,7 @@
static void
call_progress_cb (MokoGsmdConnection *connection, int type, MokoDialerData
*data)
{
+ g_debug ("Outgoing Call Progress: %d", type);
if (type == MOKO_GSMD_PROG_REJECT)
{
g_debug ("call rejected");
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-05-24 20:45:22 +0200 (Thu, 24 May 2007)
New Revision: 2079
Modified:
trunk/src/target/kernel/patches/hxd8-core.patch
Log:
HXD8: Set LCM type S3C2410_LCDCON1_TFT (Johnny Wu)
Modified: trunk/src/target/kernel/patches/hxd8-core.patch
===================================================================
--- trunk/src/target/kernel/patches/hxd8-core.patch 2007-05-24 16:03:31 UTC
(rev 2078)
+++ trunk/src/target/kernel/patches/hxd8-core.patch 2007-05-24 18:45:22 UTC
(rev 2079)
@@ -29,7 +29,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.21-moko/arch/arm/mach-s3c2440/mach-hxd8.c
-@@ -0,0 +1,401 @@
+@@ -0,0 +1,402 @@
+/* linux/arch/arm/mach-s3c2440/mach-hxd8.c
+ *
+ * S3C2440 Machine Support for the FIC HXD8
@@ -303,6 +303,7 @@
+ },
+
+ .lpcsel = ((0xCE6) & ~7),
++ .type = S3C2410_LCDCON1_TFT,
+
+ .width = 480,
+ .height = 272,
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
