This email list is read-only. Emails sent to this list will be discarded
----------------------------------
ChangeLog | 19 +
moblin-system-daemon/battery/battery.c | 63 +++-
moblin-system-daemon/battery/battery.h | 2 +-
moblin-system-daemon/battery/battery.xml | 5 +-
moblin-system-daemon/datetime/datetime.c | 130 ++-----
moblin-system-daemon/datetime/datetime.h | 10 +-
moblin-system-daemon/datetime/datetime.xml | 3 +
moblin-system-daemon/dbus-footer.xml | 1 -
moblin-system-daemon/dbus-header.xml | 2 -
moblin-system-daemon/lcdbacklight/lcdbacklight.c | 11 +-
moblin-system-daemon/lcdbacklight/lcdbacklight.h | 6 +-
moblin-system-daemon/lcdbacklight/lcdbacklight.xml | 9 +-
moblin-system-daemon/moblin-system-daemon.conf | 8 +-
moblin-system-daemon/moblin-system-dbus.c | 85 +++++-
moblin-system-daemon/moblin-system-tool.c | 352 +++++++++++++-------
moblin-system-daemon/sound/sound.xml | 37 ++-
moblin-system-daemon/touchscreen/calibrator.c | 14 +-
moblin-system-daemon/touchscreen/calibrator.h | 8 +-
moblin-system-daemon/touchscreen/touchscreen.xml | 3 +
scripts/moblin-settings.spec | 2 +-
20 files changed, 499 insertions(+), 271 deletions(-)
New commits:
commit 703fe0133bfdb7c081a9a96277dc87053971a8d4
Author: Todd Brandt <[EMAIL PROTECTED]>
Date: Thu Oct 16 12:18:38 2008 -0700
grouped the api calls by common functionality
Diff in this email is a maximum of 400 lines.
diff --git a/ChangeLog b/ChangeLog
index 44d9c7b..23f3f05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+moblin-settings (2.22)
+
+ * Grouped the common functions into subgroups of the org.moblin.SystemDaemon
+ interface:
+ org.moblin.SystemDaemon.battery
+ org.moblin.SystemDaemon.sound
+ org.moblin.SystemDaemon.lcdbacklight
+ org.moblin.SystemDaemon.touchscreen
+ org.moblin.SystemDaemon.datetime
+ * Added 5 message broadcasts to the battery interface. These are sent out
+ as events advising any listeners of battery status:
+ BatteryCharging: sent when the AC is plugged in
+ BatteryDischarging: sent when the AC is unplugged
+ BatteryChargeCritical: sent when the charge falls below 5%
+ BatteryChargeLow: sent when the charge falls below 10%, or rises to 5%
+ BatteryChargeNormal: sent when the charge rises to10%
+
+ -- Todd Brandt <[EMAIL PROTECTED]> Thu Oct 16 12:14:50 PDT 2008
+
moblin-settings (2.21)
* Removed the ubuntu module loads from moblin-kernel-modules
diff --git a/moblin-system-daemon/battery/battery.c
b/moblin-system-daemon/battery/battery.c
index 1eb0808..5b0c6ca 100644
--- a/moblin-system-daemon/battery/battery.c
+++ b/moblin-system-daemon/battery/battery.c
@@ -115,12 +115,34 @@ GetPropertyString(DBusGProxy *proxy, char *prop)
void
refresh_info(MoblinSystemServer *server)
{
+gboolean ac_present;
+gdouble percent_charged;
+DBusMessage *message;
+DBusConnection *cnct = dbus_g_connection_get_connection(server->connection);
if (bobj.proxy[AC_ADAPTER] != NULL)
{
- bobj.ac_present =
+ ac_present =
GetPropertyBoolean(bobj.proxy[AC_ADAPTER],
"ac_adapter.present");
+ if((ac_present)&&!(bobj.ac_present)) {
+ message = dbus_message_new_signal(
+ "/org/moblin/SystemDaemon/battery",
+ "org.moblin.SystemDaemon.battery",
+ "BatteryCharging");
+ dbus_connection_send(cnct, message, NULL);
+ dbus_connection_flush(cnct);
+ dbus_message_unref(message);
+ } else if(!(ac_present)&&(bobj.ac_present)) {
+ message = dbus_message_new_signal(
+ "/org/moblin/SystemDaemon/battery",
+ "org.moblin.SystemDaemon.battery",
+ "BatteryDischarging");
+ dbus_connection_send(cnct, message, NULL);
+ dbus_connection_flush(cnct);
+ dbus_message_unref(message);
+ }
+ bobj.ac_present = ac_present;
}
if (bobj.proxy[BATTERY] != NULL)
@@ -140,8 +162,35 @@ refresh_info(MoblinSystemServer *server)
if((bobj.charge_max != -1)&&(bobj.charge_curr != -1))
{
- bobj.percent_charged =
+ percent_charged =
100.0*((gdouble)bobj.charge_curr/(gdouble)bobj.charge_max);
+ if((percent_charged >= 0.10)&&(bobj.percent_charged < 0.10)) {
+ message = dbus_message_new_signal(
+ "/org/moblin/SystemDaemon/battery",
+ "org.moblin.SystemDaemon.battery",
+ "BatteryChargeNormal");
+ dbus_connection_send(cnct, message, NULL);
+ dbus_connection_flush(cnct);
+ dbus_message_unref(message);
+ } else if(((percent_charged < 0.10)&&(bobj.percent_charged >=
0.10))||
+ ((percent_charged >= 0.05)&&(bobj.percent_charged < 0.05))) {
+ message = dbus_message_new_signal(
+ "/org/moblin/SystemDaemon/battery",
+ "org.moblin.SystemDaemon.battery",
+ "BatteryChargeLow");
+ dbus_connection_send(cnct, message, NULL);
+ dbus_connection_flush(cnct);
+ dbus_message_unref(message);
+ } else if((percent_charged < 0.05)&&(bobj.percent_charged >= 0.05))
{
+ message = dbus_message_new_signal(
+ "/org/moblin/SystemDaemon/battery",
+ "org.moblin.SystemDaemon.battery",
+ "BatteryChargeCritical");
+ dbus_connection_send(cnct, message, NULL);
+ dbus_connection_flush(cnct);
+ dbus_message_unref(message);
+ }
+ bobj.percent_charged = percent_charged;
if(bobj.rate <= 0) {
bobj.seconds_remaining = 0;
} else if(bobj.ac_present) {
@@ -155,13 +204,9 @@ refresh_info(MoblinSystemServer *server)
}
if(server)
{
- DBusMessage *message;
- DBusConnection *cnct;
-
- cnct = dbus_g_connection_get_connection(server->connection);
message = dbus_message_new_signal(
- "/org/moblin/SystemDaemon",
- "org.moblin.SystemDaemon",
+ "/org/moblin/SystemDaemon/battery",
+ "org.moblin.SystemDaemon.battery",
"BatteryStatusChanged");
dbus_message_append_args(message,
DBUS_TYPE_BOOLEAN, &bobj.battery_present,
@@ -177,7 +222,7 @@ refresh_info(MoblinSystemServer *server)
}
gboolean
-system_daemon_get_battery_status(MoblinSystemServer *server,
+system_daemon_battery_get_status(MoblinSystemServer *server,
gboolean *battery_attached, gboolean *ac_attached,
gdouble *percent_charged, gint *seconds_remaining,
GError **error)
diff --git a/moblin-system-daemon/battery/battery.h
b/moblin-system-daemon/battery/battery.h
index 777a193..8d83285 100644
--- a/moblin-system-daemon/battery/battery.h
+++ b/moblin-system-daemon/battery/battery.h
@@ -2,7 +2,7 @@
#define _BATTERY_FUNCS
gboolean
-system_daemon_get_battery_status(
+system_daemon_battery_get_status(
MoblinSystemServer *server,
gboolean *battery_attached,
gboolean *ac_attached,
diff --git a/moblin-system-daemon/battery/battery.xml
b/moblin-system-daemon/battery/battery.xml
index 8fa9a24..5136380 100644
--- a/moblin-system-daemon/battery/battery.xml
+++ b/moblin-system-daemon/battery/battery.xml
@@ -1,6 +1,9 @@
- <method name="GetBatteryStatus">
+ <interface name="org.moblin.SystemDaemon.battery">
+ <annotation name="org.freedesktop.DBus.GLib.CSymbol"
value="system_daemon_battery"/>
+ <method name="GetStatus">
<arg type="b" name="battery_attached" direction="out" />
<arg type="b" name="ac_attached" direction="out" />
<arg type="d" name="percent_charged" direction="out" />
<arg type="i" name="seconds_remaining" direction="out"
/>
</method>
+ </interface>
diff --git a/moblin-system-daemon/datetime/datetime.c
b/moblin-system-daemon/datetime/datetime.c
index 8b60bc8..5dce11e 100644
--- a/moblin-system-daemon/datetime/datetime.c
+++ b/moblin-system-daemon/datetime/datetime.c
@@ -70,8 +70,6 @@ gboolean __validate_time_input(const gint year, const gint
month, const gint day
// machines but it kept failing on mine.
if( INT_MAX <= 2147483647 ) // this is the size of an integer on a
32-bit machine
{
- PRINTF("test\n");
-
// If year is between 0 and 100 (YY format instead of YYYY), I
add 2000
// to it, so I have to check to make sure it isn't between 38 &
100 too.
if( ( (year < 100) && (year >= 38) ) || (year >= 2038) )
@@ -126,14 +124,11 @@ gboolean __validate_time_input(const gint year, const
gint month, const gint day
}
gboolean
-system_daemon_set_time(MoblinSystemServer * server,
+system_daemon_datetime_set_time(MoblinSystemServer * server,
const gint year, const gint month, const gint day,
const gint hour, const gint minute, const gint second,
GError **error)
{
- PRINTF("[system_daemon_set_time]:\n\tyear=%d, month=%d,
day=%d\n\thour=%d, minute=%d, second=%d\n",
- year, month, day, hour, minute, second);
-
int retVal = 0;
// Validating the input
@@ -146,7 +141,7 @@ system_daemon_set_time(MoblinSystemServer * server,
g_set_error (error, error_quark, INVALID_INPUT,
errorMsg);
- PRINTF("[system_daemon_set_time] __verify_time_input
failed:\n\t%s\n", errorMsg);
+ PRINTF("[system_daemon_datetime_set_time] __verify_time_input
failed:\n\t%s\n", errorMsg);
return FALSE;
}
@@ -157,7 +152,7 @@ system_daemon_set_time(MoblinSystemServer * server,
g_set_error (error, error_quark, STDLIB_MALLOC_ERROR,
"malloc failed");
- PRINTF("[system_daemon_set_time] malloc failed:\n\tstruct
timeval* timev = NULL\n");
+ PRINTF("[system_daemon_datetime_set_time] malloc
failed:\n\tstruct timeval* timev = NULL\n");
return FALSE;
}
@@ -177,7 +172,7 @@ system_daemon_set_time(MoblinSystemServer * server,
g_set_error (error, error_quark, STDLIB_MALLOC_ERROR,
"malloc failed");
- PRINTF("[system_daemon_set_time] malloc failed:\n\tstruct tm*
time = NULL\n");
+ PRINTF("[system_daemon_datetime_set_time] malloc
failed:\n\tstruct tm* time = NULL\n");
free(timev);
timev = NULL;
@@ -211,7 +206,7 @@ system_daemon_set_time(MoblinSystemServer * server,
g_set_error (error, error_quark, TIME_MKTIME_ERROR,
"mktime error; likely invalid input");
- PRINTF("[system_daemon_set_time] mktime failed:\n\tLikely that
your input is not valid.\n");// errno= %s\n"), strerror(errno));
+ PRINTF("[system_daemon_datetime_set_time] mktime
failed:\n\tLikely that your input is not valid.\n");// errno= %s\n"),
strerror(errno));
free(timev);
timev = NULL;
@@ -221,9 +216,8 @@ system_daemon_set_time(MoblinSystemServer * server,
return FALSE;
}
- PRINTF("[system_daemon_set_time] mktime successful:\n\tepoch = %d\n",
((int)timev->tv_sec));
- // The system_daemon_set_time function does not support milliseconds
+ // The system_daemon_datetime_set_time function does not support
milliseconds
timev->tv_usec = 0;
// settimeofday will set the system time to UTC given the number of
@@ -234,7 +228,7 @@ system_daemon_set_time(MoblinSystemServer * server,
g_set_error (error, error_quark, SYS_SETTIMEOFDAY_ERROR,
strerror(errno));
- PRINTF("[system_daemon_set_time] settimeofday failed:\n\t%s\n",
strerror(errno));
+ PRINTF("[system_daemon_datetime_set_time] settimeofday
failed:\n\t%s\n", strerror(errno));
free(timev);
timev = NULL;
@@ -244,7 +238,6 @@ system_daemon_set_time(MoblinSystemServer * server,
return FALSE;
}
- PRINTF("[system_daemon_set_time] settimeofday successful:\n\ttime =
%s\n", asctime (time) );
free(timev);
timev = NULL;
@@ -252,18 +245,15 @@ system_daemon_set_time(MoblinSystemServer * server,
free(time);
time = NULL;
- PRINTF("[system_daemon_set_time] end\n");
return TRUE;
}
gboolean
-system_daemon_get_time(MoblinSystemServer * server,
+system_daemon_datetime_get_time(MoblinSystemServer * server,
gint *year, gint *month, gint *day,
gint *hour, gint *minute, gint *second,
GError **error)
{
- PRINTF("[system_daemon_get_time] start\n");
-
int retVal = 0;
struct timeval timev;
@@ -294,12 +284,10 @@ system_daemon_get_time(MoblinSystemServer * server,
g_set_error (error, error_quark, SYS_GETTIMEOFDAY_ERROR,
strerror(errno));
- PRINTF("[system_daemon_get_time] gettimeofday failed:\n\t%s\n",
strerror(errno));
+ PRINTF("[system_daemon_datetime_get_time] gettimeofday
failed:\n\t%s\n", strerror(errno));
return FALSE;
}
- PRINTF("[system_daemon_get_time] gettimeofday successful:\n\tepoch =
%d\n", ((int)timev.tv_sec));
-
// localtime will convert the seconds from epoch to a time struct
// so that we can extract the hours, minutes, secones, etc.
getTime = localtime(&timev.tv_sec);
@@ -308,12 +296,10 @@ system_daemon_get_time(MoblinSystemServer * server,
g_set_error (error, error_quark, TIME_LOCALTIME_ERROR,
"localtimefailed");
- PRINTF("[system_daemon_get_time] localtime failed.\n");
+ PRINTF("[system_daemon_datetime_get_time] localtime failed.\n");
return FALSE;
}
- PRINTF ( "[system_daemon_get_time] localtime successful:\n\ttime =
%s\n", asctime (getTime) );
-
// set the values to be returned to the caller
*year = (gint)(getTime->tm_year + 1900);
*month = (gint)(getTime->tm_mon + 1);
@@ -322,15 +308,13 @@ system_daemon_get_time(MoblinSystemServer * server,
*minute = (gint)(getTime->tm_min);
*second = (gint)(getTime->tm_sec);
- PRINTF("[system_daemon_get_time] end\n");
return TRUE;
}
gboolean
-system_daemon_get_all_timezones(MoblinSystemServer * server,
+system_daemon_datetime_get_all_timezones(MoblinSystemServer * server,
int options, gchar ***tz_list, GError **error)
{
- PRINTF("[system_daemon_get_all_timezones] start\n\toptions=%d\n",
options);
int optionsBitMask = 8; // 0b00001000
FILE* pFile = NULL;
@@ -364,14 +348,13 @@ system_daemon_get_all_timezones(MoblinSystemServer *
server,
g_set_error (error, error_quark, STDIO_FOPEN_ERROR,
strerror(errno));
- PRINTF("[system_daemon_get_all_timezones] fopen
failed:\n\t%s\n", strerror(errno));
+ PRINTF("[system_daemon_datetime_get_all_timezones] fopen
failed:\n\t%s\n", strerror(errno));
fclose(pFile);
pFile = NULL;
return FALSE;
}
- PRINTF("[system_daemon_get_all_timezones] fopen successful:\n\t%s\n",
strerror(errno));
// getting the length of the file zone.tab
fseek(pFile, 0, SEEK_END);
@@ -383,14 +366,13 @@ system_daemon_get_all_timezones(MoblinSystemServer *
server,
g_set_error (error, error_quark, STDIO_FSEEK_FTELL_ERROR,
"ftell/fseek error");
- PRINTF("[system_daemon_get_all_timezones] fseek/ftell
failed:\n\t%s\n", strerror(errno));
+ PRINTF("[system_daemon_datetime_get_all_timezones] fseek/ftell
failed:\n\t%s\n", strerror(errno));
fclose(pFile);
pFile = NULL;
return FALSE;
}
- PRINTF("[system_daemon_get_all_timezones] fseek/ftell
successful:\n\tfile length = %d\n", ((int)fileLen));
// allocating a buffer to the size of the file so that we can write
// the file to it
@@ -400,7 +382,7 @@ system_daemon_get_all_timezones(MoblinSystemServer * server,
g_set_error (error, error_quark, STDLIB_MALLOC_ERROR,
"malloc failed");
- PRINTF("[system_daemon_get_all_timezones] malloc
failed:\n\tchar* buffer == NULL\n");
+ PRINTF("[system_daemon_datetime_get_all_timezones] malloc
failed:\n\tchar* buffer == NULL\n");
fclose(pFile);
pFile = NULL;
@@ -424,7 +406,7 @@ system_daemon_get_all_timezones(MoblinSystemServer * server,
g_set_error (error, error_quark, STDLIB_MALLOC_ERROR,
"malloc failed");
- PRINTF("[system_daemon_get_all_timezones] malloc
failed:\n\tchar** tz_list == NULL\n");
+ PRINTF("[system_daemon_datetime_get_all_timezones] malloc
failed:\n\tchar** tz_list == NULL\n");
free(buffer);
buffer = NULL;
@@ -436,15 +418,13 @@ system_daemon_get_all_timezones(MoblinSystemServer *
server,
}
memset((*tz_list), 0, approxLines);
- PRINTF("[system_daemon_get_all_timezones] memory allocations
successful.\n");
-
// reading the file zone.tab into the buffer
if (fread(buffer, sizeof(char), fileLen, pFile) != (sizeof(char) *
fileLen))
{
g_set_error (error, error_quark, STDIO_FREAD_ERROR,
strerror(errno));
- PRINTF("[system_daemon_get_all_timezones] fread
failed:\n\t%s\n", strerror(errno));
+ PRINTF("[system_daemon_datetime_get_all_timezones] fread
failed:\n\t%s\n", strerror(errno));
free(buffer);
buffer = NULL;
@@ -458,7 +438,6 @@ system_daemon_get_all_timezones(MoblinSystemServer * server,
return FALSE;
}
buffer[fileLen] = '\0';
- PRINTF("[system_daemon_get_all_timezones] fread successful:\n\t%ld
bytes read.\n", fileLen);
// tokenizing the buffer by line
tok = strtok(buffer, "\n");
@@ -482,7 +461,7 @@ system_daemon_get_all_timezones(MoblinSystemServer * server,
g_set_error (error, error_quark,
STDLIB_MALLOC_ERROR,
"malloc failed");
- PRINTF("[system_daemon_get_all_timezones]
malloc failed:\n\tchar* copyIter == NULL\n");
+
PRINTF("[system_daemon_datetime_get_all_timezones] malloc failed:\n\tchar*
copyIter == NULL\n");
fclose(pFile);
pFile = NULL;
@@ -514,9 +493,6 @@ system_daemon_get_all_timezones(MoblinSystemServer * server,
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
