r1819 - trunk/src/target/OM-2007/applications/openmoko-dialer/src
thomas at sita.openmoko.org
thomas at sita.openmoko.org
Tue Apr 24 15:34:08 CEST 2007
Author: thomas
Date: 2007-04-24 15:34:02 +0200 (Tue, 24 Apr 2007)
New Revision: 1819
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/common.h
trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.h
trunk/src/target/OM-2007/applications/openmoko-dialer/src/event.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/history.c
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.h
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-panel.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-status.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-status.h
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-textview.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-textview.h
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-digit-button.c
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.h
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-history.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-outgoing.h
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
Log:
* Fix indentation
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/common.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/common.h 2007-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/common.h 2007-04-24 13:34:02 UTC (rev 1819)
@@ -21,7 +21,7 @@
#include <gtk/gtk.h>
GdkPixbuf *create_pixbuf (const gchar * filename);
-gchar* file_create_data_path_for_the_file (const gchar * filename);
+gchar *file_create_data_path_for_the_file (const gchar * filename);
gboolean file_load_person_image_from_relative_path (GtkWidget * widget,
char *rela_path);
GtkWidget *file_new_image_from_relative_path (char *rela_path);
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c 2007-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c 2007-04-24 13:34:02 UTC (rev 1819)
@@ -322,8 +322,8 @@
// printf("id=%s\n",e_contact_get_const(contact,E_CONTACT_UID));
gchar *name_or_org = e_contact_get_const (contact, E_CONTACT_NAME_OR_ORG);
gchar *phone;
- if ((!name_or_org ) || (g_utf8_strlen (name_or_org , -1) <= 0))
- name_or_org = "Unnamed";
+ if ((!name_or_org) || (g_utf8_strlen (name_or_org, -1) <= 0))
+ name_or_org = "Unnamed";
if (name_or_org)
{
@@ -433,7 +433,7 @@
g_stpcpy (picpath, MOKO_DIALER_DEFAULT_PERSON_IMAGE_PATH);
if (number == 0)
return 0;
- if (g_utf8_strlen (number,-1) == 0)
+ if (g_utf8_strlen (number, -1) == 0)
return 0;
// DIALER_CONTACT* contacts=g_contactlist.contacts;
@@ -492,7 +492,7 @@
if (peer->number == 0)
return 0;
- if (g_utf8_strlen (peer->number,-1) == 0)
+ if (g_utf8_strlen (peer->number, -1) == 0)
return 0;
// DIALER_CONTACT* contacts=g_contactlist.contacts;
@@ -549,9 +549,9 @@
if (string == 0)
return 1;
- if (g_utf8_strlen (string,-1) == 0)
+ if (g_utf8_strlen (string, -1) == 0)
return 1;
- if (g_utf8_strlen(string,-1) > g_utf8_strlen(content,-1))
+ if (g_utf8_strlen (string, -1) > g_utf8_strlen (content, -1))
return 0;
for (i = 0; string[i]; i++)
{
@@ -644,16 +644,16 @@
itself, just insert width/height tags in
the html */
-if(photo)
if (photo)
- {
+ if (photo)
+ {
#ifdef HAVE_ECONTACT_PHOTO_TYPE
- gdk_pixbuf_loader_write (loader, photo->data.inlined.data,
- photo->data.inlined.length, NULL);
+ gdk_pixbuf_loader_write (loader, photo->data.inlined.data,
+ photo->data.inlined.length, NULL);
#else
- gdk_pixbuf_loader_write (loader, photo->data, photo->length, NULL);
+ gdk_pixbuf_loader_write (loader, photo->data, photo->length, NULL);
#endif
- }
+ }
gdk_pixbuf_loader_close (loader, NULL);
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.c 2007-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.c 2007-04-24 13:34:02 UTC (rev 1819)
@@ -170,8 +170,8 @@
{
struct lgsm_addr addr;
addr.type = 129;
- strncpy (addr.addr, number, g_utf8_strlen (number,-1));
- addr.addr[g_utf8_strlen (number,-1)] = '\0';
+ strncpy (addr.addr, number, g_utf8_strlen (number, -1));
+ addr.addr[g_utf8_strlen (number, -1)] = '\0';
return lgsm_voice_out_init (lgsmh, &addr);
}
@@ -287,17 +287,19 @@
DBG_MESSAGE ("lgsm_voice_dtmf");
lgsm_voice_dtmf (lgsmh, dtmf);
}
+
#define PIN_SIZE 32
static int
-gsm_pin_handler (struct lgsm_handle *lh, int evt, struct gsmd_evt_auxdata *aux)
+gsm_pin_handler (struct lgsm_handle *lh, int evt,
+ struct gsmd_evt_auxdata *aux)
{
-
+
int rc;
printf ("EVENT: PIN request (type=%u) ", aux->u.pin.type);
- gsm_pin_require(lh);
+ gsm_pin_require (lh);
return 0;
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.h 2007-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.h 2007-04-24 13:34:02 UTC (rev 1819)
@@ -99,7 +99,7 @@
* @retval
*/
- void gsm_pin_require();
+ void gsm_pin_require ();
void *gsm_monitor_thread (struct lgsm_handle *lgsmh);
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/event.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/event.c 2007-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/event.c 2007-04-24 13:34:02 UTC (rev 1819)
@@ -128,24 +128,24 @@
switch (aux->u.netreg.state)
{
- case GSMD_NETREG_NONE:
- printf ("not searching for network ");
- break;
- case 1:
- printf ("registered (home network) ");
- break;
+ case GSMD_NETREG_NONE:
+ printf ("not searching for network ");
+ break;
+ case 1:
+ printf ("registered (home network) ");
+ break;
/*
* FIXME: these are not defined in gsmd/event.h
*
- case 2:
- printf ("searching for network ");
- break;
- case 3:
- printf ("registration denied ");
- break;
- case 5:
- printf ("registered (roaming) ");
- break;
+ case 2:
+ printf ("searching for network ");
+ break;
+ case 3:
+ printf ("registration denied ");
+ break;
+ case 5:
+ printf ("registered (roaming) ");
+ break;
*
*
*/
@@ -220,7 +220,7 @@
if (aux->u.call_status.prog == GSMD_CALLPROG_DISCONNECT)
{
// if (aux->u.call_status.dir == GSMD_CALL_DIR_MO)
- gsm_peer_disconnect ();
+ gsm_peer_disconnect ();
}
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/history.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/history.c 2007-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/history.c 2007-04-24 13:34:02 UTC (rev 1819)
@@ -174,9 +174,9 @@
// DBG_MESSAGE("pentry add:0X%x",pentry);
- if (name && g_utf8_strlen(name,-1) > 0)
+ if (name && g_utf8_strlen (name, -1) > 0)
{
- pentry->name = (char *) calloc (1, g_utf8_strlen (name,-1) + 1);
+ pentry->name = (char *) calloc (1, g_utf8_strlen (name, -1) + 1);
g_stpcpy (pentry->name, name);
pentry->hasname = 1;
}
@@ -186,9 +186,9 @@
pentry->hasname = 0;
}
- if (number && g_utf8_strlen (number,-1) > 0)
+ if (number && g_utf8_strlen (number, -1) > 0)
{
- pentry->number = (char *) calloc (1, g_utf8_strlen (number,-1) + 1);
+ pentry->number = (char *) calloc (1, g_utf8_strlen (number, -1) + 1);
g_stpcpy (pentry->number, number);
}
else
@@ -200,14 +200,14 @@
//DBG_MESSAGE("History add:0X%x,%s,%s,%s,%s,%s,%d",historyhead,name,number,picpath,time,date,durationsec);
- if (id && g_utf8_strlen (id,-1) > 0)
+ if (id && g_utf8_strlen (id, -1) > 0)
{
- pentry->ID = (char *) calloc (1, g_utf8_strlen (id,-1) + 1);
+ pentry->ID = (char *) calloc (1, g_utf8_strlen (id, -1) + 1);
g_stpcpy (pentry->ID, id);
}
- if (time && g_utf8_strlen (time,-1) > 0)
+ if (time && g_utf8_strlen (time, -1) > 0)
{
- pentry->time = (char *) calloc (1, g_utf8_strlen(time,-1) + 1);
+ pentry->time = (char *) calloc (1, g_utf8_strlen (time, -1) + 1);
g_stpcpy (pentry->time, time);
}
pentry->durationsec = durationsec;
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-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-autolist.c 2007-04-24 13:34:02 UTC (rev 1819)
@@ -97,8 +97,8 @@
moko_dialer_autolist->head = 0;
moko_dialer_autolist->g_alternatecount = 0;
moko_dialer_autolist->imagePerson = 0;
- moko_dialer_autolist->g_alternatecount_last_time=0;
- moko_dialer_autolist->g_last_string[0]=0; ///<memorize last sensentive string.
+ moko_dialer_autolist->g_alternatecount_last_time = 0;
+ moko_dialer_autolist->g_last_string[0] = 0; ///<memorize last sensentive string.
gtk_widget_set_size_request (GTK_WIDGET (moko_dialer_autolist), 480, 40);
@@ -230,7 +230,8 @@
{
gchar *filepath;
if ((filepath =
- file_create_data_path_for_the_file (MOKO_DIALER_DEFAULT_PERSON_IMAGE_PATH)))
+ file_create_data_path_for_the_file
+ (MOKO_DIALER_DEFAULT_PERSON_IMAGE_PATH)))
{
imagePerson = gtk_image_new_from_file (filepath);
}
@@ -257,8 +258,7 @@
moko_dialer_tip_set_selected (tip, FALSE);
- gtk_box_pack_start (GTK_BOX (moko_dialer_autolist), tip, TRUE,
- TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (moko_dialer_autolist), tip, TRUE, TRUE, 0);
// gtk_box_pack_start(GTK_CONTAINER(moko_dialer_autolist), tip, FALSE,FALSE, 0);
// gtk_box_pack_start(GTK_CONTAINER(moko_dialer_autolist), tip, FALSE,TRUE, 0);
// gtk_box_pack_start(GTK_CONTAINER(moko_dialer_autolist), tip, TRUE, FALSE,0);
@@ -275,77 +275,96 @@
}
moko_dialer_autolist->tipscreated = TRUE;
}
- //if last time, we searched ,so we want to know if the last results can be used for this time.
- int included=contact_string_has_sensentive(string,moko_dialer_autolist->g_last_string)&&(g_utf8_strlen (moko_dialer_autolist->g_last_string, -1) >= MOKO_DIALER_MIN_SENSATIVE_LEN);
-
- if(included&&(moko_dialer_autolist->g_alternatecount_last_time==0)){
- inserted=0;
- DBG_MESSAGE("NO NEED TO SEARCH ANYMORE");
- //last result is null, so we save time by not searching it at all.
- }
- else if(included&&(moko_dialer_autolist->g_alternatecount_last_time<MOKO_DIALER_MAX_TIPS)){
- //we search last result here.
- //now we start from the end of the list.
- int i=moko_dialer_autolist->g_alternatecount_last_time-1;
- DBG_MESSAGE("we search the last resutls.");
- while(i>=0&&i>=inserted){
- //here inserted stands as the next inserted position.
+ //if last time, we searched ,so we want to know if the last results can be used for this time.
+ int included = contact_string_has_sensentive (string,
+ moko_dialer_autolist->
+ g_last_string)
+ && (g_utf8_strlen (moko_dialer_autolist->g_last_string, -1) >=
+ MOKO_DIALER_MIN_SENSATIVE_LEN);
- if (contact_string_has_sensentive (moko_dialer_autolist->readycontacts[i].p_entry->content, string))
- {
- DBG_MESSAGE("find one match.");
- //we use the idle readycontacts[MOKO_DIALER_MAX_TIPS] for exchange space,to swap the 2 items.
- if(i>inserted)
- {
- moko_dialer_autolist->readycontacts[MOKO_DIALER_MAX_TIPS].p_entry=moko_dialer_autolist->readycontacts[inserted].p_entry;
- moko_dialer_autolist->readycontacts[MOKO_DIALER_MAX_TIPS].p_contact=moko_dialer_autolist->readycontacts[inserted].p_contact;
- moko_dialer_autolist->readycontacts[inserted].p_entry=moko_dialer_autolist->readycontacts[i].p_entry;
- moko_dialer_autolist->readycontacts[inserted].p_contact=moko_dialer_autolist->readycontacts[i].p_contact;
- moko_dialer_autolist->readycontacts[i].p_entry=moko_dialer_autolist->readycontacts[MOKO_DIALER_MAX_TIPS].p_entry;
- moko_dialer_autolist->readycontacts[i].p_contact=moko_dialer_autolist->readycontacts[MOKO_DIALER_MAX_TIPS].p_contact;
- }
- inserted++;
- }
- else
- {
- //we just move the point back.
- i--;
- }
+ if (included && (moko_dialer_autolist->g_alternatecount_last_time == 0))
+ {
+ inserted = 0;
+ DBG_MESSAGE ("NO NEED TO SEARCH ANYMORE");
+ //last result is null, so we save time by not searching it at all.
+ }
+ else if (included
+ && (moko_dialer_autolist->g_alternatecount_last_time <
+ MOKO_DIALER_MAX_TIPS))
+ {
+ //we search last result here.
+ //now we start from the end of the list.
+ int i = moko_dialer_autolist->g_alternatecount_last_time - 1;
+ DBG_MESSAGE ("we search the last resutls.");
+ while (i >= 0 && i >= inserted)
+ {
+ //here inserted stands as the next inserted position.
+ if (contact_string_has_sensentive
+ (moko_dialer_autolist->readycontacts[i].p_entry->content, string))
+ {
+ DBG_MESSAGE ("find one match.");
+ //we use the idle readycontacts[MOKO_DIALER_MAX_TIPS] for exchange space,to swap the 2 items.
+ if (i > inserted)
+ {
+ moko_dialer_autolist->readycontacts[MOKO_DIALER_MAX_TIPS].
+ p_entry = moko_dialer_autolist->readycontacts[inserted].p_entry;
+ moko_dialer_autolist->readycontacts[MOKO_DIALER_MAX_TIPS].
+ p_contact =
+ moko_dialer_autolist->readycontacts[inserted].p_contact;
+ moko_dialer_autolist->readycontacts[inserted].p_entry =
+ moko_dialer_autolist->readycontacts[i].p_entry;
+ moko_dialer_autolist->readycontacts[inserted].p_contact =
+ moko_dialer_autolist->readycontacts[i].p_contact;
+ moko_dialer_autolist->readycontacts[i].p_entry =
+ moko_dialer_autolist->readycontacts[MOKO_DIALER_MAX_TIPS].p_entry;
+ moko_dialer_autolist->readycontacts[i].p_contact =
+ moko_dialer_autolist->readycontacts[MOKO_DIALER_MAX_TIPS].
+ p_contact;
}
-
+ inserted++;
+ }
+ else
+ {
+ //we just move the point back.
+ i--;
+ }
+
}
- else{
+
+ }
+ else
+ {
//we had to search all the contact list. may be we can improve the performance by draw every suitalbe items to be the first of the list.
contacts = moko_dialer_autolist->head->contacts;
- DBG_MESSAGE("we search the whole contact list.");
- while (contacts != NULL && inserted < MOKO_DIALER_MAX_TIPS)
- {
- entry = contacts->entry;
- while (entry != NULL && inserted < MOKO_DIALER_MAX_TIPS)
+ DBG_MESSAGE ("we search the whole contact list.");
+ while (contacts != NULL && inserted < MOKO_DIALER_MAX_TIPS)
{
- //judge if the entry includes the string
- if (contact_string_has_sensentive (entry->content, string))
+ entry = contacts->entry;
+ while (entry != NULL && inserted < MOKO_DIALER_MAX_TIPS)
{
- DBG_MESSAGE("find one match from the whole list.");
- //if the person not inserted, then insert first
- moko_dialer_autolist->readycontacts[inserted].p_contact = contacts;
- moko_dialer_autolist->readycontacts[inserted].p_entry = entry;
- inserted++;
- //break;
+ //judge if the entry includes the string
+ if (contact_string_has_sensentive (entry->content, string))
+ {
+ DBG_MESSAGE ("find one match from the whole list.");
+ //if the person not inserted, then insert first
+ moko_dialer_autolist->readycontacts[inserted].p_contact = contacts;
+ moko_dialer_autolist->readycontacts[inserted].p_entry = entry;
+ inserted++;
+ //break;
+ }
+ entry = entry->next;
}
- entry = entry->next;
+
+ contacts = contacts->next;
+
}
- contacts = contacts->next;
+ } //
+ strcpy (moko_dialer_autolist->g_last_string, string);
+ moko_dialer_autolist->g_alternatecount_last_time = inserted;
- }
-
- }//
- strcpy(moko_dialer_autolist->g_last_string,string);
- moko_dialer_autolist->g_alternatecount_last_time=inserted;
-
//DBG_MESSAGE("inserted=%d",inserted);
moko_dialer_autolist_fill_alternative (moko_dialer_autolist, inserted,
selectdefault);
@@ -439,7 +458,8 @@
//refresh the imagePerson widget
// file_load_person_image_from_relative_path(moko_dialer_autolist->imagePerson,moko_dialer_autolist->readycontacts[selected].p_contact->picpath);
// file_load_person_image_scalable_from_relative_path(moko_dialer_autolist->imagePerson,moko_dialer_autolist->readycontacts[selected].p_contact->picpath);
- contact_load_contact_photo (GTK_IMAGE (moko_dialer_autolist->imagePerson),
+ contact_load_contact_photo (GTK_IMAGE
+ (moko_dialer_autolist->imagePerson),
moko_dialer_autolist->
readycontacts[selected].p_contact->ID);
gtk_widget_show (moko_dialer_autolist->imagePerson);
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-autolist.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-autolist.h 2007-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-autolist.h 2007-04-24 13:34:02 UTC (rev 1819)
@@ -56,9 +56,9 @@
DIALER_READY_CONTACT readycontacts[MOKO_DIALER_MAX_TIPS]; ///<the prepared contact list which will display to the user when he/she inputs part of the digits he/she wants to dial out
- gint g_alternatecount_last_time; ///<indicate how many alternatives that we had from last search.
+ gint g_alternatecount_last_time; ///<indicate how many alternatives that we had from last search.
- gchar g_last_string[MOKO_DIALER_MAX_NUMBER_LEN]; ///<memorize last sensentive string.
+ gchar g_last_string[MOKO_DIALER_MAX_NUMBER_LEN]; ///<memorize last sensentive string.
gboolean selected; ///<indicates wether some tip is currently selected.
@@ -103,7 +103,8 @@
gint moko_dialer_autolist_hide_all_tips (MokoDialerAutolist *
moko_dialer_autolist);
-gboolean moko_dialer_autolist_set_data (MokoDialerAutolist * moko_dialer_autolist,
+gboolean moko_dialer_autolist_set_data (MokoDialerAutolist *
+ moko_dialer_autolist,
DIALER_CONTACTS_LIST_HEAD * head);
G_END_DECLS
#endif //
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-panel.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-panel.c 2007-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-panel.c 2007-04-24 13:34:02 UTC (rev 1819)
@@ -27,8 +27,8 @@
//forward definition
static gboolean moko_dialer_panel_pressed (MokoDigitButton * button,
- GdkEventButton * event,
- gpointer data);
+ GdkEventButton * event,
+ gpointer data);
static gint moko_dialer_panel_signals[LAST_SIGNAL] = { 0 };
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-status.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-status.c 2007-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-status.c 2007-04-24 13:34:02 UTC (rev 1819)
@@ -161,7 +161,8 @@
//file_load_person_image_scalable_from_relative_path(moko_dialer_status->imagePerson,path);
//file_load_person_image_from_relative_path(moko_dialer_status->imagePerson,path);
- contact_load_contact_photo (GTK_IMAGE (moko_dialer_status->imagePerson), id);
+ contact_load_contact_photo (GTK_IMAGE (moko_dialer_status->imagePerson),
+ id);
//file_load_person_image_scalable_from_relative_path(moko_dialer_status->imagePerson,path);
}
@@ -171,7 +172,8 @@
{
if (moko_dialer_status->number_of_the_icons < MOKO_DIALER_MAX_STATUS_ICONS)
{
- moko_dialer_status->iconStatus[moko_dialer_status->number_of_the_icons] =
+ moko_dialer_status->iconStatus[moko_dialer_status->
+ number_of_the_icons] =
create_pixbuf (text);
moko_dialer_status->number_of_the_icons++;
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-status.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-status.h 2007-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-status.h 2007-04-24 13:34:02 UTC (rev 1819)
@@ -97,8 +97,8 @@
void moko_dialer_status_update_icon (MokoDialerStatus * moko_dialer_status);
int moko_dialer_status_add_status_icon (MokoDialerStatus * moko_dialer_status,
const gchar * text);
-void moko_dialer_status_set_icon_by_index (MokoDialerStatus * moko_dialer_status,
- gint index);
+void moko_dialer_status_set_icon_by_index (MokoDialerStatus *
+ moko_dialer_status, gint index);
G_END_DECLS
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-textview.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-textview.c 2007-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-textview.c 2007-04-24 13:34:02 UTC (rev 1819)
@@ -34,8 +34,8 @@
//static gint moko_dialer_textview_signals[LAST_SIGNAL] = { 0 };
-static void
-moko_dialer_textview_class_init (MokoDialerTextviewClass * class)
+ static void
+ moko_dialer_textview_class_init (MokoDialerTextviewClass * class)
{
GtkObjectClass *object_class;
@@ -155,7 +155,8 @@
gtk_text_buffer_remove_all_tags (buffer, &start, &end);
gtk_text_buffer_get_iter_at_offset (buffer, &cursoriter_1, cur - 1);
- gtk_text_buffer_apply_tag (buffer, moko_dialer_textview->tag_for_inputed,
+ gtk_text_buffer_apply_tag (buffer,
+ moko_dialer_textview->tag_for_inputed,
&start, &cursoriter);
gtk_text_buffer_apply_tag (buffer,
moko_dialer_textview->tag_for_autofilled,
@@ -254,7 +255,8 @@
if (len >= 0 && len < MOKO_DIALER_MAX_NUMBER_LEN)
{
- gtk_text_buffer_insert_at_cursor (buffer, number, g_utf8_strlen (number, -1));
+ gtk_text_buffer_insert_at_cursor (buffer, number,
+ g_utf8_strlen (number, -1));
len = len + g_utf8_strlen (number, -1);
}
else
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-textview.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-textview.h 2007-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-textview.h 2007-04-24 13:34:02 UTC (rev 1819)
@@ -63,14 +63,17 @@
int moko_dialer_textview_insert (MokoDialerTextview * moko_dialer_textview,
const gchar * number);
-gchar *moko_dialer_textview_get_input (MokoDialerTextview * moko_dialer_textview,
+gchar *moko_dialer_textview_get_input (MokoDialerTextview *
+ moko_dialer_textview,
gboolean all_text);
int moko_dialer_textview_empty (MokoDialerTextview * moko_dialer_textview);
int moko_dialer_textview_fill_it (MokoDialerTextview * moko_dialer_textview,
gchar * string);
int moko_dialer_textview_delete (MokoDialerTextview * moko_dialer_textview);
-void moko_dialer_textview_set_color (MokoDialerTextview * moko_dialer_textview);
-gint moko_dialer_textview_confirm_it (MokoDialerTextview * moko_dialer_textview,
+void moko_dialer_textview_set_color (MokoDialerTextview *
+ moko_dialer_textview);
+gint moko_dialer_textview_confirm_it (MokoDialerTextview *
+ moko_dialer_textview,
const gchar * string);
G_END_DECLS
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-digit-button.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-digit-button.c 2007-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-digit-button.c 2007-04-24 13:34:02 UTC (rev 1819)
@@ -62,13 +62,13 @@
{
PangoFontDescription *font_desc_label = 0;
- font_desc_label = pango_font_description_new ();
+ font_desc_label = pango_font_description_new ();
MokoDigitButton *digitbutton =
(MokoDigitButton *) g_object_new (MOKO_TYPE_DIGIT_BUTTON, NULL);
gtk_widget_show (GTK_WIDGET (digitbutton));
gtk_widget_set_size_request (GTK_WIDGET (digitbutton), 64, 64);
- GTK_WIDGET_UNSET_FLAGS( GTK_WIDGET(digitbutton), GTK_CAN_FOCUS);
+ GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET (digitbutton), GTK_CAN_FOCUS);
// GtkWidget * hbox = gtk_hbox_new (TRUE, 0);
GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox);
@@ -95,19 +95,17 @@
MokoDigitButtonPrivate *priv =
(MokoDigitButtonPrivate *) MOKO_DIGIT_BUTTON_GET_PRIVATE (digitbutton);
- //set the fonts of each side.
- pango_font_description_set_size (font_desc_label, 32 * PANGO_SCALE);
+ //set the fonts of each side.
+ pango_font_description_set_size (font_desc_label, 32 * PANGO_SCALE);
if (font_desc_label)
- gtk_widget_modify_font (labelDigit ,
- font_desc_label);
- pango_font_description_set_size (font_desc_label, 10*PANGO_SCALE);
+ gtk_widget_modify_font (labelDigit, font_desc_label);
+ pango_font_description_set_size (font_desc_label, 10 * PANGO_SCALE);
if (font_desc_label)
- gtk_widget_modify_font (labelAcrobat,
- font_desc_label);
+ gtk_widget_modify_font (labelAcrobat, font_desc_label);
- if(font_desc_label)
- pango_font_description_free(font_desc_label);
-
+ if (font_desc_label)
+ pango_font_description_free (font_desc_label);
+
priv->labelDigit = labelDigit;
priv->labelAcrobat = labelAcrobat;
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-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c 2007-04-24 13:34:02 UTC (rev 1819)
@@ -49,143 +49,158 @@
MOKO_DIALER_APP_DATA *
moko_get_app_data ()
{
-return p_dialer_data;
+ return p_dialer_data;
}
-void gsm_pin_require(struct lgsm_handle *lh)
-{
-MOKO_DIALER_APP_DATA* appdata=moko_get_app_data();
-if(appdata)
+void
+gsm_pin_require (struct lgsm_handle *lh)
{
-appdata->lh=lh;
-gtk_widget_show(appdata->window_pin);
-}
-else
-{
-DBG_ERROR("gui failed to initialize.try another time.");
-}
-
+ MOKO_DIALER_APP_DATA *appdata = moko_get_app_data ();
+ if (appdata)
+ {
+ appdata->lh = lh;
+ gtk_widget_show (appdata->window_pin);
+ }
+ else
+ {
+ DBG_ERROR ("gui failed to initialize.try another time.");
+ }
+
+
}
-void gsm_incoming_call(gchar * number)
+void
+gsm_incoming_call (gchar * number)
{
-MOKO_DIALER_APP_DATA* appdata=moko_get_app_data();
+ MOKO_DIALER_APP_DATA *appdata = moko_get_app_data ();
-if(appdata)
-{
+ if (appdata)
+ {
//first, we should remove the "" from the number.
-char* temp=NULL;
-int start=0;
-int end=strlen(number)-1;
-while(number[start]=='\"'&&start<end)start++;
-if(end>0)while(number[end]=='\"'&&start<end)end--;
+ char *temp = NULL;
+ int start = 0;
+ int end = strlen (number) - 1;
+ while (number[start] == '\"' && start < end)
+ start++;
+ if (end > 0)
+ while (number[end] == '\"' && start < end)
+ end--;
-g_return_if_fail(start<=end);
+ g_return_if_fail (start <= end);
-DBG_MESSAGE("START=%d,END=%d",start,end);
-temp=g_strndup(number+start,end-start+1);
+ DBG_MESSAGE ("START=%d,END=%d", start, end);
+ temp = g_strndup (number + start, end - start + 1);
-g_return_if_fail(temp!=NULL);
+ g_return_if_fail (temp != NULL);
-DBG_MESSAGE("%s",temp);
+ DBG_MESSAGE ("%s", temp);
//got the number;
-g_stpcpy(appdata->g_peer_info.number,temp);
+ g_stpcpy (appdata->g_peer_info.number, temp);
-g_free(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 (appdata->g_contactlist.contacts,
+ &(appdata->g_peer_info));
// contact_get_peer_info_from_number
//transfer the contact info
-window_incoming_prepare(appdata);
+ window_incoming_prepare (appdata);
-gtk_widget_show(appdata->window_incoming);
-}
-else
-{
-DBG_ERROR("gui failed to initialize.try another time.");
-}
+ gtk_widget_show (appdata->window_incoming);
+ }
+ else
+ {
+ DBG_ERROR ("gui failed to initialize.try another time.");
+ }
}
-void gsm_peer_accept()
+void
+gsm_peer_accept ()
{
-MOKO_DIALER_APP_DATA* appdata=moko_get_app_data();
-DBG_ENTER();
+ MOKO_DIALER_APP_DATA *appdata = moko_get_app_data ();
+ DBG_ENTER ();
//moko_dialer_status_update_icon(appdata->status_outgoing);
-appdata->g_state.callstate=STATE_TALKING;
+ appdata->g_state.callstate = STATE_TALKING;
-gtk_widget_hide(appdata->window_outgoing);
+ gtk_widget_hide (appdata->window_outgoing);
//transfer the contact info
-window_talking_prepare(appdata);
+ window_talking_prepare (appdata);
//start talking.
-gtk_widget_show(appdata->window_talking);
+ gtk_widget_show (appdata->window_talking);
-DBG_LEAVE();
+ DBG_LEAVE ();
}
-void gsm_peer_refuse()
+void
+gsm_peer_refuse ()
{
-MOKO_DIALER_APP_DATA* appdata=moko_get_app_data();
-window_outgoing_fails(appdata);
+ MOKO_DIALER_APP_DATA *appdata = moko_get_app_data ();
+ window_outgoing_fails (appdata);
}
-void gsm_peer_abort()
+void
+gsm_peer_abort ()
{
-MOKO_DIALER_APP_DATA* appdata=moko_get_app_data();
-if(appdata->window_incoming)
- gtk_widget_hide(appdata->window_incoming);
+ MOKO_DIALER_APP_DATA *appdata = moko_get_app_data ();
+ if (appdata->window_incoming)
+ gtk_widget_hide (appdata->window_incoming);
}
-void gsm_peer_disconnect()
+void
+gsm_peer_disconnect ()
{
- MOKO_DIALER_APP_DATA* appdata=moko_get_app_data();
- gsm_hangup();
- if(appdata->window_talking)gtk_widget_hide(appdata->window_talking);
- if(appdata->window_outgoing)gtk_widget_hide(appdata->window_outgoing);
- if(appdata->window_incoming)gtk_widget_hide(appdata->window_incoming);
+ MOKO_DIALER_APP_DATA *appdata = moko_get_app_data ();
+ gsm_hangup ();
+ if (appdata->window_talking)
+ gtk_widget_hide (appdata->window_talking);
+ if (appdata->window_outgoing)
+ gtk_widget_hide (appdata->window_outgoing);
+ if (appdata->window_incoming)
+ gtk_widget_hide (appdata->window_incoming);
}
-static void
+static void
handle_sigusr1 (int value)
{
-DBG_ENTER();
- MOKO_DIALER_APP_DATA* p_data=moko_get_app_data();
-if(!p_data)return;
-GtkWidget* mainwindow=p_data->window_present;
- if(mainwindow==0)
- mainwindow=p_data->window_dialer;
-
+ DBG_ENTER ();
+ MOKO_DIALER_APP_DATA *p_data = moko_get_app_data ();
+ if (!p_data)
+ return;
+ GtkWidget *mainwindow = p_data->window_present;
+ if (mainwindow == 0)
+ mainwindow = p_data->window_dialer;
+
if (mainwindow == NULL)
- {
- return;
- }
+ {
+ return;
+ }
gtk_widget_show_all (mainwindow);
gtk_window_present (GTK_WINDOW (mainwindow));
- DBG_TRACE();
+ DBG_TRACE ();
signal (SIGUSR1, handle_sigusr1);
- DBG_LEAVE();
+ DBG_LEAVE ();
}
-static pid_t
+static pid_t
testlock (char *fname)
{
int fd;
@@ -193,17 +208,17 @@
fd = open (fname, O_WRONLY, S_IWUSR);
if (fd < 0)
+ {
+ if (errno == ENOENT)
{
- if (errno == ENOENT)
- {
- return 0;
- }
- else
- {
- perror ("Test lock open file");
- return -1;
- }
+ return 0;
}
+ else
+ {
+ perror ("Test lock open file");
+ return -1;
+ }
+ }
fl.l_type = F_WRLCK;
fl.l_whence = SEEK_SET;
@@ -211,10 +226,10 @@
fl.l_len = 0;
if (fcntl (fd, F_GETLK, &fl) < 0)
- {
- close (fd);
- return -1;
- }
+ {
+ close (fd);
+ return -1;
+ }
close (fd);
if (fl.l_type == F_UNLCK)
@@ -223,18 +238,18 @@
return fl.l_pid;
}
-static void
+static void
setlock (char *fname)
{
int fd;
struct flock fl;
- fd = open (fname, O_WRONLY|O_CREAT, S_IWUSR);
+ fd = open (fname, O_WRONLY | O_CREAT, S_IWUSR);
if (fd < 0)
- {
- perror ("Set lock open file");
- return ;
- }
+ {
+ perror ("Set lock open file");
+ return;
+ }
fl.l_type = F_WRLCK;
fl.l_whence = SEEK_SET;
@@ -242,98 +257,99 @@
fl.l_len = 0;
if (fcntl (fd, F_SETLK, &fl) < 0)
- {
- perror ("Lock file");
- close (fd);
- }
+ {
+ perror ("Lock file");
+ close (fd);
+ }
}
static gboolean show_gui;
-static GOptionEntry entries[] =
-{
- { "show-gui", 's', 0, G_OPTION_ARG_NONE, &show_gui, "Show the GUI at startup (default off)", "N" },
- { NULL }
+static GOptionEntry entries[] = {
+ {"show-gui", 's', 0, G_OPTION_ARG_NONE, &show_gui,
+ "Show the GUI at startup (default off)", "N"},
+ {NULL}
};
-int main( int argc, char** argv )
+int
+main (int argc, char **argv)
{
- pid_t lockapp;
+ pid_t lockapp;
- /* Initialize GTK+ */
- gtk_init( &argc, &argv );
+ /* Initialize GTK+ */
+ gtk_init (&argc, &argv);
-if (argc != 1)
- {
- /* Add init code. */
- GError *error = NULL;
- GOptionContext *context = g_option_context_new ("");
+ if (argc != 1)
+ {
+ /* Add init code. */
+ GError *error = NULL;
+ GOptionContext *context = g_option_context_new ("");
- g_option_context_add_main_entries (context, entries, NULL);
- g_option_context_add_group (context, gtk_get_option_group (TRUE));
- g_option_context_parse (context, &argc, &argv, &error);
+ g_option_context_add_main_entries (context, entries, NULL);
+ g_option_context_add_group (context, gtk_get_option_group (TRUE));
+ g_option_context_parse (context, &argc, &argv, &error);
- g_option_context_free (context);
- }
+ g_option_context_free (context);
+ }
//FIXME: the following lines to enable unique instance will be changed.
lockapp = testlock ("/tmp/dialer.lock");
if (lockapp > 0)
- {
- kill (lockapp, SIGUSR1);
- return 0;
- }
+ {
+ kill (lockapp, SIGUSR1);
+ return 0;
+ }
setlock ("/tmp/dialer.lock");
- p_dialer_data=calloc(1,sizeof(MOKO_DIALER_APP_DATA));
+ p_dialer_data = calloc (1, sizeof (MOKO_DIALER_APP_DATA));
- //init application data
- contact_init_contact_data(&(p_dialer_data->g_contactlist));
- history_init_history_data(&(p_dialer_data->g_historylist));
-
+ //init application data
+ contact_init_contact_data (&(p_dialer_data->g_contactlist));
+ history_init_history_data (&(p_dialer_data->g_historylist));
- /* application object */
+
+ /* application object */
// MokoApplication* app = MOKO_APPLICATION(moko_application_get_instance());
- g_set_application_name( "OpenMoko Dialer" );
+ g_set_application_name ("OpenMoko Dialer");
// gtk_main();
- GMainLoop* mainloop=0;
- mainloop = g_main_loop_new(NULL, FALSE );
- p_dialer_data->mainloop=mainloop;
+ GMainLoop *mainloop = 0;
+ mainloop = g_main_loop_new (NULL, FALSE);
+ p_dialer_data->mainloop = mainloop;
-signal (SIGUSR1, handle_sigusr1);
+ signal (SIGUSR1, handle_sigusr1);
//init the dialer window
- window_dialer_init(p_dialer_data);
- window_incoming_init(p_dialer_data);
- window_pin_init(p_dialer_data);
- window_outgoing_init(p_dialer_data);
- window_history_init(p_dialer_data);
- DBG_MSG ("\nusage: \"openmoko-dialer\" will not show any GUI initialy until you reactivate the app using another \"openmoko-dialer\" command");
+ window_dialer_init (p_dialer_data);
+ window_incoming_init (p_dialer_data);
+ window_pin_init (p_dialer_data);
+ window_outgoing_init (p_dialer_data);
+ window_history_init (p_dialer_data);
+ DBG_MSG
+ ("\nusage: \"openmoko-dialer\" will not show any GUI initialy until you reactivate the app using another \"openmoko-dialer\" command");
-if (show_gui)
-{
- handle_sigusr1 (SIGUSR1);
-}
+ if (show_gui)
+ {
+ handle_sigusr1 (SIGUSR1);
+ }
//from now on we will not use multithreads.
- gsm_lgsm_start(mainloop);
+ gsm_lgsm_start (mainloop);
//for debug only>>
//gsm_incoming_call("13917209523");
//<<for debug only
- g_main_loop_run(mainloop);
+ g_main_loop_run (mainloop);
//release everything
- contact_release_contact_list(&(p_dialer_data->g_contactlist));
+ contact_release_contact_list (&(p_dialer_data->g_contactlist));
- history_release_history_list(&(p_dialer_data->g_historylist));
- return 0;
+ history_release_history_list (&(p_dialer_data->g_historylist));
+ return 0;
}
-
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h 2007-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h 2007-04-24 13:34:02 UTC (rev 1819)
@@ -37,7 +37,7 @@
GMainLoop *mainloop;
- char str_sim_pin[MOKO_DIALER_MAX_PIN_LEN+1];
+ char str_sim_pin[MOKO_DIALER_MAX_PIN_LEN + 1];
gint int_sim_pin_end_point;
MokoDialerTextview *moko_dialer_text_view; ///<the textview for the dialer window
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-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c 2007-04-24 13:34:02 UTC (rev 1819)
@@ -65,7 +65,8 @@
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,
+ moko_dialer_autolist_refresh_by_string (appdata->
+ moko_dialer_autolist,
codesinput, FALSE);
moko_dialer_textview_set_color (appdata->moko_dialer_text_view);
}
@@ -102,15 +103,17 @@
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)
+ 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,
+ moko_dialer_autolist_refresh_by_string (appdata->
+ moko_dialer_autolist,
appdata->g_state.lastnumber,
TRUE);
}
@@ -172,15 +175,15 @@
MokoDialerTextview *moko_dialer_text_view = appdata->moko_dialer_text_view;
DIALER_READY_CONTACT *ready_contact = (DIALER_READY_CONTACT *) para_pointer;
codesinput = moko_dialer_textview_get_input (moko_dialer_text_view, FALSE);
- if(ready_contact->p_entry->content)
- lenstring = g_utf8_strlen (ready_contact->p_entry->content, -1);
+ if (ready_contact->p_entry->content)
+ lenstring = g_utf8_strlen (ready_contact->p_entry->content, -1);
else
- lenstring=0;
-
- if(codesinput)
- leninput = g_utf8_strlen (codesinput, -1);
+ lenstring = 0;
+
+ if (codesinput)
+ leninput = g_utf8_strlen (codesinput, -1);
else
- leninput =0;
+ leninput = 0;
if (lenstring > leninput)
{
@@ -190,7 +193,7 @@
}
else
- moko_dialer_textview_fill_it (moko_dialer_text_view,"");
+ moko_dialer_textview_fill_it (moko_dialer_text_view, "");
g_free (codesinput);
}
@@ -263,7 +266,8 @@
codesinput =
g_strdup (moko_dialer_textview_get_input (moko_dialer_text_view, FALSE));
- if (codesinput&&(g_utf8_strlen (codesinput, -1) >= MOKO_DIALER_MIN_SENSATIVE_LEN))
+ if (codesinput
+ && (g_utf8_strlen (codesinput, -1) >= MOKO_DIALER_MIN_SENSATIVE_LEN))
{
moko_dialer_autolist_refresh_by_string (appdata->moko_dialer_autolist,
codesinput, TRUE);
@@ -320,7 +324,7 @@
GtkWidget *window = moko_finger_window_new ();
- gtk_window_set_decorated(GTK_WINDOW(window ),FALSE);
+ gtk_window_set_decorated (GTK_WINDOW (window), FALSE);
GtkMenu *appmenu = GTK_MENU (gtk_menu_new ());
GtkWidget *closeitem = gtk_menu_item_new_with_label ("Close");
@@ -415,10 +419,9 @@
g_signal_connect (G_OBJECT (button1), "clicked",
G_CALLBACK (cb_delete_button_clicked), p_dialer_data);
gtk_widget_set_name (button1, "mokofingerbutton-orange");
- moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON
- (button1),
- file_new_image_from_relative_path
- ("delete.png"));
+ moko_pixmap_button_set_finger_toolbox_btn_center_image
+ (MOKO_PIXMAP_BUTTON (button1),
+ file_new_image_from_relative_path ("delete.png"));
moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
(button1), "Delete");
gtk_widget_set_size_request (button1, WINDOW_DIALER_BUTTON_SIZE_X,
@@ -430,10 +433,9 @@
g_signal_connect (G_OBJECT (button3), "clicked",
G_CALLBACK (cb_history_button_clicked), p_dialer_data);
gtk_widget_set_name (button3, "mokofingerbutton-orange");
- moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON
- (button3),
- file_new_image_from_relative_path
- ("history.png"));
+ moko_pixmap_button_set_finger_toolbox_btn_center_image
+ (MOKO_PIXMAP_BUTTON (button3),
+ file_new_image_from_relative_path ("history.png"));
moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
(button3), "History");
gtk_widget_set_size_request (button3, WINDOW_DIALER_BUTTON_SIZE_X,
@@ -446,10 +448,9 @@
g_signal_connect (G_OBJECT (button2), "clicked",
G_CALLBACK (cb_dialer_button_clicked), p_dialer_data);
gtk_widget_set_name (button2, "mokofingerbutton-black");
- moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON
- (button2),
- file_new_image_from_relative_path
- ("phone.png"));
+ moko_pixmap_button_set_finger_toolbox_btn_center_image
+ (MOKO_PIXMAP_BUTTON (button2),
+ file_new_image_from_relative_path ("phone.png"));
moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
(button2), "Dial");
gtk_widget_set_size_request (button2, WINDOW_DIALER_BUTTON_SIZE_X + 20,
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c 2007-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c 2007-04-24 13:34:02 UTC (rev 1819)
@@ -132,7 +132,7 @@
}
void
-cb_openmoko_history_wheel_press_left_up(GtkWidget * widget,
+cb_openmoko_history_wheel_press_left_up (GtkWidget * widget,
MOKO_DIALER_APP_DATA * appdata)
{
DBG_ENTER ();
@@ -349,7 +349,7 @@
//now the container--window
window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
- gtk_window_set_decorated(GTK_WINDOW(window ),FALSE);
+ gtk_window_set_decorated (GTK_WINDOW (window), FALSE);
p_dialer_data->window_history = GTK_WIDGET (window);
@@ -362,8 +362,8 @@
g_signal_connect ((gpointer) window, "hide",
G_CALLBACK (on_window_history_hide), p_dialer_data);
- //FIXME: without gtk_widget_show_all first and then hide, the history view will not show properly. -tony
- //gtk_widget_show_all(GTK_WIDGET(window));
+ //FIXME: without gtk_widget_show_all first and then hide, the history view will not show properly. -tony
+ //gtk_widget_show_all(GTK_WIDGET(window));
//now the wheel and tool box, why should the wheel and toolbox created after the gtk_widget_show_all???
// This causes a segfault for me... maybe a problem in libmokoui? - thomas
@@ -375,7 +375,8 @@
p_dialer_data);
g_signal_connect (G_OBJECT (moko_finger_window_get_wheel (window)),
"press_right_down",
- G_CALLBACK (cb_openmoko_history_wheel_press_right_down),
+ G_CALLBACK
+ (cb_openmoko_history_wheel_press_right_down),
p_dialer_data);
g_signal_connect (G_OBJECT (moko_finger_window_get_wheel (window)),
@@ -389,8 +390,8 @@
/* TODO: remove the GTK_WIDGET() casts when libmokoui is fixed */
button = moko_finger_tool_box_add_button_without_label (tools);
image = file_new_image_from_relative_path ("phone.png");
- moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON
- (button), image);
+ moko_pixmap_button_set_finger_toolbox_btn_center_image
+ (MOKO_PIXMAP_BUTTON (button), image);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (cb_tool_button_history_call_clicked),
p_dialer_data);
@@ -398,8 +399,8 @@
button =
GTK_WIDGET (moko_finger_tool_box_add_button_without_label (tools));
image = file_new_image_from_relative_path ("sms.png");
- moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON
- (button), image);
+ moko_pixmap_button_set_finger_toolbox_btn_center_image
+ (MOKO_PIXMAP_BUTTON (button), image);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (cb_tool_button_history_sms_clicked),
p_dialer_data);
@@ -408,21 +409,22 @@
button =
GTK_WIDGET (moko_finger_tool_box_add_button_without_label (tools));
image = file_new_image_from_relative_path ("delete_01.png");
- moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON
- (button), image);
+ moko_pixmap_button_set_finger_toolbox_btn_center_image
+ (MOKO_PIXMAP_BUTTON (button), image);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (cb_tool_button_history_delete_clicked),
p_dialer_data);
button =
GTK_WIDGET (moko_finger_tool_box_add_button_without_label (tools));
image = file_new_image_from_relative_path ("exit.png");
- moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON
- (button), image);
+ moko_pixmap_button_set_finger_toolbox_btn_center_image
+ (MOKO_PIXMAP_BUTTON (button), image);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (cb_tool_button_history_back_clicked),
p_dialer_data);
- p_dialer_data->wheel_history = GTK_WIDGET (moko_finger_window_get_wheel (window));
+ p_dialer_data->wheel_history =
+ GTK_WIDGET (moko_finger_window_get_wheel (window));
p_dialer_data->toolbox_history = GTK_WIDGET (tools);
DBG_LEAVE ();
}
@@ -444,7 +446,9 @@
int hasname;
MOKO_DIALER_APP_DATA *p_dialer_data = (MOKO_DIALER_APP_DATA *) user_data;
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (p_dialer_data->treeview_history));
+ selection =
+ gtk_tree_view_get_selection (GTK_TREE_VIEW
+ (p_dialer_data->treeview_history));
if (!gtk_tree_selection_get_selected (selection, &model, &iter))
{
@@ -669,39 +673,39 @@
p_dialer_data->g_iconReceived = create_pixbuf ("received.png");
/* FIXME: error handling hasn't been implemented yet!
- p_dialer_data->g_iconReceived = create_pixbuf ("received.png", &error);
- if (error)
- {
- DBG_WARN ("Cound not load icon :%s", error->message);
- g_error_free (error);
- p_dialer_data->g_iconReceived = NULL;
- error = NULL;
- }
- */
+ p_dialer_data->g_iconReceived = create_pixbuf ("received.png", &error);
+ if (error)
+ {
+ DBG_WARN ("Cound not load icon :%s", error->message);
+ g_error_free (error);
+ p_dialer_data->g_iconReceived = NULL;
+ error = NULL;
+ }
+ */
p_dialer_data->g_iconDialed = create_pixbuf ("dialed.png");
/* FIXME: error handling hasn't been implemented yet!
- p_dialer_data->g_iconDialed = create_pixbuf ("dialed.png", &error);
- if (error)
- {
- DBG_WARN ("Cound not load icon :%s", error->message);
- g_error_free (error);
- p_dialer_data->g_iconDialed = NULL;
- error = NULL;
- }
- */
+ p_dialer_data->g_iconDialed = create_pixbuf ("dialed.png", &error);
+ if (error)
+ {
+ DBG_WARN ("Cound not load icon :%s", error->message);
+ g_error_free (error);
+ p_dialer_data->g_iconDialed = NULL;
+ error = NULL;
+ }
+ */
p_dialer_data->g_iconMissed = create_pixbuf ("missed.png");
/* FIXME: error handling hasn't been implemented yet!
- p_dialer_data->g_iconMissed = create_pixbuf ("missed.png", &error);
- if (error)
- {
- DBG_WARN ("Cound not load icon :%s", error->message);
- g_error_free (error);
- p_dialer_data->g_iconMissed = NULL;
- error = NULL;
- }
- */
+ p_dialer_data->g_iconMissed = create_pixbuf ("missed.png", &error);
+ if (error)
+ {
+ DBG_WARN ("Cound not load icon :%s", error->message);
+ g_error_free (error);
+ p_dialer_data->g_iconMissed = NULL;
+ error = NULL;
+ }
+ */
while (entry)
{
@@ -720,39 +724,39 @@
}
else
{
- gtk_list_store_set (list_store, &iter, COLUMN_NAME_NUMBER, entry->name,
- -1);
+ 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,
- p_dialer_data->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,
- p_dialer_data->g_iconDialed, -1);
- break;
- }
- case MISSED:
- { //icon=gdk_pixbuf_new_from_file("./missed.png",&error);
- gtk_list_store_set (list_store, &iter, COLUMN_TYPEICON,
- p_dialer_data->g_iconMissed, -1);
- break;
- }
+ case INCOMING:
+ {
+ gtk_list_store_set (list_store, &iter, COLUMN_TYPEICON,
+ p_dialer_data->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,
+ p_dialer_data->g_iconDialed, -1);
+ break;
+ }
+ case MISSED:
+ { //icon=gdk_pixbuf_new_from_file("./missed.png",&error);
+ gtk_list_store_set (list_store, &iter, COLUMN_TYPEICON,
+ p_dialer_data->g_iconMissed, -1);
+ break;
+ }
- default:
+ default:
- { //icon=gdk_pixbuf_new_from_file("./missed.png",&error);
- gtk_list_store_set (list_store, &iter, COLUMN_TYPEICON,
- p_dialer_data->g_iconMissed, -1);
- break;
- }
+ { //icon=gdk_pixbuf_new_from_file("./missed.png",&error);
+ gtk_list_store_set (list_store, &iter, COLUMN_TYPEICON,
+ p_dialer_data->g_iconMissed, -1);
+ break;
+ }
}
@@ -979,8 +983,8 @@
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_NAME_NUMBER,
+ entry->number, -1);
gtk_list_store_set (list_store, &iter, COLUMN_HASNAME, 0, -1);
}
else
@@ -991,33 +995,33 @@
}
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;
- }
+ 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:
+ default:
- { //icon=gdk_pixbuf_new_from_file("./missed.png",&error);
- gtk_list_store_set (list_store, &iter, COLUMN_TYPEICON,
- appdata->g_iconMissed, -1);
- break;
- }
+ { //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);
return 1;
@@ -1029,10 +1033,10 @@
const char *name, const char *number, const char *id,
char *time, char *date, int durationsec)
{
-
+
//DBG_ENTER();
- //DBG_MESSAGE("History add:%s,%s,%s,%s,%s,%d",name,number,picpath,time,date,durationsec);
- HISTORY_ENTRY * pentry =
+ //DBG_MESSAGE("History add:%s,%s,%s,%s,%s,%d",name,number,picpath,time,date,durationsec);
+ HISTORY_ENTRY *pentry =
history_add_entry (&(appdata->g_historylist), type, name, number, id,
time, date, durationsec);
return history_list_view_add (appdata, pentry);
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-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c 2007-04-24 13:34:02 UTC (rev 1819)
@@ -14,13 +14,13 @@
* GNU Lesser Public License for more details.
*
* Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
- */
-
+ */
+
#include <libmokoui/moko-finger-tool-box.h>
#include <libmokoui/moko-finger-window.h>
#include <libmokoui/moko-finger-wheel.h>
#include <libmokoui/moko-pixmap-button.h>
-
+
#include <gtk/gtkalignment.h>
#include <gtk/gtkbutton.h>
#include <gtk/gtkhbox.h>
@@ -29,7 +29,7 @@
#include <gtk/gtkmenu.h>
#include <gtk/gtkmenuitem.h>
#include <gtk/gtkvbox.h>
-
+
#include "contacts.h"
#include "openmoko-dialer-main.h"
#include "moko-dialer-status.h"
@@ -38,95 +38,83 @@
#include "openmoko-dialer-window-history.h"
#include "dialergsm.h"
#include "history.h"
-
-void
-cb_answer_button_clicked (GtkButton * button, MOKO_DIALER_APP_DATA * appdata)
-{
- DBG_ENTER ();
-
- appdata->g_state.callstate = STATE_TALKING;
- gsm_answer ();
-
- gtk_widget_hide (appdata->window_incoming);
-
-
+
void
+cb_answer_button_clicked (GtkButton * button,
+ MOKO_DIALER_APP_DATA * appdata)
+{
+
DBG_ENTER ();
+
appdata->g_state.callstate = STATE_TALKING;
+
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, MOKO_DIALER_APP_DATA * 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, MOKO_DIALER_APP_DATA * appdata)
-{
- DBG_ENTER ();
- gsm_hangup ();
- appdata->g_state.callstate = STATE_REJECTED;
- gtk_widget_hide (appdata->window_incoming);
- DBG_LEAVE ();
-}
-
-void
-window_incoming_prepare (MOKO_DIALER_APP_DATA * appdata)
-{
- if (!appdata)
- {
- DBG_WARN ("appdata=NULL!");
- return;
- }
-
- if (appdata->window_incoming == 0)
- {
- window_incoming_init (appdata);
- }
-
- moko_dialer_status_set_person_number (appdata->status_incoming,
- appdata->g_peer_info.number);
- if (appdata->g_peer_info.hasname)
- {
-
- moko_dialer_status_set_person_image (appdata->status_incoming,
- appdata->g_peer_info.ID);
- moko_dialer_status_set_person_name (appdata->status_incoming,
- appdata->g_peer_info.name);
- }
- else
- {
- moko_dialer_status_set_person_image (appdata->status_incoming, "");
- moko_dialer_status_set_person_name (appdata->status_incoming, "");
-
- }
-
-
-
-}
-
-void
-window_incoming_fails (MOKO_DIALER_APP_DATA * appdata)
-{
- DBG_ENTER ();
- DBG_LEAVE ();
-}
-
-gint
-timer_incoming_time_out (MOKO_DIALER_APP_DATA * appdata)
-{
+ window_talking_prepare (appdata);
+
gtk_widget_show (appdata->window_talking);
+
DBG_LEAVE ();
+
}
void
+
+cb_ignore_button_clicked (GtkButton * button,
+ MOKO_DIALER_APP_DATA * 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,
+ MOKO_DIALER_APP_DATA * appdata)
+{
+
DBG_ENTER ();
+
gsm_hangup ();
+
appdata->g_state.callstate = STATE_REJECTED;
+
gtk_widget_hide (appdata->window_incoming);
+
DBG_LEAVE ();
+
}
void
+
+window_incoming_prepare (MOKO_DIALER_APP_DATA * appdata)
+{
+
if (!appdata)
+
+ {
+
DBG_WARN ("appdata=NULL!");
+
return;
+
}
+
if (appdata->window_incoming == 0)
+
+ {
+
window_incoming_init (appdata);
+
}
+
moko_dialer_status_set_person_number (appdata->status_incoming,
+
appdata->g_peer_info.number);
+
if (appdata->g_peer_info.hasname)
+
+ {
+
moko_dialer_status_set_person_image (appdata->status_incoming,
+
appdata->g_peer_info.ID);
+
moko_dialer_status_set_person_name (appdata->status_incoming,
+
appdata->g_peer_info.name);
+
}
+
+ else
+
+ {
+
moko_dialer_status_set_person_image (appdata->status_incoming, "");
+
moko_dialer_status_set_person_name (appdata->status_incoming, "");
+
}
+
}
+
void
+window_incoming_fails (MOKO_DIALER_APP_DATA * appdata)
+{
+
DBG_ENTER ();
+
DBG_LEAVE ();
+
}
gint
timer_incoming_time_out (MOKO_DIALER_APP_DATA * appdata)
+{
+
//DBG_ENTER();
- TIMER_DATA *timer_data = &(appdata->g_timer_data);
-
-moko_dialer_status_update_icon(appdata->status_incoming);
+ 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 ())
@@ -153,167 +141,134 @@
timer_data->ticks++;
}
}
-*/
- return 1;
-
-
-}
-
-
-
-void
-on_window_incoming_hide (GtkWidget * widget, MOKO_DIALER_APP_DATA * 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)
+*/
+ return 1;
+
}
+
void
+on_window_incoming_hide (GtkWidget * widget, MOKO_DIALER_APP_DATA * 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 (MOKO_DIALER_APP_DATA * 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, MOKO_DIALER_APP_DATA * appdata)
-{
-
- DBG_ENTER ();
- appdata->g_state.callstate = STATE_INCOMING;
- window_incoming_setup_timer (appdata);
- DBG_LEAVE ();
-
-}
-
-
-gint
-window_incoming_init (MOKO_DIALER_APP_DATA * p_dialer_data)
-{
-
- DBG_ENTER ();
- MokoFingerWindow *window;
- GtkWidget *vbox;
- GtkWidget *status;
-
- if (p_dialer_data->window_incoming == 0)
- {
-
- vbox = gtk_vbox_new (FALSE, 0);
- status = moko_dialer_status_new ();
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "incoming_0.png");
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "incoming_1.png");
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "incoming_2.png");
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "incoming_3.png");
- moko_dialer_status_set_icon_by_index (MOKO_DIALER_STATUS (status), 0);
-
- gtk_box_pack_start (GTK_BOX (vbox), status, FALSE, FALSE, 0);
-
-
- GtkWidget *hbox2 = gtk_hbox_new (FALSE, 0);
- GtkWidget *button = gtk_button_new_with_label ("Answer");
- gtk_button_set_image(GTK_BUTTON(button),file_new_image_from_relative_path("answer.png"));
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (cb_answer_button_clicked), p_dialer_data);
-
- gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE, 10);
-
- button = gtk_button_new_with_label ("Ignore");
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (cb_ignore_button_clicked), p_dialer_data);
- gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE, 10);
-
-
-
- button = gtk_button_new_with_label ("Reject");
- gtk_button_set_image(GTK_BUTTON(button),file_new_image_from_relative_path("cancel.png"));
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (cb_reject_button_clicked), p_dialer_data);
- gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE, 10);
-
-
-
-
- gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 50);
-
-
+
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 (MOKO_DIALER_APP_DATA * 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, MOKO_DIALER_APP_DATA * appdata)
+{
+
DBG_ENTER ();
+
appdata->g_state.callstate = STATE_INCOMING;
+
window_incoming_setup_timer (appdata);
+
DBG_LEAVE ();
+
}
gint
window_incoming_init (MOKO_DIALER_APP_DATA * p_dialer_data)
+{
+
DBG_ENTER ();
+
MokoFingerWindow * window;
+
GtkWidget * vbox;
+
GtkWidget * status;
+
if (p_dialer_data->window_incoming == 0)
+
+ {
+
vbox = gtk_vbox_new (FALSE, 0);
+
status = moko_dialer_status_new ();
+
moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
+ "incoming_0.png");
+
moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
+ "incoming_1.png");
+
moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
+ "incoming_2.png");
+
moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
+ "incoming_3.png");
+
moko_dialer_status_set_icon_by_index (MOKO_DIALER_STATUS (status), 0);
+
gtk_box_pack_start (GTK_BOX (vbox), status, FALSE, FALSE, 0);
+
GtkWidget * hbox2 = gtk_hbox_new (FALSE, 0);
+
GtkWidget * button = gtk_button_new_with_label ("Answer");
+
gtk_button_set_image (GTK_BUTTON (button),
+ file_new_image_from_relative_path ("answer.png"));
+
g_signal_connect (G_OBJECT (button), "clicked",
+
G_CALLBACK (cb_answer_button_clicked), p_dialer_data);
+
gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE,
+ 10);
+
button = gtk_button_new_with_label ("Ignore");
+
g_signal_connect (G_OBJECT (button), "clicked",
+
G_CALLBACK (cb_ignore_button_clicked), p_dialer_data);
+
gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE,
+ 10);
+
button = gtk_button_new_with_label ("Reject");
+
gtk_button_set_image (GTK_BUTTON (button),
+ file_new_image_from_relative_path ("cancel.png"));
+
g_signal_connect (G_OBJECT (button), "clicked",
+
G_CALLBACK (cb_reject_button_clicked), p_dialer_data);
+
gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE,
+ 10);
+
gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 50);
+
//currently MokoDialogWindow is not finished, wating...
// MokoDialogWindow* window = (MokoDialogWindow *)(moko_dialog_window_new());
// moko_dialog_window_set_contents( window, GTK_WIDGET(vbox) );
-
- window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
- gtk_window_set_decorated(GTK_WINDOW(window ),FALSE);
- moko_finger_window_set_contents (window, GTK_WIDGET (vbox));
- //FIXME: dear thomas, I know that show & hide is not good, but when you removed the following 2 lines, the incoming window
- //is simply not displaying well. please have a try and then commit. If you cannot test the incoming window, you can simply modify the code to show it out debuggingly.
- //Pardon me to re-add the 2 lines. Tony Guan 14,3,2007
- gtk_widget_show_all(GTK_WIDGET(window));
- gtk_widget_hide(GTK_WIDGET(window));
-
- moko_dialer_status_set_title_label (MOKO_DIALER_STATUS (status), "Incoming call");
- moko_dialer_status_set_status_label (MOKO_DIALER_STATUS (status), "");
-
- p_dialer_data->window_incoming = GTK_WIDGET (window);
- p_dialer_data->status_incoming = MOKO_DIALER_STATUS (status);
-
+
window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
+
gtk_window_set_decorated (GTK_WINDOW (window), FALSE);
+
moko_finger_window_set_contents (window, GTK_WIDGET (vbox));
+
+ //FIXME: dear thomas, I know that show & hide is not good, but when you removed the following 2 lines, the incoming window
+ //is simply not displaying well. please have a try and then commit. If you cannot test the incoming window, you can simply modify the code to show it out debuggingly.
+ //Pardon me to re-add the 2 lines. Tony Guan 14,3,2007
+ gtk_widget_show_all (GTK_WIDGET (window));
+
gtk_widget_hide (GTK_WIDGET (window));
+
moko_dialer_status_set_title_label (MOKO_DIALER_STATUS (status),
+ "Incoming call");
+
moko_dialer_status_set_status_label (MOKO_DIALER_STATUS (status), "");
+
p_dialer_data->window_incoming = GTK_WIDGET (window);
+
p_dialer_data->status_incoming = MOKO_DIALER_STATUS (status);
+
// DBG_MESSAGE("p_dialer_data->status_incoming=0X%x",p_dialer_data->status_incoming);
-
-
- g_signal_connect ((gpointer) window, "show",
- G_CALLBACK (on_window_incoming_show), p_dialer_data);
- g_signal_connect ((gpointer) window, "hide",
- G_CALLBACK (on_window_incoming_hide), p_dialer_data);
-
- }
-
-
- DBG_LEAVE ();
- return 1;
-}
-
+
g_signal_connect ((gpointer) window, "show",
+
G_CALLBACK (on_window_incoming_show),
+ p_dialer_data);
+
g_signal_connect ((gpointer) window, "hide",
+
G_CALLBACK (on_window_incoming_hide), p_dialer_data);
+
}
+
DBG_LEAVE ();
+
return 1;
+
}
+
+
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-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c 2007-04-24 13:34:02 UTC (rev 1819)
@@ -41,7 +41,7 @@
/* function declerations */
void window_outgoing_setup_timer (MOKO_DIALER_APP_DATA * appdata);
-void
+void
cb_speaker_button_clicked (GtkButton * button, MOKO_DIALER_APP_DATA * appdata)
{
DBG_ENTER ();
@@ -60,7 +60,7 @@
DBG_TRACE ();
// gtk_widget_show_all (appdata->window_talking);
- gtk_widget_show(appdata->window_talking);
+ gtk_widget_show (appdata->window_talking);
DBG_LEAVE ();
@@ -91,7 +91,7 @@
DBG_ENTER ();
gsm_hangup ();
appdata->g_state.callstate = STATE_FAILED;
- DBG_TRACE();
+ DBG_TRACE ();
gtk_widget_hide (appdata->window_outgoing);
DBG_LEAVE ();
}
@@ -239,8 +239,8 @@
//DBG_TRACE ();
appdata->g_state.historytype = OUTGOING;
//DBG_TRACE ();
- int retv=gsm_dial (appdata->g_peer_info.number);
- DBG_MESSAGE("GSM_DIAL returns %d",retv);
+ int retv = gsm_dial (appdata->g_peer_info.number);
+ DBG_MESSAGE ("GSM_DIAL returns %d", retv);
//DBG_LEAVE ();
}
@@ -259,11 +259,16 @@
vbox = gtk_vbox_new (FALSE, 0);
status = moko_dialer_status_new ();
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "outgoing_0.png");
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "outgoing_1.png");
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "outgoing_2.png");
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "outgoing_3.png");
- moko_dialer_status_set_error_icon(MOKO_DIALER_STATUS (status),"failure.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
+ "outgoing_0.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
+ "outgoing_1.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
+ "outgoing_2.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
+ "outgoing_3.png");
+ moko_dialer_status_set_error_icon (MOKO_DIALER_STATUS (status),
+ "failure.png");
moko_dialer_status_set_icon_by_index (MOKO_DIALER_STATUS (status), 0);
gtk_box_pack_start (GTK_BOX (vbox), status, FALSE, FALSE, 0);
@@ -271,7 +276,8 @@
GtkWidget *hbox2 = gtk_hbox_new (FALSE, 0);
GtkWidget *button = gtk_button_new_with_label ("Speaker");
- gtk_button_set_image(GTK_BUTTON(button),file_new_image_from_relative_path("speaker.png"));
+ gtk_button_set_image (GTK_BUTTON (button),
+ file_new_image_from_relative_path ("speaker.png"));
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (cb_speaker_button_clicked), p_dialer_data);
p_dialer_data->buttonSpeaker = button;
@@ -279,7 +285,8 @@
gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE, 40);
button = gtk_button_new_with_label ("Redial");
- gtk_button_set_image(GTK_BUTTON(button),file_new_image_from_relative_path("redial.png"));
+ gtk_button_set_image (GTK_BUTTON (button),
+ file_new_image_from_relative_path ("redial.png"));
p_dialer_data->buttonRedial = button;
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (cb_redial_button_clicked), p_dialer_data);
@@ -288,7 +295,8 @@
button = gtk_button_new_with_label ("Cancel");
- gtk_button_set_image(GTK_BUTTON(button),file_new_image_from_relative_path("cancel.png"));
+ gtk_button_set_image (GTK_BUTTON (button),
+ file_new_image_from_relative_path ("cancel.png"));
p_dialer_data->buttonCancel = button;
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (cb_cancel_button_clicked), p_dialer_data);
@@ -303,11 +311,13 @@
// moko_dialog_window_set_contents( window, GTK_WIDGET(vbox) );
window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
- gtk_window_set_decorated(GTK_WINDOW(window ),FALSE); //FIXME: this line seems only necessary on my PC. tony
+ gtk_window_set_decorated (GTK_WINDOW (window), FALSE); //FIXME: this line seems only necessary on my PC. tony
moko_finger_window_set_contents (window, GTK_WIDGET (vbox));
- moko_dialer_status_set_title_label (MOKO_DIALER_STATUS (status), "Outgoing call");
- moko_dialer_status_set_status_label (MOKO_DIALER_STATUS (status), "Calling ... (00:00:00)");
+ moko_dialer_status_set_title_label (MOKO_DIALER_STATUS (status),
+ "Outgoing call");
+ moko_dialer_status_set_status_label (MOKO_DIALER_STATUS (status),
+ "Calling ... (00:00:00)");
p_dialer_data->window_outgoing = GTK_WIDGET (window);
p_dialer_data->status_outgoing = MOKO_DIALER_STATUS (status);
@@ -329,4 +339,3 @@
DBG_LEAVE ();
return 1;
}
-
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.h 2007-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.h 2007-04-24 13:34:02 UTC (rev 1819)
@@ -30,7 +30,7 @@
gint window_outgoing_init (MOKO_DIALER_APP_DATA * p_dialer_data);
void window_outgoing_prepare (MOKO_DIALER_APP_DATA * appdata);
- void window_outgoing_fails (MOKO_DIALER_APP_DATA *appdata);
+ void window_outgoing_fails (MOKO_DIALER_APP_DATA * appdata);
#ifdef __cplusplus
}
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.c 2007-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.c 2007-04-24 13:34:02 UTC (rev 1819)
@@ -47,7 +47,7 @@
// gchar *codesinput;
// codesinput =g_strdup(moko_dialer_textview_get_input (appdata->moko_pin_text_view, TRUE));
- if (!appdata->str_sim_pin||g_utf8_strlen (appdata->str_sim_pin, -1) < 1)
+ if (!appdata->str_sim_pin || g_utf8_strlen (appdata->str_sim_pin, -1) < 1)
{
//user didn't input anything
DBG_MESSAGE ("no input for pin");
@@ -128,7 +128,7 @@
MokoFingerWindow *window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
- gtk_window_set_decorated(GTK_WINDOW(window ),FALSE);
+ gtk_window_set_decorated (GTK_WINDOW (window), FALSE);
g_signal_connect ((gpointer) window, "show",
G_CALLBACK (on_window_pin_show), p_dialer_data);
g_signal_connect ((gpointer) window, "hide",
@@ -151,8 +151,8 @@
// moko_dialer_textview_fill_it(mokotextview , "Please input the pin:");
gtk_container_add (GTK_CONTAINER (eventbox1), mokotextview);
- gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (eventbox1), FALSE, FALSE,
- 0);
+ gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (eventbox1), FALSE,
+ FALSE, 0);
MokoDialerPanel *mokodialerpanel = moko_dialer_panel_new ();
@@ -174,12 +174,11 @@
g_signal_connect (G_OBJECT (button1), "clicked",
G_CALLBACK (pin_delete_button_clicked), p_dialer_data);
gtk_widget_set_name (GTK_WIDGET (button1), "mokofingerbutton-orange");
-
- moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON
- (button1),
- file_new_image_from_relative_path
- ("delete.png"));
+ moko_pixmap_button_set_finger_toolbox_btn_center_image
+ (MOKO_PIXMAP_BUTTON (button1),
+ file_new_image_from_relative_path ("delete.png"));
+
moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
(button1), "Delete");
// gtk_widget_set_size_request (button1, WINDOW_DIALER_BUTTON_SIZE_X,
@@ -193,10 +192,9 @@
g_signal_connect (G_OBJECT (button2), "clicked",
G_CALLBACK (pin_ok_button_clicked), p_dialer_data);
gtk_widget_set_name (GTK_WIDGET (button1), "mokofingerbutton-orange");
- moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON
- (button2),
- file_new_image_from_relative_path
- ("phone.png"));
+ moko_pixmap_button_set_finger_toolbox_btn_center_image
+ (MOKO_PIXMAP_BUTTON (button2),
+ file_new_image_from_relative_path ("phone.png"));
moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
(button2), "OK");
//gtk_widget_set_size_request (button2, WINDOW_DIALER_BUTTON_SIZE_X,
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-04-24 10:44:37 UTC (rev 1818)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c 2007-04-24 13:34:02 UTC (rev 1819)
@@ -90,17 +90,15 @@
{
- moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON (button),
- appdata->
- imageTALK);
+ moko_pixmap_button_set_finger_toolbox_btn_center_image
+ (MOKO_PIXMAP_BUTTON (button), appdata->imageTALK);
gtk_widget_hide (appdata->content_talk);
gtk_widget_show (appdata->content_dtmf);
}
else
{
- moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON (button),
- appdata->
- imageDTMF);
+ moko_pixmap_button_set_finger_toolbox_btn_center_image
+ (MOKO_PIXMAP_BUTTON (button), appdata->imageDTMF);
gtk_widget_hide (appdata->content_dtmf);
gtk_widget_show (appdata->content_talk);
@@ -228,8 +226,8 @@
gtk_widget_hide (appdata->wheel_talking);
gtk_widget_hide (appdata->toolbox_talking);
- moko_dialer_textview_empty(appdata->moko_dtmf_text_view);
- add_histroy_entry (appdata, appdata->g_state.historytype,
+ moko_dialer_textview_empty (appdata->moko_dtmf_text_view);
+ add_histroy_entry (appdata, appdata->g_state.historytype,
appdata->g_peer_info.name,
appdata->g_peer_info.number,
appdata->g_peer_info.picpath,
@@ -244,7 +242,7 @@
{
DBG_ENTER ();
- appdata->dtmf_in_talking_window = TRUE;
+ appdata->dtmf_in_talking_window = TRUE;
//hide the talking button in talking mode.
time_t timep;
@@ -264,14 +262,14 @@
appdata->g_timer_data.ptimer =
g_timeout_add (1000, (GSourceFunc) timer_talking_time_out, appdata);
- if (appdata->toolbox_talking){
- gtk_widget_show (appdata->toolbox_talking);
- moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON (appdata->buttonTalk_DTMF),
- appdata->
- imageDTMF);
- gtk_widget_hide (appdata->content_dtmf);
- gtk_widget_show(appdata->content_talk);
- }
+ if (appdata->toolbox_talking)
+ {
+ gtk_widget_show (appdata->toolbox_talking);
+ moko_pixmap_button_set_finger_toolbox_btn_center_image
+ (MOKO_PIXMAP_BUTTON (appdata->buttonTalk_DTMF), appdata->imageDTMF);
+ gtk_widget_hide (appdata->content_dtmf);
+ gtk_widget_show (appdata->content_talk);
+ }
@@ -303,7 +301,7 @@
GtkWidget *content_talk = NULL;
GtkWidget *content_dtmf = NULL;
MokoFingerToolBox *tools = NULL;
- MokoFingerWheel* wheel=NULL;
+ MokoFingerWheel *wheel = NULL;
GtkWidget *mokodialerpanel = NULL;
MokoPixmapButton *button;
GtkWidget *image;
@@ -313,15 +311,21 @@
content_talk = gtk_vbox_new (FALSE, 0);
status = moko_dialer_status_new ();
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "talking_0.png");
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "talking_1.png");
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "talking_2.png");
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status), "talking_3.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
+ "talking_0.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
+ "talking_1.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
+ "talking_2.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
+ "talking_3.png");
moko_dialer_status_set_icon_by_index (MOKO_DIALER_STATUS (status), 0);
- moko_dialer_status_set_title_label (MOKO_DIALER_STATUS (status), "In Call");
- moko_dialer_status_set_status_label (MOKO_DIALER_STATUS (status), "Talking ...(00:00:00)");
+ moko_dialer_status_set_title_label (MOKO_DIALER_STATUS (status),
+ "In Call");
+ moko_dialer_status_set_status_label (MOKO_DIALER_STATUS (status),
+ "Talking ...(00:00:00)");
gtk_box_pack_start (GTK_BOX (content_talk), status, FALSE, FALSE, 0);
@@ -344,8 +348,8 @@
p_dialer_data->moko_dtmf_text_view = MOKO_DIALER_TEXTVIEW (mokotextview);
- gtk_box_pack_start (GTK_BOX (content_dtmf), GTK_WIDGET (eventbox1), FALSE,
- FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (content_dtmf), GTK_WIDGET (eventbox1),
+ FALSE, FALSE, 2);
@@ -354,8 +358,8 @@
gtk_widget_set_size_request (mokodialerpanel, 380, 384);
g_signal_connect (GTK_OBJECT (mokodialerpanel), "user_input",
G_CALLBACK (on_dtmf_panel_user_input), p_dialer_data);
- gtk_box_pack_start (GTK_BOX (content_dtmf), GTK_WIDGET (mokodialerpanel),
- TRUE, TRUE, 5);
+ gtk_box_pack_start (GTK_BOX (content_dtmf),
+ GTK_WIDGET (mokodialerpanel), TRUE, TRUE, 5);
gtk_box_pack_start (GTK_BOX (vbox), content_dtmf, FALSE, FALSE, 0);
p_dialer_data->content_dtmf = content_dtmf;
@@ -364,7 +368,7 @@
//now the container--window
window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
- gtk_window_set_decorated(GTK_WINDOW(window ),FALSE);
+ gtk_window_set_decorated (GTK_WINDOW (window), FALSE);
p_dialer_data->window_talking = GTK_WIDGET (window);
moko_finger_window_set_contents (window, GTK_WIDGET (vbox));
g_signal_connect ((gpointer) window, "show",
@@ -378,11 +382,11 @@
//FIXME:Dear Thomas, please modify the libmokoui before deleting the show_all & hide codes. I don't want to splash
//any window either, but for now, it's the most convenient way to debug the application. We will remove it, but later, OK?
//Tony Guan 14/3/2007
- gtk_widget_show_all(GTK_WIDGET(window));
- gtk_widget_hide(content_dtmf); //And this line is necessary because dtmf interface & talking interface share the same window.
- //we have to hide it first.
- wheel=moko_finger_window_get_wheel (window);
-
+ gtk_widget_show_all (GTK_WIDGET (window));
+ gtk_widget_hide (content_dtmf); //And this line is necessary because dtmf interface & talking interface share the same window.
+ //we have to hide it first.
+ wheel = moko_finger_window_get_wheel (window);
+
g_signal_connect (G_OBJECT (wheel),
"press_left_up",
G_CALLBACK (openmoko_wheel_press_left_up_cb),
@@ -391,33 +395,42 @@
"press_right_down",
G_CALLBACK (openmoko_wheel_press_right_down_cb),
p_dialer_data);
-
+
tools = moko_finger_window_get_toolbox (window);
- button = MOKO_PIXMAP_BUTTON (moko_finger_tool_box_add_button_without_label (tools));
+ button =
+ MOKO_PIXMAP_BUTTON (moko_finger_tool_box_add_button_without_label
+ (tools));
image = file_new_image_from_relative_path ("speaker.png");
- moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON(button), image);
+ moko_pixmap_button_set_finger_toolbox_btn_center_image
+ (MOKO_PIXMAP_BUTTON (button), image);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (cb_tool_button_speaker_clicked),
p_dialer_data);
- button = MOKO_PIXMAP_BUTTON (moko_finger_tool_box_add_button_without_label (tools));
+ button =
+ MOKO_PIXMAP_BUTTON (moko_finger_tool_box_add_button_without_label
+ (tools));
image = file_new_image_from_relative_path ("dtmf.png");
- moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON(button), image);
+ moko_pixmap_button_set_finger_toolbox_btn_center_image
+ (MOKO_PIXMAP_BUTTON (button), image);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (cb_tool_button_dtmf_talk_clicked),
p_dialer_data);
- p_dialer_data->buttonTalk_DTMF=button;
+ p_dialer_data->buttonTalk_DTMF = button;
p_dialer_data->imageDTMF = image;
p_dialer_data->imageTALK =
file_new_image_from_relative_path ("talking.png");
- button = MOKO_PIXMAP_BUTTON (moko_finger_tool_box_add_button_without_label (tools));
+ button =
+ MOKO_PIXMAP_BUTTON (moko_finger_tool_box_add_button_without_label
+ (tools));
image = file_new_image_from_relative_path ("hangup.png");
- moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON(button), image);
+ moko_pixmap_button_set_finger_toolbox_btn_center_image
+ (MOKO_PIXMAP_BUTTON (button), image);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (cb_tool_button_hangup_clicked),
p_dialer_data);
@@ -433,4 +446,3 @@
return 1;
}
-
More information about the commitlog
mailing list
