r1854 - in trunk/src/target/OM-2007/openmoko-libs: . libmokojournal/src
dodji at sita.openmoko.org
dodji at sita.openmoko.org
Thu Apr 26 23:01:03 CEST 2007
Author: dodji
Date: 2007-04-26 23:00:59 +0200 (Thu, 26 Apr 2007)
New Revision: 1854
Modified:
trunk/src/target/OM-2007/openmoko-libs/ChangeLog
trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.c
trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.h
Log:
added MokoJournalVoiceInfo::callee-number,caller_number properties.
* src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.c,h:
added a MokoJournalVoiceInfo::callee_number.
Rename MokoJournalVoiceInfo::dialed_number into
MokoJournalVoiceInfo::caller_number. Both properties are serialized.
Modified: trunk/src/target/OM-2007/openmoko-libs/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-04-26 17:55:40 UTC (rev 1853)
+++ trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-04-26 21:00:59 UTC (rev 1854)
@@ -1,6 +1,14 @@
2007-04-26 Dodji Seketeli <dodji at openedhand.com>
* src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.c,h:
+ added a MokoJournalVoiceInfo::callee_number.
+ Rename MokoJournalVoiceInfo::dialed_number into
+ MokoJournalVoiceInfo::caller_number. Both properties are serialized.
+
+
+2007-04-26 Dodji Seketeli <dodji at openedhand.com>
+
+ * src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.c,h:
added MokoJournalVoiceInfo::dialed_number
and MokoJournalVoiceInfo::was_missed properties. These a serialized
and deserialized.
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.c 2007-04-26 17:55:40 UTC (rev 1853)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.c 2007-04-26 21:00:59 UTC (rev 1854)
@@ -39,7 +39,8 @@
struct _MokoJournalVoiceInfo
{
- gchar *dialed_number ;
+ gchar *caller_number ;
+ gchar *callee_number ;
gboolean was_missed ;
};
@@ -291,11 +292,16 @@
if (a_info)
{
- if (a_info->dialed_number)
+ if (a_info->caller_number)
{
- g_free (a_info->dialed_number) ;
- a_info->dialed_number = NULL ;
+ g_free (a_info->caller_number) ;
+ a_info->caller_number = NULL ;
}
+ if (a_info->callee_number)
+ {
+ g_free (a_info->callee_number) ;
+ a_info->callee_number = NULL ;
+ }
}
g_free (a_info) ;
}
@@ -541,15 +547,24 @@
break ;
/*
- * serialize dialed number
+ * serialize caller number
*/
- if (moko_journal_voice_info_get_dialed_number (info))
- number = (gchar*)moko_journal_voice_info_get_dialed_number (info) ;
+ if (moko_journal_voice_info_get_caller_number (info))
+ number = (gchar*)moko_journal_voice_info_get_caller_number (info) ;
prop = icalproperty_new_x (number) ;
- icalproperty_set_x_name (prop, "X-OPENMOKO-VOICE-DIALED-NUMBER") ;
+ icalproperty_set_x_name (prop, "X-OPENMOKO-VOICE-CALLER-NUMBER") ;
icalcomponent_add_property (comp, prop) ;
/*
+ * serialize the callee_number property
+ */
+ if (moko_journal_voice_info_get_callee_number (info))
+ number = (gchar*)moko_journal_voice_info_get_caller_number (info) ;
+ prop = icalproperty_new_x (number) ;
+ icalproperty_set_x_name (prop, "X-OPENMOKO-VOICE-CALLEE-NUMBER") ;
+ icalcomponent_add_property (comp, prop) ;
+
+ /*
* serialize the "was-missed" property
*/
if (moko_journal_voice_info_get_was_missed (info))
@@ -715,18 +730,32 @@
g_return_val_if_fail (info, FALSE) ;
/*
- * deserialize dialed number
+ * deserialize caller number
*/
if (icalcomponent_find_property_as_string
(a_comp,
- "X-OPENMOKO-VOICE-DIALED-NUMBER",
+ "X-OPENMOKO-VOICE-CALLER-NUMBER",
&prop_value))
{
if (prop_value)
{
- moko_journal_voice_info_set_dialed_number (info, prop_value) ;
+ moko_journal_voice_info_set_caller_number (info, prop_value) ;
}
}
+
+ /*
+ * deserialize callee number
+ */
+ if (icalcomponent_find_property_as_string
+ (a_comp,
+ "X-OPENMOKO-VOICE-CALLEE-NUMBER",
+ &prop_value))
+ {
+ if (prop_value)
+ {
+ moko_journal_voice_info_set_callee_number (info, prop_value) ;
+ }
+ }
prop_value = NULL ;
if (icalcomponent_find_property_as_string
(a_comp,
@@ -1807,29 +1836,52 @@
}
void
-moko_journal_voice_info_set_dialed_number (MokoJournalVoiceInfo *a_info,
+moko_journal_voice_info_set_caller_number (MokoJournalVoiceInfo *a_info,
gchar *a_number)
{
g_return_if_fail (a_info) ;
- if (a_info->dialed_number)
+ if (a_info->caller_number)
{
- g_free (a_info->dialed_number) ;
- a_info->dialed_number = NULL ;
+ g_free (a_info->caller_number) ;
+ a_info->caller_number = NULL ;
}
if (a_number)
- a_info->dialed_number = g_strdup (a_number) ;
+ a_info->caller_number = g_strdup (a_number) ;
}
const gchar*
-moko_journal_voice_info_get_dialed_number (MokoJournalVoiceInfo *a_info)
+moko_journal_voice_info_get_caller_number (MokoJournalVoiceInfo *a_info)
{
g_return_val_if_fail (a_info, NULL) ;
- return a_info->dialed_number ;
+ return a_info->caller_number ;
}
void
+moko_journal_voice_info_set_callee_number (MokoJournalVoiceInfo *a_info,
+ const gchar *a_number)
+{
+ g_return_if_fail (a_info);
+ g_return_if_fail (a_number) ;
+
+ if (a_info->callee_number)
+ {
+ g_free (a_info->callee_number) ;
+ a_info->callee_number = NULL ;
+ }
+ if (a_number)
+ a_info->callee_number = g_strdup (a_number) ;
+}
+
+const gchar*
+moko_journal_voice_info_get_callee_number (MokoJournalVoiceInfo *a_info)
+{
+ g_return_val_if_fail (a_info, NULL) ;
+ return a_info->callee_number ;
+}
+
+void
moko_journal_voice_info_set_was_missed (MokoJournalVoiceInfo *a_info,
gboolean a_flag)
{
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.h 2007-04-26 17:55:40 UTC (rev 1853)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.h 2007-04-26 21:00:59 UTC (rev 1854)
@@ -431,16 +431,22 @@
/**
- * moko_journal_voice_info_set_dialed_number:
+ * moko_journal_voice_info_set_caller_number:
* @info: the current
* @info: the extra property set attached to the voice call
*/
-void moko_journal_voice_info_set_dialed_number (MokoJournalVoiceInfo *info,
+void moko_journal_voice_info_set_caller_number (MokoJournalVoiceInfo *info,
gchar *number) ;
-const gchar* moko_journal_voice_info_get_dialed_number
+const gchar* moko_journal_voice_info_get_caller_number
(MokoJournalVoiceInfo *info) ;
+void moko_journal_voice_info_set_callee_number (MokoJournalVoiceInfo *info,
+ const gchar *number) ;
+
+const gchar* moko_journal_voice_info_get_callee_number
+ (MokoJournalVoiceInfo *info) ;
+
void moko_journal_voice_info_set_was_missed (MokoJournalVoiceInfo *info,
gboolean a_flag) ;
More information about the commitlog
mailing list
