r1862 - in trunk/src/target/OM-2007/openmoko-libs: . libmokojournal/src
dodji at sita.openmoko.org
dodji at sita.openmoko.org
Fri Apr 27 16:52:35 CEST 2007
Author: dodji
Date: 2007-04-27 16:52:32 +0200 (Fri, 27 Apr 2007)
New Revision: 1862
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
trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-time.c
trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-time.h
Log:
added moko_time_as_timet. did some cosmetic changes to moko-journal.h,c.
* src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.c:
changed the caller/callee number props into local/distant props.
* src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-time.c,h:
added moko_time_as_timet()
Modified: trunk/src/target/OM-2007/openmoko-libs/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-04-27 14:45:20 UTC (rev 1861)
+++ trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-04-27 14:52:32 UTC (rev 1862)
@@ -1,3 +1,10 @@
+2007-04-27 Dodji Seketeli <dodji at openedhand.org>
+
+ * src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.c:
+ changed the caller/callee number props into local/distant props.
+ * src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-time.c,h:
+ added moko_time_as_timet()
+
2007-04-27 Rob Bradford <rob at openedhand.com>
* libmokoui/moko-window.c: (moko_window_set_status_message),
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-27 14:45:20 UTC (rev 1861)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.c 2007-04-27 14:52:32 UTC (rev 1862)
@@ -39,8 +39,8 @@
struct _MokoJournalVoiceInfo
{
- gchar *caller_number ;
- gchar *callee_number ;
+ gchar *distant_number ;
+ gchar *local_number ;
gboolean was_missed ;
};
@@ -292,15 +292,15 @@
if (a_info)
{
- if (a_info->caller_number)
+ if (a_info->distant_number)
{
- g_free (a_info->caller_number) ;
- a_info->caller_number = NULL ;
+ g_free (a_info->distant_number) ;
+ a_info->distant_number = NULL ;
}
- if (a_info->callee_number)
+ if (a_info->local_number)
{
- g_free (a_info->callee_number) ;
- a_info->callee_number = NULL ;
+ g_free (a_info->local_number) ;
+ a_info->local_number = NULL ;
}
}
g_free (a_info) ;
@@ -549,17 +549,17 @@
/*
* serialize caller number
*/
- if (moko_journal_voice_info_get_caller_number (info))
- number = (gchar*)moko_journal_voice_info_get_caller_number (info) ;
+ if (moko_journal_voice_info_get_distant_number (info))
+ number = (gchar*)moko_journal_voice_info_get_distant_number (info) ;
prop = icalproperty_new_x (number) ;
icalproperty_set_x_name (prop, "X-OPENMOKO-VOICE-CALLER-NUMBER") ;
icalcomponent_add_property (comp, prop) ;
/*
- * serialize the callee_number property
+ * serialize the local_number property
*/
- if (moko_journal_voice_info_get_callee_number (info))
- number = (gchar*)moko_journal_voice_info_get_caller_number (info) ;
+ if (moko_journal_voice_info_get_local_number (info))
+ number = (gchar*)moko_journal_voice_info_get_distant_number (info) ;
prop = icalproperty_new_x (number) ;
icalproperty_set_x_name (prop, "X-OPENMOKO-VOICE-CALLEE-NUMBER") ;
icalcomponent_add_property (comp, prop) ;
@@ -739,7 +739,7 @@
{
if (prop_value)
{
- moko_journal_voice_info_set_caller_number (info, prop_value) ;
+ moko_journal_voice_info_set_distant_number (info, prop_value) ;
}
}
@@ -753,7 +753,7 @@
{
if (prop_value)
{
- moko_journal_voice_info_set_callee_number (info, prop_value) ;
+ moko_journal_voice_info_set_local_number (info, prop_value) ;
}
}
prop_value = NULL ;
@@ -1836,49 +1836,49 @@
}
void
-moko_journal_voice_info_set_caller_number (MokoJournalVoiceInfo *a_info,
- gchar *a_number)
+moko_journal_voice_info_set_distant_number (MokoJournalVoiceInfo *a_info,
+ gchar *a_number)
{
g_return_if_fail (a_info) ;
- if (a_info->caller_number)
+ if (a_info->distant_number)
{
- g_free (a_info->caller_number) ;
- a_info->caller_number = NULL ;
+ g_free (a_info->distant_number) ;
+ a_info->distant_number = NULL ;
}
if (a_number)
- a_info->caller_number = g_strdup (a_number) ;
+ a_info->distant_number = g_strdup (a_number) ;
}
const gchar*
-moko_journal_voice_info_get_caller_number (MokoJournalVoiceInfo *a_info)
+moko_journal_voice_info_get_distant_number (MokoJournalVoiceInfo *a_info)
{
g_return_val_if_fail (a_info, NULL) ;
- return a_info->caller_number ;
+ return a_info->distant_number ;
}
void
-moko_journal_voice_info_set_callee_number (MokoJournalVoiceInfo *a_info,
+moko_journal_voice_info_set_local_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)
+ if (a_info->local_number)
{
- g_free (a_info->callee_number) ;
- a_info->callee_number = NULL ;
+ g_free (a_info->local_number) ;
+ a_info->local_number = NULL ;
}
if (a_number)
- a_info->callee_number = g_strdup (a_number) ;
+ a_info->local_number = g_strdup (a_number) ;
}
const gchar*
-moko_journal_voice_info_get_callee_number (MokoJournalVoiceInfo *a_info)
+moko_journal_voice_info_get_local_number (MokoJournalVoiceInfo *a_info)
{
g_return_val_if_fail (a_info, NULL) ;
- return a_info->callee_number ;
+ return a_info->local_number ;
}
void
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-27 14:45:20 UTC (rev 1861)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.h 2007-04-27 14:52:32 UTC (rev 1862)
@@ -431,20 +431,20 @@
/**
- * moko_journal_voice_info_set_caller_number:
+ * moko_journal_voice_info_set_distant_number:
* @info: the current
* @info: the extra property set attached to the voice call
*/
-void moko_journal_voice_info_set_caller_number (MokoJournalVoiceInfo *info,
+void moko_journal_voice_info_set_distant_number (MokoJournalVoiceInfo *info,
gchar *number) ;
-const gchar* moko_journal_voice_info_get_caller_number
+const gchar* moko_journal_voice_info_get_distant_number
(MokoJournalVoiceInfo *info) ;
-void moko_journal_voice_info_set_callee_number (MokoJournalVoiceInfo *info,
+void moko_journal_voice_info_set_local_number (MokoJournalVoiceInfo *info,
const gchar *number) ;
-const gchar* moko_journal_voice_info_get_callee_number
+const gchar* moko_journal_voice_info_get_local_number
(MokoJournalVoiceInfo *info) ;
void moko_journal_voice_info_set_was_missed (MokoJournalVoiceInfo *info,
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-time.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-time.c 2007-04-27 14:45:20 UTC (rev 1861)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-time.c 2007-04-27 14:52:32 UTC (rev 1862)
@@ -79,3 +79,10 @@
g_return_val_if_fail (a_t, NULL) ;
return icaltime_as_ical_string (a_t->t) ;
}
+
+time_t
+moko_time_as_timet (MokoTime *time)
+{
+ g_return_val_if_fail (time, 0) ;
+ return icaltime_as_timet (time->t) ;
+}
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-time.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-time.h 2007-04-27 14:45:20 UTC (rev 1861)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-time.h 2007-04-27 14:52:32 UTC (rev 1862)
@@ -29,6 +29,7 @@
MokoTime* moko_time_from_timet (const time_t t, gboolean is_date) ;
MokoTime* moko_time_from_string (const gchar *iso_format_date) ;
void moko_time_free (MokoTime *time) ;
+time_t moko_time_as_timet (MokoTime *time) ;
const gchar* moko_time_as_ical_string (MokoTime *t) ;
#endif /*__MOKO_TIME_H__*/
More information about the commitlog
mailing list